[SCM] xbmc/master: Refresh patches

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 077b007d46993188582774e21e1d4f56d287cb6a
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Mon May 5 13:53:57 2014 +0200

    Refresh patches

diff --git a/debian/patches/05-Fix-GLES-with-X11.patch b/debian/patches/05-Fix-GLES-with-X11.patch
index b95fef8..9ed8976 100644
--- a/debian/patches/05-Fix-GLES-with-X11.patch
+++ b/debian/patches/05-Fix-GLES-with-X11.patch
@@ -34,8 +34,8 @@ index 3d82fbf..cef19a0 100644
  	return false;
  
 -  CTexture iconTexture;
--  iconTexture.LoadFromFile("special://xbmc/media/icon.png");
-+  CBaseTexture* iconTexture = CTexture::LoadFromFile("special://xbmc/media/icon.png");
+-  iconTexture.LoadFromFile("special://xbmc/media/icon256x256.png");
++  CBaseTexture* iconTexture = CTexture::LoadFromFile("special://xbmc/media/icon256x256.png");
  
 -  SDL_WM_SetIcon(SDL_CreateRGBSurfaceFrom(iconTexture.GetPixels(), iconTexture.GetWidth(), iconTexture.GetHeight(), BPP, iconTexture.GetPitch(), 0xff0000, 0x00ff00, 0x0000ff, 0xff000000L), NULL);
 +  if (iconTexture)
diff --git a/debian/patches/06-use-external-libraries.patch b/debian/patches/06-use-external-libraries.patch
index 7c681cc..44d3a09 100644
--- a/debian/patches/06-use-external-libraries.patch
+++ b/debian/patches/06-use-external-libraries.patch
@@ -61,7 +61,7 @@ Forwarded: not-needed
  use_static_ffmpeg=no
  
  # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os
-@@ -1185,6 +1185,12 @@
+@@ -1186,6 +1186,12 @@
  PKG_CHECK_MODULES([TAGLIB],  [taglib >= 1.8],
    [INCLUDES="$INCLUDES $TAGLIB_CFLAGS"; LIBS="$LIBS $TAGLIB_LIBS"],
    AC_MSG_ERROR($missing_library))
@@ -74,7 +74,7 @@ Forwarded: not-needed
  
  if test "$use_optical_drive" = "yes"; then
    PKG_CHECK_MODULES([CDIO],       [libcdio],
-@@ -1267,6 +1273,8 @@
+@@ -1268,6 +1274,8 @@
  XB_FIND_SONAME([MODPLUG],     [modplug])
  XB_FIND_SONAME([ASS],         [ass])
  XB_FIND_SONAME([MPEG2],       [mpeg2])
@@ -83,7 +83,7 @@ Forwarded: not-needed
  
  # Audio encoders
  if test "x$use_libmp3lame" != "xno"; then
-@@ -2530,7 +2538,6 @@
+@@ -2537,7 +2545,6 @@
      lib/timidity/Makefile \
      lib/asap/Makefile \
      lib/nosefart/Makefile \
@@ -91,7 +91,7 @@ Forwarded: not-needed
      lib/vgmstream/Makefile \
      lib/snesapu/SNES/SNESAPU/Makefile \
      lib/stsound/StSoundLibrary/Makefile \
-@@ -2546,7 +2553,6 @@
+@@ -2553,7 +2560,6 @@
      lib/libexif/Makefile \
      lib/libXDAAP/Makefile \
      lib/cmyth/Makefile \
@@ -99,7 +99,7 @@ Forwarded: not-needed
      lib/libsquish/Makefile \
      lib/cximage-6.0/Makefile \
      lib/libUPnP/Makefile \
-@@ -2897,7 +2903,7 @@
+@@ -2905,7 +2911,7 @@
    set -x
    rm -f CMakeCache.txt &&                              \
    CC="$ORIGCC" CXX="$ORIGCXX" LDFLAGS="$LDFLAGS" cmake \

-- 
xbmc packaging