version bump: new cvs snapshot

Package-Manager: portage-2.1.1_pre2-r2

5 files changed, 157 insertions, 5 deletions

diff --git a/net-www/gnash/ChangeLog b/net-www/gnash/ChangeLog
index b53b13e56ee9..e82e95bbc177 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.13 2006/06/29 23:04:00 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gnash/ChangeLog,v 1.14 2006/07/04 17:48:12 genstef Exp $
+
+*gnash-0.7.1_p20060704 (04 Jul 2006)
+
+  04 Jul 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/gnash-0.7.1_p20060704-opengl.diff, +gnash-0.7.1_p20060704.ebuild:
+  version bump: new cvs snapshot
 
   29 Jun 2006; Jason Wever <weeve@gentoo.org> gnash-0.7.1_p20060528.ebuild:
   Masking on SPARC as it makes the baby Xwindow crash.
diff --git a/net-www/gnash/Manifest b/net-www/gnash/Manifest
index 21979ed72bb6..d0cc3592df4e 100644
--- a/net-www/gnash/Manifest
+++ b/net-www/gnash/Manifest
@@ -6,12 +6,17 @@ AUX gnash-0.7.1_p20060528-opengl.diff 1459 RMD160 25c45abb3427c2db70f2ed8031176b
 MD5 75bf7804629d31f152ce60d2540c5bf4 files/gnash-0.7.1_p20060528-opengl.diff 1459
 RMD160 25c45abb3427c2db70f2ed8031176b9c7bdf31bc files/gnash-0.7.1_p20060528-opengl.diff 1459
 SHA256 8346b49ab7361cc735f22e20b438d49e66203bab78455319e91aa77ac7617984 files/gnash-0.7.1_p20060528-opengl.diff 1459
+AUX gnash-0.7.1_p20060704-opengl.diff 829 RMD160 68dae8f130e6dfbd2051007c7f819b47e1889334 SHA1 ef7603ec759d628404e97aab7f2b73d70f6daeb2 SHA256 ff88cbac28c3465f8f7ea46f0bc61cfa2e016dade9b56ce729a44734d2798729
+MD5 4a1d412f7aab9b5b69ed4e6bba4780c2 files/gnash-0.7.1_p20060704-opengl.diff 829
+RMD160 68dae8f130e6dfbd2051007c7f819b47e1889334 files/gnash-0.7.1_p20060704-opengl.diff 829
+SHA256 ff88cbac28c3465f8f7ea46f0bc61cfa2e016dade9b56ce729a44734d2798729 files/gnash-0.7.1_p20060704-opengl.diff 829
 AUX gnash-as-needed.diff 1359 RMD160 e3caac39b725724bb3d31cde6f0a9bae7788363e SHA1 c8524a715e912d74a21187c89d9d7460040ef384 SHA256 beae9755cc8c45b4675b562dd57da720e5b24b56dfebe5a7e7220e4dadc019c7
 MD5 5758f8309a9738a69b55dc2f8de7c7eb files/gnash-as-needed.diff 1359
 RMD160 e3caac39b725724bb3d31cde6f0a9bae7788363e files/gnash-as-needed.diff 1359
 SHA256 beae9755cc8c45b4675b562dd57da720e5b24b56dfebe5a7e7220e4dadc019c7 files/gnash-as-needed.diff 1359
 DIST gnash-0.7.1.tar.bz2 1089794 RMD160 db7817a80d41a9e1a7168bc8554c64c66f23eb98 SHA1 df52437321c976be132dd85b64d32d6b9a975bdb SHA256 48fcb533e3989757c23af2b9130c8b490a4d40375be4813ce425efea82ae0f62
 DIST gnash-0.7.1_p20060528.tar.gz 3436546 RMD160 bb2aeb547a56158cdfd28103438bee9d848e5a14 SHA1 999093780f1c562ab826643683e9909576a37e06 SHA256 9cd5917a33c07a2708fde5c97a9e01fea6608088dcfdb15848965bbcadb757b6
