Attachment #116056 for bug #157961

View | Details | Raw Unified | Return to bug 157961
Collapse All | Expand All




#

PORTNAME=	gnash
PORTVERSION=	0.8.9
PORTREVISION=	1
CATEGORIES=	graphics
MASTER_SITES=	GNU/${PORTNAME}/${PORTVERSION}/ \
		http://mirror.amdmi3.ru/distfiles/

USE_XORG=	x11 xau xdmcp xext xi xinerama ice sm xv
USE_AUTOTOOLS=	libltdl
MAKE_JOBS_SAFE=	yes
INSTALLS_ICONS=	yes

# jemalloc leads to infinite recursion on FreeBSD
# --enable-avm2 doesn't build (but consider for future)
CONFIGURE_ARGS=	--with-boost-incl="${LOCALBASE}/include" \
		--with-boost-lib="${LOCALBASE}/lib" \
		--disable-testsuite --disable-avm2 \
		--with-plugins-install=prefix \
		--sysconfdir="${WRKDIR}/etc" \
		--disable-jemalloc \
		--disable-silent-rules

USE_LDCONFIG=	${PREFIX}/lib/gnash

MAN1=		cygnal.1 findmicrophones.1 findwebcams.1 \
		flvdumper.1 gnash.1 gprocessor.1 \
		rtmpget.1 soldumper.1

OPTIONS=	PLUGIN		"Enable browser plugin" on \

#
.if !defined(WITHOUT_GTK) && !defined(WITHOUT_PLUGIN)
USE_WEBPLUGINS=		native
WEBPLUGINS_FILES=	gecko18/libgnashplugin.so gecko19/libgnashplugin.so\
			opera-devel/libgnashplugin.so opera/libgnashplugin.so\
			webkit-gtk2/libgnashplugin.so libgnashplugin.so
.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
PLIST_SUB+=	NPAPI=""
CONFIGURE_ARGS+=--with-npapi-plugindir="${WEBPLUGINS_DIR}"

.if defined(WITH_KDE4) && !defined(WITHOUT_PLUGIN)
PLIST_SUB+=	KPARTS4=""
USE_LDCONFIG+=	${KDE4_PREFIX}/lib/kde4
CONFIGURE_ARGS+=	--with-kde4_prefix=${PREFIX}/kde4
MAN1+=	gnash-qt-launcher.1 kde4-gnash.1
.else
PLIST_SUB+=	KPARTS4="@comment "
CONFIGURE_ARGS+=	--disable-kparts4

USE_GNOME=	gtk20
GNASH_GUIS+=	gtk
PLIST_SUB+=	GTK=""
MAN1+=	gnash-gtk-launcher.1 gtk-gnash.1
.else
PLIST_SUB+=	GTK="@comment "
.endif

Lines 1-3 Link Here

(-)gnash/distinfo (-3 / +2 lines)
1	MD5 (gnash-0.8.8.tar.bz2) = ce57f66e222f7eb1adf7f7b4a1274612	1	SHA256 (gnash-0.8.9.tar.bz2) = f90dbdc6f03d787b239b9edacbea077b46d69ae9d85f08af23f256af389c48bd
2	SHA256 (gnash-0.8.8.tar.bz2) = dcac4b81f81ecd6cc7c5422d7c731fc5c2a7be7fb18b5570a7e6f8fb5fc6e220	2	SIZE (gnash-0.8.9.tar.bz2) = 3777140
3	SIZE (gnash-0.8.8.tar.bz2) = 3850383




--- configure.orig	2011-06-17 14:55:08.857169643 -0400
+++ configure	2011-06-17 15:03:29.300807257 -0400
@@ -27778,6 +27778,11 @@
       esac
     fi
 
+#  KDE4_PREFIX override
+    if test x"${with_kde4_prefix}" != x; then
+        KDE4_PREFIX="${with_kde4_prefix}"
+    fi
+
     if test x"${with_kde4_plugindir}" != x ; then
       KDE4_PLUGINDIR="${with_kde4_plugindir}"
     else

Lines 1-10 Link Here

(-)gnash/files/patch-libbase-tu_file.h (-10 lines)
1	--- libbase/tu_file.h.orig 2010-08-07 19:50:00.000000000 +0400
2	+++ libbase/tu_file.h 2010-10-01 20:49:40.000000000 +0400
3	@@ -12,6 +12,7 @@
4	#include "dsodefs.h" // DSOEXPORT
5	#include "utility.h"
6	#include "IOChannel.h" // for inheritance
7	+#include <cstdio>
8
9
10	namespace gnash {

Lines 1-6 Link Here

(-)gnash/files/patch-plugin-klash-klash_part.cpp (-3 / +3 lines)
1	--- plugin/klash/klash_part.cpp.orig 2009-03-02 18:29:45.000000000 +0300	1	--- plugin/klash/klash_part.cpp.orig 2011-06-16 18:54:16.833252653 -0400
2	+++ plugin/klash/klash_part.cpp 2009-03-06 05:27:45.000000000 +0300	2	+++ plugin/klash/klash_part.cpp 2011-06-16 18:54:56.913835639 -0400
3	@@ -160,7 +160,7 @@	3	@@ -161,7 +161,7 @@
4	QString procname;	4	QString procname;
5	char *gnash_env = getenv("KLASH_PLAYER");	5	char *gnash_env = getenv("KLASH_PLAYER");
6	if (!gnash_env) {	6	if (!gnash_env) {

Lines 1-6 Link Here

(-)gnash/files/patch-plugin-klash4-klash_part.cpp (-3 / +3 lines)
1	--- plugin/klash4/klash_part.cpp.orig 2009-03-02 18:29:50.000000000 +0300	1	--- plugin/klash4/klash_part.cpp.orig 2011-06-16 18:56:30.869545798 -0400
2	+++ plugin/klash4/klash_part.cpp 2009-03-06 05:44:08.000000000 +0300	2	+++ plugin/klash4/klash_part.cpp 2011-06-16 18:57:04.979892841 -0400
3	@@ -147,7 +147,7 @@	3	@@ -148,7 +148,7 @@
4	}	4	}
5	}	5	}
6	KParts::Part::setWidget (new KlashView (wparent));	6	KParts::Part::setWidget (new KlashView (wparent));

