[SCM] ffmpeg/master: Revert "Disable broken optimizations on ppc64el to fix FTBFS"
jcowgill at users.alioth.debian.org
jcowgill at users.alioth.debian.org
Wed Sep 6 19:49:19 UTC 2017
The following commit has been merged in the master branch:
commit c5b5069c53e9e527d311929a158ed30e3157cdbf
Author: James Cowgill <jcowgill at debian.org>
Date: Wed Sep 6 19:25:46 2017 +0100
Revert "Disable broken optimizations on ppc64el to fix FTBFS"
This reverts commit 4b7b2d27de9ea451ee4f0c84b87a8a9d01853789.
diff --git a/debian/patches/0006-disable-ppc-scalarproduct.patch b/debian/patches/0006-disable-ppc-scalarproduct.patch
deleted file mode 100644
index 47faca7..0000000
--- a/debian/patches/0006-disable-ppc-scalarproduct.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Disable broken scalarproduct optimizations on PowerPC
- GCC 7 miscompiles these functions causing various tests to fail on ppc64el.
- Disable them until the toolchain is fixed.
- .
- Toolchain bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81833
-Author: James Cowgill <jcowgill at debian.org>
-Bug-Debian: https://bugs.debian.org/871565
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/libavcodec/ppc/audiodsp.c
-+++ b/libavcodec/ppc/audiodsp.c
-@@ -88,17 +88,4 @@ static int32_t scalarproduct_int16_vsx(c
-
- av_cold void ff_audiodsp_init_ppc(AudioDSPContext *c)
- {
--#if HAVE_ALTIVEC
-- if (!PPC_ALTIVEC(av_get_cpu_flags()))
-- return;
--
-- c->scalarproduct_int16 = scalarproduct_int16_altivec;
--#endif /* HAVE_ALTIVEC */
--
--#if HAVE_VSX
-- if (!PPC_VSX(av_get_cpu_flags()))
-- return;
--
-- c->scalarproduct_int16 = scalarproduct_int16_vsx;
--#endif /* HAVE_VSX */
- }
diff --git a/debian/patches/series b/debian/patches/series
index 983d53d..812c215 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
0003-sws-tests-pixdesc_query-replace-rgb-based-pix-fmts-w.patch
0004-swscale-fix-gbrap16-alpha-channel-issues.patch
0005-arm-thumb2-blx.patch
-0006-disable-ppc-scalarproduct.patch
--
ffmpeg packaging
More information about the pkg-multimedia-commits
mailing list