Disable non pic safe asm on x86 and amd64, bug #172845, bug #172877 and dupes

Package-Manager: portage-2.1.2.3

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index ac341b87cdbb467594e5b427fcec826766ce955c..d42f3d529ea4dc8d48a64d46693ad1f07efc52ae 100644 (file)
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.188 2007/04/04 20:14:07 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.189 2007/04/05 19:28:18 aballier Exp $
+
+  05 Apr 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/ffmpeg-0.4.9_p20070330-asmpic.patch, ffmpeg-0.4.9_p20070330.ebuild:
+  Disable non pic safe asm on x86 and amd64, bug #172845, bug #172877 and dupes
 
   04 Apr 2007; Markus Rothe <corsair@gentoo.org>
   ffmpeg-0.4.9_p20070330.ebuild:

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index b11af51938f69b32038ad5bc5d35e76f9f6e54ce..fbf88344fea3aa8690fa0863b5dcbad77ae4eec0 100644 (file)
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.4.8-gcc3.4-magicF2W.patch 994 RMD160 4192e2537d220d4b63c55bdea36ac7f5532d8a6a SHA1 07c79c6680ebe0b1a695394ba4d24abb503c4b46 SHA256 3d359f8483903dcc876be0ee4ff511d63a8cf57fade26d58f72e4a3ec0694226
 MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 RMD160 4192e2537d220d4b63c55bdea36ac7f5532d8a6a files/0.4.8-gcc3.4-magicF2W.patch 994
@@ -18,6 +21,10 @@ AUX ffmpeg-0.4.9_p20060530-snow-mmx.patch 10622 RMD160 7c2d6900b9079468d6ab2bc9b
 MD5 049939198b5acd5b3fb3f0e319724c81 files/ffmpeg-0.4.9_p20060530-snow-mmx.patch 10622
 RMD160 7c2d6900b9079468d6ab2bc9b619ebe853d7b8fb files/ffmpeg-0.4.9_p20060530-snow-mmx.patch 10622
 SHA256 7df5d4a945d36b582392f671eead16a94bdc75e859ab69c1f2e6c05c34bf8c7b files/ffmpeg-0.4.9_p20060530-snow-mmx.patch 10622
+AUX ffmpeg-0.4.9_p20070330-asmpic.patch 2111 RMD160 3172d33b3f98933de028a279a55ceea488ab635a SHA1 1a60ea4599324bb29be2de818ee126804203b060 SHA256 a0799a9fda4312c468ec812af67e3a69f7e9f298f877734ce061dfaa4e5b1ce9
+MD5 cb246a8aa562c144f39894d5d7e1c00a files/ffmpeg-0.4.9_p20070330-asmpic.patch 2111
+RMD160 3172d33b3f98933de028a279a55ceea488ab635a files/ffmpeg-0.4.9_p20070330-asmpic.patch 2111
+SHA256 a0799a9fda4312c468ec812af67e3a69f7e9f298f877734ce061dfaa4e5b1ce9 files/ffmpeg-0.4.9_p20070330-asmpic.patch 2111
 AUX ffmpeg-libdir-2007.patch 313 RMD160 88b86d34eaf976db25db70449b0d4a3238a16a32 SHA1 43486a328913beec5ae1f38eb6fd987b2d756995 SHA256 08df45ff041269c1226eda787e9a30373ed7b5a469e06b6b30bd6a81e781f863
 MD5 7e0641383d698cdb826850074b38ca1f files/ffmpeg-libdir-2007.patch 313
 RMD160 88b86d34eaf976db25db70449b0d4a3238a16a32 files/ffmpeg-libdir-2007.patch 313
@@ -89,14 +96,14 @@ EBUILD ffmpeg-0.4.9_p20070325.ebuild 6111 RMD160 6a71e087b81ea18ecccdda5a2032c5d
 MD5 e642796170ecfed3c1259e509a0a84ca ffmpeg-0.4.9_p20070325.ebuild 6111
 RMD160 6a71e087b81ea18ecccdda5a2032c5d088be9aa4 ffmpeg-0.4.9_p20070325.ebuild 6111
 SHA256 2eac1188c63ec067414b56c6a971d29a406e4e739c84f4bf3495bef001a6651c ffmpeg-0.4.9_p20070325.ebuild 6111