Lines 1-11 Link Here

(-)gnash/files/patch-plugin-npapi-Makefile.in (-6 / +6 lines)
1	--- plugin/npapi/Makefile.in.orig 2010-08-21 22:04:45.000000000 +0400	1	--- plugin/npapi/Makefile.in.orig 2011-06-16 18:47:41.180628330 -0400
2	+++ plugin/npapi/Makefile.in 2010-08-25 05:43:40.000000000 +0400	2	+++ plugin/npapi/Makefile.in 2011-06-16 18:48:21.950238296 -0400
3	@@ -637,7 +637,7 @@	3	@@ -633,7 +633,7 @@
4	-I$(top_srcdir)/libcore/parser -I$(top_srcdir)/libbase \	4	-I$(top_srcdir)/libcore/parser -I$(top_srcdir)/libbase \
5	-I$(top_srcdir)/librender -I$(srcdir)/mozilla-sdk \	5	-I$(top_srcdir)/librender -I$(srcdir)/mozilla-sdk \
6	-I$(srcdir)/mozilla-sdk/include $(GLIB_CFLAGS) $(NULL) \	6	$(NPAPI_CFLAGS) $(X11_CFLAGS) $(GLIB_CFLAGS) $(NULL) \
7	- $(am__append_1) $(am__append_2)	7	- $(am__append_1) $(am__append_2) $(am__append_3)
8	+ $(am__append_1) $(am__append_2) $(BOOST_CFLAGS)	8	+ $(am__append_1) $(am__append_2) $(am__append_3) $(BOOST_CFLAGS)
9		9
10	# AM_CXXFLAGS = $(AM_CPPFLAGS)	10	# AM_CXXFLAGS = $(AM_CPPFLAGS)
11	noinst_HEADERS = plugin.h mozilla-sdk/pluginbase.h \	11	noinst_HEADERS = plugin.h mozilla-sdk/pluginbase.h \




bin/gnash
%%GTK%%bin/gnash-gtk-launcher
%%GTK%%bin/gtk-gnash
%%KDE%%bin/kde3-gnash
%%KDE4%%bin/gnash-qt-launcher
%%KDE4%%bin/kde4-gnash
bin/gprocessor
bin/rtmpget
%%GSTREAMER%%bin/findmicrophones
%%GSTREAMER%%bin/findwebcams
%%CYGNAL%%bin/cygnal
@comment %%CYGNAL%%bin/dumpshm
%%CYGNAL%%bin/flvdumper
%%CYGNAL%%bin/soldumper
%%NPAPI%%%%WEBPLUGINS_DIR%%/libgnashplugin.so
%%CYGNAL%%@unexec if cmp -s %D/etc/cygnalrc.dist %D/etc/cygnalrc; then rm -f %D/etc/cygnalrc; fi
%%CYGNAL%%etc/cygnalrc.dist
%%CYGNAL%%@exec if [ ! -f %B/cygnalrc ]; then cp -p %D/%F %B/cygnalrc; fi
@unexec if cmp -s %D/etc/gnashpluginrc.dist %D/etc/gnashpluginrc; then rm -f %D/etc/gnashpluginrc; fi
etc/gnashpluginrc.dist
@exec if [ ! -f %B/gnashpluginrc ]; then cp -p %D/%F %B/gnashpluginrc; fi
@unexec if cmp -s %D/etc/gnashrc.dist %D/etc/gnashrc; then rm -f %D/etc/gnashrc; fi
etc/gnashrc.dist
@exec if [ ! -f %B/gnashrc ]; then cp -p %D/%F %B/gnashrc; fi
include/gnash/AMF.h
include/gnash/BevelFilter_as.h
include/gnash/BitmapData_as.h
include/gnash/BitmapFilterQuality_as.h
include/gnash/BitmapFilterType_as.h
include/gnash/BitmapFilter_as.h
include/gnash/BitsReader.h
include/gnash/BlurFilter_as.h

include/gnash/ColorMatrixFilter_as.h
include/gnash/ColorTransform_as.h
include/gnash/ConvolutionFilter_as.h
include/gnash/DisplacementMapFilterMode_as.h
include/gnash/DisplacementMapFilter_as.h
include/gnash/DropShadowFilter_as.h
include/gnash/ExternalInterface_as.h
include/gnash/FileTypes.h
include/gnash/GC.h
include/gnash/GlowFilter_as.h
include/gnash/GnashAlgorithm.h
include/gnash/GnashEnums.h
include/gnash/GnashException.h
include/gnash/GnashFactory.h
include/gnash/GnashFileUtilities.h

include/gnash/GradientBevelFilter_as.h
include/gnash/GradientGlowFilter_as.h
include/gnash/IOChannel.h
include/gnash/ImageIterators.h
include/gnash/Matrix_as.h
include/gnash/NamingPolicy.h
include/gnash/NetworkAdapter.h

include/gnash/RTMP.h
include/gnash/Range2d.h
include/gnash/Rectangle_as.h
include/gnash/Renderer.h
include/gnash/SWFCtype.h
include/gnash/SharedMem.h
include/gnash/SimpleBuffer.h
include/gnash/Socket.h
include/gnash/Stats.h
include/gnash/StreamProvider.h
include/gnash/StringPredicates.h
include/gnash/Transform_as.h
include/gnash/URL.h
include/gnash/URLAccessManager.h
include/gnash/WallClockTimer.h
include/gnash/accumulator.h
include/gnash/arg_parser.h
include/gnash/asobj/AMFConverter.h
include/gnash/asobj/ASConversions.h
include/gnash/asobj/Accessibility_as.h
include/gnash/asobj/Array_as.h
include/gnash/asobj/AsBroadcaster.h

