Update to gnash 0.8.0.

Tested by ajacoutot@, Peter Hessler, RD Thrush, jufi@, ian@ and others, thanks! Help from and ok steven@.
2007-07-07 10:47:04 +00:00 · 2007-07-07 10:47:04 +00:00 · d2975592a5
commit d2975592a5
parent c260705a23
9 changed files with 98 additions and 100 deletions
--- a/www/gnash/Makefile
+++ b/www/gnash/Makefile
@ -1,73 +1,79 @@
-# $OpenBSD: Makefile,v 1.11 2007/05/25 16:17:45 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.12 2007/07/07 10:47:04 deanna Exp $
 SHARED_ONLY=	Yes

 COMMENT=	"flash player with firefox browser plugin"
-DISTNAME=	gnash-0.7.2
-PKGNAME=	${DISTNAME}p5
-SHARED_LIBS +=	gnashbase 1.0
-SHARED_LIBS +=	gnashgeo 1.0
-SHARED_LIBS +=	gnashamf 1.0
-SHARED_LIBS +=	gnashserver 1.0
-SHARED_LIBS +=	gnashbackend 1.0
-SHARED_LIBS +=	gnashgui 1.0
-
-EXTRACT_SUFX=	.tar.bz2
+DISTNAME=	gnash-0.8.0
+SHARED_LIBS +=	gnashbase 2.0
+SHARED_LIBS +=	gnashgeo 2.0
+SHARED_LIBS +=	gnashamf 2.0
+SHARED_LIBS +=	gnashserver 2.0
+SHARED_LIBS +=	gnashbackend 2.0
+SHARED_LIBS +=	gnashgui 2.0
+SHARED_LIBS +=	gnashplayer 2.0

 CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.gnu.org/pub/gnu/gnash/0.7.2/
+MASTER_SITES=	${MASTER_SITE_GNU:=/gnash/0.8.0/}

-HOMEPAGE=	http://www.gnu.org/software/gnash/
+HOMEPAGE=	http://gnash.lulu.com

 MAINTAINER=	Deanna Phillips <deanna@openbsd.org>

-# GPL
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
+# patented codecs
+PERMIT_PACKAGE_CDROM=	No
+PERMIT_PACKAGE_FTP=	No
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes

 LIBTOOL_FLAGS+=	--tag=disable-static
 MODULES=	gettext
-NO_REGRESS=	"testsuite available at http://www.gnu.org/software/gnash/testcases"
+NO_REGRESS=	"testsuite available at http://www.gnashdev.org/testcases/"
 USE_GMAKE=	Yes
 USE_LIBTOOL=	Yes
 USE_X11=	Yes

 BUILD_DEPENDS+=	::devel/boost

-LIB_DEPENDS+=	curl.>=4::net/curl \
+
+LIB_DEPENDS+=	curl.>=5::net/curl \
 		xml2.>=9.0::textproc/libxml \
 		theora.>=2::multimedia/libtheora \
 		agg.>=2::graphics/agg \
-		avcodec.>=7,avutil.>=1,avformat.>=7::graphics/ffmpeg \
-		gdk_pixbuf-2.0,gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2
+		gdk_pixbuf-2.0,gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 \
+		boost_thread-mt,boost_date_time::devel/boost,-libs \
+		gsm::audio/gsm ltdl::devel/libtool,-ltdl \
+		SDL.>=7::devel/sdl \
+		vorbis,vorbisenc::audio/libvorbis \
+		avcodec.>=9,avutil.>=2,avformat.>=9::graphics/ffmpeg

 WANTLIB=	Xau Xcursor Xdmcp Xfixes Xi Xinerama Xrandr expat \
-		freetype fontconfig Xrender usbhid Xext X11 z \
-		stdc++ m pthread c ssl crypto ogg cairo \
+		freetype fontconfig Xrender usbhid Xext X11 ICE SM \
+		stdc++ m pthread c ssl crypto z ogg cairo \
 		glib-2.0 pango-1.0 pangoft2-1.0 pangocairo-1.0 pangox-1.0 \
-		gobject-2.0 gmodule-2.0 atk-1.0 png jpeg glitz SDL idn
+		gobject-2.0 gmodule-2.0 atk-1.0 png jpeg glitz idn

 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		ac_cv_lib_gsm_gsm_encode=no

-CONFIGURE_ARGS+=--enable-plugin \
-		--enable-sound=SDL \
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+CONFIGURE_ARGS+=--enable-media=ffmpeg \
 		--with-plugindir=${LOCALBASE}/lib/mozilla-plugins \
-		--without-arts \
 		--disable-klash \
+		--disable-cygnal \
+		--disable-debugger \
 		--enable-renderer=agg \
 		--enable-gui=gtk \
-		--with-mp3-decoder=ffmpeg \
-		--without-gcc-arch
+		--without-gcc-arch \
+		--with-expat-incl=${X11BASE}/include \
+		--with-expat-lib=${X11BASE}/lib \
+		--with-libintl-prefix=${LOCALBASE}

