[SCM] xbmc/master: Refresh patches

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 94bf01c873261a1b3a6e0afeab574f8404311a56
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Sat Apr 19 21:13:55 2014 +0200

    Refresh patches

diff --git a/debian/patches/06-use-external-libraries.patch b/debian/patches/06-use-external-libraries.patch
index 49cd756..7c681cc 100644
--- a/debian/patches/06-use-external-libraries.patch
+++ b/debian/patches/06-use-external-libraries.patch
@@ -99,7 +99,7 @@ Forwarded: not-needed
      lib/libsquish/Makefile \
      lib/cximage-6.0/Makefile \
      lib/libUPnP/Makefile \
-@@ -2898,7 +2904,7 @@
+@@ -2897,7 +2903,7 @@
    set -x
    rm -f CMakeCache.txt &&                              \
    CC="$ORIGCC" CXX="$ORIGCXX" LDFLAGS="$LDFLAGS" cmake \
@@ -166,7 +166,7 @@ Forwarded: not-needed
 @@ -34,6 +34,8 @@
   #define HAVE_CONFIG_H
   #endif
-
+ 
 + // pull in XBMC's config h instead of dvdnav's one
 + #include "xbmc/config.h"
   #include "dvdnav/dvdnav_internal.h"
diff --git a/debian/patches/10-configure-all-arches.patch b/debian/patches/10-configure-all-arches.patch
index b0a5924..57e06df 100644
--- a/debian/patches/10-configure-all-arches.patch
+++ b/debian/patches/10-configure-all-arches.patch
@@ -6,11 +6,9 @@ Description: Modify XBMC to compile on all architectures
 Author: Balint Reczey <balint at balintreczey.hu>
 Forwarded: not-needed
 
-diff --git a/configure.in b/configure.in
-index beb8aac..352ab80 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -683,7 +683,7 @@ case $host in
+@@ -683,7 +683,7 @@
    powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*)
       ARCH="powerpc-linux"
       ;;
@@ -18,8 +16,8 @@ index beb8aac..352ab80 100644
 +  powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*|ppc64-linux-gnu)
       ARCH="powerpc64-linux"
       ;;
-   arm*-*-linux-gnu*)
-@@ -713,8 +713,13 @@ case $host in
+   arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
+@@ -713,8 +713,13 @@
       use_wayland=no
       build_shared_lib=yes
       ;;

-- 
xbmc packaging