diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-06-23 22:42:05 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-06-23 22:42:05 +0000 |
| commit | b180d373c03e57755d21bbc5adb69f3322386e6e (patch) | |
| tree | 172f920c15d137521956661c125be4b7bad2352c /media-tv | |
| parent | Stable on alpha wrt Bug #137392. (diff) | |
| download | gentoo-2-b180d373c03e57755d21bbc5adb69f3322386e6e.tar.gz gentoo-2-b180d373c03e57755d21bbc5adb69f3322386e6e.tar.bz2 gentoo-2-b180d373c03e57755d21bbc5adb69f3322386e6e.zip | |
Replace PIC conditionals with __PIC__ conditionals, as suggested by Alexandre Carsac, to try to fix bug #133375.
(Portage version: 2.1.1_pre1-r2)
Diffstat (limited to 'media-tv')
| -rw-r--r-- | media-tv/xdtv/ChangeLog | 6 | ||||
| -rw-r--r-- | media-tv/xdtv/xdtv-2.3.2-r1.ebuild | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/media-tv/xdtv/ChangeLog b/media-tv/xdtv/ChangeLog index f3eafb58ba6f..eeb196da194b 100644 --- a/media-tv/xdtv/ChangeLog +++ b/media-tv/xdtv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-tv/xdtv # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.31 2006/06/18 12:37:22 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.32 2006/06/23 22:42:05 flameeyes Exp $ + + 23 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> xdtv-2.3.2-r1.ebuild: + Replace PIC conditionals with __PIC__ conditionals, as suggested by + Alexandre Carsac, to try to fix bug #133375. *xdtv-2.3.2-r1 (18 Jun 2006) diff --git a/media-tv/xdtv/xdtv-2.3.2-r1.ebuild b/media-tv/xdtv/xdtv-2.3.2-r1.ebuild index b15fddf0e0e9..52bb7a2d9cd8 100644 --- a/media-tv/xdtv/xdtv-2.3.2-r1.ebuild +++ b/media-tv/xdtv/xdtv-2.3.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.3.2-r1.ebuild,v 1.1 2006/06/18 12:37:22 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.3.2-r1.ebuild,v 1.2 2006/06/23 22:42:05 flameeyes Exp $ inherit font multilib autotools flag-o-matic @@ -95,7 +95,7 @@ extension_compile() { extension_install() { einfo "Installing ${1}" cd ${WORKDIR}/${1} \ - && make DESTDIR=${D} LIBDIR="/usr/$(get_libdir)/${PN}" install + && emake DESTDIR=${D} LIBDIR="/usr/$(get_libdir)/${PN}" install } src_unpack() { @@ -109,6 +109,13 @@ src_unpack() { epatch "${FILESDIR}/${PN}-2.3.0-setXid.patch" epatch "${FILESDIR}/${P}-strict-aliasing.patch" + # ffmpeg doesn'g use libtool, so the condition for PIC code + # is __PIC__, not PIC. + sed -i -e 's/#\(\(.*def *\)\|\(.*defined *\)\|\(.*defined(*\)\)PIC/#\1__PIC__/' \ + libavcodec/i386/dsputil_mmx{.c,_rnd.h,_avg.h} \ + libavcodec/msmpeg4.c \ + || die "sed failed (__PIC__)" + eautomake } @@ -163,7 +170,7 @@ src_compile() { } src_install() { - make DESTDIR=${D} install || die "Installation failed." + emake DESTDIR=${D} install || die "Installation failed." # .desktop file and default icon domenu gentoo/xdtv.desktop |