Added some stuff that will hopefully get this mmx/pic/hardened thing working.

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index dec95f2f8823cc922bd83968b78bb4d101f2235c..76ee5f18c1f7754be56b1a290293ec9a698ce543 100644 (file)
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.174 2004/12/29 01:02:00 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.175 2004/12/29 20:06:45 chriswhite Exp $
+
+  30 Dec 2004; Chris White <chriswhite@gentoo.org> xine-lib-1.0.ebuild:
+  Added some stuff that will hopefully get this mmx/pic/hardened thing working.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 975611c70a9bcb960722de313063bad618f4f349..87e2a388042c89b796650df60bcaa096a407d915 100644 (file)
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,42 +1,52 @@
-MD5 2b87924cf6365a271bec22a970161ae8 xine-lib-1.0.ebuild 8090
-MD5 4a98ed4ff2014644326c04df9c1693bf ChangeLog 29424
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c672dfc420a1ca7841d8b093cd96f70f ChangeLog 29580
+MD5 af08cabbae4b191018ca153392a86bea metadata.xml 304
+MD5 d081077906922a06461f52cb79c2270a xine-lib-1.0.ebuild 8354
 MD5 b25152bddc933afdf390149b07f2ff43 xine-lib-1_rc5-r3.ebuild 5473
-MD5 d9591aa743f1cbe61c93c98846b139b2 xine-lib-1_rc8.ebuild 5380
-MD5 7b14f0e8c5222de8df9e0dac4c5d10c4 xine-lib-1_rc8-r1.ebuild 6265
-MD5 d2d62f59048715eaf85d88a90842729d xine-lib-1_rc7.ebuild 5327
 MD5 a53b6f55661ef41e343932ceb7108cc3 xine-lib-1_rc6.ebuild 5358
-MD5 af08cabbae4b191018ca153392a86bea metadata.xml 304
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc7-2.6.patch 594
-MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
-MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc7-configure-sparc.patch 587
+MD5 d2d62f59048715eaf85d88a90842729d xine-lib-1_rc7.ebuild 5327
+MD5 7b14f0e8c5222de8df9e0dac4c5d10c4 xine-lib-1_rc8-r1.ebuild 6265
+MD5 d9591aa743f1cbe61c93c98846b139b2 xine-lib-1_rc8.ebuild 5380
+MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
+MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65
+MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r3 67
+MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6 68
+MD5 98e135f240fada719668b012c77b40be files/digest-xine-lib-1_rc7 67
+MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8 67
+MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67
 MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559
+MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
 MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597
-MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67
+MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
+MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
 MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc6 316
-MD5 5d2c3c00bf3ae9a89dfcaa8b5c5b17a2 files/xine-lib-x11.patch 703
-MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
-MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65
+MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
+MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
 MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
-MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655
-MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
-MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
-MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8 67
-MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
-MD5 a11a93cf97cecb7c1c2b24e11a5419ae files/xine-lib-1_rc6-ffmpeg.patch 1279
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc6-configure-sparc.patch 587
-MD5 98e135f240fada719668b012c77b40be files/digest-xine-lib-1_rc7 67
-MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc7-pic.patch 2655
-MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
-MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6 68
-MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r3 67
-MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
 MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754
-MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
 MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc6-2.6.patch 594
-MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc6-configure-sparc.patch 587
+MD5 a11a93cf97cecb7c1c2b24e11a5419ae files/xine-lib-1_rc6-ffmpeg.patch 1279
+MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391
+MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc7-2.6.patch 594
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc7-configure-sparc.patch 587
 MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc7-mmx.patch 391
+MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc7-pic.patch 2655
 MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
-MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
+MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
+MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
+MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
+MD5 5d2c3c00bf3ae9a89dfcaa8b5c5b17a2 files/xine-lib-x11.patch 703
+MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB0w2oFdQwWVoAgN4RAlgIAJ0UawKqD/AxUnnn0CwiVkv5ugAWYQCg3llu
+vye/6MCwATeWrJCvFjHuiKU=
+=FgRm
+-----END PGP SIGNATURE-----

diff --git a/media-libs/xine-lib/xine-lib-1.0.ebuild b/media-libs/xine-lib/xine-lib-1.0.ebuild
index 3147a1957781695ab9bd29dc20a52a75d66c6449..ed600dce963ba1574165a60f7a4ec6d61bda921d 100644 (file)
--- a/media-libs/xine-lib/xine-lib-1.0.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.0.ebuild,v 1.4 2004/12/28 17:39:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.0.ebuild,v 1.5 2004/12/29 20:06:45 chriswhite Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -17,7 +17,7 @@ SLOT="1"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex
        theora ipv6 altivec opengl aac fb xv xvmc nvidia i8x0 libcaca
-       samba dxr3 vidix png mng"
+       samba dxr3 vidix png mng pic mmx"
 
 RDEPEND="oggvorbis? ( media-libs/libvorbis )
        !amd64? ( X? ( virtual/x11 ) )
@@ -76,7 +76,15 @@ src_unpack() {
        # Fix building on amd64, #49569
        #use amd64 && epatch ${FILESDIR}/configure-64bit-define.patch
 
-       epatch ${FILESDIR}/${PN}-1_rc7-pic.patch
+       use pic && epatch ${FILESDIR}/${PN}-1_rc7-pic.patch
+       if use pic && use !mmx
+       then
+               # mmx doesn't play nice with hardened gcc
+               # but only on x86 works for some.. works
+               # for others, so I'm going to do this
+               # with a flag to make things easier...
+               epatch ${FILESDIR}/${PN}-1_rc7-mmx.patch
+       fi
 
        # Fix detection of hppa2.0 and hppa1.1 CHOST
        use hppa && sed -e 's/hppa-/hppa*-linux-/' -i ${S}/configure