include/gnash/asobj/ContextMenuItem_as.h
include/gnash/asobj/ContextMenu_as.h
include/gnash/asobj/ControlTag.h
include/gnash/asobj/CustomActions.h
include/gnash/asobj/Date_as.h
include/gnash/asobj/DefinitionTag.h
include/gnash/asobj/DisplayList.h
include/gnash/asobj/DisplayObject.h
include/gnash/asobj/DisplayObjectContainer.h
include/gnash/asobj/DragState.h
include/gnash/asobj/DynamicShape.h
include/gnash/asobj/Error_as.h
include/gnash/asobj/FillStyle.h
include/gnash/asobj/Function_as.h
include/gnash/asobj/Geometry.h
include/gnash/asobj/Global_as.h
include/gnash/asobj/Globals.h
include/gnash/asobj/GnashKey.h
include/gnash/asobj/InteractiveObject.h
include/gnash/asobj/Key_as.h

include/gnash/asobj/Relay.h
include/gnash/asobj/RunResources.h
include/gnash/asobj/SWF.h
include/gnash/asobj/SWFCxForm.h
include/gnash/asobj/SWFMatrix.h
include/gnash/asobj/SWFRect.h
include/gnash/asobj/Selection_as.h

include/gnash/asobj/SharedObject_as.h
include/gnash/asobj/Sound_as.h
include/gnash/asobj/Stage_as.h
include/gnash/asobj/StreamProvider.h
include/gnash/asobj/String_as.h
include/gnash/asobj/System_as.h
include/gnash/asobj/TagLoadersTable.h

include/gnash/asobj/as_object.h
include/gnash/asobj/as_value.h
include/gnash/asobj/builtin_function.h
include/gnash/asobj/cxform.h
include/gnash/asobj/drag_state.h
include/gnash/asobj/event_id.h
include/gnash/asobj/gnash.h
include/gnash/asobj/movie_root.h
include/gnash/asobj/namedStrings.h
include/gnash/display_pkg.h

include/gnash/log.h
include/gnash/net_pkg.h
include/gnash/noseek_fd_adapter.h
include/gnash/ogl.h
include/gnash/parser/movie_definition.h
include/gnash/rc.h
include/gnash/ref_counted.h

include/gnash/text_pkg.h
include/gnash/tree.hh
include/gnash/tu_file.h
include/gnash/tu_opengl_includes.h
include/gnash/utf8.h
include/gnash/utility.h
include/gnash/vm/ASHandlers.h
include/gnash/vm/ActionExec.h
include/gnash/vm/CallStack.h
include/gnash/vm/ExecutableCode.h
include/gnash/vm/Machine.h
include/gnash/vm/SafeStack.h
include/gnash/vm/VM.h
include/gnash/vm/fn_call.h
include/gnash/zlib_adapter.h
%%KPARTS%%share/apps/klash/pluginsinfo
%%KPARTS%%share/apps/klash/klashpartui.rc
%%KPARTS%%share/services/klash_part.desktop
%%KPARTS%%lib/kde3/libklashpart.so
%%KPARTS%%lib/kde3/libklashpart.la
%%KPARTS4%%kde4/share/apps/klash/pluginsinfo
%%KPARTS4%%kde4/share/apps/klash/klashpartui.rc
%%KPARTS4%%kde4/share/kde4/services/klash_part.desktop
%%KPARTS4%%kde4/lib/kde4/libklashpart.so
%%KPARTS4%%kde4/lib/kde4/libklashpart.la
%%CYGNAL%%@unexec if cmp -s %D/etc/cygnalrc.dist %D/etc/cygnalrc; then rm -f %D/etc/cygnalrc; fi
%%CYGNAL%%etc/cygnalrc.dist
%%CYGNAL%%@exec if [ ! -f %B/cygnalrc ]; then cp -p %D/%F %B/cygnalrc; fi
@unexec if cmp -s %D/etc/gnashpluginrc.dist %D/etc/gnashpluginrc; then rm -f %D/etc/gnashpluginrc; fi
etc/gnashpluginrc.dist
@exec if [ ! -f %B/gnashpluginrc ]; then cp -p %D/%F %B/gnashpluginrc; fi
@unexec if cmp -s %D/etc/gnashrc.dist %D/etc/gnashrc; then rm -f %D/etc/gnashrc; fi
etc/gnashrc.dist
@exec if [ ! -f %B/gnashrc ]; then cp -p %D/%F %B/gnashrc; fi
%%CYGNAL%%lib/cygnal/plugins/echo.so
%%CYGNAL%%lib/cygnal/plugins/oflaDemo.so
%%CYGNAL%%lib/gnash/libgnashamf-%%GNASHVER%%.so
%%CYGNAL%%lib/gnash/libgnashamf.la
%%CYGNAL%%lib/gnash/libgnashamf.so
lib/gnash/libgnashbase-%%GNASHVER%%.so
lib/gnash/libgnashbase.la
lib/gnash/libgnashbase.so
lib/gnash/libgnashcore-%%GNASHVER%%.so
lib/gnash/libgnashcore.la
lib/gnash/libgnashcore.so
lib/gnash/libgnashmedia-%%GNASHVER%%.so
lib/gnash/libgnashmedia.la
lib/gnash/libgnashmedia.so
%%CYGNAL%%lib/gnash/libgnashnet-%%GNASHVER%%.so
%%CYGNAL%%lib/gnash/libgnashnet.so
lib/gnash/libgnashrender-%%GNASHVER%%.so
lib/gnash/libgnashrender.la
lib/gnash/libgnashrender.so
lib/gnash/libgnashrender.so.0
lib/gnash/libgnashsound-%%GNASHVER%%.so
lib/gnash/libgnashsound.la
lib/gnash/libgnashsound.so
%%VAAPI%%lib/gnash/libgnashvaapi-%%GNASHVER%%.so
%%VAAPI%%lib/gnash/libgnashvaapi.la
%%VAAPI%%lib/gnash/libgnashvaapi.so
@comment %%NPAPI%%lib/gnash/libmozsdk.la
@comment %%NPAPI%%lib/gnash/libmozsdk.so
@comment %%NPAPI%%lib/gnash/libmozsdk.so.0
libdata/pkgconfig/gnash.pc
%%GTK%%share/applications/gnash.desktop
%%KDE4%%share/applications/klash.desktop
%%DATADIR%%/doc/gnash/C/gnashref.html
%%DATADIR%%/doc/gnash/C/gnashuser.html
%%DATADIR%%/doc/gnash/C/images/rtmp.png
%%DATADIR%%/GnashG.png
%%DATADIR%%/gnash-splash.swf
%%DATADIR%%/gnash_128_96.ico
%%GTK%%share/icons/hicolor/32x32/apps/gnash.xpm
%%KDE4%%share/icons/hicolor/32x32/apps/klash.xpm
share/locale/cs/LC_MESSAGES/gnash.mo
share/locale/de/LC_MESSAGES/gnash.mo
share/locale/es/LC_MESSAGES/gnash.mo

