summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Crête <tester@gentoo.org>2004-06-05 15:25:52 +0000
committerOlivier Crête <tester@gentoo.org>2004-06-05 15:25:52 +0000
commitc2ddbbfb3651d641be63ce84ce66d207951103ef (patch)
tree26ea8e63cdf3974b3f8103e0b84a76b7e199db3f /media-video
parentStable on alpha. (Manifest recommit) (diff)
downloadgentoo-2-c2ddbbfb3651d641be63ce84ce66d207951103ef.tar.gz
gentoo-2-c2ddbbfb3651d641be63ce84ce66d207951103ef.tar.bz2
gentoo-2-c2ddbbfb3651d641be63ce84ce66d207951103ef.zip
more fixed to media-video/mpeg4ip-1.1
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mpeg4ip/ChangeLog6
-rw-r--r--media-video/mpeg4ip/mpeg4ip-1.1.ebuild55
2 files changed, 42 insertions, 19 deletions
diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index 9dc26617b9bf..5b878c242937 100644
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mpeg4ip
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.8 2004/06/01 15:25:04 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.9 2004/06/05 15:25:52 tester Exp $
+
+ 05 Jun 2004; <tester@gentoo.org> mpeg4ip-1.1.ebuild:
+ Made xvid, nas, alsa, esd, arts support use flags. Fixed a few bugs (including
+ #52693 and 52071). And disabled mp4live because I can't get it to build.
01 Jun 2004; <tester@gentoo.org> mpeg4ip-1.0.ebuild, mpeg4ip-1.1.ebuild:
only --disable-v4l2 is valid, fixes bug #52649, removed useless cruft from
diff --git a/media-video/mpeg4ip/mpeg4ip-1.1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.1.ebuild
index 1f3a41d91b17..975664e9db11 100644
--- a/media-video/mpeg4ip/mpeg4ip-1.1.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.1.ebuild,v 1.2 2004/06/01 15:25:04 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.1.ebuild,v 1.3 2004/06/05 15:25:52 tester Exp $
DESCRIPTION="MPEG 4 implementation library"
@@ -14,32 +14,51 @@ SLOT="0"
KEYWORDS="~x86 ~amd64"
-IUSE="ipv6 mmx gtk v4l2"
-
-DEPEND="sys-devel/libtool
- sys-devel/autoconf
- sys-devel/automake
- media-libs/faac
- >=media-sound/lame-3.92
- gtk? ( >=x11-libs/gtk+-2 )
- x86? ( mmx? ( >=dev-lang/nasm-0.98.19 ) )
- media-video/ffmpeg
- media-libs/libid3tag"
+IUSE="ipv6 mmx gtk v4l2 xvid nas alsa esd arts"
+
+RDEPEND="sys-devel/libtool
+ sys-devel/autoconf
+ sys-devel/automake
+ >=media-libs/faac-1.20.1
+ >=media-sound/lame-3.92
+ gtk? ( >=x11-libs/gtk+-2 )
+ media-libs/libid3tag
+ xvid? ( media-libs/xvid )
+ nas? ( media-libs/nas virtual/x11 )
+ alsa? ( media-libs/alsa-lib )
+ arts? ( kde-base/arts )
+ esd? ( media-sound/esound )
+ !media-libs/faad2"
+
+DEPENDS="${RDEPEND}
+ x86? ( mmx? ( >=dev-lang/nasm-0.98.19 ) )"
S="${WORKDIR}/${P}"
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ sed -i -e 's/-Wmissing-prototypes//g' configure
+
+ cd ${S}/lib/SDLAudio
+ sed -i -e 's:-laudio:-L/usr/X11R6/lib -laudio:' configure
+}
+
src_compile() {
cd ${S}
local myconf
- myconf=" `use_enable ipv6`
- `use_enable mmx`
- ` use_enable ppc`"
- use v4l2 || myconf="${myconf} --disable-v4l2"
- use amd64 && myconf="$myconf --disable-mp4live" && \
- ewarn "mp4live disabled on amd64"
+ # mp4live doesnt build, disable it..
+ myconf=" --disable-mp4live --disable-ffmpeg $(use_enable ipv6)
+ $(use_enable mmx)
+ $(use_enable ppc)
+ $(use_enable nas)
+ $(use_enable esd)
+ $(use_enable alsa)
+ $(use_enable arts)"
+ use v4l2 || myconf="${myconf} --disable-v4l2"
econf ${myconf} || die "configure failed"