[SCM] x264/master: Disable altivec on powerpcspe (Closes: #701628)
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Mar 23 14:32:32 UTC 2014
The following commit has been merged in the master branch:
commit 7d2b0b74f83b531de50806cc727f7b2a44e9c8b1
Author: Roland Stigge <stigge at antcom.de>
Date: Sun Mar 23 10:15:30 2014 -0400
Disable altivec on powerpcspe (Closes: #701628)
diff --git a/debian/confflags b/debian/confflags
index 42333e0..f475ff9 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -91,6 +91,8 @@ ifneq ($(has_altivec),1)
do_opt := yes
opt_libdir := /usr/lib/$(DEB_HOST_MULTIARCH)/altivec
shared_confflags += --disable-asm
+static_confflags += --disable-asm
+opt_confflags += --disable-asm
endif
endif
diff --git a/debian/patches/powerpcspe.patch b/debian/patches/powerpcspe.patch
new file mode 100644
index 0000000..0b40695
--- /dev/null
+++ b/debian/patches/powerpcspe.patch
@@ -0,0 +1,20 @@
+--- a/common/cpu.c
++++ b/common/cpu.c
+@@ -338,6 +338,9 @@ uint32_t x264_cpu_detect( void )
+
+ uint32_t x264_cpu_detect( void )
+ {
++#ifdef __NO_FPRS__
++ return 0;
++#else
+ static void (*oldsig)( int );
+
+ oldsig = signal( SIGILL, sigill_handler );
+@@ -357,6 +360,7 @@ uint32_t x264_cpu_detect( void )
+ signal( SIGILL, oldsig );
+
+ return X264_CPU_ALTIVEC;
++#endif
+ }
+ #endif
+
diff --git a/debian/patches/series b/debian/patches/series
index 36a551a..04e7c87 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
aarch64-pic.patch
+powerpcspe.patch
--
x264 packaging
More information about the pkg-multimedia-commits
mailing list