share/locale/fr/LC_MESSAGES/gnash.mo
share/locale/it/LC_MESSAGES/gnash.mo
share/locale/ja/LC_MESSAGES/gnash.mo
@dirrmtry share/icons/hicolor/32x32/apps
@dirrmtry share/icons/hicolor/32x32
@dirrmtry share/icons/hicolor
@dirrmtry share/icons
@dirrm %%DATADIR%%/doc/gnash/C/images
@dirrm %%DATADIR%%/doc/gnash/C
@dirrm %%DATADIR%%/doc/gnash
@dirrm %%DATADIR%%/doc
@dirrm %%DATADIR%%
@dirrmtry share/applications
@dirrm %%DOCSDIR%%
@dirrm lib/gnash
%%CYGNAL%%@dirrmtry lib/cygnal/plugins
%%CYGNAL%%@dirrmtry lib/cygnal
@dirrm include/gnash/vm
@dirrm include/gnash/parser
@dirrm include/gnash/asobj
@dirrm include/gnash
@comment Should be //KPARTS//, but it is installed regardless of whether plugin is enabled
%%KPARTS%%@dirrm share/apps/klash
%%KPARTS4%%@dirrm kde4/share/apps/klash
%%NPAPI%%@dirrmtry %%WEBPLUGINS_DIR%%

Return to bug 157961

Lines 6-13 Link Here

(-)gnash/Makefile (-5 / +10 lines)
6	#	6	#
7		7
8	PORTNAME= gnash	8	PORTNAME= gnash
9	PORTVERSION= 0.8.8	9	PORTVERSION= 0.8.9
10	PORTREVISION= 1
11	CATEGORIES= graphics	10	CATEGORIES= graphics
12	MASTER_SITES= GNU/${PORTNAME}/${PORTVERSION}/ \	11	MASTER_SITES= GNU/${PORTNAME}/${PORTVERSION}/ \
13	http://mirror.amdmi3.ru/distfiles/	12	http://mirror.amdmi3.ru/distfiles/
Lines 34-46 Link Here
34	USE_XORG= x11 xau xdmcp xext xi xinerama ice sm xv	33	USE_XORG= x11 xau xdmcp xext xi xinerama ice sm xv
35	USE_AUTOTOOLS= libltdl	34	USE_AUTOTOOLS= libltdl
36	MAKE_JOBS_SAFE= yes	35	MAKE_JOBS_SAFE= yes
		36	INSTALLS_ICONS= yes
37		37
38	# jemalloc leads to infinite recursion on FreeBSD	38	# jemalloc leads to infinite recursion on FreeBSD
39	# --enable-avm2 doesn't build (but consider for future)	39	# --enable-avm2 doesn't build (but consider for future)
40	CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/include" \	40	CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/include" \
41	--with-boost-lib="${LOCALBASE}/lib" \	41	--with-boost-lib="${LOCALBASE}/lib" \
42	--disable-testsuite --disable-avm2 \	42	--disable-testsuite --disable-avm2 \
43	--with-plugins-install=system \	43	--with-plugins-install=prefix \
44	--sysconfdir="${WRKDIR}/etc" \	44	--sysconfdir="${WRKDIR}/etc" \
45	--disable-jemalloc \	45	--disable-jemalloc \
46	--disable-silent-rules	46	--disable-silent-rules
Lines 54-60 Link Here
54	USE_LDCONFIG= ${PREFIX}/lib/gnash	54	USE_LDCONFIG= ${PREFIX}/lib/gnash
55		55
56	MAN1= cygnal.1 findmicrophones.1 findwebcams.1 \	56	MAN1= cygnal.1 findmicrophones.1 findwebcams.1 \
57	flvdumper.1 gnash.1 gprocessor.1 gtk-gnash.1 kde4-gnash.1 \	57	flvdumper.1 gnash.1 gprocessor.1 \
58	rtmpget.1 soldumper.1	58	rtmpget.1 soldumper.1
59		59
60	OPTIONS= PLUGIN "Enable browser plugin" on \	60	OPTIONS= PLUGIN "Enable browser plugin" on \
Lines 95-101 Link Here
95	#	95	#
96	.if !defined(WITHOUT_GTK) && !defined(WITHOUT_PLUGIN)	96	.if !defined(WITHOUT_GTK) && !defined(WITHOUT_PLUGIN)
97	USE_WEBPLUGINS= native	97	USE_WEBPLUGINS= native
98	WEBPLUGINS_FILES= libgnashplugin.so	98	WEBPLUGINS_FILES= gecko18/libgnashplugin.so gecko19/libgnashplugin.so\
		99	opera-devel/libgnashplugin.so opera/libgnashplugin.so\
		100	webkit-gtk2/libgnashplugin.so libgnashplugin.so
