diff options
| -rw-r--r-- | net-www/gnash/ChangeLog | 17 | ||||
| -rw-r--r-- | net-www/gnash/files/digest-gnash-0.7.1_p20090909 | 1 | ||||
| -rw-r--r-- | net-www/gnash/files/gnash-as-needed.diff | 67 | ||||
| -rw-r--r-- | net-www/gnash/files/kdedir.diff | 11 | ||||
| -rw-r--r-- | net-www/gnash/files/klash-int-not-external.diff | 20 | ||||
| -rw-r--r-- | net-www/gnash/files/klash-makefile.diff | 34 | ||||
| -rw-r--r-- | net-www/gnash/gnash-0.7.1_p20060704.ebuild | 7 | ||||
| -rw-r--r-- | net-www/gnash/gnash-0.7.1_p20090909.ebuild | 129 |
8 files changed, 251 insertions, 35 deletions
diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog index 7548ca1f0473..cf893f88a626 100644 --- a/net-www/gnash/ChangeLog +++ b/net-www/gnash/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for net-www/gnash # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.15 2006/07/07 00:51:16 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.16 2006/08/08 12:00:43 genstef Exp $ + +*gnash-0.7.1_p20090909 (08 Aug 2006) + + 08 Aug 2006; Stefan Schweizer <genstef@gentoo.org> + -files/gnash-0.7.1_p20060528-confcache-gtkglext.patch, + -files/gnash-0.7.1_p20060528-opengl.diff, files/gnash-as-needed.diff, + +files/kdedir.diff, +files/klash-int-not-external.diff, + +files/klash-makefile.diff, -gnash-0.7.1.ebuild, + -gnash-0.7.1_p20060528.ebuild, gnash-0.7.1_p20060704.ebuild, + +gnash-0.7.1_p20090909.ebuild: + remove old ebuilds, remove dmalloc use flag thanks to Attila Stehr + <as.gentoo@web.de> in bug 142939, add new live cvs ebuild thnaks to Markus + Gothe <nietzsche@lysator.liu.se> in bug 143131 that compiles klash even + without the nsplugin thanks to Simon Siemonsma <simon.gentoo@hccnet.nl> in + bug 142190 07 Jul 2006; Stefan Schweizer <genstef@gentoo.org> +files/gnash-fix-cxxflags-rpath.patch, gnash-0.7.1_p20060704.ebuild: diff --git a/net-www/gnash/files/digest-gnash-0.7.1_p20090909 b/net-www/gnash/files/digest-gnash-0.7.1_p20090909 new file mode 100644 index 000000000000..8b137891791f --- /dev/null +++ b/net-www/gnash/files/digest-gnash-0.7.1_p20090909 @@ -0,0 +1 @@ + diff --git a/net-www/gnash/files/gnash-as-needed.diff b/net-www/gnash/files/gnash-as-needed.diff index 627f348f6873..9a3093722ab4 100644 --- a/net-www/gnash/files/gnash-as-needed.diff +++ b/net-www/gnash/files/gnash-as-needed.diff @@ -1,35 +1,42 @@ -diff -u gnash-0.7.1/libbase/Makefile.am.orig gnash-0.7.1/libbase/Makefile.am ---- gnash-0.7.1/libbase/Makefile.am.orig 2006-05-10 01:05:21.000000000 +0200 -+++ gnash-0.7.1/libbase/Makefile.am 2006-05-10 01:06:36.000000000 +0200 -@@ -99,6 +99,7 @@ - utf8.cpp \ - utility.cpp \ - zlib_adapter.cpp -+libgnashbase_la_LIBADD = $(JPEG_LIBS) $(ZLIB_LIBS) +diff -u gnash/libbase/Makefile.am.orig gnash/libbase/Makefile.am +--- gnash/libbase/Makefile.am.orig 2006-06-07 22:28:25.000000000 +0200 ++++ gnash/libbase/Makefile.am 2006-06-07 22:35:51.000000000 +0200 +@@ -94,8 +94,8 @@ + $(JPEG_LIBS) \ + $(ZLIB_LIBS) \ + $(CURL_LIBS) \ +- $(SDL_LIBS) +-# $(OPENGL_LIBS) ++ $(SDL_LIBS) \ ++ $(OPENGL_LIBS) noinst_HEADERS = \ - container.h \ -diff -u gnash-0.7.1/server/Makefile.am.orig gnash-0.7.1/server/Makefile.am ---- gnash-0.7.1/server/Makefile.am.orig 2006-05-10 00:51:18.000000000 +0200 -+++ gnash-0.7.1/server/Makefile.am 2006-05-10 01:07:43.000000000 +0200 -@@ -150,6 +150,7 @@ - text.cpp \ - array.cpp \ - types.cpp $(MP3_HANDLER) -+libgnashserver_la_LIBADD = libgnashasobjs.la $(MP3_LIBS) $(LIBXML_LIBS) $(OPENGL_LIBS) $(ZLIB_LIBS) + container.h \ +diff -u gnash/server/Makefile.am.orig gnash/server/Makefile.am +--- gnash/server/Makefile.am.orig 2006-06-07 22:28:28.000000000 +0200 ++++ gnash/server/Makefile.am 2006-06-07 22:36:00.000000000 +0200 +@@ -184,8 +184,8 @@ - noinst_HEADERS = $(as_incls) \ - action.h \ -diff -u gnash-0.7.1/plugin/klash/Makefile.am.orig gnash-0.7.1/plugin/klash/Makefile.am ---- gnash-0.7.1/plugin/klash/Makefile.am.orig 2006-05-11 01:08:17.000000000 +0200 -+++ gnash-0.7.1/plugin/klash/Makefile.am 2006-05-11 01:10:37.000000000 +0200 -@@ -116,7 +116,8 @@ - ../../server/libgnashserver.la \ - ../../server/libgnashasobjs.la \ - ../../libgeometry/libgnashgeo.la \ -- ../../libbase/libgnashbase.la -+ ../../libbase/libgnashbase.la \ -+ $(LIB_QT) + libgnashserver_la_LIBADD = \ + $(ZLIB_LIBS) \ +- $(LIBXML_LIBS) +-# $(OPENGL_LIBS) ++ $(LIBXML_LIBS) \ ++ $(OPENGL_LIBS) + #libserver_la_LDFLAGS = -module -avoid-version -no-undefined + #libserver_la_LIBDADD = #@DL_LIB@ # $(LIBLTDL) +diff -u gnash/gui/Makefile.am.orig gnash/gui/Makefile.am +--- gnash/gui/Makefile.am.orig 2006-08-06 08:31:57.000000000 +0200 ++++ gnash/gui/Makefile.am 2006-08-06 08:38:15.000000000 +0200 +@@ -152,7 +152,9 @@ - CLEANFILES = klash_part.moc klash.moc + libgnashgui_la_LIBADD = \ + ../server/libgnashserver.la \ +- ../libamf/libgnashamf.la ++ ../libamf/libgnashamf.la \ ++ ../backend/libgnashbackend.la \ ++ $(GLEXT_LIBS) + + if USE_GUI_KDE + bin_PROGRAMS = gnash klash diff --git a/net-www/gnash/files/kdedir.diff b/net-www/gnash/files/kdedir.diff new file mode 100644 index 000000000000..cb6df8127c2f --- /dev/null +++ b/net-www/gnash/files/kdedir.diff @@ -0,0 +1,11 @@ +--- macros/kde.m4.orig 2006-08-06 11:52:41.000000000 +0200 ++++ macros/kde.m4 2006-08-06 11:53:03.000000000 +0200 +@@ -1869,7 +1869,7 @@ + + KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION" + +-KDE_LDFLAGS=`echo $kde_libraries | sed -e 's:/usr/lib64::;s:/usr/lib::'` ++KDE_LDFLAGS="-L`echo $kde_libraries | sed -e 's:/usr/lib64::;s:/usr/lib::'`" + + if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then + all_libraries="$KDE_LDFLAGS $all_libraries" diff --git a/net-www/gnash/files/klash-int-not-external.diff b/net-www/gnash/files/klash-int-not-external.diff new file mode 100644 index 000000000000..245e5e99dddc --- /dev/null +++ b/net-www/gnash/files/klash-int-not-external.diff @@ -0,0 +1,20 @@ +--- gnash/plugin/klash.orig/klash.cpp 2006-08-08 13:29:19.000000000 +0200 ++++ gnash/plugin/klash/klash.cpp 2006-08-08 13:30:25.000000000 +0200 +@@ -99,12 +99,12 @@ + + movie_state_e movie_menu_state; + +-extern int mouse_x; +-extern int mouse_y; +-extern int mouse_buttons; ++int mouse_x; ++int mouse_y; ++int mouse_buttons; + +-extern int width; +-extern int height; ++int width; ++int height; + + extern int windowid; + class EmbedWidget : public QGLWidget diff --git a/net-www/gnash/files/klash-makefile.diff b/net-www/gnash/files/klash-makefile.diff new file mode 100644 index 000000000000..8367e0453876 --- /dev/null +++ b/net-www/gnash/files/klash-makefile.diff @@ -0,0 +1,34 @@ +--- Makefile.am.orig 2006-08-06 08:43:09.000000000 +0200 ++++ Makefile.am 2006-08-06 08:44:13.000000000 +0200 +@@ -50,11 +50,16 @@ + PLUGIN_DIRS = plugin + endif + ++if KLASH ++KLASH_DIRS = plugin/klash ++endif ++ ++ + if DOCBOOK + DOC_DIRS = doc + endif + +-SUBDIRS = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS) ++SUBDIRS = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS) $(KLASH_DIRS) + + # libamf isn't used yet, but we still want it in the distribution + DIST_SUBDIRS = $(STD_DIRS) doc testsuite libamf plugin +--- plugin/Makefile.am.orig 2006-08-06 08:43:00.000000000 +0200 ++++ plugin/Makefile.am 2006-08-06 08:43:21.000000000 +0200 +@@ -38,11 +38,6 @@ + + AUTOMAKE_OPTIONS = dejagnu + +-if KLASH +-KLASH = klash +-endif +-SUBDIRS = $(KLASH) # test mozilla-sdk +- + if MP3 + MP3_CFLAGS = $(MAD_CFLAGS) + MP3_LIBS = $(MAD_LIBS) diff --git a/net-www/gnash/gnash-0.7.1_p20060704.ebuild b/net-www/gnash/gnash-0.7.1_p20060704.ebuild index 259a8daec030..71d1c826f5aa 100644 --- a/net-www/gnash/gnash-0.7.1_p20060704.ebuild +++ b/net-www/gnash/gnash-0.7.1_p20060704.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.1_p20060704.ebuild,v 1.2 2006/07/07 00:51:16 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.1_p20060704.ebuild,v 1.3 2006/08/08 12:00:43 genstef Exp $ inherit nsplugins kde-functions autotools @@ -12,9 +12,9 @@ S=${WORKDIR}/${PN} LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc -sparc ~x86" -IUSE="dmalloc mad nsplugin nptl xml kde video_cards_i810" +IUSE="mad nsplugin nptl xml kde video_cards_i810" -RDEPEND="dmalloc? ( dev-libs/dmalloc ) +RDEPEND=" xml? ( dev-libs/libxml2 ) kde? ( kde-base/kdelibs @@ -84,7 +84,6 @@ src_compile() { #$(use_enable gtk glext) with USE=-gtk, fails to detect gtkglext, bug 135010 econf \ - $(use_enable dmalloc) \ $(use_enable kde klash) \ $(use_enable mad mp3) \ $(use_enable nptl pthreads) \ diff --git a/net-www/gnash/gnash-0.7.1_p20090909.ebuild b/net-www/gnash/gnash-0.7.1_p20090909.ebuild new file mode 100644 index 000000000000..199c07cb588e --- /dev/null +++ b/net-www/gnash/gnash-0.7.1_p20090909.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/gnash-0.7.1_p20090909.ebuild,v 1.1 2006/08/08 12:00:43 genstef Exp $ + +inherit nsplugins kde-functions autotools cvs + +DESCRIPTION="Gnash is a GNU Flash movie player that supports many SWF v7 features" +HOMEPAGE="http://www.gnu.org/software/gnash" +#SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${PV}/${P}.tar.bz2" +ECVS_SERVER="cvs.sv.gnu.org:/sources/${PN}" +ECVS_MODULE="${PN}" +ECVS_CO_OPTS="-D ${PV/0.7.1_p}" +ECVS_UP_OPTS="-dP ${ECVS_CO_OPTS}" +S=${WORKDIR}/${PN} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-*" +IUSE="gstreamer mad nsplugin nptl xml kde video_cards_i810" +#dmalloc, broken see bug 142939 +#dmalloc? ( dev-libs/dmalloc ) +# $(use_enable dmalloc) \ + +RDEPEND=" + xml? ( dev-libs/libxml2 ) + kde? ( + kde-base/kdelibs + x11-libs/qt + ) + sys-libs/zlib + media-libs/jpeg + mad? ( media-libs/libmad ) + media-libs/libogg + media-libs/libpng + media-libs/libsdl + net-misc/curl + virtual/opengl + || ( + ( x11-libs/libX11 + x11-libs/libXi + x11-libs/libXmu + x11-libs/libXt + x11-proto/xproto ) + virtual/x11 + ) + gstreamer? ( media-libs/gstreamer ) + !gstreamer? ( media-libs/sdl-mixer ) + dev-libs/atk + dev-libs/glib + >x11-libs/gtk+-2 + x11-libs/pango + x11-libs/gtkglext" + #cairo? ( x11-libs/cairo ) + +S=${WORKDIR}/gnash + +set-kdedir + +src_unpack() { + cvs_src_unpack + cd ${S} + + # as-needed fixes + epatch ${FILESDIR}/gnash-as-needed.diff + + # build klash even without nsplugin + epatch ${FILESDIR}/klash-makefile.diff + + # we need -L for linking + epatch ${FILESDIR}/kdedir.diff + + # height, width, mouse* are obviously not available externally + epatch ${FILESDIR}/klash-int-not-external.diff + + # we want sound + einfo "do_sound grep before: " + grep "bool do_sound = false;" backend/gnash.cpp || die soundsed failed + sed -i -e "s:bool do_sound = false;:bool do_sound = true;:" backend/gnash.cpp + einfo "do_sound grep after: " + grep "bool do_sound = true;" backend/gnash.cpp || die soundsed failed + + AT_M4DIR="macros" eautoreconf +} + +src_compile() { + local myconf + + use nsplugin && myconf="${myconf} --enable-plugin --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 + #--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 + + econf \ + $(use_enable kde klash) \ + $(use_enable mad mp3) \ + $(use_enable nptl pthreads) \ + $(use_enable xml) \ + $(use_enable video_cards_i810 i810-lod-bias) \ + ${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" +} |