diff options
| -rw-r--r-- | net-www/gnash/ChangeLog | 7 | ||||
| -rw-r--r-- | net-www/gnash/files/digest-gnash-0.8.0 | 3 | ||||
| -rw-r--r-- | net-www/gnash/files/digest-gnash-0.8.1 | 3 | ||||
| -rw-r--r-- | net-www/gnash/files/gnash-0.8.0-ffmpeg.patch | 103 | ||||
| -rw-r--r-- | net-www/gnash/gnash-0.8.0.ebuild | 148 | ||||
| -rw-r--r-- | net-www/gnash/gnash-0.8.1-r1.ebuild | 14 | ||||
| -rw-r--r-- | net-www/gnash/gnash-0.8.1.ebuild | 164 |
7 files changed, 13 insertions, 429 deletions
diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog index 6e059c2ae4cf..9338b3d7ed73 100644 --- a/net-www/gnash/ChangeLog +++ b/net-www/gnash/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-www/gnash # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.53 2008/01/12 03:49:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.54 2008/01/19 17:20:15 genstef Exp $ + + 19 Jan 2008; Stefan Schweizer <genstef@gentoo.org> + -files/gnash-0.8.0-ffmpeg.patch, -gnash-0.8.0.ebuild, -gnash-0.8.1.ebuild, + gnash-0.8.1-r1.ebuild: + remove old, dont offer fltk because we do not have fltk2, bug 205408 *gnash-0.8.1-r1 (12 Jan 2008) diff --git a/net-www/gnash/files/digest-gnash-0.8.0 b/net-www/gnash/files/digest-gnash-0.8.0 deleted file mode 100644 index c58c1de56149..000000000000 --- a/net-www/gnash/files/digest-gnash-0.8.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b3a3b22d608b5050b1b2743bc348c536 gnash-0.8.0.tar.bz2 2053076 -RMD160 6c885c283345973d27206f6e3f90635264a724ae gnash-0.8.0.tar.bz2 2053076 -SHA256 ff8c3ca6f297ad4fa7cc8fecea45119dbaf8fef7f95901c04eccbf0d6424ef84 gnash-0.8.0.tar.bz2 2053076 diff --git a/net-www/gnash/files/digest-gnash-0.8.1 b/net-www/gnash/files/digest-gnash-0.8.1 deleted file mode 100644 index e063d5b29b5c..000000000000 --- a/net-www/gnash/files/digest-gnash-0.8.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5f80a25cb7a37fb351d28fd2097d8f3e gnash-0.8.1.tar.bz2 1983596 -RMD160 8872e58fb1b2915edd62a2a48fc076a0cda3ed2d gnash-0.8.1.tar.bz2 1983596 -SHA256 30fb283e707bc209109ca313c83b069b1c482497b62f8c4cc37e9a23e0ba8993 gnash-0.8.1.tar.bz2 1983596 diff --git a/net-www/gnash/files/gnash-0.8.0-ffmpeg.patch b/net-www/gnash/files/gnash-0.8.0-ffmpeg.patch deleted file mode 100644 index b9b763ba4357..000000000000 --- a/net-www/gnash/files/gnash-0.8.0-ffmpeg.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff -ur gnash-0.8.0.orig/backend/sound_handler_sdl.h gnash-0.8.0/backend/sound_handler_sdl.h ---- gnash-0.8.0.orig/backend/sound_handler_sdl.h 2007-05-28 18:40:58.000000000 +0300 -+++ gnash-0.8.0/backend/sound_handler_sdl.h 2007-07-23 16:13:13.000000000 +0300 -@@ -26,7 +26,11 @@ - #include "log.h" - - #ifdef USE_FFMPEG -+ -+extern "C" { - #include <ffmpeg/avcodec.h> -+} -+ - #elif defined(USE_MAD) - #include <mad.h> - #endif -diff -ur gnash-0.8.0.orig/configure.ac gnash-0.8.0/configure.ac ---- gnash-0.8.0.orig/configure.ac 2007-06-09 03:48:15.000000000 +0300 -+++ gnash-0.8.0/configure.ac 2007-07-23 17:14:05.000000000 +0300 -@@ -881,6 +881,7 @@ - - if test x"$media_handler" = x"ffmpeg"; then - GNASH_PATH_FFMPEG -+ PKG_CHECK_MODULES(FFMPEG, libavutil libavformat libavcodec libswscale, HAVE_FFMPEG=yes, AC_MSG_ERROR([FFMPEG not found.])) - if test x"${media_handler_specified}" = xfalse; then - # If the library is not found, or its version is not ok, we'll try gst - if test x"${ac_cv_path_ffmpeg_lib}" = x -o x"${ffmpeg_version}" != xok; then -@@ -890,6 +891,8 @@ - fi - fi - -+AC_SUBST(FFMPEG_LIBS) -+ - if test "$media_handler" = "gst"; then - GNASH_PKG_FIND(gstreamer, [gst/gst.h], [gstreamer library], gst_init, [0.10]) - if test x"${media_handler_specified}" = xfalse; then -diff -ur gnash-0.8.0.orig/libbase/embedVideoDecoderFfmpeg.cpp gnash-0.8.0/libbase/embedVideoDecoderFfmpeg.cpp ---- gnash-0.8.0.orig/libbase/embedVideoDecoderFfmpeg.cpp 2007-06-08 21:44:16.000000000 +0300 -+++ gnash-0.8.0/libbase/embedVideoDecoderFfmpeg.cpp 2007-07-23 16:10:45.000000000 +0300 -@@ -26,7 +26,11 @@ - #include "embedVideoDecoderFfmpeg.h" - - #ifdef HAVE_SWSCALE_H -+ -+extern "C" { - #include <ffmpeg/swscale.h> -+} -+ - #endif - - #include <boost/scoped_array.hpp> -diff -ur gnash-0.8.0.orig/libbase/embedVideoDecoderFfmpeg.h gnash-0.8.0/libbase/embedVideoDecoderFfmpeg.h ---- gnash-0.8.0.orig/libbase/embedVideoDecoderFfmpeg.h 2007-06-08 07:18:37.000000000 +0300 -+++ gnash-0.8.0/libbase/embedVideoDecoderFfmpeg.h 2007-07-23 16:10:37.000000000 +0300 -@@ -28,7 +28,11 @@ - - #include <vector> - #include "embedVideoDecoder.h" -+ -+extern "C" { - #include <ffmpeg/avcodec.h> -+} -+ - #include "image.h" - - namespace gnash { -diff -ur gnash-0.8.0.orig/libbase/Makefile.am gnash-0.8.0/libbase/Makefile.am ---- gnash-0.8.0.orig/libbase/Makefile.am 2007-05-21 18:46:48.000000000 +0300 -+++ gnash-0.8.0/libbase/Makefile.am 2007-07-23 17:01:18.000000000 +0300 -@@ -160,7 +160,7 @@ - if USE_FFMPEG_ENGINE - libgnashbase_la_SOURCES += embedVideoDecoderFfmpeg.cpp - noinst_HEADERS += embedVideoDecoderFfmpeg.h --libgnashbase_la_LIBADD += $(FFMPEG_LIBS) -+libgnashbase_la_LIBADD += $(FFMPEG_LIBS) @FFMPEG_LIBS@ - libgnashbase_la_CPPFLAGS += $(FFMPEG_CFLAGS) - endif - -diff -ur gnash-0.8.0.orig/server/asobj/NetStreamFfmpeg.h gnash-0.8.0/server/asobj/NetStreamFfmpeg.h ---- gnash-0.8.0.orig/server/asobj/NetStreamFfmpeg.h 2007-06-04 15:02:16.000000000 +0300 -+++ gnash-0.8.0/server/asobj/NetStreamFfmpeg.h 2007-07-23 16:11:27.000000000 +0300 -@@ -39,7 +39,9 @@ - #include "impl.h" - #include "video_stream_instance.h" - -+extern "C" { - #include <ffmpeg/avformat.h> -+} - - #include "image.h" - #include "StreamProvider.h" -diff -ur gnash-0.8.0.orig/server/asobj/SoundFfmpeg.h gnash-0.8.0/server/asobj/SoundFfmpeg.h ---- gnash-0.8.0.orig/server/asobj/SoundFfmpeg.h 2007-05-28 18:41:08.000000000 +0300 -+++ gnash-0.8.0/server/asobj/SoundFfmpeg.h 2007-07-23 16:11:53.000000000 +0300 -@@ -32,7 +32,9 @@ - #include <boost/bind.hpp> - #include <boost/thread/mutex.hpp> - -+extern "C" { - #include <ffmpeg/avformat.h> -+} - - namespace gnash { - diff --git a/net-www/gnash/gnash-0.8.0.ebuild b/net-www/gnash/gnash-0.8.0.ebuild deleted file mode 100644 index 11ffc62186e0..000000000000 --- a/net-www/gnash/gnash-0.8.0.ebuild +++ /dev/null @@ -1,148 +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.8.0.ebuild,v 1.6 2007/07/23 14:36:24 drac Exp $ - -WANT_AUTOMAKE="1.9" - -inherit nsplugins kde-functions qt3 multilib flag-o-matic autotools -set-kdedir eutils - -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 mad 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 - mad? ( 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 - 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 ) - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -pkg_setup() { - if use agg && use kde; then - eerror "Building klash with the agg based renderer is not supported" - 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 - - 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}" - epatch "${FILESDIR}"/${P}-ffmpeg.patch - eautoconf - eautomake -} - -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-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} --enable-media=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 --disable-debugger \ - ${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.1-r1.ebuild b/net-www/gnash/gnash-0.8.1-r1.ebuild index 2504617b66b9..9c4e1cea3a7f 100644 --- a/net-www/gnash/gnash-0.8.1-r1.ebuild +++ b/net-www/gnash/gnash-0.8.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.8.1-r1.ebuild,v 1.1 2008/01/12 03:49:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.8.1-r1.ebuild,v 1.2 2008/01/19 17:20:15 genstef Exp $ inherit nsplugins kde-functions qt3 multilib set-kdedir eutils @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" -IUSE="agg cairo fbcon ffmpeg fltk gstreamer gtk kde mad nsplugin opengl qt sdl video_cards_i810" +IUSE="agg cairo fbcon ffmpeg gstreamer gtk kde mad nsplugin opengl qt sdl video_cards_i810" RDEPEND=" agg? ( >=x11-libs/agg-2.5 ) @@ -31,8 +31,7 @@ RDEPEND=" kde? ( kde-base/kdelibs ) qt? ( x11-libs/qt ) sdl? ( media-libs/libsdl ) - fltk? ( x11-libs/fltk ) - !gtk? ( !kde? ( !qt? ( !sdl? ( !fltk? ( !fbcon? ( + !gtk? ( !kde? ( !qt? ( !sdl? ( ( !fbcon? ( >x11-libs/gtk+-2 x11-libs/pango dev-libs/glib @@ -71,7 +70,8 @@ pkg_setup() { die "cairo and kde USE flags enabled at the same time" fi - if ! use agg && use opengl && ( use fbcon || use fltk ) ; then +#( use fbcon || use fltk ) + if ! use agg && use opengl && use fbcon; then eerror "The opengl renderer and the fb/fltk guis were selected" eerror "They are incompatible with each other" eerror "Disable one of them through the respective USE flag" @@ -113,14 +113,14 @@ src_compile() { local gui="" use fbcon && gui="${gui},fb" - use fltk && gui="${gui},fltk" + #use fltk && gui="${gui},fltk" use gtk && gui="${gui},gtk" use kde && gui="${gui},kde" use qt && gui="${gui},qt" use sdl && gui="${gui},sdl" gui=${gui#,} if [[ -z ${gui} ]] ; then - ewarn "You did not select a gui from: fbcon fltk gtk kde qt sdl" + ewarn "You did not select a gui from: fbcon gtk kde qt sdl" #fltk ewarn " - Default of gtk,kde has been selected for you" gui="gtk,kde" fi diff --git a/net-www/gnash/gnash-0.8.1.ebuild b/net-www/gnash/gnash-0.8.1.ebuild deleted file mode 100644 index 431e0580cb1a..000000000000 --- a/net-www/gnash/gnash-0.8.1.ebuild +++ /dev/null @@ -1,164 +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.8.1.ebuild,v 1.1 2007/11/21 09:19:53 uid895 Exp $ - -inherit nsplugins kde-functions qt3 multilib -set-kdedir eutils - -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-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" -IUSE="agg opengl cairo gtk kde nsplugin gstreamer ffmpeg video_cards_i810" - -RDEPEND=" - agg? ( >=x11-libs/agg-2.5 ) - cairo? ( x11-libs/cairo ) - opengl? ( - virtual/opengl - gtk? ( - x11-libs/gtkglext - ) - ) - gtk? ( - >x11-libs/gtk+-2 - x11-libs/pango - dev-libs/glib - dev-libs/atk - ) - kde? ( kde-base/kdelibs ) - dev-libs/libxml2 - sys-libs/zlib - media-libs/jpeg - media-libs/libpng - net-misc/curl - ffmpeg? ( - media-libs/libsdl - media-video/ffmpeg - ) - gstreamer? ( - media-plugins/gst-plugins-ffmpeg - media-plugins/gst-plugins-mad - ) - dev-libs/boost - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXt - x11-proto/xproto - " - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -pkg_setup() { - if ! ( use agg || use opengl || use cairo ); then - eerror "No renderer was selected. Select one between AGG, OpenGL and cairo" - eerror "They correspond to the agg, opengl and cairo USE flags" - eerror "AGG is upstream's default, so it is probably a safe choice" - die "None of the opengl, agg and cairo USE flags enabled" - - elif use agg && use opengl || use cairo && ( use agg || use opengl ); then - eerror "More than one renderer was selected" - eerror "Please select only one renderer between AGG, OpenGL and cairo" - eerror "They correspond to the agg, opengl and cairo USE flags" - eerror "AGG is upstream's default, so it is probably a safe choice" - die "More than one USE flag enabled between opengl, agg and cairo" - fi - - if use cairo && use kde; then - eerror "The cairo renderer and the kde gui were selected" - eerror "They are incompatible with each other" - eerror "Disable one of them through the respective USE flag" - die "cairo and kde USE flags enabled at the same time" - fi - - if has_version '<dev-libs/boost-1.34' && ! built_with_use dev-libs/boost threads; then - eerror "dev-libs/boost must have been built with the 'threads' USE flag enabled" - die "dev-libs/boost not built with threads USE flag enabled" - fi - - if use !ffmpeg && use !gstreamer; then - eerror "No media handler was selected. Select one between FFmpeg and GStreamer" - eerror "Enable one (and only one) of the ffmpeg and gstreamer USE flags" - die "ffmpeg and gstreamer USE flags both disabled: no media handler selected" - - elif use ffmpeg && use gstreamer; then - eerror "Both FFmpeg and GStreamer media handlers were selected" - eerror "One, and only one, of the ffmpeg and gstreamer USE flags must be enabled" - die "Both ffmpeg and gstreamer USE flags enabled" - fi - - if use !kde && use !gtk; then - eerror "No frontend was selected" - eerror "At least one of the kde and gtk USE flags must be enabled" - die "Both kde and gtk USE flags disabled: no frontend selected" - fi - - if use nsplugin && use !gtk; then - eerror "The Firefox plugin was selected but not the GTK frontend." - eerror "Disable the nsplugin USE flag or enable the gtk USE flag" - die "nsplugin USE flag enabled with required gtk USE flag disabled" - fi -} - -src_compile() { - local myconf - local gui - - if use nsplugin; then - myconf="${myconf} --with-plugindir=/opt/netscape/plugins" - else - myconf="${myconf} --disable-nsapi" - fi - - if use !kde; then - myconf="${myconf} --disable-kparts" - fi - - if use agg; then - myconf="${myconf} --enable-renderer=agg" - elif use opengl; then - myconf="${myconf} --enable-renderer=ogl" - else - myconf="${myconf} --enable-renderer=cairo" - fi - - if use gtk; then - if use kde; then - gui="gtk,kde"; - else - gui=gtk - fi - else - gui=kde - fi - - if use gstreamer; then - myconf="${myconf} --enable-media=gst" - else - myconf="${myconf} --enable-media=ffmpeg" - fi - - econf ${myconf} \ - $(use_enable video_cards_i810 i810-lod-bias) \ - --enable-gui=${gui} \ - || 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" -} |