[SCM] kodi/master: Refresh patches

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1548f519ba975a0a49c4e561b7132b54ddc0a4a5
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Fri Jan 2 13:27:16 2015 +0100

    Refresh patches

diff --git a/debian/patches/01-Stop-using-internal-ffmpeg-functions.patch b/debian/patches/01-Stop-using-internal-ffmpeg-functions.patch
index 57e8c0a..6d4ca67 100644
--- a/debian/patches/01-Stop-using-internal-ffmpeg-functions.patch
+++ b/debian/patches/01-Stop-using-internal-ffmpeg-functions.patch
@@ -1,8 +1,6 @@
-diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-index 81a511e..3a2dbf2 100644
 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
 +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-@@ -516,11 +516,80 @@ void CDVDDemuxFFmpeg::Reset()
+@@ -535,11 +535,80 @@
    Open(pInputStream, m_streaminfo);
  }
  
@@ -83,5 +81,5 @@ index 81a511e..3a2dbf2 100644
 -    av_read_frame_flush(m_pFormatContext);
 +    xbmc_read_frame_flush(m_pFormatContext);
  
-   m_iCurrentPts = DVD_NOPTS_VALUE;
+   m_currentPts = DVD_NOPTS_VALUE;
  
diff --git a/debian/patches/04-differentiate-from-vanilla-Kodi.patch b/debian/patches/04-differentiate-from-vanilla-Kodi.patch
index 5e2895d..a1e5ebd 100644
--- a/debian/patches/04-differentiate-from-vanilla-Kodi.patch
+++ b/debian/patches/04-differentiate-from-vanilla-Kodi.patch
@@ -1,17 +1,27 @@
 --- a/addons/skin.confluence/720p/Home.xml
 +++ b/addons/skin.confluence/720p/Home.xml
-@@ -19,7 +19,7 @@
- 			<description>LOGO</description>
- 			<left>10</left>
- 			<top>10</top>
--			<width>100</width>
-+			<width>305</width>
- 			<height>50</height>
- 			<aspectratio aligny="top" align="left">keep</aspectratio>
- 			<texture>kodi-logo.png</texture>
+@@ -27,6 +27,18 @@
+ 			<include>Window_OpenClose_Animation</include>
+ 			<visible>!Skin.HasSetting(homepageWeatherinfo)</visible>
+ 		</control>
++		<control type="image">
++			<description>LOGO2</description>
++			<left>118</left>
++			<top>9</top>
++			<width>125</width>
++			<height>41</height>
++			<aspectratio aligny="top" align="left">keep</aspectratio>
++			<texture>from-debian-logo.png</texture>
++			<include>VisibleFadeEffect</include>
++			<include>Window_OpenClose_Animation</include>
++			<visible>!Skin.HasSetting(homepageWeatherinfo)</visible>
++		</control>
+ 		<!-- Music Info -->
+ 		<control type="group">
+ 			<left>0</left>
 --- a/xbmc/GUIInfoManager.cpp
 +++ b/xbmc/GUIInfoManager.cpp
-@@ -4242,12 +4242,12 @@
+@@ -4240,12 +4240,12 @@
    if (strlen(CCompileInfo::GetSuffix()) == 0)
      return StringUtils::Format("%d.%d", CCompileInfo::GetMajor(), CCompileInfo::GetMinor());
    else
@@ -26,7 +36,7 @@
  }
  
  CStdString CGUIInfoManager::GetBuild()
-@@ -4257,7 +4257,7 @@
+@@ -4255,7 +4255,7 @@
  
  CStdString CGUIInfoManager::GetAppName()
  {
diff --git a/debian/patches/06-use-external-libraries.patch b/debian/patches/06-use-external-libraries.patch
index 232d287..5258770 100644
--- a/debian/patches/06-use-external-libraries.patch
+++ b/debian/patches/06-use-external-libraries.patch
@@ -52,7 +52,7 @@ Forwarded: not-needed
  BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac
 --- a/configure.in
 +++ b/configure.in
-@@ -1150,6 +1150,12 @@
+@@ -1162,6 +1162,12 @@
  PKG_CHECK_MODULES([TAGLIB],  [taglib >= 1.8],
    [INCLUDES="$INCLUDES $TAGLIB_CFLAGS"; LIBS="$LIBS $TAGLIB_LIBS"],
    AC_MSG_ERROR($missing_library))
@@ -65,7 +65,7 @@ Forwarded: not-needed
  
  if test "$use_optical_drive" = "yes"; then
    PKG_CHECK_MODULES([CDIO],       [libcdio],
-@@ -1241,6 +1247,8 @@
+@@ -1253,6 +1259,8 @@
  XB_FIND_SONAME([MODPLUG],     [modplug])
  XB_FIND_SONAME([ASS],         [ass])
  XB_FIND_SONAME([MPEG2],       [mpeg2])
@@ -74,7 +74,7 @@ Forwarded: not-needed
  
  # WebServer
  if test "$use_webserver" = "yes"; then
-@@ -2446,7 +2454,6 @@
+@@ -2458,7 +2466,6 @@
      lib/timidity/Makefile \
      lib/asap/Makefile \
      lib/nosefart/Makefile \
@@ -82,7 +82,7 @@ Forwarded: not-needed
      lib/vgmstream/Makefile \
      lib/snesapu/SNES/SNESAPU/Makefile \
      lib/stsound/StSoundLibrary/Makefile \
-@@ -2462,7 +2469,6 @@
+@@ -2474,7 +2481,6 @@
      lib/libexif/Makefile \
      lib/libXDAAP/Makefile \
      lib/cmyth/Makefile \

-- 
kodi packaging