-EBUILD ffmpeg-0.4.9_p20070330.ebuild 6082 RMD160 4780327ac73464f3408bbc22d99ad4e4a4f131f3 SHA1 64e47cea606a0448c3b6db1d088718929ddfe578 SHA256 66ada40089828a3139f3b9d058cf6d6d6d7689de13ad304d12cc2dd6e8c8f328
-MD5 3ab2a7f0f357af665dbc914acf5d863f ffmpeg-0.4.9_p20070330.ebuild 6082
-RMD160 4780327ac73464f3408bbc22d99ad4e4a4f131f3 ffmpeg-0.4.9_p20070330.ebuild 6082
-SHA256 66ada40089828a3139f3b9d058cf6d6d6d7689de13ad304d12cc2dd6e8c8f328 ffmpeg-0.4.9_p20070330.ebuild 6082
-MISC ChangeLog 28141 RMD160 92e718bfb2601af76e95a6010fd0960913d0e8bd SHA1 8c49c0ee5dd247cf46e0eb4a2c3934ed61c68ccb SHA256 efcaf3f6b58f049ec75a93ea4fb87489098d61f2be401729a7f6d5ee5319884f
-MD5 36f2ceae85255d7d99bed852aecddadc ChangeLog 28141
-RMD160 92e718bfb2601af76e95a6010fd0960913d0e8bd ChangeLog 28141
-SHA256 efcaf3f6b58f049ec75a93ea4fb87489098d61f2be401729a7f6d5ee5319884f ChangeLog 28141
+EBUILD ffmpeg-0.4.9_p20070330.ebuild 6187 RMD160 8d15497bd62d049708878a5a031ccc1f6417682e SHA1 4e3222d2801ecedfe74fb3327b3068166c3d4a43 SHA256 0641753f9d5bb2f872387aac1ec85465364eb8367faab9ae53e4ef009f515621
+MD5 c6087676bcca9ded9b73f8a35cea8ab8 ffmpeg-0.4.9_p20070330.ebuild 6187
+RMD160 8d15497bd62d049708878a5a031ccc1f6417682e ffmpeg-0.4.9_p20070330.ebuild 6187
+SHA256 0641753f9d5bb2f872387aac1ec85465364eb8367faab9ae53e4ef009f515621 ffmpeg-0.4.9_p20070330.ebuild 6187
+MISC ChangeLog 28352 RMD160 130ab2863be62b827ccd3701aae64f3ad5b6a89a SHA1 c65d14526f4f8d9cb7497d5c6ed67241739a166f SHA256 5e9f37e83f08ac778b7c6e57099be4a90367c67729172f573f22e356223fd8cf
+MD5 31f977f9c07543157272e93a7c3bbc07 ChangeLog 28352
+RMD160 130ab2863be62b827ccd3701aae64f3ad5b6a89a ChangeLog 28352
+SHA256 5e9f37e83f08ac778b7c6e57099be4a90367c67729172f573f22e356223fd8cf ChangeLog 28352
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -128,3 +135,10 @@ SHA256 1e5dc7d4a04cc22acdd5de9055bc5313893eaab38703cff06fc004e95a9ec1c4 files/di
 MD5 d98d9051657b11d7b00a8ac162ebbf40 files/digest-ffmpeg-0.4.9_p20070330 714
 RMD160 1d590a65f72ee227dbed00f4529f3d326b7fe007 files/digest-ffmpeg-0.4.9_p20070330 714
 SHA256 e7362005124f820743564e7eddd99840696e2d5689f1afe46c53c35089b4a0fb files/digest-ffmpeg-0.4.9_p20070330 714
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGFU2cvFcC4BYPU0oRAlLfAJ9k8n7YKk3Jy7IDoaIL2bvVBiOz1QCgiv/1
+QO+SHn+DBWPzEJStPDbxo8c=
+=eioT
+-----END PGP SIGNATURE-----

diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20070330.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20070330.ebuild
index c89779be7a15202103d978dc07d44bf6f3a71f1e..36d5e74dbe5e8bad4e5a03bf0ce3a6c02371baab 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20070330.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20070330.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20070330.ebuild,v 1.3 2007/04/04 20:14:07 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20070330.ebuild,v 1.4 2007/04/05 19:28:18 aballier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -89,6 +89,8 @@ src_unpack() {
        sed -i -e "s:-e debug=off::" tests/server-regression.sh
 
        epatch "${FILESDIR}/${PN}-shared-gcc4.1.patch"
+       # disable non pic safe asm, bug #172877, bug #172845 and dupes
+       epatch "${FILESDIR}/${P}-asmpic.patch"
 }
 
 src_compile() {

diff --git a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20070330-asmpic.patch b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20070330-asmpic.patch
new file mode 100644 (file)
index 0000000..0cf16c3
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20070330-asmpic.patch
@@ -0,0 +1,35 @@
+Index: ffmpeg/libavcodec/cabac.h
+===================================================================
+--- ffmpeg.orig/libavcodec/cabac.h
++++ ffmpeg/libavcodec/cabac.h
+@@ -376,7 +376,7 @@ static int av_always_inline get_cabac_in
+ #define BYTE        "16"
+ #define BYTEEND     "20"
+ #endif
+-#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE)
++#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !(defined(PIC) && defined(__GNUC__))
+     int bit;
+ 
+ #ifndef BRANCHLESS_CABAC_DECODER
+@@ -680,7 +680,7 @@ static av_always_inline int get_cabac_by
+ 
+ //FIXME the x86 code from this file should be moved into i386/h264 or cabac something.c/h (note ill kill you if you move my code away from under my fingers before iam finished with it!)
+ //FIXME use some macros to avoid duplicatin get_cabac (cant be done yet as that would make optimization work hard)
+-#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE)
++#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !(defined(PIC) && defined(__GNUC__))
+ static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index){
+     void *end= significant_coeff_ctx_base + max_coeff - 1;
+     int minusstart= -(int)significant_coeff_ctx_base;
+Index: ffmpeg/libavcodec/h264.c
+===================================================================
+--- ffmpeg.orig/libavcodec/h264.c
++++ ffmpeg/libavcodec/h264.c
+@@ -6111,7 +6111,7 @@ static int decode_cabac_residual( H264Co
+             index[coeff_count++] = last;\
+         }
+         const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
+-#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE)
++#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !(defined(PIC) && defined(__GNUC__))
+         coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, sig_off);
+     } else {
+         coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index);