summaryrefslogtreecommitdiff
path: root/multimedia/gnash
diff options
context:
space:
mode:
authorobache <obache>2010-10-29 14:15:02 +0000
committerobache <obache>2010-10-29 14:15:02 +0000
commit383c897f9aea225ed49c9768e4f8a849f84f4ca0 (patch)
tree7fe1c491c24911d6957663d5da515e7b17668e2c /multimedia/gnash
parent4c537c569ed10414b61ea77eab266d30ad41afa6 (diff)
downloadpkgsrc-383c897f9aea225ed49c9768e4f8a849f84f4ca0.tar.gz
Update gnash to 0.8.8.
Gnash 0.8.8 2010/08/17 * Renderers are able to be switched at runtime between Cairo, OpenGL, and AGG. * Media handlers can be switched at runtime between ffmpeg and Gstreamer. * Hardware video decoding support via VAAPI for Nvidia, ATI, and Intel GPUs. * Android specific support. * Gnash now compiles faster due to reduce internal dependencies. * Mostly complete Scriptable Plugin support which works with the ExternalInterface class. * Improved input device handling when using a raw framebuffer. * 100% of all YouTube videos should work Improvements since 0.8.7 release are: Gnash 0.8.7 2010/02/15 Improvements since 0.8.6 release are: * Automatic and spontaneous screenshots support in all GUIs (Benjamin Wolsey) * Significant memory savings in parsing large XML trees (Benjamin Wolsey) * Significant memory savings in functions calls when super is not required (Benjamin Wolsey) * Enhancements in video streaming [youtube HD button and seeks] (Sandro Santilli) * Non blocking load of bitmaps, movies, data (Sandro Santilli) * Fix use of imported library symbols (Sandro Santilli) * AS2 Array handling fixed. (Benjamin Wolsey) * Refactoring to eliminate most static data and get closer to re-entrant VM. (Benjamin Wolsey) * SWF6 dynamic gradients tested and implemented correctly. (Benjamin Wolsey) * TextFormat.getTextExtent implemented. (Benjamin Wolsey) * TextField.autoSize implemented for right and center autosizing. (Benjamin Wolsey) Gnash 0.8.6 Improvements since 0.8.5 release are: * TextSnapshot, Camera, Microphone, TextField and TextFormat implemented. * ASSetNative, ASSetNativeAccessor, ASconstructor implemented. * New utilities for finding input devices for Camera and Microphone. * Fix bitmap smoothing handling in AGG renderer (Bug #25894). * Custom Gnash GTK widget. * Various improvements to text handling. * large-scale refactoring of object and class creation for improved AS compatibility. * extension of native classes now works in many cases. * PyGTK module support. * Native and built-in functions properly separated, more native functions added. * AmigaOS4 support (gui and sound handler). * Fixes to XMLSocket crash and event order. * Performance improvement for SDL gui (invalidated regions). * Corrected timing of various AS events, fixing various SWFs that rely on them. * Many minor bug fixes. * Better A/V synchronization. * Rudimentary AVM2 implementation when enabled. * Fix in sendAndLoad forcing use of POST. 2009-03-04 Rob Savoye <rob@welcomehome.org> Gnash 0.8.5 released ! Improvements since 0.8.4 release are: Due to better XML parsing compatibility and a minor fix to NetConnection, many more video sites work than in the last release. Support for new codecs keeps YouTube support up to date. XML parsing, Selection implementation, Sound and MovieClip fixes mean that many BBC Flash movies (not the BBC iPlayer) now work. Potlatch support is improved with better remoting compatibility and XML parsing. All of the Orisinal morning sunshine games now work due to support for Mixed SWF Versions runs. * Support for saving streamed (FLV, H264, MP3 etc) and loaded (JPEG, SWF, PNG, GIF) media to disk. * Basic GUI warning messages when media decoding fails (usually missing codecs). * Added support for FLV parsing and decoding of H.264 video and AAC audio. * Scaled video smoothing implemented in AS and in default renderer (AGG). YouTube video looks better when Gnash is running with high quality or better. * Support for _quality implemented with user-specified override. (Presently only affects video smoothing in the default renderer). * Made NPAPI plugin quiet, except on plugin-specific errors (to reduce .xsession-errors pollution). * Implemented LoadVars.toString(), XML.send() and LoadVars.send(). * XML parsing made compatible (less strict), XML.xmlDecl and XML.docTypeDecl implemented. * XMLNode methods implemented: getPrefixForNamespace(), getNamespaceForPrefix(), namespaceURI, localName, prefix. Handling of attributes corrected. * New GUI for KDE4 / Qt4 with SWF properties and Gnash preferences dialog boxes. * Corrected AS enumeration order. * Fixed incorrect mouse event on double click (shouldn't exist). * Implemented MovieClip.getURL(), MovieClip.attachBitmap(). * Implemented POST for send() and getURL() methods. * Added support for parsing and decoding Speex audio in FLV files using libspeex. * __resolve property implemented. Fixes a Flickr Flash badge. * Video.clear(), Video.width and Video.height implemented. * Multiple NetStream.play() fixed. * Fixed support of mixed-version swf runs. * Fix decoding of RAW and UNCOMPRESSED audio with gstreamer media handler * Improve SWF4 compatibility. * Improve compatibility in setting characters properties. * NetConnection.isConnected and NetConnection connect events implemented (fixes various video sites). * Remoting support generally improved (NetConnection). * Make initialization object available to MovieClip constructor (attachMovie, duplicateMovieClip). * Sound.getBytesLoaded, Sound.getBytesTotal implemented. * Complete Selection class implemented. -- 2008-10-13 Russ Nelson <nelson@crynwr.com> Sixth alpha release of Gnash (0.8.4). Improvements since 0.8.3 release are: More visible to users: * The -d switch won't behave the same as in 0.8.3. This is a temporary thing, we'll likely bring it back to its original behaviour for next releases. If you're curious, -d will now change heart beating rate. * Support for MIT SHM X extention is disabled by default `cause it broke (*grin*). We'll get it back on next release. Let us know if you really notice a performance degradation on the rendering side please <gnash-dev@gnu.org>. * Keep Adobe happy with our users and our users happy with us by changing "Flash player" into "SWF player" everywhere. Adobe claims "Flash" as a trademark and had asked a Linux distributor to fix it. * The popular SWF Twitter badge now renders correctly. * Fix parsing of urls containing multiple question marks * Fix support for movies embedding multiple sound streams * Support for loading PNG and GIF images added. * Improved rendering of SWF movies because of the less visible changes listed below. * Support for writing RGB/RGBA PNG images and JPEG images. * Works with Potlatch OpenStreetMap editor * New 'flvdumper' utility for analyzing FLV video files. * XPI packaging support for Mozilla & Firefox. Less visible to users: * Improved SWF version 8 support: o flash.geom.Point, flash.geom.Rect, flash.geom.Matrix classes implemented. o flash.geom.ColorTransform almost fully implemented. o flash.display.BitmapData partially implemented. o flash.geom.Transform.matrix and flash.geom.Transform.ColorTransform implemented. o MovieClip.transform implemented, with ability to find and apply MovieClip transformations. o Playback of VP6F video (SWF version 8 FLV) with Ffmpeg. * Fixes and implementation of ActionScript 2 classes: o NetConnection.call() implemented: initial support for flash Remoting o toString() method of objects called correctly, String.split implementation fixed. o XMLSocket onData method implemented properly, other methods fixed. o Error class implemented. o XML and LoadVars sendAndLoad() now derive from a common base object (loadable AS object); fixes the popular SWF Twitter badge. o addRequestHeaders and contentType implemented for LoadVars and XML. * VM bugfixes and improvements: o Heart beating model, allowing for fine-grained interval timers and threading reduction. o Frame label fix (case sensitivity). o Fixes and improvements to Color and cxform. o SWF matrix made faster and more compatible (golf.swf works now!) o try/catch/finally ActionScript expression handled more correctly. o Parse and partially use ScriptLimits tag. Handle stack limit more correctly. o Fixed scoping issues for SWF <= 5 o Bitmap characters now support alpha. * Media handling improvements: o Pluggable architecture for MediaHandlers (ffmpeg/gst available) o Media-handler agnostic Sound and NetStream classes o Numerous bug fixes in ffmpeg and gstreamer media handling * SWF version 2-specific fixes: o PlaceObject tag display fixed (also applies to SWFs generated with some free tools) o DefineButtonCxform tag implemented). * Codebase improvements: o Renamed the 'server' directory to be a more accurate 'libcore'. Merge 'libgeometry' into 'libbase' o Keep Adobe happy with our users and our users happy with us by changing "Flash player" into "SWF player" everywhere (a Linux distributor received a demand letter). o Numerous cleanups and changes to improve portability.
Diffstat (limited to 'multimedia/gnash')
-rw-r--r--multimedia/gnash/Makefile25
-rw-r--r--multimedia/gnash/PLIST220
-rw-r--r--multimedia/gnash/PLIST.gtk3
-rw-r--r--multimedia/gnash/PLIST.kde6
-rw-r--r--multimedia/gnash/distinfo16
-rw-r--r--multimedia/gnash/options.mk105
-rw-r--r--multimedia/gnash/patches/patch-aa64
-rw-r--r--multimedia/gnash/patches/patch-ab12
-rw-r--r--multimedia/gnash/patches/patch-ac24
-rw-r--r--multimedia/gnash/patches/patch-ae34
-rw-r--r--multimedia/gnash/patches/patch-ag15
-rw-r--r--multimedia/gnash/patches/patch-ah13
12 files changed, 350 insertions, 187 deletions
diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile
index 6943822e37f..5ff7ca6bced 100644
--- a/multimedia/gnash/Makefile
+++ b/multimedia/gnash/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.27 2010/09/14 11:02:29 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/10/29 14:15:02 obache Exp $
#
DISTNAME= gnash-${VER}
-VER= 0.8.3
-PKGREVISION= 11
+VER= 0.8.8
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GNU:=gnash/${VER}/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= matias@dotbsd.org
HOMEPAGE= http://www.gnashdev.org/
-COMMENT= GPL Flash movie player
+COMMENT= GPL SWF player
+LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
@@ -19,8 +19,7 @@ USE_LANGUAGES= c c++
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_TOOLS+= bash gmake msgfmt pkg-config
-# for appending below
-INSTALL_TARGET= install
+INSTALL_TARGET= install install-plugin
# /bin/sh finds a syntax error without line number
CONFIG_SHELL= ${TOOLS_BASH}
@@ -33,21 +32,21 @@ CONF_FILES+= ${EGDIR}/gnashrc ${PKG_SYSCONFDIR}/gnashrc
.include "options.mk"
-PLIST_SRC+= ${PKGDIR}/PLIST
+#ld: .libs/libgnashplugin_la-plugin.o(.text+0x5564): unresolvable relocation
+# against symbol `_ZNKSs5c_strEv'
+BUILDLINK_TRANSFORM+= rm:-fvisibility-inlines-hidden
-.include "../../devel/atk/buildlink3.mk"
+.include "../../audio/speex/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gnash/PLIST b/multimedia/gnash/PLIST
index 284a7cc09db..3b439c5bc82 100644
--- a/multimedia/gnash/PLIST
+++ b/multimedia/gnash/PLIST
@@ -1,18 +1,199 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 20:53:25 joerg Exp $
-bin/dumpshm
+@comment $NetBSD: PLIST,v 1.8 2010/10/29 14:15:02 obache Exp $
+${PLIST.gstreamer}bin/findmicrophones
+${PLIST.gstreamer}bin/findwebcams
bin/gnash
bin/gprocessor
-bin/soldumper
-lib/gnash/libgnashamf.la
+${PLIST.gtk}bin/gtk-gnash
+${PLIST.kde3}bin/kde3-gnash
+${PLIST.kde4}bin/kde4-gnash
+bin/rtmpget
+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/CachedBitmap.h
+include/gnash/ClockTime.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/GnashException.h
+include/gnash/GnashFactory.h
+include/gnash/GnashFileUtilities.h
+include/gnash/GnashImage.h
+include/gnash/GnashImageJpeg.h
+include/gnash/GnashNumeric.h
+include/gnash/GnashSleep.h
+include/gnash/GnashSystemFDHeaders.h
+include/gnash/GnashSystemIOHeaders.h
+include/gnash/GnashSystemNetHeaders.h
+include/gnash/GradientBevelFilter_as.h
+include/gnash/GradientGlowFilter_as.h
+include/gnash/IOChannel.h
+include/gnash/Matrix_as.h
+include/gnash/NamingPolicy.h
+include/gnash/NetworkAdapter.h
+include/gnash/Point2d.h
+include/gnash/Point_as.h
+include/gnash/RTMP.h
+include/gnash/Range2d.h
+include/gnash/Rectangle_as.h
+include/gnash/SharedMem.h
+include/gnash/SimpleBuffer.h
+include/gnash/Socket.h
+include/gnash/StringPredicates.h
+include/gnash/Transform_as.h
+include/gnash/URL.h
+include/gnash/WallClockTimer.h
+include/gnash/arg_parser.h
+include/gnash/asobj/AMFConverter.h
+include/gnash/asobj/Accessibility_as.h
+include/gnash/asobj/Array_as.h
+include/gnash/asobj/AsBroadcaster.h
+include/gnash/asobj/Boolean_as.h
+include/gnash/asobj/Camera_as.h
+include/gnash/asobj/CharacterProxy.h
+include/gnash/asobj/Color_as.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/DynamicShape.h
+include/gnash/asobj/Error_as.h
+include/gnash/asobj/FillStyle.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/LineStyle.h
+include/gnash/asobj/LoadVars_as.h
+include/gnash/asobj/LoadableObject.h
+include/gnash/asobj/LocalConnection_as.h
+include/gnash/asobj/Math_as.h
+include/gnash/asobj/Microphone_as.h
+include/gnash/asobj/MouseButtonState.h
+include/gnash/asobj/Mouse_as.h
+include/gnash/asobj/Movie.h
+include/gnash/asobj/MovieClip.h
+include/gnash/asobj/MovieClipLoader.h
+include/gnash/asobj/MovieClip_as.h
+include/gnash/asobj/MovieFactory.h
+include/gnash/asobj/NativeFunction.h
+include/gnash/asobj/NetConnection_as.h
+include/gnash/asobj/NetStream_as.h
+include/gnash/asobj/Number_as.h
+include/gnash/asobj/Object.h
+include/gnash/asobj/ObjectURI.h
+include/gnash/asobj/PlayHead.h
+include/gnash/asobj/PropFlags.h
+include/gnash/asobj/Property.h
+include/gnash/asobj/PropertyList.h
+include/gnash/asobj/RGBA.h
+include/gnash/asobj/Relay.h
+include/gnash/asobj/RunResources.h
+include/gnash/asobj/SWF.h
+include/gnash/asobj/SWFMatrix.h
+include/gnash/asobj/SWFRect.h
+include/gnash/asobj/Selection_as.h
+include/gnash/asobj/ShapeRecord.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/TextField_as.h
+include/gnash/asobj/TextFormat_as.h
+include/gnash/asobj/TextSnapshot_as.h
+include/gnash/asobj/UserFunction.h
+include/gnash/asobj/Video.h
+include/gnash/asobj/XMLNode_as.h
+include/gnash/asobj/XMLSocket_as.h
+include/gnash/asobj/XML_as.h
+include/gnash/asobj/as_environment.h
+include/gnash/asobj/as_function.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/dsodefs.h
+include/gnash/extension.h
+include/gnash/external_pkg.h
+include/gnash/filters_pkg.h
+include/gnash/geom_pkg.h
+include/gnash/getclocktime.hpp
+include/gnash/gettext.h
+include/gnash/gmemory.h
+include/gnash/jemtree.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/sharedlib.h
+include/gnash/smart_ptr.h
+include/gnash/snappingrange.h
+include/gnash/string_table.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
lib/gnash/libgnashbase.la
+lib/gnash/libgnashcore.la
lib/gnash/libgnashmedia.la
-lib/gnash/libgnashnet.la
-lib/gnash/libgnashserver.la
-lib/gnash/libmozsdk.la
+lib/gnash/libgnashrender.la
+lib/gnash/libgnashsound.la
+${PLIST.kde3}lib/kde3/libklashpart.la
+${PLIST.kde4}lib/kde4/libklashpart.la
+${PLIST.plugin}lib/netscape/plugins/libgnashplugin.so
+lib/pkgconfig/gnash.pc
man/man1/cygnal.1
-man/man1/dumpshm.1
+man/man1/findmicrophones.1
+man/man1/findwebcams.1
+man/man1/flvdumper.1
man/man1/gnash.1
man/man1/gprocessor.1
+man/man1/gtk-gnash.1
+man/man1/kde4-gnash.1
+man/man1/rtmpget.1
man/man1/soldumper.1
share/doc/gnash/gnashref.html
share/doc/gnash/gnashuser.html
@@ -20,13 +201,16 @@ share/doc/gnash/images/car_crash.png
share/doc/gnash/images/rtmp.png
share/examples/gnash/gnashpluginrc
share/examples/gnash/gnashrc
-share/${KDE}gnash/GnashG.png
-share/${KDE}gnash/gnash_128_96.ico
-share/${KDE}locale/cs/LC_MESSAGES/gnash.mo
-share/${KDE}locale/de/LC_MESSAGES/gnash.mo
-share/${KDE}locale/es/LC_MESSAGES/gnash.mo
-share/${KDE}locale/fi/LC_MESSAGES/gnash.mo
-share/${KDE}locale/fr/LC_MESSAGES/gnash.mo
-share/${KDE}locale/it/LC_MESSAGES/gnash.mo
-share/${KDE}locale/ja/LC_MESSAGES/gnash.mo
-share/${KDE}locale/sv/LC_MESSAGES/gnash.mo
+share/gnash/GnashG.png
+share/gnash/gnash_128_96.ico
+${PLIST.kde}share/kde/apps/klash/klashpartui.rc
+${PLIST.kde}share/kde/apps/klash/pluginsinfo
+${PLIST.kde3}share/kde/services/klash_part.desktop
+${PLIST.kde4}share/kde4/services/klash_part.desktop
+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/ja/LC_MESSAGES/gnash.mo
diff --git a/multimedia/gnash/PLIST.gtk b/multimedia/gnash/PLIST.gtk
deleted file mode 100644
index 462143c6842..00000000000
--- a/multimedia/gnash/PLIST.gtk
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.gtk,v 1.2 2009/09/22 13:23:57 tnn Exp $
-bin/gtk-gnash
-lib/netscape/plugins/libgnashplugin.so
diff --git a/multimedia/gnash/PLIST.kde b/multimedia/gnash/PLIST.kde
deleted file mode 100644
index f8c2c1bbb5b..00000000000
--- a/multimedia/gnash/PLIST.kde
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST.kde,v 1.3 2009/06/14 18:08:04 joerg Exp $
-bin/kde-gnash
-lib/kde3/libklashpart.la
-share/kde/apps/klash/klashpartui.rc
-share/kde/apps/klash/pluginsinfo
-share/kde/services/klash_part.desktop
diff --git a/multimedia/gnash/distinfo b/multimedia/gnash/distinfo
index ff3f84ee104..66802fb2cdb 100644
--- a/multimedia/gnash/distinfo
+++ b/multimedia/gnash/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.14 2009/09/22 13:23:57 tnn Exp $
+$NetBSD: distinfo,v 1.15 2010/10/29 14:15:02 obache Exp $
-SHA1 (gnash-0.8.3.tar.bz2) = 3cd4a0930e772a42b0155295fca292fd94be7c42
-RMD160 (gnash-0.8.3.tar.bz2) = f7bf4d06d35c3ad40df4419b179fc6482731854b
-Size (gnash-0.8.3.tar.bz2) = 2902610 bytes
-SHA1 (patch-aa) = 05460170941019168fa072c803ad60eac919e44a
-SHA1 (patch-ab) = b86c152618ed4258bede5d95f71446db3af8ad0f
-SHA1 (patch-ac) = 6454620529a281c707f7ccf68eb17c0754dfe7a7
-SHA1 (patch-ae) = d4f18032bc091e5ef84fcb81f16ea649c5c20701
-SHA1 (patch-ag) = f4f82df7bff71464cdb3a76b91c4b2475a8e9eef
+SHA1 (gnash-0.8.8.tar.bz2) = d349e0321e7fe9abcd265d63ce282cd2a7ce59d3
+RMD160 (gnash-0.8.8.tar.bz2) = 621afbd14180ce770f60a6e158f9fda0b4d5ec02
+Size (gnash-0.8.8.tar.bz2) = 3850383 bytes
+SHA1 (patch-aa) = cd37f3200dd35d499deaae66e9f05d1a8ebfdc4c
+SHA1 (patch-ae) = a5a59452cf6e1aaa079963a628f994e66bcd1288
+SHA1 (patch-ah) = 3da0110d6e2840a4b772a0d2795d2d7f5512c502
diff --git a/multimedia/gnash/options.mk b/multimedia/gnash/options.mk
index dbe0fde6808..3b98aa8fbe4 100644
--- a/multimedia/gnash/options.mk
+++ b/multimedia/gnash/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2009/09/22 13:23:57 tnn Exp $
+# $NetBSD: options.mk,v 1.12 2010/10/29 14:15:02 obache Exp $
#
#
@@ -6,48 +6,62 @@
#
PKG_OPTIONS_VAR= PKG_OPTIONS.gnash
-# XXX: add support for SDL or FLTK GUIs?
-PKG_SUPPORTED_OPTIONS= gtk kde mitshm
PKG_OPTIONS_OPTIONAL_GROUPS= gnash-media
PKG_OPTIONS_GROUP.gnash-media= ffmpeg gstreamer
-PKG_OPTIONS_REQUIRED_GROUPS= gnash-renderer
+PKG_OPTIONS_REQUIRED_GROUPS= gnash-gui gnash-renderer
+# XXX: add support for SDL or FLTK GUIs?
+PKG_OPTIONS_GROUP.gnash-gui= gtk kde kde3
PKG_OPTIONS_GROUP.gnash-renderer= agg cairo opengl
-PKG_SUGGESTED_OPTIONS+= agg gstreamer gtk mitshm
+PKG_SUGGESTED_OPTIONS+= agg gstreamer gtk
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= gtk kde kde3 kde4 plugin gstreamer
+
###
### Select GUIs.
###
.if !empty(PKG_OPTIONS:Mgtk)
GNASH_GUIS+= gtk
-PLIST_SRC+= ${PKGDIR}/PLIST.gtk
-CONFIGURE_ARGS+= --with-npapi-plugindir=${PREFIX}/lib/netscape/plugins
-INSTALL_TARGET+= install-plugin
+PLIST.gtk= yes
.include "../../x11/gtk2/buildlink3.mk"
.endif
+.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mkde)
+#.include "../../devel/nspr/buildlink3.mk"
+CONFIGURE_ARGS+= --with-npapi-plugins-install=system
+CONFIGURE_ARGS+= --with-npapi-plugindir=${PREFIX}/lib/netscape/plugins
+PLIST.plugin= yes
+.endif
+
.if !empty(PKG_OPTIONS:Mkde)
-GNASH_GUIS+= kde
-PLIST_SRC+= ${PKGDIR}/PLIST.kde
-PLIST_SUBST+= KDE="kde/"
-CONFIGURE_ARGS+= --with-kde-pluginprefix=${PREFIX}
-# XXX: next three are ignored by configure script
-CONFIGURE_ARGS+= --with-kde-appsdatadir=${PREFIX}/share/kde/apps
-CONFIGURE_ARGS+= --with-kde-configdir=${PREFIX}/share/kde/config
-CONFIGURE_ARGS+= --with-kde-servicesdir=${PREFIX}/share/kde/services
-SUBST_CLASSES+= kde
-SUBST_FILES.kde= configure
-SUBST_STAGE.kde= pre-configure
-SUBST_SED.kde= -e "s,KDE_PLUGINPREFIX./share,KDE_PLUGINPREFIX\'/share/kde,"
-SUBST_MESSAGE.kde= Fix installation paths for KDE.
+GNASH_GUIS+= kde4
+PLIST.kde= yes
+PLIST.kde4= yes
+CONFIGURE_ARGS+= --with-plugins-install=system
+# broken, not wroked as expected.
+#CONFIGURE_ARGS+= --with-kde4-plugindir=${PREFIX}/lib/kde4
+#CONFIGURE_ARGS+= --with-kde-appsdatadir=${PREFIX}/share/kde/apps
+#CONFIGURE_ARGS+= --with-kde4-configdir=${PREFIX}/share/kde4/config
+#CONFIGURE_ARGS+= --with-kde4-servicesdir=${PREFIX}/share/kde4/services
+.include "../../x11/kdebase4/buildlink3.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
+.include "../../meta-pkgs/kde4/kde4.mk"
+
+.elif !empty(PKG_OPTIONS:Mkde3)
+GNASH_GUIS+= kde3
+PLIST.kde= yes
+PLIST.kde3= yes
+CONFIGURE_ARGS+= --with-plugins-install=system
+# broken, not wroked as expected.
+#CONFIGURE_ARGS+= --with-kde3-plugindir=${PREFIX}/lib/kde3
+#CONFIGURE_ARGS+= --with-kde-appsdatadir=${PREFIX}/share/kde/apps
+#CONFIGURE_ARGS+= --with-kde3-configdir=${PREFIX}/share/kde/config
+#CONFIGURE_ARGS+= --with-kde3-servicesdir=${PREFIX}/share/kde/services
.include "../../x11/kdebase3/buildlink3.mk"
.include "../../meta-pkgs/kde3/kde3.mk"
-
-post-install:
- cd ${WRKSRC}/plugin/klash && ${MAKE} install-plugin
-.else
-PLIST_SUBST+= KDE=""
+# overwrite, or not kde ralated files also will be installed in share/kde.
+CONFIGURE_ARGS+= --datadir=${PREFIX}/share
.endif
CONFIGURE_ARGS+= --enable-gui=${GNASH_GUIS:tW:S/ /,/}
@@ -56,54 +70,49 @@ CONFIGURE_ARGS+= --enable-gui=${GNASH_GUIS:tW:S/ /,/}
### Select renderers.
###
.if !empty(PKG_OPTIONS:Magg)
-GNASH_RENDER= agg
-CONFIGURE_ARGS+= --enable-agg
+GNASH_RENDER+= agg
.include "../../graphics/agg/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mcairo)
-GNASH_RENDER= cairo
-CONFIGURE_ARGS+= --enable-cairo
+GNASH_RENDER+= cairo
.include "../../graphics/cairo/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mopengl)
-GNASH_RENDER= ogl
+GNASH_RENDER+= ogl
.include "../../x11/glproto/buildlink3.mk"
-.if !empty(PKG_OPTIONS:Mgtk)
+. if !empty(PKG_OPTIONS:Mgtk)
.include "../../graphics/gtkglext/buildlink3.mk"
-.endif
+. endif
.endif
-CONFIGURE_ARGS+= --enable-renderer=${GNASH_RENDER}
+CONFIGURE_ARGS+= --enable-renderer=${GNASH_RENDER:tW:S/ /,/}
###
### Select a media handler
###
.if !empty(PKG_OPTIONS:Mffmpeg)
-CONFIGURE_ARGS+= --enable-media=ffmpeg
+GNASH_MEDIA+= ffmpeg
.include "../../audio/SDL_mixer/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
.include "../../multimedia/ffmpeg/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mgstreamer)
-CONFIGURE_ARGS+= --enable-media=gst --enable-gstreamer
+GNASH_MEDIA+= gst
+PLIST.gstreamer= yes
.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-# see http://bjacques.org/gst-plugins
-DEPENDS+= gst-plugins0.10-base-[0-9]*:../../multimedia/gst-plugins0.10-base
-DEPENDS+= gst-plugins0.10-oss-[0-9]*:../../audio/gst-plugins0.10-oss
-DEPENDS+= gst-fluendo-mp3-0.10.[0-9]*:../../audio/gst-plugins0.10-fluendo-mp3
+.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
DEPENDS+= gst-ffmpeg-0.10.[0-9]*:../../multimedia/gst-plugins0.10-ffmpeg
-DEPENDS+= gst-plugins0.10-gnomevfs-[0-9]*:../../sysutils/gst-plugins0.10-gnomevfs
-DEPENDS+= gst-plugins0.10-x11-[0-9]*:../../x11/gst-plugins0.10-x11
.endif
-###
-### MIT-SHM Support.
-###
-.if !empty(PKG_OPTIONS:Mmitshm)
-CONFIGURE_ARGS+= --enable-mit-shm
+CONFIGURE_ARGS+= --enable-media=${GNASH_MEDIA:Unone:tW:S/ /,/}
+
+.if !empty(PKG_OPTIONS:Mffmpeg)
+.include "../../multimedia/ffmpeg/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-hwaccel=VAAPI
.else
-CONFIGURE_ARGS+= --disable-mit-shm
+.include "../../x11/libXv/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-hwaccel=xvideo
.endif
diff --git a/multimedia/gnash/patches/patch-aa b/multimedia/gnash/patches/patch-aa
index 3af12e82b78..85fb4060f8e 100644
--- a/multimedia/gnash/patches/patch-aa
+++ b/multimedia/gnash/patches/patch-aa
@@ -1,31 +1,41 @@
-$NetBSD: patch-aa,v 1.10 2008/06/22 15:20:56 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2010/10/29 14:15:03 obache Exp $
---- configure.orig 2008-06-19 10:48:05.000000000 +0000
+--- configure.orig 2010-08-21 17:30:15.000000000 +0000
+++ configure
-@@ -53135,7 +53135,7 @@ echo "${ECHO_T}no" >&6; }
- fi
+@@ -39826,7 +39826,7 @@ else
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /usr/lib/qt-3.3/bin ${QTDIR}/bin${pathlist}
++for as_dir in /usr/lib/qt-3.3/bin ${QTDIR}/bin ${pathlist}
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+@@ -40128,9 +40128,9 @@ fi
+ fi
-
-- if test x"$FOP" == x; then
-+ if test x"$FOP" = x; then
- # Extract the first word of "fop", so it can be a program name with args.
- set dummy fop; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -58445,7 +58445,7 @@ fi
- echo " This version of ffmpeg may not work!" >&3
- echo " Version 51.27.0 or newer is highly recommended." >&3
- else
-- if test x"${avformat_h}" == x; then
-+ if test x"${avformat_h}" = x; then
- echo " ERROR: FFMPEG's libavcodec header is installed but not libavformat." >&3
- echo " You can install FFMPEG from http://ffmpeg.mplayerhq.hu" >&3
- echo " or .deb users: apt-get install libavformat-dev" >&3
-@@ -58791,7 +58791,7 @@ if test x$ext_mysql = xyes; then
+ KDE3_PLUGINDIR="${KDE3_PREFIX}/lib/kde3"
+- KDE3_SERVICESDIR="${KDE3_PREFIX}/share/services"
+- KDE3_CONFIGDIR="${KDE3_PREFIX}/share/config"
+- KDE3_APPSDATADIR="${KDE3_PREFIX}/share/apps/klash"
++ KDE3_SERVICESDIR="${KDE3_PREFIX}/share/kde/services"
++ KDE3_CONFIGDIR="${KDE3_PREFIX}/share/kde/config"
++ KDE3_APPSDATADIR="${KDE3_PREFIX}/share/kde/apps/klash"
fi
- fi
-
--if test "$GMSGFMT" == ":"; then
-+if test "$GMSGFMT" = ":"; then
- echo " WARNING: You need the gettext package installed to use translations." >&4
- echo " Required for building a package or 'make distcheck'" >&4
- echo " Install it from http://www.gnu.org/software/gettext/" >&4
+ if test x"${ac_cv_path_kde3_incl}" != x ; then
+ if test x"${ac_cv_path_kde3_incl}" != x"-I/usr/include"; then
+@@ -40688,12 +40688,12 @@ fi
+ if test x"${KDE4_CONFIGDIR}" != x ; then
+ KDE4_CONFIGDIR="${KDE4_CONFIGDIR}}/share/kde4/config"
+ else
+- KDE4_CONFIGDIR="${KDE4_PREFIX}}/share/kde4/config"
++ KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config"
+ fi
+ if test x"${KDE4_APPSDATADIR}" != x ; then
+ KDE4_APPSDATADIR="${KDE4_APPSDATADIR}/share/kde4/apps/klash"
+ else
+- KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash"
++ KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde/apps/klash"
+ fi
+ fi
+ if test x"${ac_cv_path_kde4_incl}" != x ; then
diff --git a/multimedia/gnash/patches/patch-ab b/multimedia/gnash/patches/patch-ab
deleted file mode 100644
index b73e802ca66..00000000000
--- a/multimedia/gnash/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2009/09/22 13:23:57 tnn Exp $
-
---- libbase/utility.h.orig 2008-06-06 22:07:55.000000000 +0200
-+++ libbase/utility.h
-@@ -29,6 +29,7 @@
- #include <typeinfo>
- #include <cmath>
- #include <boost/cstdint.hpp>
-+#include <stdlib.h>
-
- #if defined(__GNUC__) && __GNUC__ > 2
- # include <cxxabi.h>
diff --git a/multimedia/gnash/patches/patch-ac b/multimedia/gnash/patches/patch-ac
deleted file mode 100644
index ae668739cd7..00000000000
--- a/multimedia/gnash/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/07/07 08:34:55 abs Exp $
-
---- server/as_value.h.orig 2008-05-05 22:02:01.000000000 +0100
-+++ server/as_value.h
-@@ -65,6 +65,9 @@ class asName;
- // The following template works just like its C counterpart, with added
- // type safety (i.e., they will only compile for floating point arguments).
-
-+#ifdef isnan
-+# undef isnan
-+#endif /* isnan */
- template <typename T>
- inline bool
- isnan(const T& num, typename boost::enable_if<boost::is_floating_point<T> >::type* dummy = 0)
-@@ -73,6 +76,9 @@ isnan(const T& num, typename boost::enab
- return num != num;
- }
-
-+#ifdef isinf
-+# undef isinf
-+#endif /* isinf */
- #define isinf(x) (isnan(x - x))
-
- /// Use this methods to obtain a properly-formatted property name
diff --git a/multimedia/gnash/patches/patch-ae b/multimedia/gnash/patches/patch-ae
index af51536bff0..ea31dd66506 100644
--- a/multimedia/gnash/patches/patch-ae
+++ b/multimedia/gnash/patches/patch-ae
@@ -1,14 +1,24 @@
-$NetBSD: patch-ae,v 1.1 2008/04/27 06:44:52 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2010/10/29 14:15:03 obache Exp $
---- gui/Makefile.in.orig 2008-04-25 17:05:02.000000000 +0200
+--- gui/Makefile.in.orig 2010-08-21 18:04:41.000000000 +0000
+++ gui/Makefile.in
-@@ -1164,8 +1164,8 @@ GUI_SRCS = gnash.cpp \
- @BUILD_QTOPIA_GUI_TRUE@ $(GNASH_LIBS) $(AM_LDFLAGS) \
- @BUILD_QTOPIA_GUI_TRUE@ $(am__append_14) $(am__append_17)
- @BUILD_KDE_GUI_TRUE@kde_gnash_CPPFLAGS = -DGUI_KDE \
--@BUILD_KDE_GUI_TRUE@ -DGUI_CONFIG=\"KDE\" $(AM_CPPFLAGS) \
- @BUILD_KDE_GUI_TRUE@ $(KDE_CFLAGS) $(QT_CFLAGS) \
-+@BUILD_KDE_GUI_TRUE@ -DGUI_CONFIG=\"KDE\" $(AM_CPPFLAGS) \
- @BUILD_KDE_GUI_TRUE@ $(am__append_22) $(am__append_25)
- @BUILD_KDE_GUI_TRUE@kde_gnash_SOURCES = $(GUI_SRCS) gui_kde.cpp \
- @BUILD_KDE_GUI_TRUE@ $(am__append_24) $(am__append_27)
+@@ -1815,8 +1815,8 @@ GUI_SRCS = gnash.cpp \
+ @BUILD_QTOPIA3_GUI_TRUE@ $(GNASH_LIBS) $(AM_LDFLAGS) \
+ @BUILD_QTOPIA3_GUI_TRUE@ $(am__append_19) $(am__append_22)
+ @BUILD_KDE3_GUI_TRUE@kde3_gnash_CPPFLAGS = -DGUI_KDE3 \
+-@BUILD_KDE3_GUI_TRUE@ -DGUI_CONFIG=\"KDE3\" $(AM_CPPFLAGS) \
+ @BUILD_KDE3_GUI_TRUE@ $(KDE3_CFLAGS) $(QT3_CFLAGS) \
++@BUILD_KDE3_GUI_TRUE@ -DGUI_CONFIG=\"KDE3\" $(AM_CPPFLAGS) \
+ @BUILD_KDE3_GUI_TRUE@ $(am__append_26) $(am__append_29)
+ @BUILD_KDE3_GUI_TRUE@kde3_gnash_SOURCES = $(GUI_SRCS) kde/gui_kde.cpp \
+ @BUILD_KDE3_GUI_TRUE@ $(am__append_28) $(am__append_31)
+@@ -1831,8 +1831,8 @@ GUI_SRCS = gnash.cpp \
+ @BUILD_KDE4_GUI_TRUE@ $(am__append_36) $(am__append_39) \
+ @BUILD_KDE4_GUI_TRUE@ $(am__append_42)
+ @BUILD_KDE4_GUI_TRUE@kde4_gnash_CPPFLAGS = -DGUI_KDE4 \
+-@BUILD_KDE4_GUI_TRUE@ -DGUI_CONFIG=\"KDE4\" $(AM_CPPFLAGS) \
+ @BUILD_KDE4_GUI_TRUE@ $(KDE4_CFLAGS) $(QT4_CFLAGS) \
++@BUILD_KDE4_GUI_TRUE@ -DGUI_CONFIG=\"KDE4\" $(AM_CPPFLAGS) \
+ @BUILD_KDE4_GUI_TRUE@ $(am__append_34) $(am__append_37) \
+ @BUILD_KDE4_GUI_TRUE@ $(am__append_40)
+ @BUILD_KDE4_GUI_TRUE@kde4_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
diff --git a/multimedia/gnash/patches/patch-ag b/multimedia/gnash/patches/patch-ag
deleted file mode 100644
index a7a3d42f601..00000000000
--- a/multimedia/gnash/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2008/04/27 06:44:52 wiz Exp $
-
---- gui/am-frag/kde.am.orig 2008-01-21 22:19:22.000000000 +0100
-+++ gui/am-frag/kde.am
-@@ -23,8 +23,8 @@ bin_PROGRAMS += kde-gnash
- if HAVE_QT_4
- QT_CFLAGS += -DQT3_SUPPORT
- endif
--kde_gnash_CPPFLAGS = -DGUI_KDE -DGUI_CONFIG=\"KDE\" \
-- $(AM_CPPFLAGS) $(KDE_CFLAGS) $(QT_CFLAGS)
-+kde_gnash_CPPFLAGS = $(KDE_CFLAGS) $(QT_CFLAGS) -DGUI_KDE -DGUI_CONFIG=\"KDE\" \
-+ $(AM_CPPFLAGS)
- kde_gnash_SOURCES = $(GUI_SRCS) gui_kde.cpp
- kde_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic
- #kde_gnash_DEPENDENCIES = .configline
diff --git a/multimedia/gnash/patches/patch-ah b/multimedia/gnash/patches/patch-ah
new file mode 100644
index 00000000000..bdd01e960de
--- /dev/null
+++ b/multimedia/gnash/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2010/10/29 14:15:03 obache Exp $
+
+--- doc/C/Makefile.in.orig 2010-09-25 07:54:31.000000000 +0000
++++ doc/C/Makefile.in
+@@ -492,7 +492,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-man1dir = ${prefix}/share/man/man1
++man1dir = ${mandir}/man1
+ docname = gnash
+ lang = C
+ omffile = gnash-C.omf