Date: Sat, 17 May 2008 03:47:51 +0400 (MSD) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/123744: [REPOCOPY][NEW PORT] graphics/gnash to graphics/gnash-devel Message-ID: <20080516234751.D5ED71702D@hades.panopticon> Resent-Message-ID: <200805162350.m4GNo120004841@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 123744
>Category: ports
>Synopsis: [REPOCOPY][NEW PORT] graphics/gnash to graphics/gnash-devel
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri May 16 23:50:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 7.0-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #0: Fri Apr 25 11:18:45 MSD 2008 root@hades.panopticon:/usr/obj/usr/src/sys/HADES i386
>Description:
Please repocopy graphics/gnash to graphics/gnash-devel and update the latter with the attached patch. This is snapshot version of GNU Flash movie player
Thanks to: Carlos A. M. dos Santos
>How-To-Repeat:
>Fix:
--- gnash-devel.patch begins here ---
diff -ruN gnash.orig/Makefile gnash-devel/Makefile
--- gnash.orig/Makefile 2008-05-17 03:45:37.855114795 +0400
+++ gnash-devel/Makefile 2008-05-17 03:44:17.582162506 +0400
@@ -1,16 +1,17 @@
-# New ports collection makefile for: gnash
-# Date created: 12 Jan 2006
+# New ports collection makefile for: gnash-devel
+# Date created: 15 May 2008
# Whom: Dmitry Marakasov <amdmi3@amdmi3.ru>
#
-# $FreeBSD: ports/graphics/gnash/Makefile,v 1.23 2008/04/19 17:50:10 miwi Exp $
+# $FreeBSD$
#
PORTNAME= gnash
-PORTVERSION= 0.8.1
-PORTREVISION= 3
+PORTVERSION= 20080515
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
+# gnashdev.org is slower
+MASTER_SITES= http://www.amdmi3.ru/distfiles/ \
+ http://www.gnashdev.org/dev_snapshots/
+PKGNAMESUFFIX= -devel
MAINTAINER= amdmi3@amdmi3.ru
COMMENT= GNU Flash movie player
@@ -19,16 +20,17 @@
jpeg.9:${PORTSDIR}/graphics/jpeg \
curl.4:${PORTSDIR}/ftp/curl
-USE_BZIP2= yes
+CONFLICTS= gnash-[0-9]*
+
+EXTRACT_SUFX= .tar.tgz
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
+USE_XORG= x11 xau xdmcp xext xi xinerama ice sm
+USE_AUTOTOOLS= libltdl:15 automake:19:env autoheader:261:env autoconf:261:env aclocal:19:env
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -37,23 +39,24 @@
PTHREAD_CFLAGS="${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/include" \
--with-boost-lib="${LOCALBASE}/lib" \
- --with-plugindir="${PLUGIN_DIR}"
+ --with-npapi-plugindir="${PREFIX}/lib/browser_plugins" \
+ --with-kde-pluginprefix="${PREFIX}"
+
+WRKSRC= ${WRKDIR}/${PORTNAME}-0.8.3
USE_LDCONFIG= ${PREFIX}/lib/gnash
-MAN1= gnash.1
+MAN1= cygnal.1 gnash.1 gprocessor.1 soldumper.1 dumpshm.1
OPTIONS= PLUGIN "Enable browser plugin" on \
CYGNAL "Enable Cygnal media server" off \
- GTK "GUI: GTK (required for FF plugin)" 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 \
+ OPENGL "Renderer: OpenGL (broken)" 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
+ GSTREAMER "Media handler: GStreamer" off
.include <bsd.port.pre.mk>
@@ -67,6 +70,7 @@
.if defined(WITH_KDE) && !defined(WITHOUT_PLUGIN)
PLIST_SUB+= KONQPLUGIN=""
+USE_LDCONFIG+= ${PREFIX}/lib/kde3
.else
PLIST_SUB+= KONQPLUGIN="@comment "
CONFIGURE_ARGS+= --disable-kparts
@@ -111,12 +115,14 @@
# 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
+.if ${GNASH_GUIS} == ""
+IGNORE= needs at least one GUI enabled. Please rerun 'make config' and enable GTK, KDE or both GUIs
+.endif
+
CONFIGURE_ARGS+= --enable-gui=`${ECHO} ${GNASH_GUIS} | ${TR} ' ' ,`
#
@@ -144,32 +150,44 @@
#
# 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
-post-patch:
- @${REINPLACE_CMD} -e '/^PTHREAD_[A-Z]*=/ d' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e '/test/ s|==|=|; s|== x|= x|' ${WRKSRC}/configure
+pre-everything::
+.if defined(WITH_OPENGL)
+ @${ECHO_CMD} "OpenGL support is currently broken (Gnash hangs using 100% CPU). Use at your own risk"
+ @sleep 3
+.endif
+
+pre-configure:
+ @(cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./autogen.sh)
+ @${REINPLACE_CMD} -e 's|^LIBS = |&$${INTLLIBS} |' \
+ ${WRKSRC}/utilities/Makefile.in ${WRKSRC}/cygnal/Makefile.in
+ @${REINPLACE_CMD} -e '/^PTHREAD_[LC][IF]*=/ d' ${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
+
+.if !defined(WITHOUT_PLUGIN)
+post-install:
+.if defined(WITH_GTK)
+ @cd ${INSTALL_WRKSRC}/plugin && \
+ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-plugin
+.endif
+.if defined(WITH_KDE)
+ @cd ${INSTALL_WRKSRC}/plugin/klash && \
+ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-plugin
+.endif
.endif
.include <bsd.port.post.mk>
diff -ruN gnash.orig/distinfo gnash-devel/distinfo
--- gnash.orig/distinfo 2008-05-17 03:45:37.857186008 +0400
+++ gnash-devel/distinfo 2008-05-17 01:59:34.552952649 +0400
@@ -1,3 +1,3 @@
-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-20080515.tar.tgz) = dfa5293481120dda51473d5974cb6bee
+SHA256 (gnash-20080515.tar.tgz) = b1e9a6bdf45e154e095c6c98ab822e9014d1c822d0841166ec39681d77b7c6eb
+SIZE (gnash-20080515.tar.tgz) = 3666406
diff -ruN gnash.orig/files/patch-server-asobj-flash-geom-Point_as.cpp gnash-devel/files/patch-server-asobj-flash-geom-Point_as.cpp
--- gnash.orig/files/patch-server-asobj-flash-geom-Point_as.cpp 1970-01-01 03:00:00.000000000 +0300
+++ gnash-devel/files/patch-server-asobj-flash-geom-Point_as.cpp 2008-05-17 02:22:16.285184259 +0400
@@ -0,0 +1,14 @@
+--- server/asobj/flash/geom/Point_as.cpp.orig 2008-05-14 14:38:44.000000000 +0400
++++ server/asobj/flash/geom/Point_as.cpp 2008-05-17 02:22:11.737384190 +0400
+@@ -193,9 +193,9 @@
+ ptr->get_member(NSV::PROP_X, &xval);
+ ptr->get_member(NSV::PROP_Y, &yval);
+ double x = xval.to_number();
+- if ( ! isfinite(x) ) return as_value(NAN);
++ if ( ! std::isfinite(x) ) return as_value(NAN);
+ double y = yval.to_number();
+- if ( ! isfinite(y) ) return as_value(NAN);
++ if ( ! std::isfinite(y) ) return as_value(NAN);
+
+ double l = sqrt(x*x+y*y);
+ return as_value(l);
diff -ruN gnash.orig/files/patch-server-asobj-flash-geom-Rectangle_as.cpp gnash-devel/files/patch-server-asobj-flash-geom-Rectangle_as.cpp
--- gnash.orig/files/patch-server-asobj-flash-geom-Rectangle_as.cpp 1970-01-01 03:00:00.000000000 +0300
+++ gnash-devel/files/patch-server-asobj-flash-geom-Rectangle_as.cpp 2008-05-17 02:22:29.358521792 +0400
@@ -0,0 +1,15 @@
+--- server/asobj/flash/geom/Rectangle_as.cpp.orig 2008-05-14 14:38:44.000000000 +0400
++++ server/asobj/flash/geom/Rectangle_as.cpp 2008-05-17 02:22:29.328831706 +0400
+@@ -241,10 +241,10 @@
+ if ( h.is_undefined() || h.is_null() ) return as_value(true);
+
+ double wn = w.to_number();
+- if ( ! isfinite(wn) || wn == 0 ) return as_value(true);
++ if ( ! std::isfinite(wn) || wn == 0 ) return as_value(true);
+
+ double hn = h.to_number();
+- if ( ! isfinite(hn) || hn == 0 ) return as_value(true);
++ if ( ! std::isfinite(hn) || hn == 0 ) return as_value(true);
+
+ log_debug("Width: %g, Height: %g", wn, hn);
+
diff -ruN gnash.orig/files/patch-utilities-Makefile.in gnash-devel/files/patch-utilities-Makefile.in
--- gnash.orig/files/patch-utilities-Makefile.in 2008-05-17 03:45:37.814535056 +0400
+++ gnash-devel/files/patch-utilities-Makefile.in 1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- 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 @@
- $(top_builddir)/libbase/libgnashbase.la \
- $(top_builddir)/backend/libgnashbackend.la \
- $(top_builddir)/libamf/libgnashamf.la $(am__append_2) \
-- $(am__append_4) $(GLIB_LIBS) $(GSTREAMER_LIBS)
-+ $(am__append_4) $(GLIB_LIBS) $(GSTREAMER_LIBS) $(INTLLIBS)
- AM_LDFLAGS = \
- $(LIBADD_DL) \
- $(LIBLTDL) \
diff -ruN gnash.orig/pkg-plist gnash-devel/pkg-plist
--- gnash.orig/pkg-plist 2008-05-17 03:45:37.837426234 +0400
+++ gnash-devel/pkg-plist 2008-05-17 03:03:41.544487327 +0400
@@ -1,43 +1,59 @@
+bin/dumpshm
bin/gnash
-bin/gparser
bin/gprocessor
+bin/soldumper
%%GTK%%bin/gtk-gnash
%%KDE%%bin/kde-gnash
%%CYGNAL%%bin/cygnal
%%FFPLUGIN%%lib/browser_plugins/libgnashplugin.so
-%%KONQPLUGIN%%lib/kde3/libklashpart.so
+%%KONQPLUGIN%%share/apps/klash/pluginsinfo
+%%KONQPLUGIN%%share/apps/klash/klashpartui.rc
+%%KONQPLUGIN%%share/services/klash_part.desktop
%%KONQPLUGIN%%lib/kde3/libklashpart.a
+%%KONQPLUGIN%%lib/kde3/libklashpart.so
%%KONQPLUGIN%%lib/kde3/libklashpart.la
-lib/gnash/libgnashamf-0.8.1.so
+etc/gnashpluginrc
+etc/gnashrc
+lib/gnash/libgnashamf-0.8.3.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.3.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.3.so
+lib/gnash/libgnashmedia.a
+lib/gnash/libgnashmedia.la
+lib/gnash/libgnashmedia.so
+lib/gnash/libgnashnet.a
+lib/gnash/libgnashnet.la
+lib/gnash/libgnashnet.so
+lib/gnash/libgnashnet.so.0
+lib/gnash/libgnashserver-0.8.3.so
lib/gnash/libgnashserver.a
lib/gnash/libgnashserver.la
lib/gnash/libgnashserver.so
+%%FFPLUGIN%%lib/gnash/libmozsdk.a
+%%FFPLUGIN%%lib/gnash/libmozsdk.la
+%%FFPLUGIN%%lib/gnash/libmozsdk.so
+%%FFPLUGIN%%lib/gnash/libmozsdk.so.0
+%%DOCSDIR%%/gnashuser.html
+%%DOCSDIR%%/images/car_crash.png
+%%DOCSDIR%%/images/rtmp.png
+%%DOCSDIR%%/gnashref.html
%%DATADIR%%/GnashG.png
%%DATADIR%%/gnash_128_96.ico
-%%KONQPLUGIN%%share/apps/klash/pluginsinfo
-%%KONQPLUGIN%%share/apps/klash/klashpartui.rc
-%%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
+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
@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%/images
+@dirrm %%DOCSDIR%%
@dirrm lib/gnash
-@dirrmtry lib/browser_plugins
+%%KONQPLUGIN%%@dirrm share/apps/klash
+%%FFPLUGIN%%@dirrmtry lib/browser_plugins
--- gnash-devel.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080516234751.D5ED71702D>