99	.include "${PORTSDIR}/www/firefox/Makefile.webplugins"	101	.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
100	PLIST_SUB+= NPAPI=""	102	PLIST_SUB+= NPAPI=""
101	CONFIGURE_ARGS+=--with-npapi-plugindir="${WEBPLUGINS_DIR}"	103	CONFIGURE_ARGS+=--with-npapi-plugindir="${WEBPLUGINS_DIR}"
Lines 115-120 Link Here
115	.if defined(WITH_KDE4) && !defined(WITHOUT_PLUGIN)	117	.if defined(WITH_KDE4) && !defined(WITHOUT_PLUGIN)
116	PLIST_SUB+= KPARTS4=""	118	PLIST_SUB+= KPARTS4=""
117	USE_LDCONFIG+= ${KDE4_PREFIX}/lib/kde4	119	USE_LDCONFIG+= ${KDE4_PREFIX}/lib/kde4
		120	CONFIGURE_ARGS+= --with-kde4_prefix=${PREFIX}/kde4
		121	MAN1+= gnash-qt-launcher.1 kde4-gnash.1
118	.else	122	.else
119	PLIST_SUB+= KPARTS4="@comment "	123	PLIST_SUB+= KPARTS4="@comment "
120	CONFIGURE_ARGS+= --disable-kparts4	124	CONFIGURE_ARGS+= --disable-kparts4
Lines 129-134 Link Here
129	USE_GNOME= gtk20	133	USE_GNOME= gtk20
130	GNASH_GUIS+= gtk	134	GNASH_GUIS+= gtk
131	PLIST_SUB+= GTK=""	135	PLIST_SUB+= GTK=""
		136	MAN1+= gnash-gtk-launcher.1 gtk-gnash.1
132	.else	137	.else
133	PLIST_SUB+= GTK="@comment "	138	PLIST_SUB+= GTK="@comment "
134	.endif	139	.endif

Line 0 Link Here

(-)gnash/files/patch-configure (+14 lines)
	1	--- configure.orig 2011-06-17 14:55:08.857169643 -0400
	2	+++ configure 2011-06-17 15:03:29.300807257 -0400
	3	@@ -27778,6 +27778,11 @@
	4	esac
	5	fi
	6
	7	+# KDE4_PREFIX override
	8	+ if test x"${with_kde4_prefix}" != x; then
	9	+ KDE4_PREFIX="${with_kde4_prefix}"
	10	+ fi
	11	+
	12	if test x"${with_kde4_plugindir}" != x ; then
	13	KDE4_PLUGINDIR="${with_kde4_plugindir}"
	14	else

Lines 1-26 Link Here

(-)gnash/pkg-plist (-51 / +47 lines)
1	bin/gnash	1	bin/gnash
		2	%%GTK%%bin/gnash-gtk-launcher
2	%%GTK%%bin/gtk-gnash	3	%%GTK%%bin/gtk-gnash
3	%%KDE%%bin/kde3-gnash	4	%%KDE%%bin/kde3-gnash
		5	%%KDE4%%bin/gnash-qt-launcher
4	%%KDE4%%bin/kde4-gnash	6	%%KDE4%%bin/kde4-gnash
5	bin/gprocessor	7	bin/gprocessor
6	bin/rtmpget	8	bin/rtmpget
7	%%GSTREAMER%%bin/findmicrophones	9	%%GSTREAMER%%bin/findmicrophones
8	%%GSTREAMER%%bin/findwebcams	10	%%GSTREAMER%%bin/findwebcams
9	%%CYGNAL%%bin/cygnal	11	%%CYGNAL%%bin/cygnal
10	@comment %%CYGNAL%%bin/dumpshm
11	%%CYGNAL%%bin/flvdumper	12	%%CYGNAL%%bin/flvdumper
12	%%CYGNAL%%bin/soldumper	13	%%CYGNAL%%bin/soldumper
13	%%NPAPI%%%%WEBPLUGINS_DIR%%/libgnashplugin.so	14	%%NPAPI%%%%WEBPLUGINS_DIR%%/libgnashplugin.so
14	@comment Should be //KPARTS//, but it is installed regardless of whether plugin is enabled	15	%%CYGNAL%%@unexec if cmp -s %D/etc/cygnalrc.dist %D/etc/cygnalrc; then rm -f %D/etc/cygnalrc; fi
15	%%KPARTS%%share/apps/klash/pluginsinfo	16	%%CYGNAL%%etc/cygnalrc.dist
16	%%KPARTS%%share/apps/klash/klashpartui.rc	17	%%CYGNAL%%@exec if [ ! -f %B/cygnalrc ]; then cp -p %D/%F %B/cygnalrc; fi
17	@comment Should be //KPARTS//, but it is installed regardless of whether plugin is enabled	18	@unexec if cmp -s %D/etc/gnashpluginrc.dist %D/etc/gnashpluginrc; then rm -f %D/etc/gnashpluginrc; fi
18	%%KPARTS%%share/services/klash_part.desktop	19	etc/gnashpluginrc.dist
		20	@exec if [ ! -f %B/gnashpluginrc ]; then cp -p %D/%F %B/gnashpluginrc; fi
		21	@unexec if cmp -s %D/etc/gnashrc.dist %D/etc/gnashrc; then rm -f %D/etc/gnashrc; fi
		22	etc/gnashrc.dist
		23	@exec if [ ! -f %B/gnashrc ]; then cp -p %D/%F %B/gnashrc; fi
19	include/gnash/AMF.h	24	include/gnash/AMF.h
20	include/gnash/BevelFilter_as.h	25	include/gnash/BevelFilter_as.h
21	include/gnash/BitmapData_as.h	26	include/gnash/BitmapData_as.h
22	include/gnash/BitmapFilterQuality_as.h
23	include/gnash/BitmapFilterType_as.h
24	include/gnash/BitmapFilter_as.h	27	include/gnash/BitmapFilter_as.h
25	include/gnash/BitsReader.h	28	include/gnash/BitsReader.h
26	include/gnash/BlurFilter_as.h	29	include/gnash/BlurFilter_as.h
Lines 29-42 Link Here
29	include/gnash/ColorMatrixFilter_as.h	32	include/gnash/ColorMatrixFilter_as.h
30	include/gnash/ColorTransform_as.h	33	include/gnash/ColorTransform_as.h
31	include/gnash/ConvolutionFilter_as.h	34	include/gnash/ConvolutionFilter_as.h
32	include/gnash/DisplacementMapFilterMode_as.h
33	include/gnash/DisplacementMapFilter_as.h	35	include/gnash/DisplacementMapFilter_as.h
34	include/gnash/DropShadowFilter_as.h	36	include/gnash/DropShadowFilter_as.h
35	include/gnash/ExternalInterface_as.h	37	include/gnash/ExternalInterface_as.h
36	include/gnash/FileTypes.h
37	include/gnash/GC.h	38	include/gnash/GC.h
38	include/gnash/GlowFilter_as.h	39	include/gnash/GlowFilter_as.h
39	include/gnash/GnashAlgorithm.h	40	include/gnash/GnashAlgorithm.h
		41	include/gnash/GnashEnums.h
