Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-libs/DirectFB/ChangeLog9
-rw-r--r--dev-libs/DirectFB/DirectFB-0.9.10-r1.ebuild80
-rw-r--r--dev-libs/DirectFB/files/digest-DirectFB-0.9.10-r11
-rw-r--r--media-sound/xmms/ChangeLog9
-rw-r--r--media-sound/xmms/files/digest-xmms-1.2.7-r42
-rw-r--r--media-sound/xmms/files/digest-xmms-1.2.7-r52
-rw-r--r--media-sound/xmms/files/digest-xmms-1.2.7-r6 (renamed from media-sound/xmms/files/digest-xmms-1.2.7-r3)0
-rw-r--r--media-sound/xmms/files/xmms-1.2.7-enable-avifile-plugins.patch12
-rw-r--r--media-sound/xmms/xmms-1.2.7-r3.ebuild104
-rw-r--r--media-sound/xmms/xmms-1.2.7-r4.ebuild100
-rw-r--r--media-sound/xmms/xmms-1.2.7-r6.ebuild (renamed from media-sound/xmms/xmms-1.2.7-r5.ebuild)30
-rw-r--r--media-video/avi4xmms/ChangeLog8
-rw-r--r--media-video/avi4xmms/avi4xmms-0.1-r1.ebuild55
-rw-r--r--media-video/avi4xmms/files/avi4xmms-0.1-avif0.7.patch20
-rw-r--r--media-video/avi4xmms/files/digest-avi4xmms-0.1-r11
-rw-r--r--media-video/avifile/ChangeLog8
-rw-r--r--media-video/avifile/avifile-0.7.4.20020426-r2.ebuild93
-rw-r--r--media-video/avifile/files/digest-avifile-0.7.4.20020426-r21
-rw-r--r--media-video/drip/ChangeLog9
-rw-r--r--media-video/drip/drip-0.8.1-r3.ebuild (renamed from media-video/drip/drip-0.8.1-r1.ebuild)44
-rw-r--r--media-video/drip/drip-0.8.1.ebuild56
-rw-r--r--media-video/drip/files/digest-drip-0.8.1-r11
-rw-r--r--media-video/drip/files/digest-drip-0.8.1-r3 (renamed from media-video/drip/files/digest-drip-0.8.1)0
-rw-r--r--media-video/drip/files/drip-0.8.0-automake.diff25
24 files changed, 357 insertions, 313 deletions
diff --git a/dev-libs/DirectFB/ChangeLog b/dev-libs/DirectFB/ChangeLog
index b5b9598162c0..a0843002d7e4 100644
--- a/dev-libs/DirectFB/ChangeLog
+++ b/dev-libs/DirectFB/ChangeLog
@@ -1,7 +1,14 @@
# ChangeLog for dev-libs/DirectFB
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.8 2002/04/27 00:36:05 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.9 2002/05/26 14:05:33 azarah Exp $
+*DirectFB-0.9.10-r1 (26 Apr 2002)
+
+ 26 May 2002; Martin Schlemmer <azarah@gentoo.org> DirectFB-0.9.10-r1.ebuild :
+
+ Having "mmx" in use did not enable it .. fixed. Updated avifile DEPEND
+ for now ... this will be needed when I can get it patched to work with
+ avifile-0.7.4.
*DirectFB-0.9.10 (26 Apr 2002)
diff --git a/dev-libs/DirectFB/DirectFB-0.9.10-r1.ebuild b/dev-libs/DirectFB/DirectFB-0.9.10-r1.ebuild
new file mode 100644
index 000000000000..9650fc053f4b
--- /dev/null
+++ b/dev-libs/DirectFB/DirectFB-0.9.10-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: system@gentoo.org
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.10-r1.ebuild,v 1.1 2002/05/26 14:05:33 azarah Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="DirectFB is a thin library on top of the Linux framebuffer devices"
+SRC_URI="http://www.directfb.org/download/DirectFB/${P}.tar.gz"
+HOMEPAGE="http://www.directfb.org"
+
+DEPEND="sys-devel/perl
+ gif? ( media-libs/giflib )
+ png? ( media-libs/libpng )
+ jpeg? ( media-libs/jpeg )
+ mpeg? ( media-libs/libmpeg3 )
+ flash? ( >=media-libs/libflash-0.4.10 )
+ truetype? ( >=media-libs/freetype-2.0.1 )
+ quicktime? ( media-libs/quicktime4linux )"
+# avi? ( >=media-video/avifile-0.7.4.20020426-r2 )"
+
+
+src_compile() {
+
+ local myconf=""
+
+ # Bug in the ./configure script that breaks if you
+ # have --enable-mmx
+ use mmx || myconf="${myconf} --disable-mmx"
+
+# Still do not work currently
+# use avi \
+# && myconf="${myconf} --enable-avifile" \
+# || myconf="${myconf} --disable-avifile"
+ myconf="${myconf} --disable-avifile"
+
+ use mpeg \
+ && myconf="${myconf} --with-libmpeg3=/usr/include/libmpeg3" \
+ || myconf="${myconf} --disable-libmpeg3"
+
+ use jpeg \
+ && myconf="${myconf} --enable-jpeg" \
+ || myconf="${myconf} --disable-jpeg"
+
+ use png \
+ && myconf="${myconf} --enable-png" \
+ || myconf="${myconf} --disable-png"
+
+ use gif \
+ && myconf="${myconf} --enable-gif" \
+ || myconf="${myconf} --disable-gif"
+
+ use truetype \
+ && myconf="${myconf} --enable-freetype" \
+ || myconf="${myconf} --disable-freetype"
+
+ econf ${myconf} || die
+
+ use mpeg && ( \
+ cd ${S}/interfaces/IDirectFBVideoProvider
+ patch < ${FILESDIR}/${PN}-gentoo-patch Makefile
+ cd ${S}
+ )
+
+ make || die
+
+}
+
+src_install () {
+
+ insinto /etc
+ doins fb.modes
+
+ make \
+ DESTDIR=${D} \
+ install || die
+
+ dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
+ dohtml -r docs/html
+}
+
diff --git a/dev-libs/DirectFB/files/digest-DirectFB-0.9.10-r1 b/dev-libs/DirectFB/files/digest-DirectFB-0.9.10-r1
new file mode 100644
index 000000000000..291e84890698
--- /dev/null
+++ b/dev-libs/DirectFB/files/digest-DirectFB-0.9.10-r1
@@ -0,0 +1 @@
+MD5 615898ec754cc8b64345ae0180fb9359 DirectFB-0.9.10.tar.gz 587293
diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 44f09b51bdc5..d8c8cb840ea1 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-sound/xmms
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.10 2002/05/19 19:03:41 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.11 2002/05/26 14:05:33 azarah Exp $
+
+*xmms-1.2.7-r6 (19 May 2002)
+
+ 26 May 2002; Martin Schlemmer <azarah@gentoo.org> xmms-1.2.7-r6.ebuild :
+
+ Change it to depend on latest avifile, and drop the suffix patch
+ for avifile-config.
*xmms-1.2.7-r5 (19 May 2002)
diff --git a/media-sound/xmms/files/digest-xmms-1.2.7-r4 b/media-sound/xmms/files/digest-xmms-1.2.7-r4
deleted file mode 100644
index bd6731115e58..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.7-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8aa14a305d1eeb1bb53dba2197ba695a xmms-1.2.7.tar.gz 2860908
-MD5 a1adac3e8c4430e735d763c1ef242e9d plover-xmms127.tar.gz 32804
diff --git a/media-sound/xmms/files/digest-xmms-1.2.7-r5 b/media-sound/xmms/files/digest-xmms-1.2.7-r5
deleted file mode 100644
index bd6731115e58..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.7-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8aa14a305d1eeb1bb53dba2197ba695a xmms-1.2.7.tar.gz 2860908
-MD5 a1adac3e8c4430e735d763c1ef242e9d plover-xmms127.tar.gz 32804
diff --git a/media-sound/xmms/files/digest-xmms-1.2.7-r3 b/media-sound/xmms/files/digest-xmms-1.2.7-r6
index bd6731115e58..bd6731115e58 100644
--- a/media-sound/xmms/files/digest-xmms-1.2.7-r3
+++ b/media-sound/xmms/files/digest-xmms-1.2.7-r6
diff --git a/media-sound/xmms/files/xmms-1.2.7-enable-avifile-plugins.patch b/media-sound/xmms/files/xmms-1.2.7-enable-avifile-plugins.patch
new file mode 100644
index 000000000000..d30e86e4220b
--- /dev/null
+++ b/media-sound/xmms/files/xmms-1.2.7-enable-avifile-plugins.patch
@@ -0,0 +1,12 @@
+--- xmms-1.2.7.original/xmms/Makefile.am Sun Mar 24 21:35:58 2002
++++ xmms-1.2.7/xmms/Makefile.am Fri Mar 15 21:47:01 2002
+@@ -6,7 +6,8 @@
+
+ xmms_LDFLAGS = -export-dynamic
+ xmms_LDADD += @GTK_LIBS@ @PTHREAD_LIBS@ @SM_LIBS@ @VM_LIBS@ \
+-@POSIX_LIBS@ $(top_builddir)/libxmms/libxmms.la @INTLLIBS@
++@POSIX_LIBS@ $(top_builddir)/libxmms/libxmms.la @INTLLIBS@ \
++-laviplay -lstdc++
+
+ INCLUDES = @GTK_CFLAGS@ @XMMS_DEFINES@ @ARCH_DEFINES@ -I$(top_builddir)/intl
+
diff --git a/media-sound/xmms/xmms-1.2.7-r3.ebuild b/media-sound/xmms/xmms-1.2.7-r3.ebuild
deleted file mode 100644
index 3ac836c81e88..000000000000
--- a/media-sound/xmms/xmms-1.2.7-r3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r3.ebuild,v 1.4 2002/05/23 06:50:14 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="X MultiMedia System"
-SRC_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz http://www.openface.ca/~nephtes/plover-xmms127.tar.gz"
-HOMEPAGE="http://www.xmms.org/"
-
-DEPEND="=x11-libs/gtk+-1.2*
- >=dev-libs/libxml-1.8.15
- >=media-libs/libmikmod-3.1.9
- esd? ( >=media-sound/esound-0.2.22 )
- oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )
- opengl? ( virtual/opengl )
- avi? ( >=media-video/avifile-0.6 )
- gnome? ( >=gnome-base/gnome-libs-1.4.1.4 )
- sdl? ( media-libs/libsdl )"
-
-
-RDEPEND="${DEPEND}
- nls? ( dev-util/intltool
- sys-devel/gettext )"
-
-src_unpack() {
- unpack ${P}.tar.gz
-
- cd ${S}
- cp configure configure.orig
- sed -e "s:-m486::" configure.orig > configure
-
- use avi \
- && unpack plover-xmms127.tar.gz \
- && patch -p1 < plover-xmms127.diff \
- && touch stamp-h1.in xmms/stamp-h2.in
-}
-
-src_compile() {
-
- libtoolize --copy --force
- aclocal
-
- local myopts
-
- use gnome \
- && myopts="${myopts} --with-gnome" \
- || myopts="${myopts} --without-gnome"
-
- use 3dnow \
- && myopts="${myopts} --enable-3dnow" \
- || myopts="${myopts} --disable-3dnow"
-
- use esd \
- && myopts="${myopts} --enable-esd" \
- || myopts="${myopts} --disable-esd"
-
- use opengl \
- && myopts="${myopts} --enable-opengl" \
- || myopts="${myopts} --disable-opengl"
-
- use oggvorbis \
- && myopts="${myopts} --with-ogg --with-vorbis" \
- || myopts="${myopts} --disable-ogg-test --disable-vorbis-test"
-
- use nls \
- || myopts="${myopts} --disable-nls --without-libintl-prefix"
-
-
- ./configure \
- --host=${CHOST} \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --enable-one-plugin-dir \
- ${myopts} || die
-
- emake || die
-}
-
-src_install() {
- make prefix=${D}/usr \
- mandir=${D}/usr/share/man \
- sysconfdir=${D}/etc \
- sysdir=${D}/usr/share/applets/Multimedia \
- GNOME_SYSCONFDIR=${D}/etc \
- install || die
-
- dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO
-
- insinto /usr/share/pixmaps/
- donewins gnomexmms/gnomexmms.xpm xmms.xpm
- doins xmms/xmms_logo.xpm
- insinto /usr/share/pixmaps/mini
- doins xmms/xmms_mini.xpm
-
- insinto /etc/X11/wmconfig
- donewins xmms/xmms.wmconfig xmms
-
- use gnome \
- && insinto /usr/share/gnome/apps/Multimedia \
- && doins xmms/xmms.desktop \
- && dosed "s:xmms_mini.xpm:mini/xmms_mini.xpm:" \
- /usr/share/gnome/apps/Multimedia/xmms.desktop
-}
diff --git a/media-sound/xmms/xmms-1.2.7-r4.ebuild b/media-sound/xmms/xmms-1.2.7-r4.ebuild
deleted file mode 100644
index 861884be417a..000000000000
--- a/media-sound/xmms/xmms-1.2.7-r4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r4.ebuild,v 1.5 2002/05/23 06:50:14 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="X MultiMedia System"
-SRC_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz http://www.openface.ca/~nephtes/plover-xmms127.tar.gz"
-HOMEPAGE="http://www.xmms.org/"
-
-RDEPEND="=x11-libs/gtk+-1.2*
- >=media-libs/libmikmod-3.1.9
- avi? ( >=media-video/avifile-0.6 )
- esd? ( >=media-sound/esound-0.2.22 )
- xml? ( >=dev-libs/libxml-1.8.15 )
- gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
- opengl? ( virtual/opengl )
- oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-
-
-DEPEND="${RDEPEND}
- nls? ( dev-util/intltool )"
-
-src_unpack() {
- unpack ${P}.tar.gz
-
- cd ${S}
-
- use avi \
- && cp xmms/Makefile.am xmms/Makefile.am.orig \
- && sed -e "s:\(@INTLLIBS@\):\1 -laviplay -lstdc++:" \
- xmms/Makefile.am.orig > xmms/Makefile.am
-}
-
-src_compile() {
- local myopts
-
- use gnome \
- && myopts="${myopts} --with-gnome" \
- || myopts="${myopts} --without-gnome"
-
- use 3dnow \
- && myopts="${myopts} --enable-3dnow" \
- || myopts="${myopts} --disable-3dnow"
-
- use esd \
- && myopts="${myopts} --enable-esd" \
- || myopts="${myopts} --disable-esd"
-
- use opengl \
- && myopts="${myopts} --enable-opengl" \
- || myopts="${myopts} --disable-opengl"
-
- use oggvorbis \
- && myopts="${myopts} --with-ogg --with-vorbis" \
- || myopts="${myopts} --disable-ogg-test --disable-vorbis-test"
-
- use xml \
- || myopts="${myopts} --disable-cdindex"
-
- use nls \
- || myopts="${myopts} --disable-nls"
-
-
- ./configure --host=${CHOST} \
- --prefix=/usr \
- --mandir=/usr/share/man \
- ${myopts} || die
-
- emake || die
-}
-
-src_install() {
- make prefix=${D}/usr \
- mandir=${D}/usr/share/man \
- sysconfdir=${D}/etc \
- sysdir=${D}/usr/share/applets/Multimedia \
- GNOME_SYSCONFDIR=${D}/etc \
- install || die
-
- dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO
-
- mkdir -p ${D}/usr/share/xmms/Skins
- insinto /usr/share/pixmaps/
- donewins gnomexmms/gnomexmms.xpm xmms.xpm
- doins xmms/xmms_logo.xpm
- insinto /usr/share/pixmaps/mini
- doins xmms/xmms_mini.xpm
-
- insinto /etc/X11/wmconfig
- donewins xmms/xmms.wmconfig xmms
-
- if [ "`use gnome`" ]
- then
- insinto /usr/share/gnome/apps/Multimedia
- doins xmms/xmms.desktop
- dosed "s:xmms_mini.xpm:mini/xmms_mini.xpm:" \
- /usr/share/gnome/apps/Multimedia/xmms.desktop
- fi
-}
diff --git a/media-sound/xmms/xmms-1.2.7-r5.ebuild b/media-sound/xmms/xmms-1.2.7-r6.ebuild
index 229a8056f6c2..6b6c8c8b34c6 100644
--- a/media-sound/xmms/xmms-1.2.7-r5.ebuild
+++ b/media-sound/xmms/xmms-1.2.7-r6.ebuild
@@ -1,18 +1,19 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
# Maintainer: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r5.ebuild,v 1.2 2002/05/23 06:50:14 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r6.ebuild,v 1.1 2002/05/26 14:05:33 azarah Exp $
PLO_VER="$(echo ${PV} | sed -e "s:\.::g")"
S=${WORKDIR}/${P}
DESCRIPTION="X MultiMedia System"
-SRC_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz
- avi? ( http://www.openface.ca/~nephtes/plover-xmms${PLO_VER}.tar.gz )"
+SRC_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz"
+# This if for the Plover patch
+# avi? ( http://www.openface.ca/~nephtes/plover-xmms${PLO_VER}.tar.gz )"
HOMEPAGE="http://www.xmms.org/"
RDEPEND="=x11-libs/gtk+-1.2*
>=media-libs/libmikmod-3.1.9
- avi? ( >=media-video/avifile-0.7.4.20020426 )
+ avi? ( >=media-video/avifile-0.7.4.20020426-r2 )
esd? ( >=media-sound/esound-0.2.22 )
xml? ( >=dev-libs/libxml-1.8.15 )
gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
@@ -27,14 +28,19 @@ src_unpack() {
unpack ${P}.tar.gz
cd ${S}
-
- use avi && (\
- tar -zxf ${DISTDIR}/plover-xmms${PLO_VER}.tar.gz || die
- cp plover-xmms${PLO_VER}.diff plover-xmms${PLO_VER}.diff.orig || die
- sed -e "s:avifile-config:avifile-config0.7:g" \
- plover-xmms${PLO_VER}.diff.orig >plover-xmms${PLO_VER}.diff
- patch -p1 <plover-xmms${PLO_VER}.diff || die
- )
+
+ # For plugins such as avi4xmms, xmms needs to be linked to libavifile
+ # and libstdcxx.
+ use avi && patch -p1 <${FILESDIR}/${P}-enable-avifile-plugins.patch || die
+
+# This is for the Plover patch
+# use avi && (\
+# tar -zxf ${DISTDIR}/plover-xmms${PLO_VER}.tar.gz || die
+# cp plover-xmms${PLO_VER}.diff plover-xmms${PLO_VER}.diff.orig || die
+# sed -e "s:avifile-config:avifile-config0.7:g" \
+# plover-xmms${PLO_VER}.diff.orig >plover-xmms${PLO_VER}.diff
+# patch -p1 <plover-xmms${PLO_VER}.diff || die
+# )
}
src_compile() {
diff --git a/media-video/avi4xmms/ChangeLog b/media-video/avi4xmms/ChangeLog
index ce670b47d92a..c5d2fca0ebea 100644
--- a/media-video/avi4xmms/ChangeLog
+++ b/media-video/avi4xmms/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-video/avi4xmms
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/avi4xmms/ChangeLog,v 1.1 2002/03/28 11:53:02 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avi4xmms/ChangeLog,v 1.2 2002/05/26 14:05:33 azarah Exp $
+
+*avi4xmms-0.1-r1 (26 May 2002)
+
+ 26 May 2002; Martin Schlemmer <azarah@gentoo.org :
+
+ Patch to work with avifile-0.7.4.
*avi4xmms-0.1 (28 Mar 2002)
diff --git a/media-video/avi4xmms/avi4xmms-0.1-r1.ebuild b/media-video/avi4xmms/avi4xmms-0.1-r1.ebuild
new file mode 100644
index 000000000000..59ff46a94305
--- /dev/null
+++ b/media-video/avi4xmms/avi4xmms-0.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author: Seemant Kulleen <seemant@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/media-video/avi4xmms/avi4xmms-0.1-r1.ebuild,v 1.1 2002/05/26 14:05:33 azarah Exp $
+
+S=${WORKDIR}/${PN}
+DESCRIPTION="A plugin for XMMS to play AVI/DivX/ASF movies"
+SRC_URI="http://prdownloads.sourceforge.net/my-xmms-plugs/${P}.tar.gz"
+HOMEPAGE="http://sourceforge.net/projects/my-xmms-plugs/"
+
+DEPEND="virtual/glibc
+ >=media-video/avifile-0.7.4.20020426-r2
+ >=media-sound/xmms-1.2.7-r6"
+
+src_unpack() {
+
+ unpack ${A}
+
+ cd ${S}
+ patch -p1 < ${FILESDIR}/${P}-avif0.7.patch || die
+}
+
+src_compile() {
+
+ libtoolize --copy --force
+
+ ./configure \
+ --prefix=/usr \
+ --host=${CHOST} || die
+
+ emake || die
+}
+
+src_install () {
+
+ make \
+ libdir=/usr/lib/xmms/Input \
+ DESTDIR=${D} install || die
+
+ dodoc AUTHORS COPYING ChangeLog README TODO
+}
+
+pkg_postinst() {
+
+ einfo
+ einfo "**************************************************************"
+ einfo " For avi4xmms to work, you need to remerge xmms with \"avi\""
+ einfo " in your USE flags if you havent at the time."
+ einfo
+ einfo " # USE=\"avi\" emerge xmms"
+ einfo
+ einfo "**************************************************************"
+ einfo
+}
+
diff --git a/media-video/avi4xmms/files/avi4xmms-0.1-avif0.7.patch b/media-video/avi4xmms/files/avi4xmms-0.1-avif0.7.patch
new file mode 100644
index 000000000000..975c930d6d6d
--- /dev/null
+++ b/media-video/avi4xmms/files/avi4xmms-0.1-avif0.7.patch
@@ -0,0 +1,20 @@
+--- avi4xmms/src/player.cpp Sun May 26 11:37:46 2002
++++ avi4xmms.azarah/src/player.cpp Sun May 26 11:39:53 2002
+@@ -50,7 +50,7 @@
+ int audioChannels;
+ int audioBitsPerSample;
+
+-static int audio_func( void *ptr, int size, void* p )
++static int audio_func( void *ptr, unsigned int size, void* p )
+ {
+
+ // Seems not to be working properly. Probably the block size is too big.
+@@ -211,7 +211,7 @@
+
+ if( outVal == 1 )
+ {
+- player->SetAudioFunc( audio_func );
++ player->SetAudioFunc( &audio_func );
+ }
+
+ // we don't wanna loop forever, do we?
diff --git a/media-video/avi4xmms/files/digest-avi4xmms-0.1-r1 b/media-video/avi4xmms/files/digest-avi4xmms-0.1-r1
new file mode 100644
index 000000000000..270d54981aeb
--- /dev/null
+++ b/media-video/avi4xmms/files/digest-avi4xmms-0.1-r1
@@ -0,0 +1 @@
+MD5 db90dbddabad61be31923b0905d6efd4 avi4xmms-0.1.tar.gz 194418
diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index 383cfa010029..fd04a91fb6b7 100644
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-video/avifile
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.13 2002/05/25 19:30:38 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.14 2002/05/26 14:05:33 azarah Exp $
+
+*avifile-0.7.4-20020426-r2 (26 May 2002)
+
+ 26 May 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+ Remove the suffix added to all binaries.
*avifile-0.7.4-20020426 (25 May 2002)
diff --git a/media-video/avifile/avifile-0.7.4.20020426-r2.ebuild b/media-video/avifile/avifile-0.7.4.20020426-r2.ebuild
new file mode 100644
index 000000000000..6a403ed2851f
--- /dev/null
+++ b/media-video/avifile/avifile-0.7.4.20020426-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author: Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.4.20020426-r2.ebuild,v 1.1 2002/05/26 14:05:33 azarah Exp $
+
+MY_P=${P/.200/-200}
+MY_S=${PN}0.7-0.7.4
+S=${WORKDIR}/${MY_S}
+DESCRIPTION="Library for AVI-Files"
+SRC_URI="http://avifile.sourceforge.net/${MY_P}.tgz"
+HOMEPAGE="http://avifile.sourceforge.net/"
+
+DEPEND=">=media-libs/divx4linux-20020418
+ media-libs/jpeg
+ media-libs/win32codecs
+ qt? ( >=x11-libs/qt-3.0.3 )
+ nas? ( >=media-libs/nas-1.4.2 )
+ sdl? ( >=media-libs/libsdl-1.2.2 )
+ oggvorbis? ( media-libs/libvorbis )"
+
+SLOT="0.7"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ patch -p1 <${FILESDIR}/${P}-gcc3.1-gentoo.patch || die
+}
+
+src_compile() {
+
+ einfo "${S}"
+
+ local myconf=""
+ local kdepre=""
+
+ ( use mmx || use sse || use 3dnow ) && myconf="${myconf} --enable-x86opt"
+
+ use qt \
+ && myconf="${myconf} --with-qt-dir=${QTDIR}" \
+ || myconf="${myconf} --without-qt"
+
+ use kde \
+ && myconf="${myconf} --enable-kde" \
+ || myconf="${myconf} --disable-kde"
+
+ use sdl \
+ && myconf="${myconf} --enable-sdl" \
+ || myconf="${myconf} --disable-sdl --disable-sdltest"
+
+ use nas && LDFLAGS="-L/usr/X11R6/lib -lXt"
+
+ use oggvorbis \
+ && myconf="${myconf} --enable-vorbis" \
+ || myconf="${myconf} --disable-vorbis --disable-oggtest --disable-vorbistest"
+
+ use kde \
+ && ( \
+ myconf="${myconf} --enable-kde" \
+ && LDFLAGS="${LDFLAGS} -L${KDEDIR}/lib" \
+ && myconf="${myconf} --with-extra-libraries=${KDEDIR}" \
+ ) || (
+ myconf="${myconf} --disable-kde" \
+ && LDFLAGS="${LDFLAGS}"
+ )
+
+
+ # this version has b0rked a52 support -- author recommends disabling it
+ myconf="${myconf} --disable-a52"
+
+ export CFLAGS=${CFLAGS/-O?/-O2}
+ export LDFLAGS
+ ./configure --prefix=/usr \
+ --host=${CHOST} \
+ --enable-quiet \
+ --disable-tsc \
+ ${myconf} || die
+
+ make || die
+}
+
+src_install () {
+
+ dodir /usr/lib /usr/bin
+ use avi && dodir /usr/lib/win32
+
+ make prefix=${D}/usr install || die
+
+ cd ${S}
+ dodoc COPYING README
+ cd doc
+ dodoc CREDITS EXCEPTIONS FreeBSD LICENSING TODO
+ dodoc VIDEO-PERFORMANCE WARNINGS
+}
diff --git a/media-video/avifile/files/digest-avifile-0.7.4.20020426-r2 b/media-video/avifile/files/digest-avifile-0.7.4.20020426-r2
new file mode 100644
index 000000000000..a05ee43f371c
--- /dev/null
+++ b/media-video/avifile/files/digest-avifile-0.7.4.20020426-r2
@@ -0,0 +1 @@
+MD5 b57fd2b745a5bd6aa801ef4786918e51 avifile-0.7.4-20020426.tgz 2162391
diff --git a/media-video/drip/ChangeLog b/media-video/drip/ChangeLog
index 2ab3a85391ae..62e3ca4af4d5 100644
--- a/media-video/drip/ChangeLog
+++ b/media-video/drip/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-video/drip
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/drip/ChangeLog,v 1.4 2002/05/19 19:03:15 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/drip/ChangeLog,v 1.5 2002/05/26 14:05:33 azarah Exp $
+
+*drip-0.8.1-r3 (26 May 2002)
+
+ 26 May 2002; M.Schlemmer <azarah@gentoo.org> drip-0.8.1-r3.ebuild :
+
+ Make it depend on latest avifile, and remove the patches for
+ the suffix that was added to avifile-config.
*drip-0.8.1-r2 (19 May 2002)
diff --git a/media-video/drip/drip-0.8.1-r1.ebuild b/media-video/drip/drip-0.8.1-r3.ebuild
index 26b4eeccf642..e119e3a30a71 100644
--- a/media-video/drip/drip-0.8.1-r1.ebuild
+++ b/media-video/drip/drip-0.8.1-r3.ebuild
@@ -1,17 +1,19 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
# Maintainer: Martin Schlemmer <azarah@cvs.gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/drip/drip-0.8.1-r1.ebuild,v 1.2 2002/05/19 10:20:41 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/drip/drip-0.8.1-r3.ebuild,v 1.1 2002/05/26 14:05:33 azarah Exp $
+AF_MINOR_VER="$(avifile-config --data-dir | cut -d. -f2)"
S=${WORKDIR}/${P}
DESCRIPTION="Drip - A DVD to DIVX convertor frontend"
SRC_URI="${SRC_URI} http://drip.sourceforge.net/files/${P}.tar.gz"
HOMEPAGE="http://drip.sourceforge.net/"
RDEPEND="gnome-base/gnome-libs
- =media-video/avifile-0.6.0*
- media-libs/libdvdcss
- media-libs/libdvdread
+ >=media-video/avifile-0.7.4.20020426-r2
+ >=media-libs/a52dec-0.7.3
+ >=media-libs/libdvdcss-1.1.1
+ >=media-libs/libdvdread-0.9.2
media-libs/gdk-pixbuf"
DEPEND="${RDEPEND}
@@ -23,26 +25,53 @@ src_unpack() {
unpack ${A}
+ # Fix hardcoded path of plugins
cd ${S}
cp encoder/plugin-loader.cpp encoder/plugin-loader.cpp.orig
sed -e "s:/usr/local/lib:/usr/lib:g" \
encoder/plugin-loader.cpp.orig >encoder/plugin-loader.cpp
+
+ # Fixup to work with avifile-0.${AF_MINOR_VER}
+ cd ${S}/encoder
+ for x in encoder.hh main.hh encoder.cpp external.cpp
+ do
+ cp ${x} ${x}.orig
+ sed -e "s:AVIFILE_MINOR_VERSION==6:AVIFILE_MINOR_VERSION==${AF_MINOR_VER}:g" \
+ ${x}.orig >${x}
+ done
+
+ # Fix it to work with the suffix the new avifile introduces.
+# cd ${S}
+# for x in $(find . -name 'Makefile.am') configure.in
+# do
+# cp ${x} ${x}.orig
+# sed -e "s:avifile-config:avifile-config0.${AF_MINOR_VER}:g" \
+# ${x}.orig >${x}
+# done
+
+ cd ${S}
+ export WANT_AUTOMAKE_1_5=1
+ aclocal -I macros
+ automake --add-missing
+ autoconf
}
src_compile() {
- libtoolize --copy --force
+ export WANT_AUTOMAKE_1_5=1
local myconf
use nls || myconf="--disable-nls"
+ CFLAGS= \
+ CXXFLAGS= \
./configure --host=${CHOST} \
--prefix=/usr \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--localstatedir=/var/lib \
--sysconfdir=/etc \
- $myconf || die
+ ${myconf} || die
emake || die
}
@@ -58,6 +87,9 @@ src_install() {
drip_pixmapdir=${D}/usr/share/pixmaps \
install || die
+ # Remove liba52.so.* as ac52dec provides this
+ rm ${D}/usr/lib/liba52*
+
dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
insinto /usr/share/pixmaps
diff --git a/media-video/drip/drip-0.8.1.ebuild b/media-video/drip/drip-0.8.1.ebuild
deleted file mode 100644
index a2f9cc40b221..000000000000
--- a/media-video/drip/drip-0.8.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Martin Schlemmer <azarah@cvs.gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/drip/drip-0.8.1.ebuild,v 1.1 2002/03/30 01:48:21 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Drip - A DVD to DIVX convertor frontend for GNOME"
-SRC_URI="${SRC_URI} http://drip.sourceforge.net/files/${P}.tar.gz"
-HOMEPAGE="http://drip.sourceforge.net/"
-
-RDEPEND="gnome-base/gnome-libs
- >=media-video/avifile-0.6
- media-libs/libdvdcss
- media-libs/libdvdread
- media-libs/gdk-pixbuf
- oggvorbis? ( media-libs/libvorbis )"
-
-DEPEND="${RDEPEND}
- dev-lang/nasm"
-
-
-src_compile() {
-
- local myconf
- use nls || myconf="--disable-nls"
-
- ./configure --host=${CHOST} \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --localstatedir=/var/lib \
- --sysconfdir=/etc \
- $myconf || die
-
- emake || die
-}
-
-src_install() {
-
- make prefix=${D}/usr \
- mandir=${D}/usr/share/man \
- infodir=${D}/usr/share/info \
- localstatedir=${D}/var/lib \
- sysconfdir=${D}/etc \
- drip_helpdir=${D}/usr/share/gnome/help/drip/C \
- drip_pixmapdir=${D}/usr/share/pixmaps \
- install || die
-
- dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-
- insinto /usr/share/pixmaps
- newins ${S}/pixmaps/drip_logo.jpg drip.jpg
- insinto /usr/share/gnome/apps/Multimedia
- doins ${FILESDIR}/drip.desktop
-}
-
diff --git a/media-video/drip/files/digest-drip-0.8.1-r1 b/media-video/drip/files/digest-drip-0.8.1-r1
deleted file mode 100644
index 53af5b8fffdc..000000000000
--- a/media-video/drip/files/digest-drip-0.8.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b88e9731f7266f0e0b9ff412c13a3624 drip-0.8.1.tar.gz 603487
diff --git a/media-video/drip/files/digest-drip-0.8.1 b/media-video/drip/files/digest-drip-0.8.1-r3
index 53af5b8fffdc..53af5b8fffdc 100644
--- a/media-video/drip/files/digest-drip-0.8.1
+++ b/media-video/drip/files/digest-drip-0.8.1-r3
diff --git a/media-video/drip/files/drip-0.8.0-automake.diff b/media-video/drip/files/drip-0.8.0-automake.diff
deleted file mode 100644
index 2c8aa94d8ba2..000000000000
--- a/media-video/drip/files/drip-0.8.0-automake.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- configure.orig Sun Dec 16 18:00:21 2001
-+++ configure Sun Dec 16 18:01:20 2001
-@@ -6767,14 +6767,14 @@
- ;;
- esac
-
--echo $ac_n "checking for automake version 1.5""... $ac_c" 1>&6
--echo "configure:6772: checking for automake version 1.5" >&5
--AUTOMAKEVERSION=`$HASAUTOMAKE --version | head -n 1 | $AWK '{printf($4)}'`
--if (test "$AUTOMAKEVERSION" = "1.5"); then
-- echo "$ac_t""found" 1>&6
--else
-- { echo "configure: error: automake 1.5 is requiered. " 1>&2; exit 1; }
--fi
-+#echo $ac_n "checking for automake version 1.5""... $ac_c" 1>&6
-+#echo "configure:6772: checking for automake version 1.5" >&5
-+#AUTOMAKEVERSION=`$HASAUTOMAKE --version | head -n 1 | $AWK '{printf($4)}'`
-+#if (test "$AUTOMAKEVERSION" = "1.5"); then
-+# echo "$ac_t""found" 1>&6
-+#else
-+# { echo "configure: error: automake 1.5 is requiered. " 1>&2; exit 1; }
-+#fi
-
-
- # Extract the first word of "avifile-config", so it can be a program name with args.