diff options
Diffstat (limited to 'net-www')
| -rw-r--r-- | net-www/gnash/ChangeLog | 8 | ||||
| -rw-r--r-- | net-www/gnash/Manifest | 49 | ||||
| -rw-r--r-- | net-www/gnash/files/digest-gnash-0.7.2 | 3 | ||||
| -rw-r--r-- | net-www/gnash/files/digest-gnash-0.7.2_p20099999 | 0 | ||||
| -rw-r--r-- | net-www/gnash/gnash-0.7.2.ebuild | 114 | ||||
| -rw-r--r-- | net-www/gnash/gnash-0.7.2_p20099999.ebuild | 132 | ||||
| -rw-r--r-- | net-www/gnash/gnash-0.8.0.ebuild | 46 | ||||
| -rw-r--r-- | net-www/gnash/gnash-9999.ebuild | 40 |
8 files changed, 83 insertions, 309 deletions
diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog index 93a70bac9d1a..c199353e22f3 100644 --- a/net-www/gnash/ChangeLog +++ b/net-www/gnash/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-www/gnash # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.46 2007/06/20 02:01:21 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.47 2007/07/10 07:20:47 genstef Exp $ + + 10 Jul 2007; Stefan Schweizer <genstef@gentoo.org> -gnash-0.7.2.ebuild, + -gnash-0.7.2_p20099999.ebuild, gnash-0.8.0.ebuild, gnash-9999.ebuild: + Fix flawed media and sound setting logic thanks to Harley Peters + <harley@thepetersclan.com> in bug 184105 also attempt to fix as-needed bug + 183714 *gnash-9999 (20 Jun 2007) diff --git a/net-www/gnash/Manifest b/net-www/gnash/Manifest index b83c1ffe0874..e25fb696bbb8 100644 --- a/net-www/gnash/Manifest +++ b/net-www/gnash/Manifest @@ -1,48 +1,23 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -DIST gnash-0.7.2.tar.bz2 1599810 RMD160 0f5904b6c13ffb3b2b4a5f723d9fdacb0a8a6198 SHA1 e2bbd71d61665c435ed22339078070af196ea31a SHA256 12dccb4bc69488f516e0283e988412ba7db5dfad32744425f97d641392a2e98b DIST gnash-0.8.0.tar.bz2 2053076 RMD160 6c885c283345973d27206f6e3f90635264a724ae SHA1 b03d3c03bb93b0ebaf5ad10cabd3d7fef2434f7e SHA256 ff8c3ca6f297ad4fa7cc8fecea45119dbaf8fef7f95901c04eccbf0d6424ef84 -EBUILD gnash-0.7.2.ebuild 2953 RMD160 50c169c8373963122d6b05864bdc7ae4dec437e9 SHA1 e31a3f6d0dca2edf7b5b552fc88d2c62e885dca1 SHA256 f06307e1d0d3270864b61ef882202e297066e27fcdbd4efee7a21b6e536402f5 -MD5 a40ed56523780ed2d1796068d26d8858 gnash-0.7.2.ebuild 2953 -RMD160 50c169c8373963122d6b05864bdc7ae4dec437e9 gnash-0.7.2.ebuild 2953 -SHA256 f06307e1d0d3270864b61ef882202e297066e27fcdbd4efee7a21b6e536402f5 gnash-0.7.2.ebuild 2953 -EBUILD gnash-0.7.2_p20099999.ebuild 3540 RMD160 721831ab5ba8adf4fcb053885f93d7e3f8a2e746 SHA1 acfc8aadc719fb828b20ffa175d1f5e12cba3b65 SHA256 d57a23a5b257fc8203aef872bb00bdbb5ea3368afb38589104dd51ab1da0955e -MD5 5502de8083aa31e05349e90ba3a2c95e gnash-0.7.2_p20099999.ebuild 3540 -RMD160 721831ab5ba8adf4fcb053885f93d7e3f8a2e746 gnash-0.7.2_p20099999.ebuild 3540 -SHA256 d57a23a5b257fc8203aef872bb00bdbb5ea3368afb38589104dd51ab1da0955e gnash-0.7.2_p20099999.ebuild 3540 -EBUILD gnash-0.8.0.ebuild 3327 RMD160 c33c1282c4456efc878e2b763b03d30b81d85b39 SHA1 13aaa0c588775ca6487cac8f52c582cf61e7852a SHA256 c020557c5055b06b1ecd7509affba88b9c105be07fc124390431f4787bbf19f7 -MD5 6b369f198f88bb138cfa5834f14a99b4 gnash-0.8.0.ebuild 3327 -RMD160 c33c1282c4456efc878e2b763b03d30b81d85b39 gnash-0.8.0.ebuild 3327 -SHA256 c020557c5055b06b1ecd7509affba88b9c105be07fc124390431f4787bbf19f7 gnash-0.8.0.ebuild 3327 -EBUILD gnash-9999.ebuild 3379 RMD160 114abc51c12bc37e80e3d6d1ccb077162820ba99 SHA1 bba988c3c684ddd50d0098281ac9d598606de541 SHA256 69521611d52bd9efc978ea8be3519bb7a447991640a4d70b03ab402ee2d66475 -MD5 20b95f03d25c5c54a0b4b309b686e6f2 gnash-9999.ebuild 3379 -RMD160 114abc51c12bc37e80e3d6d1ccb077162820ba99 gnash-9999.ebuild 3379 -SHA256 69521611d52bd9efc978ea8be3519bb7a447991640a4d70b03ab402ee2d66475 gnash-9999.ebuild 3379 -MISC ChangeLog 8387 RMD160 f5ac125d44c5c97eba5c635108272081a83d180a SHA1 0b2598819af04661bc7a184549f163ec27b01dfe SHA256 3c763bd3b600d113d98cf2b474b6cd2105148ad237e4f053e7b08e96257d730c -MD5 e814544ff2e75e9a79a5f9487c0776ab ChangeLog 8387 -RMD160 f5ac125d44c5c97eba5c635108272081a83d180a ChangeLog 8387 -SHA256 3c763bd3b600d113d98cf2b474b6cd2105148ad237e4f053e7b08e96257d730c ChangeLog 8387 +EBUILD gnash-0.8.0.ebuild 4164 RMD160 16ed72e956fb0a97fa31428df7a0d999aab3539a SHA1 4c1282b5b6306ff203614d942f898a0698992b03 SHA256 f18b9e68a7a885a8d04ab5f8c5caa325b646cb3d87472a5a7637b94906c34ded +MD5 c715865090b4a187804432caebba2b98 gnash-0.8.0.ebuild 4164 +RMD160 16ed72e956fb0a97fa31428df7a0d999aab3539a gnash-0.8.0.ebuild 4164 +SHA256 f18b9e68a7a885a8d04ab5f8c5caa325b646cb3d87472a5a7637b94906c34ded gnash-0.8.0.ebuild 4164 +EBUILD gnash-9999.ebuild 4025 RMD160 40f28c5ef1e1e409c5c9da0483ffe6e8e2bda310 SHA1 16b3106ff13f07d83063663e6e6b3f92de295662 SHA256 899aba6f6c2db4e631be8a03d8abde7dc438c3df15c6b78cc5fe72aa7eaf7960 +MD5 af875a03548294503a715d695807332e gnash-9999.ebuild 4025 +RMD160 40f28c5ef1e1e409c5c9da0483ffe6e8e2bda310 gnash-9999.ebuild 4025 +SHA256 899aba6f6c2db4e631be8a03d8abde7dc438c3df15c6b78cc5fe72aa7eaf7960 gnash-9999.ebuild 4025 +MISC ChangeLog 8689 RMD160 a65a60bf5379f327ae596ff86b19e9374e8c565c SHA1 e2c1c208d57ad5baf6e2dd42a9ba6e6830e2d4f8 SHA256 9cf073b66ec3a1d1f6b5c1b610e9576ff8738eba00ad0bb1aa1ca5bf1cd488c8 +MD5 24e6b2bd3b8e692350d2ef61451b4c74 ChangeLog 8689 +RMD160 a65a60bf5379f327ae596ff86b19e9374e8c565c ChangeLog 8689 +SHA256 9cf073b66ec3a1d1f6b5c1b610e9576ff8738eba00ad0bb1aa1ca5bf1cd488c8 ChangeLog 8689 MISC metadata.xml 263 RMD160 3a7c4caf761fd53690c78d1352c1f7c2858a2c3b SHA1 0a3e12eb5d6d1c8e869b12ce442e89791f96d1a9 SHA256 05cfd5d6b86ee3f8cfda20636cefb676c252d2f4410b610d4f189ea8bfdff37e MD5 532ea834bddad203e998a8091c1b7c2d metadata.xml 263 RMD160 3a7c4caf761fd53690c78d1352c1f7c2858a2c3b metadata.xml 263 SHA256 05cfd5d6b86ee3f8cfda20636cefb676c252d2f4410b610d4f189ea8bfdff37e metadata.xml 263 -MD5 42d1c9e2aa371ea4e97f9c0276ae9d8f files/digest-gnash-0.7.2 241 -RMD160 be77f585eab622de3489263945670952b8999b66 files/digest-gnash-0.7.2 241 -SHA256 818baff3a56f0cf9dd4e112e8d00c9816500f61d0be9ae2ddf77ba2a8975bfda files/digest-gnash-0.7.2 241 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnash-0.7.2_p20099999 0 -RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gnash-0.7.2_p20099999 0 -SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gnash-0.7.2_p20099999 0 MD5 96894973d0297970a042274df6ff9e82 files/digest-gnash-0.8.0 241 RMD160 247bd4b4a8bdd4be525eba08c036f886c829db87 files/digest-gnash-0.8.0 241 SHA256 88aef1d14cb6293b9e8609af2b5d38181abd4453e414c797d6715ac8d10282da files/digest-gnash-0.8.0 241 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnash-9999 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-gnash-9999 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-gnash-9999 0 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.4 (GNU/Linux) - -iD8DBQFGeIqIr2QksT29OyARAvXoAKCF7m94V+1tKp4fWc1JoUu0BN7n0wCglI32 -TJl8LGuGtyrv97DEB7c63FQ= -=ZHnc ------END PGP SIGNATURE----- diff --git a/net-www/gnash/files/digest-gnash-0.7.2 b/net-www/gnash/files/digest-gnash-0.7.2 deleted file mode 100644 index 449beee42c3f..000000000000 --- a/net-www/gnash/files/digest-gnash-0.7.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ccef0f45be01a4c2992b46c2363a514f gnash-0.7.2.tar.bz2 1599810 -RMD160 0f5904b6c13ffb3b2b4a5f723d9fdacb0a8a6198 gnash-0.7.2.tar.bz2 1599810 -SHA256 12dccb4bc69488f516e0283e988412ba7db5dfad32744425f97d641392a2e98b gnash-0.7.2.tar.bz2 1599810 diff --git a/net-www/gnash/files/digest-gnash-0.7.2_p20099999 b/net-www/gnash/files/digest-gnash-0.7.2_p20099999 deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/net-www/gnash/files/digest-gnash-0.7.2_p20099999 +++ /dev/null diff --git a/net-www/gnash/gnash-0.7.2.ebuild b/net-www/gnash/gnash-0.7.2.ebuild deleted file mode 100644 index f2ede351a527..000000000000 --- a/net-www/gnash/gnash-0.7.2.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.2.ebuild,v 1.9 2007/03/16 16:52:40 gustavoz Exp $ - -inherit nsplugins kde-functions -set-kdedir - -DESCRIPTION="Gnash is a GNU Flash movie player that supports many SWF v7 features" -HOMEPAGE="http://www.gnu.org/software/gnash" -SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" -IUSE="agg gstreamer ffmpeg kde nsplugin xml video_cards_i810" -#dmalloc, broken see bug 142939 -#dmalloc? ( dev-libs/dmalloc ) -# $(use_enable dmalloc) \ - -RDEPEND=" - xml? ( dev-libs/libxml2 ) - sys-libs/zlib - media-libs/jpeg - media-libs/libogg - media-libs/libpng - net-misc/curl - !ffmpeg? ( media-libs/libmad ) - ffmpeg? ( media-video/ffmpeg ) - gstreamer? ( media-libs/gstreamer - || ( - media-plugins/gst-plugins-ffmpeg - media-plugins/gst-plugins-mad - media-plugins/gst-plugins-lame - ) - ) - !gstreamer? ( media-libs/libsdl ) - dev-libs/boost - || ( - ( x11-libs/libX11 - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXt - x11-proto/xproto ) - virtual/x11 - ) - dev-libs/atk - dev-libs/glib - >x11-libs/gtk+-2 - x11-libs/pango - !agg? ( virtual/opengl x11-libs/gtkglext ) - kde? ( kde-base/kdelibs ) - agg? ( x11-libs/agg )" - #cairo? ( x11-libs/cairo ) - -pkg_setup() { - if use agg && use kde; then - eerror "Building klash with the agg based renderer is not supportet" - eerror "Please USE -kde or -agg" - die "kde and agg not supported at the same time" - fi -} - -src_compile() { - local myconf - - use nsplugin && myconf="${myconf} --with-plugindir=/opt/netscape/plugins" - - #--enable-renderer=engine Specify rendering engine: - # OpenGL (default) - # Cairo (experimental) - #cairo: does not work for plugins yet, offers flash for non-accelerated gfx? - #if use cairo; then - # myconf="${myconf} --enable-renderer=cairo" - #fi - if use agg; then - myconf="${myconf} --enable-renderer=agg" - fi - #--enable-gui=flavor Specify gui flavor: - # GTK - # SDL -> has no controls, we do not USE it - #$(use_enable gtk glext) with USE=-gtk, fails to detect gtkglext, bug 135010 - #--enable-sound=gst,sdl - if use gstreamer; then - myconf="${myconf} --enable-sound=gst" - else - myconf="${myconf} --enable-sound=sdl" - fi - - if use ffmpeg; then - myconf="${myconf} --with-mp3-decoder=ffmpeg" - fi - - econf \ - $(use_enable nsplugin plugin) \ - $(use_enable xml) \ - $(use_enable video_cards_i810 i810-lod-bias) \ - --without-gcc-arch \ - $(use_enable kde klash) \ - ${myconf} || die "econf failed" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR=${D} install || die "emake install failed" - use nsplugin && inst_plugin /opt/netscape/plugins/libgnashplugin.so \ - || rm -rf ${D}/opt - dodoc AUTHORS ChangeLog NEWS README -} - -pkg_postinst() { - ewarn "ALPHA" - ewarn "gnash is still in heavy development" - ewarn "please report gnash bugs upstream to the gnash devs" -} diff --git a/net-www/gnash/gnash-0.7.2_p20099999.ebuild b/net-www/gnash/gnash-0.7.2_p20099999.ebuild deleted file mode 100644 index 9a1e7e7cc202..000000000000 --- a/net-www/gnash/gnash-0.7.2_p20099999.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.2_p20099999.ebuild,v 1.10 2007/05/13 22:12:33 genstef Exp $ - -WANT_AUTOCONF=latest -inherit nsplugins autotools cvs kde-functions qt3 multilib -set-kdedir - -DESCRIPTION="Gnash is a GNU Flash movie player that supports many SWF v7 features" -HOMEPAGE="http://www.gnu.org/software/gnash" -#SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2" -ECVS_SERVER="cvs.sv.gnu.org:/sources/${PN}" -ECVS_MODULE="${PN}" -[ "${PV/0.7.2_p}" != "20099999" ] && ECVS_CO_OPTS="-D ${PV/0.7.2_p}" -ECVS_UP_OPTS="-dP ${ECVS_CO_OPTS}" -S=${WORKDIR}/${PN} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="agg gstreamer ffmpeg kde nsplugin xml video_cards_i810" -#dmalloc, broken see bug 142939 -#dmalloc? ( dev-libs/dmalloc ) -# $(use_enable dmalloc) \ - -RDEPEND=" - xml? ( dev-libs/libxml2 ) - sys-libs/zlib - media-libs/jpeg - media-libs/libogg - media-libs/libpng - net-misc/curl - !ffmpeg? ( media-libs/libmad ) - ffmpeg? ( media-video/ffmpeg ) - gstreamer? ( media-libs/gstreamer - || ( - media-plugins/gst-plugins-ffmpeg - media-plugins/gst-plugins-mad - media-plugins/gst-plugins-lame - ) - ) - !gstreamer? ( media-libs/libsdl ) - dev-libs/boost - || ( - ( x11-libs/libX11 - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXt - x11-proto/xproto ) - virtual/x11 - ) - dev-libs/atk - dev-libs/glib - >x11-libs/gtk+-2 - x11-libs/pango - !agg? ( virtual/opengl x11-libs/gtkglext ) - kde? ( kde-base/kdelibs ) - agg? ( x11-libs/agg )" - #cairo? ( x11-libs/cairo ) - -pkg_setup() { - if use agg && use kde; then - eerror "Building klash with the agg based renderer is not supportet" - eerror "Please USE -kde or -agg" - die "kde and agg not supported at the same time" - fi - - if has_version '<dev-libs/boost-1.34' && ! built_with_use dev-libs/boost threads; then - eerror "dev-libst/boost has to be built with the 'threads' USE flag" - die "dev-libs/boost not built with threads" - fi -} - -src_compile() { - ./autogen.sh - local myconf - - use nsplugin && myconf="${myconf} --with-plugindir=/opt/netscape/plugins" - - #--enable-renderer=engine Specify rendering engine: - # OpenGL (default) - # Cairo (experimental) - #cairo: does not work for plugins yet, offers flash for non-accelerated gfx? - #if use cairo; then - # myconf="${myconf} --enable-renderer=cairo" - #fi - if use agg; then - myconf="${myconf} --enable-renderer=agg" - fi - #--enable-gui=flavor Specify gui flavor: - # GTK - # SDL -> has no controls, we do not USE it - #$(use_enable gtk glext) with USE=-gtk, fails to detect gtkglext, bug 135010 - #--enable-sound=gst,sdl - if use gstreamer; then - myconf="${myconf} --enable-sound=gst" - else - myconf="${myconf} --enable-sound=sdl" - fi - - if use ffmpeg; then - myconf="${myconf} --with-mp3-decoder=ffmpeg" - fi - - if use kde; then - myconf="${myconf} --enable-klash --with-qt-incl=${QTDIR}/include - --with-qt-lib=${QTDIR}/$(get_libdir)" - else - myconf="${myconf} --disable-klash" - fi - - econf \ - $(use_enable nsplugin plugin) \ - $(use_enable xml) \ - $(use_enable video_cards_i810 i810-lod-bias) \ - --without-gcc-arch \ - ${myconf} || die "econf failed" - emake -j1 || die "emake failed" -} - -src_install() { - emake DESTDIR=${D} install || die "emake install failed" - use nsplugin && inst_plugin /opt/netscape/plugins/libgnashplugin.so \ - || rm -rf ${D}/opt - dodoc AUTHORS ChangeLog NEWS README -} - -pkg_postinst() { - ewarn "ALPHA" - ewarn "gnash is still in heavy development" - ewarn "please report gnash bugs upstream to the gnash devs" -} diff --git a/net-www/gnash/gnash-0.8.0.ebuild b/net-www/gnash/gnash-0.8.0.ebuild index eeec61b89777..52414adb5c53 100644 --- a/net-www/gnash/gnash-0.8.0.ebuild +++ b/net-www/gnash/gnash-0.8.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.8.0.ebuild,v 1.2 2007/06/12 11:15:09 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.8.0.ebuild,v 1.3 2007/07/10 07:20:47 genstef Exp $ -inherit nsplugins kde-functions qt3 multilib +inherit nsplugins kde-functions qt3 multilib flag-o-matic autotools set-kdedir DESCRIPTION="Gnash is a GNU Flash movie player that supports many SWF v7 features" @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" -IUSE="agg gstreamer ffmpeg kde nsplugin xml video_cards_i810" +IUSE="agg gstreamer ffmpeg kde mad nsplugin xml video_cards_i810" #dmalloc, broken see bug 142939 #dmalloc? ( dev-libs/dmalloc ) # $(use_enable dmalloc) \ @@ -24,7 +24,7 @@ RDEPEND=" media-libs/libogg media-libs/libpng net-misc/curl - !ffmpeg? ( media-libs/libmad ) + mad? ( media-libs/libmad ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( media-libs/gstreamer || ( @@ -63,6 +63,28 @@ pkg_setup() { eerror "dev-libst/boost has to be built with the 'threads' USE flag" die "dev-libs/boost not built with threads" fi + + if use mad && ( use !ffmpeg && use !gstreamer ) && ( use nsplugin || use xml ); then + eerror "Building Gnash using the mad media handler is incompatible with the nsplugin or xml USE flags" + die "nsplugin and xml not supported with mad media handler" + fi + + if use !mad && use !ffmpeg && use !gstreamer; then + eerror "You are trying to build Gnash without choosing a media handler" + eerror "Please enable one of the following ffmpeg,gstreamer or mad(mp3 audio only)" + die "No media handler selected !" + fi +} + +src_unpack() { + unpack ${A} + cd ${S} + #as-needed breaks, see bug 183714 + # + # TODO - does not work for me + #epatch ${FILESDIR}/gnash-no-asneeded.patch + #filter-ldflags -Wl,--as-needed --as-needed + #eautoconf } src_compile() { @@ -84,15 +106,17 @@ src_compile() { # GTK # SDL -> has no controls, we do not USE it #$(use_enable gtk glext) with USE=-gtk, fails to detect gtkglext, bug 135010 - #--enable-sound=gst,sdl - if use gstreamer; then - myconf="${myconf} --enable-sound=gst" - else - myconf="${myconf} --enable-sound=sdl" + #--enable-media=gst||ffmpeg||mad + if use mad && use !ffmpeg && use !gstreamer; then + myconf="${myconf} --enable-media=mad" + fi + + if use gstreamer && use !ffmpeg; then + myconf="${myconf} --enable-media=gst" fi if use ffmpeg; then - myconf="${myconf} --with-mp3-decoder=ffmpeg" + myconf="${myconf} --enable-media=ffmpeg" fi if use kde; then @@ -106,7 +130,7 @@ src_compile() { $(use_enable nsplugin plugin) \ $(use_enable xml) \ $(use_enable video_cards_i810 i810-lod-bias) \ - --without-gcc-arch \ + --without-gcc-arch --disable-debugger \ ${myconf} || die "econf failed" emake -j1 || die "emake failed" } diff --git a/net-www/gnash/gnash-9999.ebuild b/net-www/gnash/gnash-9999.ebuild index 419d887028d2..ab2c796ebc2f 100644 --- a/net-www/gnash/gnash-9999.ebuild +++ b/net-www/gnash/gnash-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-9999.ebuild,v 1.1 2007/06/20 02:01:21 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-9999.ebuild,v 1.2 2007/07/10 07:20:47 genstef Exp $ WANT_AUTOCONF=latest inherit nsplugins autotools cvs kde-functions qt3 multilib @@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="agg gstreamer ffmpeg kde nsplugin xml video_cards_i810" +IUSE="agg gstreamer ffmpeg kde mad nsplugin xml video_cards_i810" #dmalloc, broken see bug 142939 #dmalloc? ( dev-libs/dmalloc ) # $(use_enable dmalloc) \ @@ -27,7 +27,7 @@ RDEPEND=" media-libs/libogg media-libs/libpng net-misc/curl - !ffmpeg? ( media-libs/libmad ) + mad? ( media-libs/libmad ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( media-libs/gstreamer || ( @@ -66,10 +66,26 @@ pkg_setup() { eerror "dev-libst/boost has to be built with the 'threads' USE flag" die "dev-libs/boost not built with threads" fi + + if use mad && ( use !ffmpeg && use !gstreamer ) && ( use nsplugin || use xml ); then + eerror "Building Gnash using the mad media handler is incompatible with the nsplugin or xml USE flags" + die "nsplugin and xml not supported with mad media handler" + fi + + if use !mad && use !ffmpeg && use !gstreamer; then + eerror "You are trying to build Gnash without choosing a media handler" + eerror "Please enable one of the following ffmpeg,gstreamer or mad(mp3 audio only)" + die "No media handler selected !" + fi } -src_compile() { +src_unpack() { + cvs_src_unpack + cd ${S} ./autogen.sh +} + +src_compile() { local myconf use nsplugin && myconf="${myconf} --with-plugindir=/opt/netscape/plugins" @@ -88,15 +104,17 @@ src_compile() { # GTK # SDL -> has no controls, we do not USE it #$(use_enable gtk glext) with USE=-gtk, fails to detect gtkglext, bug 135010 - #--enable-sound=gst,sdl - if use gstreamer; then - myconf="${myconf} --enable-sound=gst" - else - myconf="${myconf} --enable-sound=sdl" + #--enable-media=gst||ffmpeg||mad + if use mad && use !ffmpeg && use !gstreamer; then + myconf="${myconf} --enable-media=mad" + fi + + if use gstreamer && use !ffmpeg; then + myconf="${myconf} --enable-media=gst" fi if use ffmpeg; then - myconf="${myconf} --with-mp3-decoder=ffmpeg" + myconf="${myconf} --enable-media=ffmpeg" fi if use kde; then @@ -110,7 +128,7 @@ src_compile() { $(use_enable nsplugin plugin) \ $(use_enable xml) \ $(use_enable video_cards_i810 i810-lod-bias) \ - --without-gcc-arch \ + --without-gcc-arch --disable-debugger \ ${myconf} || die "econf failed" emake -j1 || die "emake failed" } |