[SCM] libav/master: drop 01-configure-disable-i686-for-i586

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun May 31 17:23:51 UTC 2015


The following commit has been merged in the master branch:
commit 6667ee589e2bcfbe4e106902d8c5b09762e4eb60
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 31 13:11:08 2015 -0400

    drop 01-configure-disable-i686-for-i586
    
    patch merged upstream

diff --git a/debian/patches/01-configure-disable-i686-for-i586.patch b/debian/patches/01-configure-disable-i686-for-i586.patch
deleted file mode 100644
index c7496f3..0000000
--- a/debian/patches/01-configure-disable-i686-for-i586.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: configure: Disable i686 for i586 and lower CPUs
-Origin: upstream,
- https://git.libav.org/?p=libav.git;a=commit;h=9030c58a780a02fb8256cb75cd39275eaad786d1
-Last-Update: 2015-05-05
-
----
- configure |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/configure
-+++ b/configure
-@@ -3282,6 +3282,7 @@
-     case $cpu in
-         i[345]86|pentium)
-             cpuflags="-march=$cpu"
-+            disable i686
-             disable mmx
-         ;;
-         # targets that do NOT support nopl and conditional mov (cmov)
diff --git a/debian/patches/series b/debian/patches/series
index db402e3..4d3bd8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-01-configure-disable-i686-for-i586.patch
 02-configure-disable-ebx-gcc-4.9.patch
 03-disable-configuration-warnings.patch

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list