Dep fixes
authorMarinus Schraal <foser@gentoo.org>
Fri, 18 Oct 2002 00:07:57 +0000 (00:07 +0000)
committerMarinus Schraal <foser@gentoo.org>
Fri, 18 Oct 2002 00:07:57 +0000 (00:07 +0000)
media-libs/gst-plugins/ChangeLog
media-libs/gst-plugins/files/digest-gst-plugins-0.4.0 [deleted file]
media-libs/gst-plugins/files/digest-gst-plugins-0.4.0-r1 [deleted file]
media-libs/gst-plugins/files/digest-gst-plugins-0.4.1-r1 [new file with mode: 0644]
media-libs/gst-plugins/gst-plugins-0.4.0.ebuild [deleted file]
media-libs/gst-plugins/gst-plugins-0.4.1-r1.ebuild [moved from media-libs/gst-plugins/gst-plugins-0.4.0-r1.ebuild with 63% similarity]

index 0162dd1df61e244e1f058ca7a69e77bd01c43560..7f3c1e83a604edf3b2d47449430dca266f2a22f3 100644 (file)
@@ -1,7 +1,11 @@
 # ChangeLog for media-libs/gstreamer-plugins
 
+*gst-plugins-0.4.1-r1 (17 Oct 2002)
 
-
+  17 Oct 2002; foser <foser@gentoo.org> gst-plugins-0.4.1-r1.ebuild :
+  Made some deps changes, most notably add mpeg USE flag (bug #8625)
+  Disable -O3 optimization (bug #8625,#8217)
+  Disabled avi use flag, it doesn't work with our avifile
 
 *gst-plugins-0.4.1 (22 Sep 2002)
   26 Sep 2002; Spider <spider@gentoo.org> files/digest-gst-plugins-0.4.1: 
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.4.0 b/media-libs/gst-plugins/files/digest-gst-plugins-0.4.0
deleted file mode 100644 (file)
index b56f934..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 067fa772accc1f89e42ea96534e87eda gst-plugins-0.4.0.tar.gz 1675976
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.4.0-r1 b/media-libs/gst-plugins/files/digest-gst-plugins-0.4.0-r1
deleted file mode 100644 (file)
index b56f934..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 067fa772accc1f89e42ea96534e87eda gst-plugins-0.4.0.tar.gz 1675976
diff --git a/media-libs/gst-plugins/files/digest-gst-plugins-0.4.1-r1 b/media-libs/gst-plugins/files/digest-gst-plugins-0.4.1-r1
new file mode 100644 (file)
index 0000000..daf84ec
--- /dev/null
@@ -0,0 +1 @@
+MD5 753d7b6f4c1c997bd9a60bffcd716af6 gst-plugins-0.4.1.tar.gz 1848403
diff --git a/media-libs/gst-plugins/gst-plugins-0.4.0.ebuild b/media-libs/gst-plugins/gst-plugins-0.4.0.ebuild
deleted file mode 100644 (file)
index 89a97aa..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.4.0.ebuild,v 1.5 2002/10/05 05:39:15 drobbins Exp $
-
-IUSE="arts gnome dvd mikmod jpeg esd avi aalib sdl oggvorbis png alsa"
-
-inherit libtool
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Additional plugins for gstreamer - streaming media framework"
-SRC_URI="mirror://sourceforge/gstreamer/${P}.tar.gz"
-HOMEPAGE="http://gstreamer.sourceforge.net"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 sparc sparc64"
-
-
-# required packages
-# there are many many optional libraries. features are compiled if the libraries
-# are present. most optional libraries are from gnome.
-DEPEND=">=media-libs/gstreamer-0.4.0
-       >=gnome-base/gconf-1.2.0
-       media-sound/mad
-       dvd? (  >=media-libs/libdv-0.9.5 )
-       oggvorbis? (    media-libs/libvorbis 
-                                       media-libs/libogg )
-       media-sound/lame
-       media-sound/cdparanoia
-       media-libs/flac
-       media-sound/jack-audio-connection-kit
-       media-libs/hermes
-       media-libs/openquicktime
-       jpeg? ( media-video/mjpegtools 
-               >=media-libs/jpeg-mmx-1.1.2-r1 )
-       esd? ( media-sound/esound )
-       gnome? ( >=gnome-base/gnome-vfs-2.0.1 )
-       mikmod? ( media-libs/libmikmod )
-       avi? ( media-video/avifile )
-       sdl? ( media-libs/libsdl )
-       png? ( >=media-libs/libpng-1.2.3 )
-       alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
-       arts? ( >=kde-base/arts-1.0.2 )
-       aalib? ( media-libs/aalib )
-       dvd? ( media-libs/libdvdnav )
-       media-libs/ladspa-sdk "
-# xmms is off-per-default
-#      media-sound/xmms
-
-RDEPEND="${DEPEND}"
-
-src_compile() {
-       elibtoolize
-       # this is an ugly patch to remove -I/usr/include from some CFLAGS
-       patch -p0 <${FILESDIR}/${P}-configure.patch
-       local myconf
-       # aalib broken, dv on to test
-       # dvdnav is broken
-       myconf="--enable-dv"
-       use avi \
-               && myconf="${myconf} --enable-avifile" \
-               || myconf="${myconf} --disable-avifile"
-       # not testing for much here, since if its in USE we want it, but its autodetected by configure
-       
-       ./configure \
-               ${myconf} \
-               --without-vorbis-includes \
-               --host=${CHOST} \
-               --prefix=/usr \
-               --infodir=/usr/share/info \
-               --oldincludedir=/usr/include \
-               --sysconfdir=/etc \
-               --mandir=/usr/share/man || die "./configure failed"
-       emake || die
-}
-
-src_install () {
-       export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"                
-       make DESTDIR=${D} install || die
-       unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-       
-       dodoc AUTHORS COPYING INSTALL README RELEASE TODO 
-}
-
-pkg_postinst () {
-       unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-       export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source`
-       cat ${WORKDIR}/../build-info/CONTENTS | grep "obj /etc/gconf/schemas" | sed 's:obj \([^ ]*\) .*:\1:' |while read F; do
-               /usr/bin/gconftool-2  --makefile-install-rule ${F}
-       done
-       gst-register
-}
similarity index 63%
rename from media-libs/gst-plugins/gst-plugins-0.4.0-r1.ebuild
rename to media-libs/gst-plugins/gst-plugins-0.4.1-r1.ebuild
index 6b6785707a3c4cba6189ed8d798e82f7a4e09c64..304eec1e27ff6c9a9daae954d7eadb939cfe3280 100644 (file)
@@ -1,12 +1,10 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.4.0-r1.ebuild,v 1.4 2002/10/05 05:39:15 drobbins Exp $
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.4.1-r1.ebuild,v 1.1 2002/10/18 00:07:57 foser Exp $
 
-IUSE="arts gnome dvd mikmod jpeg esd avi aalib sdl oggvorbis png alsa"
-
-inherit libtool
-inherit gnome2
+inherit libtool gnome2 flag-o-matic
 
+IUSE="encode quicktime mpeg oggvorbis jpeg esd gnome mikmod avi sdl png alsa arts dvd aalib"
 S=${WORKDIR}/${P}
 DESCRIPTION="Additional plugins for gstreamer - streaming media framework"
 SRC_URI="mirror://sourceforge/gstreamer/${P}.tar.gz"
@@ -14,52 +12,63 @@ HOMEPAGE="http://gstreamer.sourceforge.net"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="x86 sparc sparc64"
-
+KEYWORDS="~x86 ~sparc ~sparc64"
 
 # required packages
 # there are many many optional libraries. features are compiled if the libraries
 # are present. most optional libraries are from gnome.
-DEPEND=">=media-libs/gstreamer-0.4.0
+DEPEND=">=media-libs/gstreamer-0.4.1
        >=gnome-base/gconf-1.2.0
        media-sound/mad
-       dvd? (  >=media-libs/libdv-0.9.5 )
-       oggvorbis? (    media-libs/libvorbis 
-                                       media-libs/libogg )
-       media-sound/lame
+       media-libs/flac
        media-sound/cdparanoia
-       media-sound/jack-audio-connection-kit
        media-libs/hermes
-       media-libs/openquicktime
+       >=media-libs/libdv-0.9.5
+       encode? ( media-sound/lame )
+       quicktime? ( media-libs/openquicktime )
+       mpeg? ( >=media-libs/libmpeg2-0.2.1 )
+       oggvorbis? (    media-libs/libvorbis 
+                       media-libs/libogg )
        jpeg? ( media-video/mjpegtools 
                >=media-libs/jpeg-mmx-1.1.2-r1 )
        esd? ( media-sound/esound )
        gnome? ( >=gnome-base/gnome-vfs-2.0.1 )
        mikmod? ( media-libs/libmikmod )
-       avi? ( media-video/avifile )
        sdl? ( media-libs/libsdl )
        png? ( >=media-libs/libpng-1.2.3 )
-       alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
+       alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 
+               media-sound/jack-audio-connection-kit )
        arts? ( >=kde-base/arts-1.0.2 )
+       dvd? (  media-libs/libdvdnav )
        aalib? ( media-libs/aalib )
-       dvd? ( media-libs/libdvdnav )
-       media-libs/ladspa-sdk "
-# xmms is off-per-default
-#      media-sound/xmms
+       media-libs/ladspa-sdk" 
+
+# disable avi for now, it doesnt work
+#      avi? ( media-video/avifile )
 
 RDEPEND="${DEPEND}"
 
 src_compile() {
        elibtoolize
+       replace-flags "-O3" "-O2"
+
        # this is an ugly patch to remove -I/usr/include from some CFLAGS
        patch -p0 <${FILESDIR}/${P}-configure.patch
+
        local myconf
-       # aalib broken, dv on to test
-       # dvdnav is broken
-       myconf="--enable-dv --disable-flac"
+       myconf=""
        use avi \
                && myconf="${myconf} --enable-avifile" \
                || myconf="${myconf} --disable-avifile"
+       use aalib \
+               && myconf="${myconf} --enable-aalib" \
+               || myconf="${myconf} --disable-aalib"
+       use dvd \
+               && myconf="${myconf} --enable-dvdread --enable-dvdnav
+                                --enable-libdv" \
+               || myconf="${myconf} --disable-dvdread --disable-dvdnav
+                                --disable-libdv"
+
        # not testing for much here, since if its in USE we want it, but its autodetected by configure
        
        ./configure \
@@ -71,6 +80,7 @@ src_compile() {
                --oldincludedir=/usr/include \
                --sysconfdir=/etc \
                --mandir=/usr/share/man || die "./configure failed"
+               
        emake || die
 }