Any chance this is going to make it into ports?
Brandon
On Sat, Apr 26, 2008 at 3:14 PM, Deanna Phillips
<[EMAIL PROTECTED]> wrote:
> This diff, from brad@, updates gnash to 0.8.2. So far, it's
> only been tested on i386.
>
> Changes: http://gnashdev.org/?q=node/52
>
> Brad takes MAINTAINER (yay!)
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/www/gnash/Makefile,v
> retrieving revision 1.19
> diff -u -p -r1.19 Makefile
> --- Makefile 18 Dec 2007 22:04:32 -0000 1.19
> +++ Makefile 26 Apr 2008 04:33:58 -0000
> @@ -1,83 +1,59 @@
> # $OpenBSD: Makefile,v 1.19 2007/12/18 22:04:32 deanna Exp $
> +
> SHARED_ONLY= Yes
>
> -COMMENT= flash player with firefox browser plugin
> -DISTNAME= gnash-0.8.0
> -PKGNAME= ${DISTNAME}p3
> -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
> +COMMENT= Flash player with Firefox browser plugin
>
> +VER= 0.8.2
> +DISTNAME= gnash-${VER}
> CATEGORIES= www
> -MASTER_SITES= ${MASTER_SITE_GNU:=/gnash/0.8.0/}
> +MASTER_SITES= ${MASTER_SITE_GNU:=/gnash/${VER}/}
>
> HOMEPAGE= http://gnash.lulu.com
>
> -MAINTAINER= Deanna Phillips <[EMAIL PROTECTED]>
> +MAINTAINER= Brad Smith <[EMAIL PROTECTED]>
>
> -# patented codecs
> -PERMIT_PACKAGE_CDROM= No
> +# GPLv3
> +PERMIT_PACKAGE_CDROM= patents
> PERMIT_PACKAGE_FTP= Yes
> PERMIT_DISTFILES_CDROM= Yes
> PERMIT_DISTFILES_FTP= Yes
> +WANTLIB= X11 Xau Xdmcp Xext Xrandr Xrender a52 c crypto expat \
> + faac faad freetype fontconfig glib-2.0 gobject-2.0 idn \
> + jpeg m mp3lame ogg pthread ssl stdc++ x264 usbhid z
>
> -LIBTOOL_FLAGS+= --tag=disable-static
> MODULES= devel/gettext
> -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.>=5::net/curl \
> xml2.>=9.0::textproc/libxml \
> theora.>=2::multimedia/libtheora \
> agg.>=2::graphics/agg \
> gdk_pixbuf-2.0,gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 \
> - boost_thread-mt,boost_date_time::devel/boost \
> + boost_thread-mt.>=1,boost_date_time-mt.>=1::devel/boost \
> 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 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 idn
> -
> -CONFIGURE_STYLE=gnu
> -
> -.for dir in libamf backend libbase libgeometry gui server
> - LINKDIRS+=-L${WRKSRC}/${dir}/.libs
> -.endfor
> -
> -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
> - LDFLAGS="${LINKDIRS} \
> - -L${LOCALBASE}/lib"
> -
> +USE_X11= Yes
> +USE_GMAKE= Yes
> +USE_LIBTOOL= Yes
> +LIBTOOL_FLAGS+= --tag=disable-static
> +CONFIGURE_STYLE= gnu
> CONFIGURE_ARGS+=--enable-media=ffmpeg \
> - --with-plugindir=${LOCALBASE}/lib/mozilla-plugins \
> - --disable-klash \
> + --with-npapi-plugindir=${LOCALBASE}/lib/mozilla-plugins \
> --disable-cygnal \
> --disable-debugger \
> --enable-renderer=agg \
> --enable-gui=gtk \
> - --without-gcc-arch \
> --with-libintl-prefix=${LOCALBASE}
> +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
> + LDFLAGS="-L${LOCALBASE}/lib"
> +
> +INSTALL_TARGET= install install-plugins
> +
> +NO_REGRESS= testsuite available at http://www.gnashdev.org/testcases/
>
> -MAKE_FLAGS+= libgnashbase_la_LDFLAGS= \
> - libgnashgeo_la_LDFLAGS= \
> - libgnashamf_la_LDFLAGS= \
> - libgnashserver_la_LDFLAGS= \
> - libgnashbackend_la_LDFLAGS= \
> - libgnashgui_la_LDFLAGS= \
> - libgnashplayer_la_LDFLAGS=
> +post-install:
> + @mv ${PREFIX}/bin/dumpshm ${PREFIX}/bin/gnash-dumpshm
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/www/gnash/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo 7 Jul 2007 10:47:04 -0000 1.4
> +++ distinfo 18 Mar 2008 20:39:54 -0000
> @@ -1,5 +1,5 @@
> -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
> +MD5 (gnash-0.8.2.tar.gz) = JN+tC1UyVPqgbPG8GkP++Q==
> +RMD160 (gnash-0.8.2.tar.gz) = wrKoOMmq+dbV7MV3LJGIR18YNyg=
> +SHA1 (gnash-0.8.2.tar.gz) = 5uViujloPAouu1o/I9oRLVBRO40=
> +SHA256 (gnash-0.8.2.tar.gz) = YQ3gjHcU/3HEoV7l3k2OqPSzDwEQQDvw2mpfp6F+iT8=
> +SIZE (gnash-0.8.2.tar.gz) = 3400405
> Index: patches/patch-backend_sound_handler_sdl_h
> ===================================================================
> RCS file: patches/patch-backend_sound_handler_sdl_h
> diff -N patches/patch-backend_sound_handler_sdl_h
> --- patches/patch-backend_sound_handler_sdl_h 24 Sep 2007 07:46:38 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -$OpenBSD: patch-backend_sound_handler_sdl_h,v 1.1 2007/09/24 07:46:38
> jakemsr Exp $
> ---- backend/sound_handler_sdl.h.orig Mon Sep 10 23:37:55 2007
> -+++ backend/sound_handler_sdl.h Mon Sep 10 23:38:48 2007
> -@@ -26,7 +26,9 @@
> - #include "log.h"
> -
> - #ifdef USE_FFMPEG
> -+extern "C" {
> - #include <ffmpeg/avcodec.h>
> -+}
> - #elif defined(USE_MAD)
> - #include <mad.h>
> - #endif
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/www/gnash/patches/patch-configure,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-configure
> --- patches/patch-configure 9 Aug 2007 22:08:19 -0000 1.2
> +++ patches/patch-configure 18 Mar 2008 20:56:36 -0000
> @@ -1,50 +1,43 @@
> $OpenBSD: patch-configure,v 1.2 2007/08/09 22:08:19 deanna Exp $
> ---- configure.orig Fri Jun 8 21:41:56 2007
> -+++ configure Thu Aug 9 14:33:08 2007
> -@@ -5271,7 +5271,7 @@ _ACEOF
> +--- configure.orig Tue Mar 4 14:59:39 2008
> ++++ configure Tue Mar 18 16:56:15 2008
> +@@ -47496,16 +47496,11 @@ echo "${ECHO_T}${libtheora}" >&6; }
>
> -
> -
> -- INTLLIBS="$LIBINTL"
> -+ INTLLIBS="$LTLIBINTL"
> -
> -
> -
> -@@ -25566,14 +25566,9 @@ echo "${ECHO_T}${libtheora}" >&6
> -
> - echo "$as_me:$LINENO: checking for libgsm library" >&5
> - echo $ECHO_N "checking for libgsm library... $ECHO_C" >&6
> + { echo "$as_me:$LINENO: checking for libgsm library" >&5
> + echo $ECHO_N "checking for libgsm library... $ECHO_C" >&6; }
> - if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
> -- $PKG_CONFIG --exists gsm && libgsm=`$PKG_CONFIG --libs gsm`
> +- $PKG_CONFIG --exists gsm && libgsm=`$PKG_CONFIG --libs-only-l gsm`
> - else
> libgsm=""
> - fi
> - if test x"${libgsm}" = x; then
> - if test -f ${topdir}/libgsm.a -o -f ${topdir}/libgsm.${shlibext};
> then
> -- ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lgsm"
> - echo "$as_me:$LINENO: result: ${topdir}/libgsm" >&5
> - echo "${ECHO_T}${topdir}/libgsm" >&6
> - else
> -@@ -25644,9 +25639,6 @@ LIBS=$ac_check_lib_save_LIBS
> +
> + if test x$openbsd_os != xopenbsd; then
> + if test x"${libgsm}" = x; then
> + if test -f ${topdir}/libgsm.a -o -f ${topdir}/libgsm.${shlibext};
> then
> +- ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lgsm"
> + { echo "$as_me:$LINENO: result: ${topdir}/libgsm" >&5
> + echo "${ECHO_T}${topdir}/libgsm" >&6; }
> + else
> +@@ -47573,9 +47568,6 @@ LIBS=$ac_check_lib_save_LIBS
> fi
> - echo "$as_me:$LINENO: result: $ac_cv_lib_gsm_gsm_destroy" >&5
> - echo "${ECHO_T}$ac_cv_lib_gsm_gsm_destroy" >&6
> + { echo "$as_me:$LINENO: result: $ac_cv_lib_gsm_gsm_destroy" >&5
> + echo "${ECHO_T}$ac_cv_lib_gsm_gsm_destroy" >&6; }
> -if test $ac_cv_lib_gsm_gsm_destroy = yes; then
> - ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lgsm"
> -fi
>
> + fi
> fi
> - fi
> -@@ -50341,10 +50333,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
> +@@ -53638,10 +53630,10 @@ CONFIG_RPATH!$CONFIG_RPATH$ac_delim
> + GREP!$GREP$ac_delim
> + EGREP!$EGREP$ac_delim
> + INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
> +-LIBICONV!$LIBICONV$ac_delim
> ++LIBICONV!$LTLIBICONV$ac_delim
> + LTLIBICONV!$LTLIBICONV$ac_delim
> + INTLLIBS!$INTLLIBS$ac_delim
> +-LIBINTL!$LIBINTL$ac_delim
> ++LIBINTL!$LTLIBINTL$ac_delim
> + LTLIBINTL!$LTLIBINTL$ac_delim
> + POSUB!$POSUB$ac_delim
> + HAS_GETTEXT_TRUE!$HAS_GETTEXT_TRUE$ac_delim
> Index: patches/patch-libbase_embedVideoDecoderFfmpeg_cpp
> ===================================================================
> RCS file: patches/patch-libbase_embedVideoDecoderFfmpeg_cpp
> diff -N patches/patch-libbase_embedVideoDecoderFfmpeg_cpp
> --- patches/patch-libbase_embedVideoDecoderFfmpeg_cpp 24 Sep 2007 07:46:38
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -$OpenBSD: patch-libbase_embedVideoDecoderFfmpeg_cpp,v 1.1 2007/09/24
> 07:46:38 jakemsr Exp $
> ---- libbase/embedVideoDecoderFfmpeg.cpp.orig Mon Sep 10 23:41:46 2007
> -+++ libbase/embedVideoDecoderFfmpeg.cpp Mon Sep 10 23:42:14 2007
> -@@ -26,7 +26,9 @@
> - #include "embedVideoDecoderFfmpeg.h"
> -
> - #ifdef HAVE_SWSCALE_H
> -+extern "C" {
> - #include <ffmpeg/swscale.h>
> -+}
> - #endif
> -
> - #include <boost/scoped_array.hpp>
> Index: patches/patch-libbase_embedVideoDecoderFfmpeg_h
> ===================================================================
> RCS file: patches/patch-libbase_embedVideoDecoderFfmpeg_h
> diff -N patches/patch-libbase_embedVideoDecoderFfmpeg_h
> --- patches/patch-libbase_embedVideoDecoderFfmpeg_h 24 Sep 2007 07:46:38
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -$OpenBSD: patch-libbase_embedVideoDecoderFfmpeg_h,v 1.1 2007/09/24 07:46:38
> jakemsr Exp $
> ---- libbase/embedVideoDecoderFfmpeg.h.orig Mon Sep 10 23:41:09 2007
> -+++ libbase/embedVideoDecoderFfmpeg.h Mon Sep 10 23:41:29 2007
> -@@ -28,7 +28,9 @@
> -
> - #include <vector>
> - #include "embedVideoDecoder.h"
> -+extern "C" {
> - #include <ffmpeg/avcodec.h>
> -+}
> - #include "image.h"
> -
> - namespace gnash {
> Index: patches/patch-po_Makefile_in
> ===================================================================
> RCS file: patches/patch-po_Makefile_in
> diff -N patches/patch-po_Makefile_in
> --- patches/patch-po_Makefile_in 7 Jul 2007 10:47:04 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$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.
> Index: patches/patch-server_asobj_NetStreamFfmpeg_h
> ===================================================================
> RCS file: patches/patch-server_asobj_NetStreamFfmpeg_h
> diff -N patches/patch-server_asobj_NetStreamFfmpeg_h
> --- patches/patch-server_asobj_NetStreamFfmpeg_h 24 Sep 2007 07:46:38
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -$OpenBSD: patch-server_asobj_NetStreamFfmpeg_h,v 1.1 2007/09/24 07:46:38
> jakemsr Exp $
> ---- server/asobj/NetStreamFfmpeg.h.orig Mon Sep 10 23:43:35 2007
> -+++ server/asobj/NetStreamFfmpeg.h Mon Sep 10 23:43:58 2007
> -@@ -39,7 +39,9 @@
> - #include "impl.h"
> - #include "video_stream_instance.h"
> -
> -+extern "C" {
> - #include <ffmpeg/avformat.h>
> -+}
> -
> - #include "image.h"
> - #include "StreamProvider.h"
> Index: patches/patch-server_asobj_SoundFfmpeg_h
> ===================================================================
> RCS file: patches/patch-server_asobj_SoundFfmpeg_h
> diff -N patches/patch-server_asobj_SoundFfmpeg_h
> --- patches/patch-server_asobj_SoundFfmpeg_h 24 Sep 2007 07:46:38 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -$OpenBSD: patch-server_asobj_SoundFfmpeg_h,v 1.1 2007/09/24 07:46:38
> jakemsr Exp $
> ---- server/asobj/SoundFfmpeg.h.orig Mon Sep 10 23:42:46 2007
> -+++ server/asobj/SoundFfmpeg.h Mon Sep 10 23:43:05 2007
> -@@ -32,7 +32,9 @@
> - #include <boost/bind.hpp>
> - #include <boost/thread/mutex.hpp>
> -
> -+extern "C" {
> - #include <ffmpeg/avformat.h>
> -+}
> -
> - namespace gnash {
> -
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/www/gnash/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 7 Jul 2007 10:47:04 -0000 1.3
> +++ pkg/PLIST 25 Apr 2008 01:33:18 -0000
> @@ -1,27 +1,42 @@
> @comment $OpenBSD: PLIST,v 1.3 2007/07/07 10:47:04 deanna Exp $
> bin/gnash
> -bin/gparser
> +bin/gnash-dumpshm
> bin/gprocessor
> -lib/libgnashamf.la
> [EMAIL PROTECTED] lib/libgnashamf.so.${LIBgnashamf_VERSION}
> -lib/libgnashbackend.la
> [EMAIL PROTECTED] lib/libgnashbackend.so.${LIBgnashbackend_VERSION}
> -lib/libgnashbase.la
> [EMAIL PROTECTED] lib/libgnashbase.so.${LIBgnashbase_VERSION}
> -lib/libgnashgeo.la
> [EMAIL PROTECTED] lib/libgnashgeo.so.${LIBgnashgeo_VERSION}
> -lib/libgnashgui.la
> [EMAIL PROTECTED] lib/libgnashgui.so.${LIBgnashgui_VERSION}
> -lib/libgnashplayer.la
> [EMAIL PROTECTED] lib/libgnashplayer.so.${LIBgnashplayer_VERSION}
> -lib/libgnashserver.la
> [EMAIL PROTECTED] lib/libgnashserver.so.${LIBgnashserver_VERSION}
> +bin/gtk-gnash
> +bin/soldumper
> +lib/gnash/
> +lib/gnash/libgnashamf-0.8.2.so
> +lib/gnash/libgnashamf.la
> +lib/gnash/libgnashamf.so
> +lib/gnash/libgnashbase-0.8.2.so
> +lib/gnash/libgnashbase.la
> +lib/gnash/libgnashbase.so
> +lib/gnash/libgnashmedia-0.8.2.so
> +lib/gnash/libgnashmedia.la
> +lib/gnash/libgnashmedia.so
> +lib/gnash/libgnashserver-0.8.2.so
> +lib/gnash/libgnashserver.la
> +lib/gnash/libgnashserver.so
> lib/mozilla-plugins/
> lib/mozilla-plugins/libgnashplugin.so
> [EMAIL PROTECTED] man/man1/cygnal.1
> [EMAIL PROTECTED] man/man1/dumpshm.1
> @man man/man1/gnash.1
> [EMAIL PROTECTED] man/man1/gprocessor.1
> [EMAIL PROTECTED] man/man1/soldumper.1
> +share/doc/gnash/
> +share/doc/gnash/gnashref.html
> +share/doc/gnash/gnashuser.html
> +share/doc/gnash/images/
> +share/doc/gnash/images/car_crash.png
> +share/doc/gnash/images/rtmp.png
> share/gnash/
> share/gnash/GnashG.png
> share/gnash/gnash_128_96.ico
> +share/locale/cs/LC_MESSAGES/gnash.mo
> share/locale/de/LC_MESSAGES/gnash.mo
> share/locale/es/LC_MESSAGES/gnash.mo
> +share/locale/fi/LC_MESSAGES/gnash.mo
> share/locale/fr/LC_MESSAGES/gnash.mo
> +share/locale/it/LC_MESSAGES/gnash.mo
> +share/locale/sv/LC_MESSAGES/gnash.mo
>
>
