summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris White <chriswhite@gentoo.org>2004-12-29 20:06:45 +0000
committerChris White <chriswhite@gentoo.org>2004-12-29 20:06:45 +0000
commitdf83f4459474deb65b2a4f67654c15a3df73e812 (patch)
treea28b349e1f80632d820db41f404d5f146feabca5 /media-libs
parentChange encoding to UTF-8 for GLEP 31 compliance (Manifest recommit) (diff)
downloadgentoo-2-df83f4459474deb65b2a4f67654c15a3df73e812.tar.gz
gentoo-2-df83f4459474deb65b2a4f67654c15a3df73e812.tar.bz2
gentoo-2-df83f4459474deb65b2a4f67654c15a3df73e812.zip
Added some stuff that will hopefully get this mmx/pic/hardened thing working.
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/xine-lib/ChangeLog5
-rw-r--r--media-libs/xine-lib/xine-lib-1.0.ebuild14
2 files changed, 15 insertions, 4 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index dec95f2f8823..76ee5f18c1f7 100644
--- 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/xine-lib-1.0.ebuild b/media-libs/xine-lib/xine-lib-1.0.ebuild
index 3147a1957781..ed600dce963b 100644
--- 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