update to 0.7.2, from maintainer

2006-11-20 04:06:41 +00:00 · 2006-11-20 04:06:41 +00:00 · 999dcef842
commit 999dcef842
parent 388742d0c4
6 changed files with 74 additions and 54 deletions
--- a/www/gnash/Makefile
+++ b/www/gnash/Makefile
@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.3 2006/10/16 08:27:19 steven Exp $
+# $OpenBSD: Makefile,v 1.4 2006/11/20 04:06:41 jolan Exp $
 SHARED_ONLY=	Yes

 COMMENT=	"flash player with firefox browser plugin"
-DISTNAME=	gnash-20060919
-.for _lib in gnashasobjs gnashbackend gnashbase gnashgeo gnashserver \
-	gnashamf gnashgui gnashplugin
-SHARED_LIBS+= ${_lib} 0.0
-.endfor
+DISTNAME=	gnash-0.7.2
+EXTRACT_SUFX=	.tar.bz2
+
 CATEGORIES=	www
-MASTER_SITES=	http://mirrors.protection.cx/~jolan/
+MASTER_SITES=	ftp://ftp.gnu.org/pub/gnu/gnash/0.7.2/

 HOMEPAGE=	http://www.gnu.org/software/gnash/

@ -20,31 +18,36 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes

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

-BUILD_DEPENDS+=	::devel/autoconf/${AUTOCONF_VERSION} \
-		::devel/automake/${AUTOMAKE_VERSION} \
-		::devel/metaauto
+BUILD_DEPENDS+=	boost-headers::devel/boost

 LIB_DEPENDS+=	atk-1.0.>=1011::devel/atk \
-		SDL_mixer.>=3::devel/sdl-mixer \
 		curl.>=4::net/curl \
 		xml2.>=9.0::textproc/libxml \
-		gtkglext-x11-1.0.>=0,gdkglext-x11-1.0.>=0::x11/gtkglext
+		theora.>=2::multimedia/libtheora \
+		ogg.>=5::audio/libogg \
+		png.>=5::graphics/png \
+		jpeg.>=62::graphics/jpeg \
+		glitz.>=1::graphics/glitz \
+		SDL.>=6::devel/sdl \
+		agg.>=2::graphics/agg \
+		cairo.>=4::graphics/cairo \
+		avcodec.>=7,avutil.>=1,avformat.>=7::graphics/ffmpeg \
+		glib-2.0.>=1000.3,gmodule-2.0.>=1000.3::devel/glib2 \
+		gobject-2.0.>=1000.3::devel/glib2 \
+		pango-1.0.>=1200.3,pangocairo-1.0.>=1200.3::devel/pango \
+		pangoft2-1.0.>=1200.3,pangox-1.0.>=1200.3::devel/pango \
+		gdk_pixbuf-2.0.>=802.1,gtk-x11-2.0.>=802.1::x11/gtk+2 \
+		gdk-x11-2.0.>=802.1::x11/gtk+2

-WANTLIB=	GL GLU ICE SM X11 Xext Xmu Xrender Xt c crypto fontconfig \
-		freetype m pthread ssl stdc++ usbhid z \
-		SDL cairo gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 glitz \
-		gmodule-2.0 gobject-2.0 gtk-x11-2.0 jpeg mikmod ogg \
-		pango-1.0 pangocairo-1.0 pangoft2-1.0 pangox-1.0 png smpeg \
-		vorbis vorbisfile
+WANTLIB=	freetype fontconfig Xrender ossaudio usbhid \
+		Xext X11 z stdc++ m pthread c ssl crypto

 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
@ -52,10 +55,25 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS+=--enable-plugin \
 		--enable-sound=SDL \
 		--with-plugindir=${LOCALBASE}/lib/mozilla-plugins \
-		--without-arts
+		--without-arts \
+		--disable-klash \
+		--enable-renderer=agg \
+		--enable-gui=gtk \
+		--with-mp3-decoder=ffmpeg \
+		--without-gcc-arch

-pre-configure:
-	cd ${WRKSRC} && ${SETENV} AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-		AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
+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'
+
+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

 .include <bsd.port.mk>
