ports/123349: Patch: upgrade graphics/gnash to version 0.8.2
Carlos Santos
unixmania at gmail.com
Sat May 3 00:00:24 UTC 2008
>Number: 123349
>Category: ports
>Synopsis: Patch: upgrade graphics/gnash to version 0.8.2
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat May 03 00:00:18 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Carlos Santos
>Release: 7.0-STABLE
>Organization:
N.A.
>Environment:
FreeBSD casantos 7.0-STABLE FreeBSD 7.0-STABLE #1: Fri Apr 25 03:02:38 BRT 2008 root at casantos:/share/FreeBSD/src/sys/i386/compile/HP_NX6320 i386
>Description:
The attached patch provides the following changes:
1. Upgrade the source distribution to 0.8.2, using an additional patch
available at the snapshot site.
2. Add the dependency on libltdl15.
3. Updates the list of manual pages.
4. Add one configuration option, "NLS" (currently it has no effect since
the "configure" script seems to ignore this option).
5. Remove one configuration option, "MAD", since the corresponding media handler
is not supported by Gnash anymore.
6. Remove unnecessary "--with-qt-incl" and "--with-qt-lib" arguments
to the "configure" script.
7. Add a trick to get the "render_handler_ogl.h" include file that is
not contained in Gnash 0.8.2 distribution, according to
http://savannah.gnu.org/bugs/?22547
>How-To-Repeat:
N.A.
>Fix:
Apply the attached patch.
Patch attached with submission follows:
diff -durP gnash.orig/Makefile gnash/Makefile
--- gnash.orig/Makefile 2008-04-21 20:34:44.000000000 -0300
+++ gnash/Makefile 2008-05-02 20:22:14.000000000 -0300
@@ -6,18 +6,22 @@
#
PORTNAME= gnash
-PORTVERSION= 0.8.1
-PORTREVISION= 3
+PORTVERSION= 0.8.2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
+PATCH_SITES= http://www.gnashdev.org/dev_snapshots/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
+PATCHFILES= gnash-0.8.2-1.patch
MAINTAINER= amdmi3 at amdmi3.ru
COMMENT= GNU Flash movie player
LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- curl.4:${PORTSDIR}/ftp/curl
+ curl.4:${PORTSDIR}/ftp/curl \
+ ltdl.4:${PORTSDIR}/devel/libltdl15
USE_BZIP2= yes
USE_GMAKE= yes
@@ -41,22 +45,25 @@
USE_LDCONFIG= ${PREFIX}/lib/gnash
-MAN1= gnash.1
+MAN1= dumpshm.1 gnash.1 gprocessor.1 soldumper.1
OPTIONS= PLUGIN "Enable browser plugin" on \
CYGNAL "Enable Cygnal media server" off \
- GTK "GUI: GTK (required for FF plugin)" on \
+ NLS "Enable Native Language Support" on \
+ GTK "GUI: GTK (required for Mozilla/Firefox plugin)" on \
KDE "GUI: KDE (required for Konqueror plugin)" off \
AGG "Renderer: AGG" on \
OPENGL "Renderer: OpenGL" off \
CAIRO "Renderer: Cairo (experimental)" off \
FFMPEG "Media handler: ffmpeg (+SDL sound output)" on \
GSTREAMER "Media handler: GStreamer" off \
- MAD "Media handler: MAD (+SDL sound output)" off \
DEBUGLOG "Leave logfile in current directory on every run" off
.include <bsd.port.pre.mk>
+MISSING_FILE= render_handler_ogl.h
+DISTFILES+= ${MISSING_FILE}
+
# Plugin option processing
.if defined(WITH_GTK) && !defined(WITHOUT_PLUGIN)
PLIST_SUB+= FFPLUGIN=""
@@ -76,6 +83,7 @@
.if defined(WITH_CYGNAL)
PLIST_SUB+= CYGNAL=""
CONFIGURE_ARGS+= --enable-cygnal
+MAN1+= cygnal.1
.else
PLIST_SUB+= CYGNAL="@comment "
CONFIGURE_ARGS+= --disable-cygnal
@@ -111,8 +119,6 @@
# 5.5/6.2 EOL. We could also include bsd.kde.mk here, but that's much more
# likely to bring more trouble
LIB_DEPENDS+= kimproxy:${PORTSDIR}/x11/kdelibs3
-CONFIGURE_ARGS+=--with-qt-incl="${LOCALBASE}/include" \
- --with-qt-lib="${LOCALBASE}/lib"
.else
PLIST_SUB+= KDE="@comment "
.endif
@@ -144,24 +150,33 @@
#
# Media handler options processing
#
-.if defined(WITH_FFMPEG) && !defined(WITH_GSTREAMER) && !defined(WITH_MAD)
+.if defined(WITH_FFMPEG) && !defined(WITH_GSTREAMER)
LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
CONFIGURE_ARGS+= --enable-media=ffmpeg
USE_SDL+= sdl
-.elif !defined(WITH_FFMPEG) && defined(WITH_GSTREAMER) && !defined(WITH_MAD)
+.elif !defined(WITH_FFMPEG) && defined(WITH_GSTREAMER)
USE_GSTREAMER= yes
CONFIGURE_ARGS+= --enable-media=gst
-.elif !defined(WITH_FFMPEG) && !defined(WITH_GSTREAMER) && defined(WITH_MAD)
-LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad
-CONFIGURE_ARGS+= --enable-media=mad
-USE_SDL+= sdl
-.elif !defined(WITH_FFMPEG) && !defined(WITH_GSTREAMER) && !defined(WITH_MAD)
+.elif !defined(WITH_FFMPEG) && !defined(WITH_GSTREAMER)
CONFIGURE_ARGS+= --enable-media=none
.else
-IGNORE= can't be built with multiple media handlers enabled. Please rerun 'make config' and leave one or none of them (ffmpeg|gstreamer|mad)
+IGNORE= can't be built with multiple media handlers enabled. Please rerun 'make config' and leave one or none of them (ffmpeg|gstreamer)
.endif
+#
+# A trick to get render_handler_ogl.h that is not contained in Gnash 0.8.2
+# distribution (see http://savannah.gnu.org/bugs/?22547)
+#
+CVS_SITE= http://cvs.savannah.gnu.org/viewvc/*checkout*/gnash/backend/
+CVS_TAG= ?revision=1.7&root=gnash
+
+pre-fetch: ${DISTDIR}/${MISSING_FILE}
+
+${DISTDIR}/${MISSING_FILE}:
+ @${FETCH_BINARY} -o ${.TARGET} -q "${CVS_SITE}${MISSING_FILE}${CVS_TAG}"
+
post-patch:
+ @${CP} -p ${DISTDIR}/${MISSING_FILE} ${WRKSRC}/backend
@${REINPLACE_CMD} -e '/^PTHREAD_[A-Z]*=/ d' ${WRKSRC}/configure
@${REINPLACE_CMD} -e '/test/ s|==|=|; s|== x|= x|' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \
@@ -172,4 +187,8 @@
${WRKSRC}/libbase/rc.cpp ${WRKSRC}/libbase/log.h
.endif
+.if !defined(WITHOUT_PLUGIN)
+INSTALL_TARGET= install install-plugins
+.endif
+
.include <bsd.port.post.mk>
diff -durP gnash.orig/Makefile.orig gnash/Makefile.orig
--- gnash.orig/Makefile.orig 1969-12-31 21:00:00.000000000 -0300
+++ gnash/Makefile.orig 2008-04-30 13:27:27.000000000 -0300
@@ -0,0 +1,192 @@
+# New ports collection makefile for: gnash
+# Date created: 12 Jan 2006
+# Whom: Dmitry Marakasov <amdmi3 at amdmi3.ru>
+#
+# $FreeBSD: ports/graphics/gnash/Makefile,v 1.23 2008/04/19 17:50:10 miwi Exp $
+#
+
+PORTNAME= gnash
+PORTVERSION= 0.8.2
+CATEGORIES= graphics
+MASTER_SITES= ${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
+PATCH_SITES= http://www.gnashdev.org/dev_snapshots/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ render_handler_ogl.h
+PATCHFILES= gnash-0.8.2-1.patch
+
+MAINTAINER= amdmi3 at amdmi3.ru
+COMMENT= GNU Flash movie player
+
+LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost \
+ jpeg.9:${PORTSDIR}/graphics/jpeg \
+ curl.4:${PORTSDIR}/ftp/curl \
+ ltdl.4:${PORTSDIR}/devel/libltdl15
+
+USE_BZIP2= yes
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+WANT_SDL= yes
+WANT_GNOME= yes
+WANT_GSTREAMER= yes
+USE_GNOME= pkgconfig libxml2
+USE_AUTOTOOLS= libltdl:15
+
+PLUGIN_DIR= ${PREFIX}/lib/browser_plugins
+
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ PTHREAD_LIBS="${PTHREAD_LIBS}" \
+ PTHREAD_CFLAGS="${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
+CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/include" \
+ --with-boost-lib="${LOCALBASE}/lib" \
+ --with-plugindir="${PLUGIN_DIR}"
+
+USE_LDCONFIG= ${PREFIX}/lib/gnash
+
+MAN1= dumpshm.1 gnash.1 gprocessor.1 soldumper.1
+
+OPTIONS= PLUGIN "Enable browser plugin" on \
+ CYGNAL "Enable Cygnal media server" off \
+ NLS "Enable Native Language Support" on \
+ GTK "GUI: GTK (required for Mozilla/Firefox plugin)" on \
+ KDE "GUI: KDE (required for Konqueror plugin)" off \
+ AGG "Renderer: AGG" on \
+ OPENGL "Renderer: OpenGL" off \
+ CAIRO "Renderer: Cairo (experimental)" off \
+ FFMPEG "Media handler: ffmpeg (+SDL sound output)" on \
+ GSTREAMER "Media handler: GStreamer" off \
+ DEBUGLOG "Leave logfile in current directory on every run" off
+
+.include <bsd.port.pre.mk>
+
+# Plugin option processing
+.if defined(WITH_GTK) && !defined(WITHOUT_PLUGIN)
+PLIST_SUB+= FFPLUGIN=""
+.else
+PLIST_SUB+= FFPLUGIN="@comment "
+CONFIGURE_ARGS+= --disable-nsapi
+.endif
+
+.if defined(WITH_KDE) && !defined(WITHOUT_PLUGIN)
+PLIST_SUB+= KONQPLUGIN=""
+.else
+PLIST_SUB+= KONQPLUGIN="@comment "
+CONFIGURE_ARGS+= --disable-kparts
+.endif
+
+# Cygnal option processing
+.if defined(WITH_CYGNAL)
+PLIST_SUB+= CYGNAL=""
+CONFIGURE_ARGS+= --enable-cygnal
+MAN1+= cygnal.1
+.else
+PLIST_SUB+= CYGNAL="@comment "
+CONFIGURE_ARGS+= --disable-cygnal
+.endif
+
+# NLS option processing (not sure if --disable-nls actually has any effect)
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+#
+# GUI options processing
+#
+GNASH_GUIS=
+
+.if defined(WITH_GTK)
+USE_GNOME= gtk20
+GNASH_GUIS+= gtk
+PLIST_SUB+= GTK=""
+.else
+PLIST_SUB+= GTK="@comment "
+.endif
+
+.if defined(WITH_KDE)
+GNASH_GUIS+= kde
+PLIST_SUB+= KDE=""
+# We have to use this lame way to depend on kdelibs, as USE_KDELIBS_VER won't
+# work after bsd.port.pre.mk, and bsd.port.options.mk is unavailable until
+# 5.5/6.2 EOL. We could also include bsd.kde.mk here, but that's much more
+# likely to bring more trouble
+LIB_DEPENDS+= kimproxy:${PORTSDIR}/x11/kdelibs3
+.else
+PLIST_SUB+= KDE="@comment "
+.endif
+
+CONFIGURE_ARGS+= --enable-gui=`${ECHO} ${GNASH_GUIS} | ${TR} ' ' ,`
+
+#
+# Renderer options processing
+#
+.if defined(WITH_AGG) && !defined(WITH_OPENGL) && !defined(WITH_CAIRO)
+LIB_DEPENDS+= agg.2:${PORTSDIR}/graphics/agg
+CONFIGURE_ARGS+= --enable-renderer=agg
+.elif !defined(WITH_AGG) && defined(WITH_OPENGL) && !defined(WITH_CAIRO)
+USE_GL= yes
+. if defined(WITH_GTK)
+LIB_DEPENDS+= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
+. endif
+CONFIGURE_ARGS+= --enable-renderer=ogl
+.elif !defined(WITH_AGG) && !defined(WITH_OPENGL) && defined(WITH_CAIRO)
+. if defined(WITH_KDE)
+IGNORE= doesn't support Cairo renderer with KDE gui. Please rerun 'make config' and select different renderer or disable KDE GUI
+. endif
+LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo
+CONFIGURE_ARGS+= --enable-renderer=cairo
+.else
+IGNORE= can't be built with multiple or without renderers enabled. Please rerun 'make config' and select exactly one renderer (agg|opengl|cairo)
+.endif
+
+#
+# Media handler options processing
+#
+.if defined(WITH_FFMPEG) && !defined(WITH_GSTREAMER)
+LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+CONFIGURE_ARGS+= --enable-media=ffmpeg
+USE_SDL+= sdl
+.elif !defined(WITH_FFMPEG) && defined(WITH_GSTREAMER)
+USE_GSTREAMER= yes
+CONFIGURE_ARGS+= --enable-media=gst
+.elif !defined(WITH_FFMPEG) && !defined(WITH_GSTREAMER)
+CONFIGURE_ARGS+= --enable-media=none
+.else
+IGNORE= can't be built with multiple media handlers enabled. Please rerun 'make config' and leave one or none of them (ffmpeg|gstreamer)
+.endif
+
+#
+# A trick to get render_handler_ogl.h that is not contained in Gnash 0.8.2
+# distribution (see http://savannah.gnu.org/bugs/?22547)
+#
+CVS_SITE= "http://cvs.savannah.gnu.org/viewvc/*checkout*/gnash/backend/"
+CVS_TAG= "?revision=1.7&root=gnash"
+
+pre-fetch: ${DISTDIR}/render_handler_ogl.h
+
+${DISTDIR}/render_handler_ogl.h:
+ @cd ${DISTDIR} && \
+ ${FETCH_BINARY} -o render_handler_ogl.h ${CVS_SITE}render_handler_ogl.h${CVS_TAG}
+
+post-patch:
+ @${CP} -p ${DISTDIR}/render_handler_ogl.h ${WRKSRC}/backend
+ @${REINPLACE_CMD} -e '/^PTHREAD_[A-Z]*=/ d' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e '/test/ s|==|=|; s|== x|= x|' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \
+ s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure \
+ ${WRKSRC}/macros/libslist ${WRKSRC}/macros/incllist
+.if !defined(WITH_DEBUGLOG)
+ @${REINPLACE_CMD} -e 's|gnash-dbg.log|/dev/null|' \
+ ${WRKSRC}/libbase/rc.cpp ${WRKSRC}/libbase/log.h
+.endif
+
+.if !defined(WITHOUT_PLUGIN)
+INSTALL_TARGET= install install-plugins
+.endif
+
+.include <bsd.port.post.mk>
diff -durP gnash.orig/distinfo gnash/distinfo
--- gnash.orig/distinfo 2007-09-21 19:12:11.000000000 -0300
+++ gnash/distinfo 2008-04-29 23:11:41.000000000 -0300
@@ -1,3 +1,9 @@
-MD5 (gnash-0.8.1.tar.bz2) = 5f80a25cb7a37fb351d28fd2097d8f3e
-SHA256 (gnash-0.8.1.tar.bz2) = 30fb283e707bc209109ca313c83b069b1c482497b62f8c4cc37e9a23e0ba8993
-SIZE (gnash-0.8.1.tar.bz2) = 1983596
+MD5 (gnash-0.8.2.tar.bz2) = 05cac831181be3fb40cbf3c00ab25c0f
+SHA256 (gnash-0.8.2.tar.bz2) = 4c81e71e6619b79da9641a90ed2c73c362603103bcdcc7b9cc5cc53739d06baa
+SIZE (gnash-0.8.2.tar.bz2) = 2637636
+MD5 (render_handler_ogl.h) = e7e8637488dd83d5fe7a4162562c15a8
+SHA256 (render_handler_ogl.h) = 9a11d87b4deddaedc4d77b850665aeaff93d49a6de583fd23d970ae74c936834
+SIZE (render_handler_ogl.h) = 3469
+MD5 (gnash-0.8.2-1.patch) = 03726272386f10859e29cdd1f01986be
+SHA256 (gnash-0.8.2-1.patch) = fd126675d67c5311bd768690f31ff9d7279f5f6850e454a992e690183f3af85d
+SIZE (gnash-0.8.2-1.patch) = 10061
diff -durP gnash.orig/files/patch-utilities-Makefile.in gnash/files/patch-utilities-Makefile.in
--- gnash.orig/files/patch-utilities-Makefile.in 2007-12-19 09:24:50.000000000 -0200
+++ gnash/files/patch-utilities-Makefile.in 2008-04-28 23:13:34.000000000 -0300
@@ -1,11 +1,11 @@
---- utilities/Makefile.in.orig 2007-08-29 15:03:59.000000000 +0000
-+++ utilities/Makefile.in 2007-11-07 20:37:02.000000000 +0000
-@@ -365,7 +365,7 @@
+--- utilities/Makefile.in.orig 2008-03-04 20:13:02.000000000 -0300
++++ utilities/Makefile.in 2008-04-28 23:09:35.000000000 -0300
+@@ -390,7 +390,7 @@
+ $(top_builddir)/libamf/libgnashamf.la \
$(top_builddir)/libbase/libgnashbase.la \
- $(top_builddir)/backend/libgnashbackend.la \
- $(top_builddir)/libamf/libgnashamf.la $(am__append_2) \
+ $(top_builddir)/libmedia/libgnashmedia.la $(am__append_2) \
- $(am__append_4) $(GLIB_LIBS) $(GSTREAMER_LIBS)
-+ $(am__append_4) $(GLIB_LIBS) $(GSTREAMER_LIBS) $(INTLLIBS)
++ $(am__append_4) $(GLIB_LIBS) $(GSTREAMER_LIBS) $(INTLLIBS)
AM_LDFLAGS = \
$(LIBADD_DL) \
$(LIBLTDL) \
diff -durP gnash.orig/pkg-plist gnash/pkg-plist
--- gnash.orig/pkg-plist 2008-01-01 11:19:56.000000000 -0200
+++ gnash/pkg-plist 2008-04-30 01:03:23.000000000 -0300
@@ -1,43 +1,46 @@
+%%CYGNAL%%bin/cygnal
+bin/dumpshm
bin/gnash
-bin/gparser
bin/gprocessor
%%GTK%%bin/gtk-gnash
%%KDE%%bin/kde-gnash
-%%CYGNAL%%bin/cygnal
+bin/soldumper
%%FFPLUGIN%%lib/browser_plugins/libgnashplugin.so
-%%KONQPLUGIN%%lib/kde3/libklashpart.so
-%%KONQPLUGIN%%lib/kde3/libklashpart.a
-%%KONQPLUGIN%%lib/kde3/libklashpart.la
-lib/gnash/libgnashamf-0.8.1.so
+lib/gnash/libgnashamf-0.8.2.so
lib/gnash/libgnashamf.a
lib/gnash/libgnashamf.la
lib/gnash/libgnashamf.so
-lib/gnash/libgnashbackend-0.8.1.so
-lib/gnash/libgnashbackend.a
-lib/gnash/libgnashbackend.la
-lib/gnash/libgnashbackend.so
-lib/gnash/libgnashbase-0.8.1.so
+lib/gnash/libgnashbase-0.8.2.so
lib/gnash/libgnashbase.a
lib/gnash/libgnashbase.la
lib/gnash/libgnashbase.so
-lib/gnash/libgnashgeo-0.8.1.so
-lib/gnash/libgnashgeo.a
-lib/gnash/libgnashgeo.la
-lib/gnash/libgnashgeo.so
-lib/gnash/libgnashserver-0.8.1.so
+lib/gnash/libgnashmedia-0.8.2.so
+lib/gnash/libgnashmedia.a
+lib/gnash/libgnashmedia.la
+lib/gnash/libgnashmedia.so
+lib/gnash/libgnashserver-0.8.2.so
lib/gnash/libgnashserver.a
lib/gnash/libgnashserver.la
lib/gnash/libgnashserver.so
+%%KONQPLUGIN%%lib/kde3/libklashpart.a
+%%KONQPLUGIN%%lib/kde3/libklashpart.la
+%%KONQPLUGIN%%lib/kde3/libklashpart.so
+%%KONQPLUGIN%%share/apps/klash/klashpartui.rc
+%%KONQPLUGIN%%share/apps/klash/pluginsinfo
+share/doc/gnash/gnashref.html
+share/doc/gnash/gnashuser.html
+share/doc/gnash/images/car_crash.png
+share/doc/gnash/images/rtmp.png
%%DATADIR%%/GnashG.png
%%DATADIR%%/gnash_128_96.ico
-%%KONQPLUGIN%%share/apps/klash/pluginsinfo
-%%KONQPLUGIN%%share/apps/klash/klashpartui.rc
+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
%%KONQPLUGIN%%share/services/klash_part.desktop
-share/locale/cs/gnash.mo
-share/locale/de/gnash.mo
-share/locale/es/gnash.mo
-share/locale/fr/gnash.mo
-share/locale/it/gnash.mo
@dirrm %%DATADIR%%
@dirrm lib/gnash
@dirrmtry lib/browser_plugins
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list