[SCM] xbmc/master: Refactor patches to split Libav-related ones

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f1bc8c1c221e83245ba2c110fef588c635eb4376
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Fri May 16 12:10:44 2014 +0200

    Refactor patches to split Libav-related ones

diff --git a/debian/patches/0007-Enable-using-external-ffmpeg-in-.-configure.patch b/debian/patches/0007-Enable-using-external-ffmpeg-in-.-configure.patch
new file mode 100644
index 0000000..c228740
--- /dev/null
+++ b/debian/patches/0007-Enable-using-external-ffmpeg-in-.-configure.patch
@@ -0,0 +1,25 @@
+From dc85016024fef825a8fffcd9881a7a0bd86912af Mon Sep 17 00:00:00 2001
+From: Balint Reczey <balint at balintreczey.hu>
+Date: Fri, 16 May 2014 12:07:51 +0200
+Subject: [PATCH] Enable using external ffmpeg in ./configure
+
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 4c73ff1..31b02a7 100644
+--- a/configure.in
++++ b/configure.in
+@@ -600,7 +600,7 @@ PKG_PROG_PKG_CONFIG
+ MAKE="${MAKE:-make}"
+ OBJDUMP="${OBJDUMP:-objdump}"
+ 
+-use_external_ffmpeg=no
++use_external_ffmpeg=yes
+ use_static_ffmpeg=no
+ 
+ # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os
+-- 
+1.9.1
+
diff --git a/debian/patches/06-use-external-libraries.patch b/debian/patches/06-use-external-libraries.patch
index 44d3a09..cf99899 100644
--- a/debian/patches/06-use-external-libraries.patch
+++ b/debian/patches/06-use-external-libraries.patch
@@ -52,15 +52,6 @@ Forwarded: not-needed
  BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac
 --- a/configure.in
 +++ b/configure.in
-@@ -600,7 +600,7 @@
- MAKE="${MAKE:-make}"
- OBJDUMP="${OBJDUMP:-objdump}"
- 
--use_external_ffmpeg=no
-+use_external_ffmpeg=yes
- use_static_ffmpeg=no
- 
- # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os
 @@ -1186,6 +1186,12 @@
  PKG_CHECK_MODULES([TAGLIB],  [taglib >= 1.8],
    [INCLUDES="$INCLUDES $TAGLIB_CFLAGS"; LIBS="$LIBS $TAGLIB_LIBS"],
@@ -83,7 +74,7 @@ Forwarded: not-needed
  
  # Audio encoders
  if test "x$use_libmp3lame" != "xno"; then
-@@ -2537,7 +2545,6 @@
+@@ -2538,7 +2546,6 @@
      lib/timidity/Makefile \
      lib/asap/Makefile \
      lib/nosefart/Makefile \
@@ -91,7 +82,7 @@ Forwarded: not-needed
      lib/vgmstream/Makefile \
      lib/snesapu/SNES/SNESAPU/Makefile \
      lib/stsound/StSoundLibrary/Makefile \
-@@ -2553,7 +2560,6 @@
+@@ -2554,7 +2561,6 @@
      lib/libexif/Makefile \
      lib/libXDAAP/Makefile \
      lib/cmyth/Makefile \
@@ -99,7 +90,7 @@ Forwarded: not-needed
      lib/libsquish/Makefile \
      lib/cximage-6.0/Makefile \
      lib/libUPnP/Makefile \
-@@ -2905,7 +2911,7 @@
+@@ -2906,7 +2912,7 @@
    set -x
    rm -f CMakeCache.txt &&                              \
    CC="$ORIGCC" CXX="$ORIGCXX" LDFLAGS="$LDFLAGS" cmake \
diff --git a/debian/patches/series b/debian/patches/series
index 2ec3310..f8ed748 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@
 0004-Disable-static-ffmpeg-when-using-external-ffmpeg-liba.patch
 0005-Fix-av_stream_get_r_frame_rate-Libav-hack-accessor.patch
 0006-Not-all-FFmpeg-versions-have-AV_CODEC_ID_SUBRIP.patch
+0007-Enable-using-external-ffmpeg-in-.-configure.patch
 04-differentiate-from-vanilla-XBMC.patch
 05-Fix-GLES-with-X11.patch
 06-use-external-libraries.patch

-- 
xbmc packaging