+DIST gnash-0.7.1_p20060704.tar.bz2 3287215 RMD160 708ebf8a2a4d26c8a1ba14465ab12662e00a5f11 SHA1 48bff4683b48611874844c406baca7f12cf64a4c SHA256 e236556ab800adad5dfd37aa55bb1b12ba2a8ecb4d0de277505e7a7eb7446d88
 EBUILD gnash-0.7.1.ebuild 2229 RMD160 c274ea987a00dd579ad9c516900c88784821472f SHA1 743ff94ba99b29a2a984c0f1d553c15fa7901d5b SHA256 73e1b49a9568a7d2fed40c9161a4aaacbda27a2505ceb1217b54dd3f1fa54eab
 MD5 21ff21874073e37af2ac0e9b25e8784a gnash-0.7.1.ebuild 2229
 RMD160 c274ea987a00dd579ad9c516900c88784821472f gnash-0.7.1.ebuild 2229
@@ -20,10 +25,14 @@ EBUILD gnash-0.7.1_p20060528.ebuild 2706 RMD160 97c68894c439886a2692926970a18d4a
 MD5 38802422e368ed19b4fc49a5175cb5ec gnash-0.7.1_p20060528.ebuild 2706
 RMD160 97c68894c439886a2692926970a18d4a770a6a33 gnash-0.7.1_p20060528.ebuild 2706
 SHA256 dceb811c3beb8f14f00c5f53e7f1467611d097db8574e73363d3471020b038c3 gnash-0.7.1_p20060528.ebuild 2706
-MISC ChangeLog 2488 RMD160 1c85674b6f3ba16a042ea2dea456976bc1a65ed2 SHA1 fd5bbad845942abd8dd9f37f2fe90ca828bc0a01 SHA256 e36e8655ad5dcd10976d1bd35924d99cd6f256b8dadb16f74b8e4d84c413c614
-MD5 704db33eda58749a7a200646c52a3adb ChangeLog 2488
-RMD160 1c85674b6f3ba16a042ea2dea456976bc1a65ed2 ChangeLog 2488
-SHA256 e36e8655ad5dcd10976d1bd35924d99cd6f256b8dadb16f74b8e4d84c413c614 ChangeLog 2488
+EBUILD gnash-0.7.1_p20060704.ebuild 2514 RMD160 9c2b5833613b6aa375e97652ebf6cf731877ab1f SHA1 5f956d5a2702052408ebc0df912afe151054b13c SHA256 e481c3c402542e3412a7ff79dfda3309696344477d2738b65ef8942cd553fe10
+MD5 047d53bb822eac824ab477cc1e0f8ddf gnash-0.7.1_p20060704.ebuild 2514
+RMD160 9c2b5833613b6aa375e97652ebf6cf731877ab1f gnash-0.7.1_p20060704.ebuild 2514
+SHA256 e481c3c402542e3412a7ff79dfda3309696344477d2738b65ef8942cd553fe10 gnash-0.7.1_p20060704.ebuild 2514
+MISC ChangeLog 2690 RMD160 344d13d93566106ce5b3e2a8130e8bc276b8987c SHA1 96f8c2b5b782c22b01f91f41fe26abe3a4b5b10c SHA256 53c955c7fe155ea1335cec2c532a376fc31af8ea62c489aa977e54db04229a4d
+MD5 15d2ce6cab26d38501435adf007e77ab ChangeLog 2690
+RMD160 344d13d93566106ce5b3e2a8130e8bc276b8987c ChangeLog 2690
+SHA256 53c955c7fe155ea1335cec2c532a376fc31af8ea62c489aa977e54db04229a4d ChangeLog 2690
 MISC metadata.xml 242 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c SHA1 383cfdd7a210a459dd71b1a8bad03be54f047d5b SHA256 771b4e1c8b0943aae8c90480ad18a37ee37bd086f0eeb329099eee9d238c81f2
 MD5 d5ce5bbf8880322ebca9672595e248ab metadata.xml 242
 RMD160 0c1495108d642a4ab0e1bffef66b6ff60a3e619c metadata.xml 242
