[SCM] libav/experimental: drop 02-fix-build-on-non-armv5te.patch, merged upstream

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Tue Feb 26 19:07:52 UTC 2013


The following commit has been merged in the experimental branch:
commit 09028c3bdac8479ccbb615cc843889c29265d53f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Feb 26 20:05:46 2013 +0100

    drop 02-fix-build-on-non-armv5te.patch, merged upstream

diff --git a/debian/patches/02-fix-build-on-non-armv5te.patch b/debian/patches/02-fix-build-on-non-armv5te.patch
deleted file mode 100644
index 6f263ee..0000000
--- a/debian/patches/02-fix-build-on-non-armv5te.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fix build on armel without armv5te support.
- libavutil/arm/asm.S sets '.arch' depending on HAVE_ARMV5TE so that
- assembling armv5te code will always succeed even if the default -march
- flag does not support it. HAVE_ARMV5TE_EXTERNAL tests assembling code
- with the default arch.
- .
- Fixes the missing symbol ff_prefetch_arm with --cpu= not including
- armv5te.
-Origin: upstream, https://patches.libav.org/patch/33688/
-Author: Janne Grunau <janne-libav at jannau.net>
-Forwarded: yes
-Last-Update: 2013-01-20
-
---- a/libavcodec/arm/videodsp_armv5te.S
-+++ b/libavcodec/arm/videodsp_armv5te.S
-@@ -22,7 +22,6 @@
- #include "config.h"
- #include "libavutil/arm/asm.S"
- 
--#if HAVE_ARMV5TE_EXTERNAL
- function ff_prefetch_arm, export=1
-         subs            r2,  r2,  #1
-         pld             [r0]
-@@ -30,4 +29,3 @@
-         bne             ff_prefetch_arm
-         bx              lr
- endfunc
--#endif
diff --git a/debian/patches/series b/debian/patches/series
index eb924c8..3199e41 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-02-fix-build-on-non-armv5te.patch
 03-disable-configuration-warnings.patch

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list