From 5122cf6da9e3ebd21a98991940a4a1b8ae2300d9 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 5 Nov 2003 14:36:44 +0000 Subject: ok, non-x86 works again ... stupid nasm --- media-libs/libmpeg3/files/1.5.2-no-nasm.patch | 15 +++++++++++++++ media-libs/libmpeg3/libmpeg3-1.5.2.ebuild | 7 ++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 media-libs/libmpeg3/files/1.5.2-no-nasm.patch (limited to 'media-libs/libmpeg3') diff --git a/media-libs/libmpeg3/files/1.5.2-no-nasm.patch b/media-libs/libmpeg3/files/1.5.2-no-nasm.patch new file mode 100644 index 000000000000..73acfc29c270 --- /dev/null +++ b/media-libs/libmpeg3/files/1.5.2-no-nasm.patch @@ -0,0 +1,15 @@ +--- Makefile.orig 2003-11-05 09:35:19.787583544 -0500 ++++ Makefile 2003-11-05 09:35:26.617545232 -0500 +@@ -6,9 +6,9 @@ + + HAVE_NASM := $(shell if [ -x /usr/bin/nasm -o -x /usr/local/bin/nasm ]; then echo y; else echo n; fi) + +-ifeq ($(HAVE_NASM), n) +-$(error "Nasm is required. Download it from nasm.sourceforge.net.") +-endif ++#ifeq ($(HAVE_NASM), n) ++#$(error "Nasm is required. Download it from nasm.sourceforge.net.") ++#endif + + + ifeq ($(origin CFLAGS), environment) diff --git a/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild index 3723a67e12be..f742f1466614 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-2003 Gentoo Technologies, Inc. # 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.4 2003/11/05 14:30:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild,v 1.5 2003/11/05 14:36:44 vapier Exp $ inherit flag-o-matic eutils @@ -10,13 +10,13 @@ SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="-* x86" +KEYWORDS="x86 ppc sparc alpha hppa amd64" RDEPEND="sys-libs/zlib media-libs/jpeg media-libs/a52dec" DEPEND="${RDEPEND} - dev-lang/nasm" + x86? ( dev-lang/nasm )" src_unpack() { unpack ${A} @@ -30,6 +30,7 @@ src_unpack() { epatch ${FILESDIR}/${PV}-pthread.patch epatch ${FILESDIR}/${PV}-largefile.patch epatch ${FILESDIR}/${PV}-proper-c.patch + epatch ${FILESDIR}/${PV}-no-nasm.patch # remove a52 crap echo > Makefile.a52 rm -rf a52dec-0.7.3/* -- cgit v1.2.3-65-gdbad