-MAKE_FLAGS+=	libgnashbase_la_LDFLAGS='-version-info 1:0' \
-		libgnashgeo_la_LDFLAGS='-version-info 1:0' \
-		libgnashamf_la_LDFLAGS='-version-info 1:0' \
-		libgnashserver_la_LDFLAGS='-version-info 1:0' \
-		libgnashbackend_la_LDFLAGS='-version-info 1:0' \
-		libgnashgui_la_LDFLAGS='-version-info 1:0'
+MAKE_FLAGS+=	libgnashbase_la_LDFLAGS= \
+		libgnashgeo_la_LDFLAGS= \
+		libgnashamf_la_LDFLAGS= \
+		libgnashserver_la_LDFLAGS= \
+		libgnashbackend_la_LDFLAGS= \
+		libgnashgui_la_LDFLAGS= \
+		libgnashplayer_la_LDFLAGS=

 .include <bsd.port.mk>
--- a/www/gnash/distinfo
+++ b/www/gnash/distinfo
@ -1,5 +1,5 @@
-MD5 (gnash-0.7.2.tar.bz2) = zO8PRb4BpMKZK0bCNjpRTw==
-RMD160 (gnash-0.7.2.tar.bz2) = D1kEtsE/+zsrSl9yPZ/aywqKYZg=
-SHA1 (gnash-0.7.2.tar.bz2) = 4rvXHWFmXENe0iM5B4Bwrxluoxo=
-SHA256 (gnash-0.7.2.tar.bz2) = EtzLS8aUiPUW4Cg+mIQSun21360ydEQl+X1kE5Ki6Ys=
-SIZE (gnash-0.7.2.tar.bz2) = 1599810
+MD5 (gnash-0.8.0.tar.gz) = AvcI2tx839juJY4Ix8Dqyw==
+RMD160 (gnash-0.8.0.tar.gz) = BTFLYbkZD/QsmJqhZu39A+I7d8w=
+SHA1 (gnash-0.8.0.tar.gz) = KainhCElctnX+nw+76RKOxutN2g=
+SHA256 (gnash-0.8.0.tar.gz) = bIPPXiIFzBjqHaJx3LzOvBtTyqWZZLwW0opy6XjlgLQ=
+SIZE (gnash-0.8.0.tar.gz) = 2706203
--- a/www/gnash/patches/patch-backend_render_handler_agg_style_h
+++ b/www/gnash/patches/patch-backend_render_handler_agg_style_h
@ -1,16 +0,0 @@
-$OpenBSD: patch-backend_render_handler_agg_style_h,v 1.2 2007/05/11 20:20:23 deanna Exp $
--- backend/render_handler_agg_style.h.orig	Mon Nov  6 14:24:24 2006
-+++ backend/render_handler_agg_style.h	Fri May 11 12:38:37 2007
-@@ -44,6 +44,12 @@ class agg_style_base  (public)
-   
-   // for non-solid styles:
-   virtual void generate_span(agg::rgba8* span, int x, int y, unsigned len)=0;
-+
-+  // Everytime a class has a virtual method it should
-+  // also have a virtual destructor. This will ensure
-+  // that the destructor for the *derived* class is invoked
-+  // when deleting a pointer to base class !!
-+  virtual ~agg_style_base() {}
- };
- 
- 
--- a/www/gnash/patches/patch-configure
+++ b/www/gnash/patches/patch-configure
@ -0,0 +1,25 @@
+$OpenBSD: patch-configure,v 1.1 2007/07/07 10:47:04 deanna Exp $
+--- configure.orig	Fri Jul  6 09:24:13 2007
+++ configure	Fri Jul  6 09:25:30 2007
+@@ -5271,7 +5271,7 @@ _ACEOF
+ 
+ 
+ 
+-    INTLLIBS="$LIBINTL"
+    INTLLIBS="$LTLIBINTL"
+ 
+ 
+ 
+@@ -50341,10 +50341,10 @@ s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
+ s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+ s,@EGREP@,$EGREP,;t t
+ s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t
+-s,@LIBICONV@,$LIBICONV,;t t
+s,@LIBICONV@,$LTLIBICONV,;t t
+ s,@LTLIBICONV@,$LTLIBICONV,;t t
+ s,@INTLLIBS@,$INTLLIBS,;t t
+-s,@LIBINTL@,$LIBINTL,;t t
+s,@LIBINTL@,$LTLIBINTL,;t t
+ s,@LTLIBINTL@,$LTLIBINTL,;t t
+ s,@POSUB@,$POSUB,;t t
+ s,@HAS_GETTEXT_TRUE@,$HAS_GETTEXT_TRUE,;t t
--- a/www/gnash/patches/patch-po_Makefile_in
+++ b/www/gnash/patches/patch-po_Makefile_in
@ -0,0 +1,15 @@
+$OpenBSD: patch-po_Makefile_in,v 1.1 2007/07/07 10:47:04 deanna Exp $
+--- po/Makefile.in.orig	Fri Jul  6 09:30:11 2007
+++ po/Makefile.in	Fri Jul  6 09:30:31 2007
+@@ -636,9 +636,9 @@ force:
+ # install-hook: rename the es.gmo files to gnash.mo at installtion time
+ install-data-hook: $(gmofiles)
+ 	@for i in $(translations); do \
+-	  $(mkinstalldirs) "$(DESTDIR)$(datadir)/locale/$$i"; \
+	  $(mkinstalldirs) "$(DESTDIR)$(datadir)/locale/$$i/LC_MESSAGES"; \
+ 	  if test -f $$i.gmo; then \
+-	    $(INSTALL_DATA) $$i.gmo $(DESTDIR)$(datadir)/locale/$$i/gnash.mo; \
+	    $(INSTALL_DATA) $$i.gmo $(DESTDIR)$(datadir)/locale/$$i/LC_MESSAGES/gnash.mo; \
+ 	  fi; \
+ 	done
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/www/gnash/patches/patch-server_parser_sprite_definition_cpp
+++ b/www/gnash/patches/patch-server_parser_sprite_definition_cpp
@ -1,12 +0,0 @@
-$OpenBSD: patch-server_parser_sprite_definition_cpp,v 1.1 2007/05/11 20:20:23 deanna Exp $
--- server/parser/sprite_definition.cpp.orig	Sat Oct 28 18:58:32 2006
-+++ server/parser/sprite_definition.cpp	Fri May 11 12:40:53 2007
-@@ -104,6 +104,8 @@ sprite_definition::read(stream* in)
- 			IF_VERBOSE_PARSE (
- 		    log_parse("  show_frame (sprite)");
- 		    	);
-+
-+		    assert(m_loading_frame < m_frame_count);
- 		    m_loading_frame++;
- 		}
- 		else if (_tag_loaders.get(tag_type, &lf))
--- a/www/gnash/patches/patch-server_sprite_instance_cpp
+++ b/www/gnash/patches/patch-server_sprite_instance_cpp
@ -1,25 +0,0 @@
-$OpenBSD: patch-server_sprite_instance_cpp,v 1.2 2007/05/11 20:20:23 deanna Exp $
--- server/sprite_instance.cpp.orig	Fri Nov 17 14:08:21 2006
-+++ server/sprite_instance.cpp	Fri May 11 12:38:37 2007
-@@ -1210,12 +1210,12 @@ bool sprite_instance::on_event(event_id id)
- 	// Keep m_as_environment alive during any method calls!
- 	// Don't do this, make sure caller is keeping us alive instead
- 	//smart_ptr<as_object>	this_ptr(this);
-+	as_value		method;
- 
- 	bool called = false;
- 			
- 	// First, check for built-in event handler.
- 	    {
-		as_value	method;
- 		if (get_event_handler(id, &method))
- 		    {
- 			// Dispatch.
-@@ -1235,7 +1235,6 @@ bool sprite_instance::on_event(event_id id)
- 		const tu_stringi&	method_name = id.get_function_name();
- 		if (method_name.length() > 0)
- 		    {
-			as_value	method;
- 			if (get_member(method_name, &method))
- 			    {
- 				call_method0(method, &m_as_environment, this);
--- a/www/gnash/pkg/DESCR
+++ b/www/gnash/pkg/DESCR
@ -1,4 +1,3 @@
-Gnash is a Free Flash movie player, which works either standalone, or
-as a Firefox/Mozilla plugin.  This alpha release supports all Flash
-versions up to, but not including, v9.  Flash video is not yet
-supported.
+Gnash is the GNU Flash movie player, which can be run standalone on
+the desktop or an embedded device, as well as as a plugin for several
+browsers.
--- a/www/gnash/pkg/PLIST
+++ b/www/gnash/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2006/11/20 04:06:41 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.3 2007/07/07 10:47:04 deanna Exp $
 bin/gnash
 bin/gparser
 bin/gprocessor
@ -12,10 +12,16 @@ lib/libgnashgeo.la
@lib lib/libgnashgeo.so.${LIBgnashgeo_VERSION}
 lib/libgnashgui.la
@lib lib/libgnashgui.so.${LIBgnashgui_VERSION}
+lib/libgnashplayer.la
+@lib lib/libgnashplayer.so.${LIBgnashplayer_VERSION}
 lib/libgnashserver.la
@lib lib/libgnashserver.so.${LIBgnashserver_VERSION}
 lib/mozilla-plugins/
 lib/mozilla-plugins/libgnashplugin.so
@man man/man1/gnash.1
 share/gnash/
+share/gnash/GnashG.png
 share/gnash/gnash_128_96.ico
+share/locale/de/LC_MESSAGES/gnash.mo
+share/locale/es/LC_MESSAGES/gnash.mo
+share/locale/fr/LC_MESSAGES/gnash.mo