40	include/gnash/GnashException.h	42	include/gnash/GnashException.h
41	include/gnash/GnashFactory.h	43	include/gnash/GnashFactory.h
42	include/gnash/GnashFileUtilities.h	44	include/gnash/GnashFileUtilities.h
Lines 50-55 Link Here
50	include/gnash/GradientBevelFilter_as.h	52	include/gnash/GradientBevelFilter_as.h
51	include/gnash/GradientGlowFilter_as.h	53	include/gnash/GradientGlowFilter_as.h
52	include/gnash/IOChannel.h	54	include/gnash/IOChannel.h
		55	include/gnash/ImageIterators.h
53	include/gnash/Matrix_as.h	56	include/gnash/Matrix_as.h
54	include/gnash/NamingPolicy.h	57	include/gnash/NamingPolicy.h
55	include/gnash/NetworkAdapter.h	58	include/gnash/NetworkAdapter.h
Lines 58-72 Link Here
58	include/gnash/RTMP.h	61	include/gnash/RTMP.h
59	include/gnash/Range2d.h	62	include/gnash/Range2d.h
60	include/gnash/Rectangle_as.h	63	include/gnash/Rectangle_as.h
		64	include/gnash/Renderer.h
		65	include/gnash/SWFCtype.h
61	include/gnash/SharedMem.h	66	include/gnash/SharedMem.h
62	include/gnash/SimpleBuffer.h	67	include/gnash/SimpleBuffer.h
63	include/gnash/Socket.h	68	include/gnash/Socket.h
		69	include/gnash/Stats.h
		70	include/gnash/StreamProvider.h
64	include/gnash/StringPredicates.h	71	include/gnash/StringPredicates.h
65	include/gnash/Transform_as.h	72	include/gnash/Transform_as.h
66	include/gnash/URL.h	73	include/gnash/URL.h
		74	include/gnash/URLAccessManager.h
67	include/gnash/WallClockTimer.h	75	include/gnash/WallClockTimer.h
		76	include/gnash/accumulator.h
68	include/gnash/arg_parser.h	77	include/gnash/arg_parser.h
69	include/gnash/asobj/AMFConverter.h	78	include/gnash/asobj/AMFConverter.h
		79	include/gnash/asobj/ASConversions.h
70	include/gnash/asobj/Accessibility_as.h	80	include/gnash/asobj/Accessibility_as.h
71	include/gnash/asobj/Array_as.h	81	include/gnash/asobj/Array_as.h
72	include/gnash/asobj/AsBroadcaster.h	82	include/gnash/asobj/AsBroadcaster.h
Lines 77-94 Link Here
77	include/gnash/asobj/ContextMenuItem_as.h	87	include/gnash/asobj/ContextMenuItem_as.h
78	include/gnash/asobj/ContextMenu_as.h	88	include/gnash/asobj/ContextMenu_as.h
79	include/gnash/asobj/ControlTag.h	89	include/gnash/asobj/ControlTag.h
80	include/gnash/asobj/CustomActions.h
81	include/gnash/asobj/Date_as.h	90	include/gnash/asobj/Date_as.h
82	include/gnash/asobj/DefinitionTag.h	91	include/gnash/asobj/DefinitionTag.h
83	include/gnash/asobj/DisplayList.h	92	include/gnash/asobj/DisplayList.h
84	include/gnash/asobj/DisplayObject.h	93	include/gnash/asobj/DisplayObject.h
85	include/gnash/asobj/DisplayObjectContainer.h	94	include/gnash/asobj/DisplayObjectContainer.h
		95	include/gnash/asobj/DragState.h
86	include/gnash/asobj/DynamicShape.h	96	include/gnash/asobj/DynamicShape.h
87	include/gnash/asobj/Error_as.h	97	include/gnash/asobj/Error_as.h
88	include/gnash/asobj/FillStyle.h	98	include/gnash/asobj/FillStyle.h
		99	include/gnash/asobj/Function_as.h
89	include/gnash/asobj/Geometry.h	100	include/gnash/asobj/Geometry.h
90	include/gnash/asobj/Global_as.h	101	include/gnash/asobj/Global_as.h
91	include/gnash/asobj/Globals.h
92	include/gnash/asobj/GnashKey.h	102	include/gnash/asobj/GnashKey.h
93	include/gnash/asobj/InteractiveObject.h	103	include/gnash/asobj/InteractiveObject.h
94	include/gnash/asobj/Key_as.h	104	include/gnash/asobj/Key_as.h
Lines 119-124 Link Here
119	include/gnash/asobj/Relay.h	129	include/gnash/asobj/Relay.h
120	include/gnash/asobj/RunResources.h	130	include/gnash/asobj/RunResources.h
121	include/gnash/asobj/SWF.h	131	include/gnash/asobj/SWF.h
		132	include/gnash/asobj/SWFCxForm.h
