[SCM] mplayer/master.experimental: Fix FTBFS on arm

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jan 8 19:42:41 UTC 2012


The following commit has been merged in the master.experimental branch:
commit 55edc93af99170bce17357dbd297c4fab13d51c0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 8 14:21:29 2012 +0100

    Fix FTBFS on arm

diff --git a/debian/patches/51_FTBFS_arm.patch b/debian/patches/51_FTBFS_arm.patch
new file mode 100644
index 0000000..dc0bab5
--- /dev/null
+++ b/debian/patches/51_FTBFS_arm.patch
@@ -0,0 +1,17 @@
+Author: Reinhard Tartler <siretart at tauware.de>
+Description: avoid FTBFS on arm
+
+https://buildd.debian.org/status/fetch.php?pkg=mplayer&arch=armel&ver=2%3A1.0~rc4.dfsg1%2Bsvn34492-1&stamp=1325969800
+
+diff --git a/configure b/configure
+index 253336a..b067065 100755
+--- a/configure
++++ b/configure
+@@ -2920,7 +2920,6 @@ if arm ; then
+     extra_cflags="$extra_cflags -mthumb"
+     def_armthumb='#define CONFIG_THUMB 1'
+   else
+-    extra_cflags="$extra_cflags -marm"
+     def_armthumb='#define CONFIG_THUMB 0'
+   fi
+   echores "$armthumb"
diff --git a/debian/patches/series b/debian/patches/series
index 2e86a33..804a11c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 23mplayer-debug-printf.patch
 50_Hurd_PATH_MAX.patch
+51_FTBFS_arm.patch

-- 
mplayer packaging



More information about the pkg-multimedia-commits mailing list