@@ -34,3 +43,6 @@ SHA256 0e0aba61d3e68f0b415d528c2d5483f4d9cb8c967ad611d29b043caa45a7e0d8 files/di
 MD5 608deb01ca59a089fa1f89b82d03ebb4 files/digest-gnash-0.7.1_p20060528 268
 RMD160 b1a92d3808e3ce7a20a71415204448ab98199136 files/digest-gnash-0.7.1_p20060528 268
 SHA256 4f8797ef04c7fcff822fb12d15da5b425c2d9abbb6ccd375a75f598e5982dc26 files/digest-gnash-0.7.1_p20060528 268
+MD5 6a4466f6f993b14adb1148a697292855 files/digest-gnash-0.7.1_p20060704 271
+RMD160 8fc0811284fe68365031a5e9e82ba67511be83d3 files/digest-gnash-0.7.1_p20060704 271
+SHA256 5d75ecb156870d2eec834bc8a36bbe0a91c8d58771a43e2995120ef9199f5992 files/digest-gnash-0.7.1_p20060704 271
diff --git a/net-www/gnash/files/digest-gnash-0.7.1_p20060704 b/net-www/gnash/files/digest-gnash-0.7.1_p20060704
new file mode 100644
index 000000000000..f9acb228d7a5
--- /dev/null
+++ b/net-www/gnash/files/digest-gnash-0.7.1_p20060704
@@ -0,0 +1,3 @@
+MD5 9fd93c81c3e8c1cc3ed99cab19472c31 gnash-0.7.1_p20060704.tar.bz2 3287215
+RMD160 708ebf8a2a4d26c8a1ba14465ab12662e00a5f11 gnash-0.7.1_p20060704.tar.bz2 3287215
+SHA256 e236556ab800adad5dfd37aa55bb1b12ba2a8ecb4d0de277505e7a7eb7446d88 gnash-0.7.1_p20060704.tar.bz2 3287215
diff --git a/net-www/gnash/files/gnash-0.7.1_p20060704-opengl.diff b/net-www/gnash/files/gnash-0.7.1_p20060704-opengl.diff
new file mode 100644
index 000000000000..c5a29f3cb5cf
--- /dev/null
+++ b/net-www/gnash/files/gnash-0.7.1_p20060704-opengl.diff
@@ -0,0 +1,28 @@
+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/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
+@@ -233,8 +233,8 @@
+ 	libgnashasobjs.la \
+ 	$(ZLIB_LIBS) \
+ 	$(LIBXML_LIBS) \
+-	$(MP3_LIBS)
+-#	$(OPENGL_LIBS)
++	$(MP3_LIBS) \
++	$(OPENGL_LIBS)
+ 
+ #libserver_la_LDFLAGS = -module -avoid-version -no-undefined
+ #libserver_la_LIBDADD =  #@DL_LIB@  # $(LIBLTDL)
diff --git a/net-www/gnash/gnash-0.7.1_p20060704.ebuild b/net-www/gnash/gnash-0.7.1_p20060704.ebuild
new file mode 100644
index 000000000000..9bf02f7bd106
--- /dev/null
+++ b/net-www/gnash/gnash-0.7.1_p20060704.ebuild
@@ -0,0 +1,103 @@
+# 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.1 2006/07/04 17:48:12 genstef 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.bz2"
+S=${WORKDIR}/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc -sparc ~x86"
+IUSE="dmalloc mad nsplugin nptl xml kde 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
+	net-misc/curl
+	virtual/opengl
+	|| (
+		( 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/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
+
+	use nsplugin && myconf="${myconf}  --enable-plugin --with-plugindir=/opt/netscape/plugins"
+
+	#--enable-renderer=engine Specify rendering engine:
+	#				OpenGL (default)
+	#				Cairo  (experimental)
+	#cairo: does not compile, 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
+
+	econf \
+		$(use_enable dmalloc) \
+		$(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"
+}