122	include/gnash/asobj/SWFMatrix.h	133	include/gnash/asobj/SWFMatrix.h
123	include/gnash/asobj/SWFRect.h	134	include/gnash/asobj/SWFRect.h
124	include/gnash/asobj/Selection_as.h	135	include/gnash/asobj/Selection_as.h
Lines 126-132 Link Here
126	include/gnash/asobj/SharedObject_as.h	137	include/gnash/asobj/SharedObject_as.h
127	include/gnash/asobj/Sound_as.h	138	include/gnash/asobj/Sound_as.h
128	include/gnash/asobj/Stage_as.h	139	include/gnash/asobj/Stage_as.h
129	include/gnash/asobj/StreamProvider.h
130	include/gnash/asobj/String_as.h	140	include/gnash/asobj/String_as.h
131	include/gnash/asobj/System_as.h	141	include/gnash/asobj/System_as.h
132	include/gnash/asobj/TagLoadersTable.h	142	include/gnash/asobj/TagLoadersTable.h
Lines 143-152 Link Here
143	include/gnash/asobj/as_object.h	153	include/gnash/asobj/as_object.h
144	include/gnash/asobj/as_value.h	154	include/gnash/asobj/as_value.h
145	include/gnash/asobj/builtin_function.h	155	include/gnash/asobj/builtin_function.h
146	include/gnash/asobj/cxform.h
147	include/gnash/asobj/drag_state.h
148	include/gnash/asobj/event_id.h	156	include/gnash/asobj/event_id.h
149	include/gnash/asobj/gnash.h
150	include/gnash/asobj/movie_root.h	157	include/gnash/asobj/movie_root.h
151	include/gnash/asobj/namedStrings.h	158	include/gnash/asobj/namedStrings.h
152	include/gnash/display_pkg.h	159	include/gnash/display_pkg.h
Lines 162-168 Link Here
162	include/gnash/log.h	169	include/gnash/log.h
163	include/gnash/net_pkg.h	170	include/gnash/net_pkg.h
164	include/gnash/noseek_fd_adapter.h	171	include/gnash/noseek_fd_adapter.h
165	include/gnash/ogl.h
166	include/gnash/parser/movie_definition.h	172	include/gnash/parser/movie_definition.h
167	include/gnash/rc.h	173	include/gnash/rc.h
168	include/gnash/ref_counted.h	174	include/gnash/ref_counted.h
Lines 173-242 Link Here
173	include/gnash/text_pkg.h	179	include/gnash/text_pkg.h
174	include/gnash/tree.hh	180	include/gnash/tree.hh
175	include/gnash/tu_file.h	181	include/gnash/tu_file.h
176	include/gnash/tu_opengl_includes.h
177	include/gnash/utf8.h	182	include/gnash/utf8.h
178	include/gnash/utility.h	183	include/gnash/utility.h
179	include/gnash/vm/ASHandlers.h	184	include/gnash/vm/ASHandlers.h
180	include/gnash/vm/ActionExec.h	185	include/gnash/vm/ActionExec.h
181	include/gnash/vm/CallStack.h	186	include/gnash/vm/CallStack.h
182	include/gnash/vm/ExecutableCode.h	187	include/gnash/vm/ExecutableCode.h
183	include/gnash/vm/Machine.h
184	include/gnash/vm/SafeStack.h	188	include/gnash/vm/SafeStack.h
185	include/gnash/vm/VM.h	189	include/gnash/vm/VM.h
186	include/gnash/vm/fn_call.h	190	include/gnash/vm/fn_call.h
187	include/gnash/zlib_adapter.h	191	include/gnash/zlib_adapter.h
		192	%%KPARTS%%share/apps/klash/pluginsinfo
		193	%%KPARTS%%share/apps/klash/klashpartui.rc
		194	%%KPARTS%%share/services/klash_part.desktop
