[SCM] mplayer/master.experimental: drop 51_FTBFS_arm.patch again

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Mon Jan 9 22:12:33 UTC 2012


The following commit has been merged in the master.experimental branch:
commit 916d2df9cc2b64f6b09307893c2fa2831c935dfe
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 9 22:44:41 2012 +0100

    drop 51_FTBFS_arm.patch again
    
    After switching to external libmpeg2, it has become unnecessary.

diff --git a/debian/patches/51_FTBFS_arm.patch b/debian/patches/51_FTBFS_arm.patch
deleted file mode 100644
index ff8480c..0000000
--- a/debian/patches/51_FTBFS_arm.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-
---- a/configure
-+++ b/configure
-@@ -2920,7 +2920,7 @@ if arm ; then
-     extra_cflags="$extra_cflags -mthumb"
-     def_armthumb='#define CONFIG_THUMB 1'
-   else
--    extra_cflags="$extra_cflags -marm"
-+    extra_cflags="$extra_cflags -marm -march=armv5te"
-     def_armthumb='#define CONFIG_THUMB 0'
-   fi
-   echores "$armthumb"
diff --git a/debian/patches/series b/debian/patches/series
index 804a11c..2e86a33 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 23mplayer-debug-printf.patch
 50_Hurd_PATH_MAX.patch
-51_FTBFS_arm.patch

-- 
mplayer packaging



More information about the pkg-multimedia-commits mailing list