snapshot of cvs tree, many bug fixes including x86_64 fixes

(Portage version: 2.1_rc3)

4 files changed, 159 insertions, 1 deletions

diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog
index d93c59c8b874..feb3dbc34abb 100644
--- a/net-www/gnash/ChangeLog
+++ b/net-www/gnash/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2006/05/11 17:09:54 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.8 2006/05/28 21:27:59 anarchy Exp $
+
+*gnash-0.7.1_p20060528 (28 May 2006)
+
+  28 May 2006; Jory A. Pratt <anarchy@gentoo.org>
+  +files/gnash-0.7.1_p20060528-opengl.diff, +gnash-0.7.1_p20060528.ebuild:
+  snapshot of cvs tree, many bug fixes including x86_64 fixes
 
   11 May 2006; Stefan Schweizer <genstef@gentoo.org> gnash-0.7.1.ebuild:
   Workaround install problem thanks to Roie Kerstein
diff --git a/net-www/gnash/files/digest-gnash-0.7.1_p20060528 b/net-www/gnash/files/digest-gnash-0.7.1_p20060528
new file mode 100644
index 000000000000..23a10ae84d9e
--- /dev/null
+++ b/net-www/gnash/files/digest-gnash-0.7.1_p20060528
@@ -0,0 +1,3 @@
+MD5 d4f53d59383bd7b27178cd6c6678a817 gnash-0.7.1_p20060528.tar.gz 3436546
+RMD160 bb2aeb547a56158cdfd28103438bee9d848e5a14 gnash-0.7.1_p20060528.tar.gz 3436546
+SHA256 9cd5917a33c07a2708fde5c97a9e01fea6608088dcfdb15848965bbcadb757b6 gnash-0.7.1_p20060528.tar.gz 3436546
diff --git a/net-www/gnash/files/gnash-0.7.1_p20060528-opengl.diff b/net-www/gnash/files/gnash-0.7.1_p20060528-opengl.diff
new file mode 100644
index 000000000000..eb17cb1747d8
--- /dev/null
+++ b/net-www/gnash/files/gnash-0.7.1_p20060528-opengl.diff
@@ -0,0 +1,54 @@
+Index: libbase/Makefile.am
+===================================================================
+RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
+retrieving revision 1.28
+diff -u -B -u -8 -p -r1.28 Makefile.am
+--- libbase/Makefile.am	15 May 2006 22:24:24 -0000	1.28
++++ libbase/Makefile.am	28 May 2006 19:58:19 -0000
+@@ -101,17 +101,18 @@ libgnashbase_la_SOURCES = \
+ 	utility.cpp		\
+ 	curl_adapter.cpp	\
+ 	zlib_adapter.cpp	\
+ 	URL.cpp
+ 
+ libgnashbase_la_LIBADD = \
+ 	$(JPEG_LIBS)	\
+ 	$(ZLIB_LIBS)	\
+-	$(CURL_LIBS)
++	$(CURL_LIBS)	\
++	$(OPENGL_LIBS)
+ 
+ noinst_HEADERS = \
+ 	container.h		\
+ 	demo.h			\
+ 	dlmalloc.h		\
+ 	GnashException.h	\
+ 	grid_index.h		\
+ 	image.h			\
+Index: server/Makefile.am
+===================================================================
+RCS file: /sources/gnash/gnash/server/Makefile.am,v
+retrieving revision 1.46
+diff -u -B -u -8 -p -r1.46 Makefile.am
+--- server/Makefile.am	24 May 2006 19:01:12 -0000	1.46
++++ server/Makefile.am	28 May 2006 19:58:19 -0000
+@@ -228,17 +228,18 @@ noinst_HEADERS = $(as_incls) \
+ 	swf/tag_loaders.h \
+ 	xmlsocket.h \
+ 	fn_call.h
+ 
+ libgnashserver_la_LIBADD = \
+ 	libgnashasobjs.la \
+ 	$(ZLIB_LIBS) \
+ 	$(LIBXML_LIBS) \
+-	$(MP3_LIBS)
++	$(MP3_LIBS)	\
++	$(OPENGL_LIBS)
+ 
+ #	$(OPENGL_LIBS) #
+ #libserver_la_LDFLAGS = -module -avoid-version -no-undefined
+ #libserver_la_LIBDADD =  #@DL_LIB@  # $(LIBLTDL)
+ 
+ # Rebuild with GCC 4.x Mudflap support
+ mudflap:
+ 	@echo "Rebuilding with GCC Mudflap support"
diff --git a/net-www/gnash/gnash-0.7.1_p20060528.ebuild b/net-www/gnash/gnash-0.7.1_p20060528.ebuild
new file mode 100644
index 000000000000..27064a3ed450
--- /dev/null
+++ b/net-www/gnash/gnash-0.7.1_p20060528.ebuild
@@ -0,0 +1,95 @@
+# 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_p20060528.ebuild,v 1.1 2006/05/28 21:27:59 anarchy Exp $
+
+inherit nsplugins kde-functions autotools
+
+DESCRIPTION="Gnash is a GNU Flash movie player that supports many SWF v7 features"
+HOMEPAGE="http://www.gnu.org/software/gnash"
+SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86 ~amd64"
+IUSE="dmalloc mad nsplugin nptl xml kde gtk video_cards_i810"
+
+RDEPEND="dmalloc? ( dev-libs/dmalloc )
+	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
+	media-libs/sdl-mixer
+	virtual/opengl
+	|| (
+		( x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-proto/xproto )
+		virtual/x11
+	)
+	gtk? (
+		dev-libs/atk
+		dev-libs/glib
+		x11-libs/cairo
+		>x11-libs/gtk+-2
+		x11-libs/gtkglext
+		x11-libs/pango
+	)"
+
+S=${WORKDIR}/gnash
+
+set-kdedir
+
+src_unpack() {
+	unpack ${A}
+
+	#Fix a busted opengl as-needed
+	cd ${S}
+	epatch ${FILESDIR}/${P}-opengl.diff
+
+	# we want sound
+	sed -i -e "s:bool do_sound = .*:bool do_sound = true;:" backend/gnash.cpp
+
+	AT_M4DIR="macros" eautoreconf
+}
+
+src_compile() {
+	local myconf
+
+	if use nsplugin; then
+		myconf="${myconf}  --enable-plugin --with-plugindir=/opt/netscape/plugins"
+	fi
+
+	econf \
+		$(use_enable dmalloc) \
+		$(use_enable kde klash) \
+		$(use_enable mad mp3) \
+		$(use_enable nptl pthreads) \
+		$(use_enable xml) \
+		$(use_enable gtk glext) \
+		$(use_enable video_cards_i810 i810-lod-bias) \
+		${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	sed -i -e "s:-lXmu @inst_prefix_dir:-lXmu -L../backend/.libs -L../server/.libs -L../libgeometry/.libs -L../libbase/.libs -L. @inst_prefix_dir:" server/libgnashserver.la
+	make DESTDIR=${D} install || die "make install failed"
+	use nsplugin && inst_plugin /opt/netscape/plugins/libgnashplugin.so \
+		|| rm ${D}/opt/netscape/plugins/libgnashplugin.so
+	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"
+}