[SCM] x264/master: Drop powerpcspe.patch which got upstreamed
ricotz-guest at users.alioth.debian.org
ricotz-guest at users.alioth.debian.org
Sat Jun 7 07:25:59 UTC 2014
The following commit has been merged in the master branch:
commit 41d4969cef8d8bd7578aee7d483b47e0e7007e0f
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date: Sat Jun 7 09:21:13 2014 +0200
Drop powerpcspe.patch which got upstreamed
diff --git a/debian/patches/powerpcspe.patch b/debian/patches/powerpcspe.patch
deleted file mode 100644
index 0b40695..0000000
--- a/debian/patches/powerpcspe.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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 e251b81..5cbc1d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
aarch64-pic.patch
-powerpcspe.patch
link_gpac_dynamically.patch
--
x264 packaging
More information about the pkg-multimedia-commits
mailing list