188	%%KPARTS%%lib/kde3/libklashpart.so	195	%%KPARTS%%lib/kde3/libklashpart.so
189	%%KPARTS%%lib/kde3/libklashpart.la
190	%%KPARTS4%%kde4/share/apps/klash/pluginsinfo	196	%%KPARTS4%%kde4/share/apps/klash/pluginsinfo
191	%%KPARTS4%%kde4/share/apps/klash/klashpartui.rc	197	%%KPARTS4%%kde4/share/apps/klash/klashpartui.rc
192	%%KPARTS4%%kde4/share/kde4/services/klash_part.desktop	198	%%KPARTS4%%kde4/share/kde4/services/klash_part.desktop
193	%%KPARTS4%%kde4/lib/kde4/libklashpart.so	199	%%KPARTS4%%kde4/lib/kde4/libklashpart.so
194	%%KPARTS4%%kde4/lib/kde4/libklashpart.la
195	%%CYGNAL%%@unexec if cmp -s %D/etc/cygnalrc.dist %D/etc/cygnalrc; then rm -f %D/etc/cygnalrc; fi
196	%%CYGNAL%%etc/cygnalrc.dist
197	%%CYGNAL%%@exec if [ ! -f %B/cygnalrc ]; then cp -p %D/%F %B/cygnalrc; fi
198	@unexec if cmp -s %D/etc/gnashpluginrc.dist %D/etc/gnashpluginrc; then rm -f %D/etc/gnashpluginrc; fi
199	etc/gnashpluginrc.dist
200	@exec if [ ! -f %B/gnashpluginrc ]; then cp -p %D/%F %B/gnashpluginrc; fi
201	@unexec if cmp -s %D/etc/gnashrc.dist %D/etc/gnashrc; then rm -f %D/etc/gnashrc; fi
202	etc/gnashrc.dist
203	@exec if [ ! -f %B/gnashrc ]; then cp -p %D/%F %B/gnashrc; fi
204	%%CYGNAL%%lib/cygnal/plugins/echo.so	200	%%CYGNAL%%lib/cygnal/plugins/echo.so
205	%%CYGNAL%%lib/cygnal/plugins/oflaDemo.so	201	%%CYGNAL%%lib/cygnal/plugins/oflaDemo.so
206	%%CYGNAL%%lib/gnash/libgnashamf-%%GNASHVER%%.so	202	%%CYGNAL%%lib/gnash/libgnashamf-%%GNASHVER%%.so
207	%%CYGNAL%%lib/gnash/libgnashamf.la
208	%%CYGNAL%%lib/gnash/libgnashamf.so	203	%%CYGNAL%%lib/gnash/libgnashamf.so
209	lib/gnash/libgnashbase-%%GNASHVER%%.so	204	lib/gnash/libgnashbase-%%GNASHVER%%.so
210	lib/gnash/libgnashbase.la
211	lib/gnash/libgnashbase.so	205	lib/gnash/libgnashbase.so
212	lib/gnash/libgnashcore-%%GNASHVER%%.so	206	lib/gnash/libgnashcore-%%GNASHVER%%.so
213	lib/gnash/libgnashcore.la
214	lib/gnash/libgnashcore.so	207	lib/gnash/libgnashcore.so
215	lib/gnash/libgnashmedia-%%GNASHVER%%.so	208	lib/gnash/libgnashmedia-%%GNASHVER%%.so
216	lib/gnash/libgnashmedia.la
217	lib/gnash/libgnashmedia.so	209	lib/gnash/libgnashmedia.so
218	%%CYGNAL%%lib/gnash/libgnashnet.la	210	%%CYGNAL%%lib/gnash/libgnashnet-%%GNASHVER%%.so
219	%%CYGNAL%%lib/gnash/libgnashnet.so	211	%%CYGNAL%%lib/gnash/libgnashnet.so
220	%%CYGNAL%%lib/gnash/libgnashnet.so.0	212	lib/gnash/libgnashrender-%%GNASHVER%%.so
221	lib/gnash/libgnashrender.la
222	lib/gnash/libgnashrender.so	213	lib/gnash/libgnashrender.so
223	lib/gnash/libgnashrender.so.0
224	lib/gnash/libgnashsound-%%GNASHVER%%.so	214	lib/gnash/libgnashsound-%%GNASHVER%%.so
225	lib/gnash/libgnashsound.la
226	lib/gnash/libgnashsound.so	215	lib/gnash/libgnashsound.so
227	%%VAAPI%%lib/gnash/libgnashvaapi-%%GNASHVER%%.so	216	%%VAAPI%%lib/gnash/libgnashvaapi-%%GNASHVER%%.so
228	%%VAAPI%%lib/gnash/libgnashvaapi.la	217	%%VAAPI%%lib/gnash/libgnashvaapi.la
229	%%VAAPI%%lib/gnash/libgnashvaapi.so	218	%%VAAPI%%lib/gnash/libgnashvaapi.so
230	@comment %%NPAPI%%lib/gnash/libmozsdk.la
231	@comment %%NPAPI%%lib/gnash/libmozsdk.so
232	@comment %%NPAPI%%lib/gnash/libmozsdk.so.0
233	libdata/pkgconfig/gnash.pc	219	libdata/pkgconfig/gnash.pc
234	%%DOCSDIR%%/gnashuser.html	220	%%GTK%%share/applications/gnash.desktop
235	%%DOCSDIR%%/images/car_crash.png	221	%%KDE4%%share/applications/klash.desktop
236	%%DOCSDIR%%/images/rtmp.png	222	%%DATADIR%%/doc/gnash/C/gnashref.html
237	%%DOCSDIR%%/gnashref.html	223	%%DATADIR%%/doc/gnash/C/gnashuser.html
		224	%%DATADIR%%/doc/gnash/C/images/rtmp.png
238	%%DATADIR%%/GnashG.png	225	%%DATADIR%%/GnashG.png
		226	%%DATADIR%%/gnash-splash.swf
239	%%DATADIR%%/gnash_128_96.ico	227	%%DATADIR%%/gnash_128_96.ico
		228	%%GTK%%share/icons/hicolor/32x32/apps/gnash.xpm
		229	%%KDE4%%share/icons/hicolor/32x32/apps/klash.xpm
240	share/locale/cs/LC_MESSAGES/gnash.mo	230	share/locale/cs/LC_MESSAGES/gnash.mo
241	share/locale/de/LC_MESSAGES/gnash.mo	231	share/locale/de/LC_MESSAGES/gnash.mo
242	share/locale/es/LC_MESSAGES/gnash.mo	232	share/locale/es/LC_MESSAGES/gnash.mo
Lines 244-260 Link Here
244	share/locale/fr/LC_MESSAGES/gnash.mo	234	share/locale/fr/LC_MESSAGES/gnash.mo
245	share/locale/it/LC_MESSAGES/gnash.mo	235	share/locale/it/LC_MESSAGES/gnash.mo
246	share/locale/ja/LC_MESSAGES/gnash.mo	236	share/locale/ja/LC_MESSAGES/gnash.mo
		237	@dirrmtry share/icons/hicolor/32x32/apps
		238	@dirrmtry share/icons/hicolor/32x32
		239	@dirrmtry share/icons/hicolor
		240	@dirrmtry share/icons
		241	@dirrm %%DATADIR%%/doc/gnash/C/images
		242	@dirrm %%DATADIR%%/doc/gnash/C
		243	@dirrm %%DATADIR%%/doc/gnash
		244	@dirrm %%DATADIR%%/doc
247	@dirrm %%DATADIR%%	245	@dirrm %%DATADIR%%
248	@dirrm %%DOCSDIR%%/images	246	@dirrmtry share/applications
249	@dirrm %%DOCSDIR%%
250	@dirrm lib/gnash	247	@dirrm lib/gnash
251	%%CYGNAL%%@dirrm lib/cygnal/plugins	248	%%CYGNAL%%@dirrmtry lib/cygnal/plugins
252	%%CYGNAL%%@dirrm lib/cygnal	249	%%CYGNAL%%@dirrmtry lib/cygnal
253	@dirrm include/gnash/vm	250	@dirrm include/gnash/vm
254	@dirrm include/gnash/parser	251	@dirrm include/gnash/parser
255	@dirrm include/gnash/asobj	252	@dirrm include/gnash/asobj
256	@dirrm include/gnash	253	@dirrm include/gnash
257	@comment Should be //KPARTS//, but it is installed regardless of whether plugin is enabled
258	%%KPARTS%%@dirrm share/apps/klash	254	%%KPARTS%%@dirrm share/apps/klash
259	%%KPARTS4%%@dirrm kde4/share/apps/klash	255	%%KPARTS4%%@dirrm kde4/share/apps/klash
260	%%NPAPI%%@dirrmtry %%WEBPLUGINS_DIR%%	256	%%NPAPI%%@dirrmtry %%WEBPLUGINS_DIR%%