--- a/www/gnash/distinfo
+++ b/www/gnash/distinfo
@ -1,4 +1,4 @@
-MD5 (gnash-20060919.tar.gz) = 02ea7dd3f47f81274f5f0953db6a8cf4
-RMD160 (gnash-20060919.tar.gz) = fbb164fe6108fb6796ccc212e4dba8afcc79eaab
-SHA1 (gnash-20060919.tar.gz) = 99aa12a05fc5c24598117fabd53962b217515e4a
-SIZE (gnash-20060919.tar.gz) = 3838966
+MD5 (gnash-0.7.2.tar.bz2) = ccef0f45be01a4c2992b46c2363a514f
+RMD160 (gnash-0.7.2.tar.bz2) = 0f5904b6c13ffb3b2b4a5f723d9fdacb0a8a6198
+SHA1 (gnash-0.7.2.tar.bz2) = e2bbd71d61665c435ed22339078070af196ea31a
+SIZE (gnash-0.7.2.tar.bz2) = 1599810
--- a/www/gnash/patches/patch-configure_ac
+++ b/www/gnash/patches/patch-configure_ac
@ -1,12 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1.1.1 2006/09/21 15:48:10 jolan Exp $
--- configure.ac.orig	Tue Sep 19 08:39:04 2006
-+++ configure.ac	Wed Sep 20 15:54:37 2006
-@@ -456,7 +456,7 @@ if test x"$pthreads" = x"yes"; then
- 	fi
- fi
- 
-AX_GCC_ARCHFLAG(no)
-+#AX_GCC_ARCHFLAG(no)
- 
- dnl enable more warnings. These should be cleaned up to make Gnash a
- dnl better project, but for now they generate too many messages,
--- a/www/gnash/patches/patch-plugin_Makefile_am
+++ b/www/gnash/patches/patch-plugin_Makefile_am
@ -1,12 +0,0 @@
-$OpenBSD: patch-plugin_Makefile_am,v 1.1.1.1 2006/09/21 15:48:10 jolan Exp $
--- plugin/Makefile.am.orig	Sun Sep 17 15:45:59 2006
-+++ plugin/Makefile.am	Sun Sep 17 19:04:07 2006
-@@ -158,7 +158,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLI
- #	cp .libs/libgnashplugin.so $(DESTDIR)$(plugindir)/libgnashplugin.so
- 	$(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $(plugin_LTLIBRARIES) "$(DESTDIR)$(plugindir)/$(plugin_LTLIBRARIES)"
- if PLUGIN_LINK_UNDEFINED
-	cp $(DESTDIR)$(plugindir)/.libs/libgnashplugin.so.0.* $(DESTDIR)$(plugindir)/libgnashplugin.so
-+#	cp $(DESTDIR)$(plugindir)/.libs/libgnashplugin.so.0.* $(DESTDIR)$(plugindir)/libgnashplugin.so
- endif
- 	$(RM) $(DESTDIR)$(plugindir)/libgnashplugin.*a $(DESTDIR)$(plugindir)/libgnashplugin.so.0 $(DESTDIR)$(plugindir)/libgnashplugin.*.T
- 
--- a/www/gnash/patches/patch-server_sprite_instance_cpp
+++ b/www/gnash/patches/patch-server_sprite_instance_cpp
@ -0,0 +1,25 @@
+$OpenBSD: patch-server_sprite_instance_cpp,v 1.1 2006/11/20 04:06:41 jolan Exp $
+--- server/sprite_instance.cpp.orig	Fri Nov 17 14:08:21 2006
+++ server/sprite_instance.cpp	Fri Nov 17 20:38:51 2006
+@@ -1210,12 +1210,12 @@ bool sprite_instance::on_event(event_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 
+ 		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/PLIST
+++ b/www/gnash/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2006/09/21 15:48:10 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.2 2006/11/20 04:06:41 jolan Exp $
 bin/gnash
 bin/gparser
 bin/gprocessor
@ -16,5 +16,6 @@ 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/gnash_128_96.ico