[SCM] xbmc/master: Refresh patches after adding MIPS support

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d004b2ffb18458f35034769142ca4e165b2b248d
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Mon Oct 13 22:04:33 2014 +0200

    Refresh patches after adding MIPS support

diff --git a/debian/patches/04-differentiate-from-vanilla-XBMC.patch b/debian/patches/04-differentiate-from-vanilla-XBMC.patch
index 5b449c6..a032937 100644
--- a/debian/patches/04-differentiate-from-vanilla-XBMC.patch
+++ b/debian/patches/04-differentiate-from-vanilla-XBMC.patch
@@ -22,7 +22,7 @@
  				<texture>xbmc-logo.png</texture>
 --- a/xbmc/Application.cpp
 +++ b/xbmc/Application.cpp
-@@ -693,7 +693,7 @@
+@@ -691,7 +691,7 @@
    CProfilesManager::Get().Load();
  
    CLog::Log(LOGNOTICE, "-----------------------------------------------------------------------");
diff --git a/debian/patches/06-use-external-libraries.patch b/debian/patches/06-use-external-libraries.patch
index 6dec2c0..9252542 100644
--- a/debian/patches/06-use-external-libraries.patch
+++ b/debian/patches/06-use-external-libraries.patch
@@ -21,7 +21,7 @@ Forwarded: not-needed
  	lib/cpluff \
  	lib/xbmc-dll-symbols
  
-@@ -423,7 +421,7 @@
+@@ -424,7 +422,7 @@
  	$(MAKE) -C lib/timidity
  	$(MAKE) -C lib/nosefart
  ifneq ($(findstring arm-osx, at ARCH@), arm-osx)
@@ -30,7 +30,7 @@ Forwarded: not-needed
  endif
  ifeq (@USE_ASAP_CODEC@,1)
    ifneq ($(findstring osx, at ARCH@), osx)
-@@ -444,7 +442,7 @@
+@@ -445,7 +443,7 @@
  
  codecs: papcodecs dvdpcodecs dvdpextcodecs
  
@@ -52,7 +52,7 @@ Forwarded: not-needed
  BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac
 --- a/configure.in
 +++ b/configure.in
-@@ -1186,6 +1186,12 @@
+@@ -1206,6 +1206,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],
-@@ -1268,6 +1274,8 @@
+@@ -1287,6 +1293,8 @@
  XB_FIND_SONAME([MODPLUG],     [modplug])
  XB_FIND_SONAME([ASS],         [ass])
  XB_FIND_SONAME([MPEG2],       [mpeg2])
@@ -74,7 +74,7 @@ Forwarded: not-needed
  
  # Audio encoders
  if test "x$use_libmp3lame" != "xno"; then
-@@ -2538,7 +2546,6 @@
+@@ -2552,7 +2560,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 \
-@@ -2554,7 +2561,6 @@
+@@ -2568,7 +2575,6 @@
      lib/libexif/Makefile \
      lib/libXDAAP/Makefile \
      lib/cmyth/Makefile \
diff --git a/debian/patches/08-armel.patch b/debian/patches/08-armel.patch
index 5ea75fb..23a983f 100644
--- a/debian/patches/08-armel.patch
+++ b/debian/patches/08-armel.patch
@@ -1,20 +1,18 @@
-diff --git a/xbmc/utils/MathUtils.h b/xbmc/utils/MathUtils.h
-index 96af9f4..76dacc8 100644
 --- a/xbmc/utils/MathUtils.h
 +++ b/xbmc/utils/MathUtils.h
-@@ -34,6 +34,7 @@
- 
+@@ -35,6 +35,7 @@
  #if defined(__ppc__) || \
      defined(__powerpc__) || \
-+   (defined(__VFP_FP__) && defined(__SOFTFP__)) || \
+     defined(__mips__) || \
++   (defined(__VFP_FP__) && defined(__SOFTFP__)) ||       \
     (defined(TARGET_DARWIN_IOS) && defined(__llvm__)) || \
     (defined(TARGET_ANDROID) && defined(__arm__)) || \
      defined(TARGET_RASPBERRY_PI)
-@@ -42,6 +43,7 @@
- 
+@@ -44,6 +45,7 @@
  #if defined(__ppc__) || \
      defined(__powerpc__) || \
-+   (defined(__VFP_FP__) && defined(__SOFTFP__)) || \
+     defined(__mips__) || \
++   (defined(__VFP_FP__) && defined(__SOFTFP__)) ||       \
     (defined(TARGET_DARWIN) && defined(__llvm__)) || \
     (defined(TARGET_ANDROID) && defined(__arm__)) || \
      defined(TARGET_RASPBERRY_PI)
diff --git a/debian/patches/10-configure-all-arches.patch b/debian/patches/10-configure-all-arches.patch
index 57e06df..913f07f 100644
--- a/debian/patches/10-configure-all-arches.patch
+++ b/debian/patches/10-configure-all-arches.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
 
 --- a/configure.in
 +++ b/configure.in
-@@ -683,7 +683,7 @@
+@@ -685,7 +685,7 @@
    powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*)
       ARCH="powerpc-linux"
       ;;
@@ -17,9 +17,9 @@ Forwarded: not-needed
       ARCH="powerpc64-linux"
       ;;
    arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
-@@ -713,8 +713,13 @@
+@@ -725,8 +725,13 @@
+      use_x11=no
       use_wayland=no
-      build_shared_lib=yes
       ;;
 +  mipsel-linux-gnu)
 +     ARCH="mipsel"

-- 
xbmc packaging