diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2004-10-08 09:36:14 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-10-08 09:36:14 +0000 |
| commit | 72e7fc4a27c2117654ef13f83e969ef76c79252b (patch) | |
| tree | 2151089de85227b0f9f211d7bd292e12cdaa1f82 /media-libs/libmpeg3 | |
| parent | multilib fixes (Manifest recommit) (diff) | |
| download | gentoo-2-72e7fc4a27c2117654ef13f83e969ef76c79252b.tar.gz gentoo-2-72e7fc4a27c2117654ef13f83e969ef76c79252b.tar.bz2 gentoo-2-72e7fc4a27c2117654ef13f83e969ef76c79252b.zip | |
multilib fixes
Diffstat (limited to 'media-libs/libmpeg3')
| -rw-r--r-- | media-libs/libmpeg3/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libmpeg3/files/1.5.2-gentoo-multilib.patch | 20 | ||||
| -rw-r--r-- | media-libs/libmpeg3/libmpeg3-1.5.2.ebuild | 13 |
3 files changed, 33 insertions, 6 deletions
diff --git a/media-libs/libmpeg3/ChangeLog b/media-libs/libmpeg3/ChangeLog index b4b59c2c62d7..aedd3d922319 100644 --- a/media-libs/libmpeg3/ChangeLog +++ b/media-libs/libmpeg3/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libmpeg3 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.28 2004/10/07 02:59:46 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.29 2004/10/08 09:36:14 eradicator Exp $ + + 08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> + +files/1.5.2-gentoo-multilib.patch, libmpeg3-1.5.2.ebuild: + multilib fixes 06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> libmpeg3-1.5.2.ebuild: diff --git a/media-libs/libmpeg3/files/1.5.2-gentoo-multilib.patch b/media-libs/libmpeg3/files/1.5.2-gentoo-multilib.patch new file mode 100644 index 000000000000..795e1ac7bea5 --- /dev/null +++ b/media-libs/libmpeg3/files/1.5.2-gentoo-multilib.patch @@ -0,0 +1,20 @@ +diff -Naur libmpeg3-1.5.2.orig/Makefile libmpeg3-1.5.2/Makefile +--- libmpeg3-1.5.2.orig/Makefile 2004-10-08 02:31:11.839597000 -0700 ++++ libmpeg3-1.5.2/Makefile 2004-10-08 02:33:42.627740299 -0700 +@@ -212,13 +212,13 @@ + install -d $(DESTDIR)/include/libmpeg3 + install -d $(DESTDIR)/include/libmpeg3/audio + install -d $(DESTDIR)/include/libmpeg3/video +- install -d $(DESTDIR)/lib ++ install -d $(DESTDIR)/$(LIBDIR) + install $(UTILS) $(DESTDIR)/bin + install -m 644 $(INSTALL_HEADERS) $(DESTDIR)/include/libmpeg3 + install -m 644 $(INSTALL_AHEADERS) $(DESTDIR)/include/libmpeg3/audio + install -m 644 $(INSTALL_VHEADERS) $(DESTDIR)/include/libmpeg3/video +- install -m 644 $(OUTPUT) $(DESTDIR)/lib +- install -m 644 $(SHAREDOUTPUT) $(DESTDIR)/lib ++ install -m 644 $(OUTPUT) $(DESTDIR)/$(LIBDIR) ++ install -m 644 $(SHAREDOUTPUT) $(DESTDIR)/$(LIBDIR) + + clean: + rm -rf $(OBJDIR) diff --git a/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild index 53bea330b431..d623d9bfda5a 100644 --- a/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild +++ b/media-libs/libmpeg3/libmpeg3-1.5.2.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/libmpeg3/libmpeg3-1.5.2.ebuild,v 1.14 2004/10/07 02:59:46 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild,v 1.15 2004/10/08 09:36:14 eradicator Exp $ inherit flag-o-matic eutils gcc @@ -32,6 +32,7 @@ src_unpack() { epatch ${FILESDIR}/${PV}-largefile.patch epatch ${FILESDIR}/${PV}-proper-c.patch epatch ${FILESDIR}/${PV}-no-nasm.patch + epatch ${FILESDIR}/${PV}-gentoo-multilib.patch [ "`gcc-version`" == "3.4" ] && epatch ${FILESDIR}/${PV}-gcc3.4.patch #49452 # remove a52 crap echo > Makefile.a52 @@ -39,10 +40,12 @@ src_unpack() { ln -s /usr/include/a52dec a52dec-0.7.3/include local libs libs=" -la52" - if grep -q djbfft ${ROOT}usr/$(get_libdir)/liba52.a; then - libs="${libs} -ldjbfft" + if ! [ -f "${ROOT}/usr/$(get_libdir)/liba52.so" ]; then + if grep -q djbfft ${ROOT}/usr/$(get_libdir)/liba52.a; then + libs="${libs} -ldjbfft" + fi fi - sed -i "/LIBS = /s:$: -L\${ROOT}usr/lib ${libs}:" Makefile + sed -i "/LIBS = /s:$: -L\${ROOT}usr/$(get_libdir) ${libs}:" Makefile } src_compile() { @@ -60,6 +63,6 @@ src_install() { # to show the correct include syntax '<>' instead of '""' This patch # was also generated using info from SF's src.rpm epatch ${FILESDIR}/${PV}-gentoo-p2.patch - make DESTDIR=${D}/usr install || die + make DESTDIR="${D}/usr" LIBDIR="$(get_libdir)" install || die dohtml -r docs } |