From 9a4cdf085f104a14883d4401d20e020f165a21f5 Mon Sep 17 00:00:00 2001 From: obache Date: Tue, 12 Apr 2011 13:15:01 +0000 Subject: Update Gnash to 0.8.9. Improvements since 0.8.8 release are: * Avoid drawing operations when the window is obscured, including when Gnash is used as a plugin, starting with Firefox 4.0 (GTK GUI). * Support SWF with embedded ScreenVideo when using FFMPEG or gstreamer-ffmpeg >= 0.10.12. * Fix playback of SWF-embedded ADPCM audio when using Gstreamer. * Fix playback of SWF-embedded PCM audio when using FFMPEG. * Fix swapped _framesloaded and _totalframes properties. * Fixes for several crashes, with better automated testing of the entire ActionScript API for input sanitization. * Improved ActionScript performance processing, especially for interactive applications. * npapi plugin: fix relative urls resolution in presence of tag and "base" parameter; improved robustness and compatibility with chromium browser. * Improved SWF8 support with BitmapData.draw, BitmapData.loadBitmap, and other bitmap functions. * Re-entrant core libraries. * RTMP remoting support. * Support for PNG and GIF files in all DefineBitsJpeg tags; support for DefineBitsJpeg4 tags, and fix display of some GIFs with multiple records. * Restore support for mingw32. * fb-gnash: allow specifying size and offset of rendering "window". * dump-gnash: improved speed, sync and flexibility. * JPEG screenshot output. * Support for linear RGB interpolation mode in gradient fills. * Clipboard setting (GTK only). * More flash.geom.Rectangle functions. * Improved OpenBSD compatibility --- multimedia/gnash/Makefile | 6 +-- multimedia/gnash/PLIST | 47 +++++++++++++--------- multimedia/gnash/distinfo | 19 +++++---- multimedia/gnash/options.mk | 15 ++++--- multimedia/gnash/patches/patch-aa | 34 +++++++--------- multimedia/gnash/patches/patch-ae | 24 +++++------ multimedia/gnash/patches/patch-ah | 13 ------ multimedia/gnash/patches/patch-libbase_Makefile.in | 17 ++++++++ multimedia/gnash/patches/patch-libcore_Makefile.in | 17 ++++++++ .../gnash/patches/patch-libmedia_Makefile.in | 17 ++++++++ .../gnash/patches/patch-librender_Makefile.in | 17 ++++++++ .../gnash/patches/patch-libsound_Makefile.in | 17 ++++++++ .../gnash/patches/patch-plugin_klash4_Makefile.in | 16 ++++++++ 13 files changed, 178 insertions(+), 81 deletions(-) delete mode 100644 multimedia/gnash/patches/patch-ah create mode 100644 multimedia/gnash/patches/patch-libbase_Makefile.in create mode 100644 multimedia/gnash/patches/patch-libcore_Makefile.in create mode 100644 multimedia/gnash/patches/patch-libmedia_Makefile.in create mode 100644 multimedia/gnash/patches/patch-librender_Makefile.in create mode 100644 multimedia/gnash/patches/patch-libsound_Makefile.in create mode 100644 multimedia/gnash/patches/patch-plugin_klash4_Makefile.in (limited to 'multimedia') diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile index 7fdd8d4f9e0..42ba0a28c02 100644 --- a/multimedia/gnash/Makefile +++ b/multimedia/gnash/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.35 2011/03/09 16:29:23 drochner Exp $ +# $NetBSD: Makefile,v 1.36 2011/04/12 13:15:01 obache Exp $ # DISTNAME= gnash-${VER} -VER= 0.8.8 -PKGREVISION= 6 +VER= 0.8.9 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GNU:=gnash/${VER}/} EXTRACT_SUFX= .tar.bz2 @@ -48,6 +47,5 @@ BUILDLINK_TRANSFORM+= rm:-fvisibility-inlines-hidden .include "../../www/curl/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXi/buildlink3.mk" - .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/gnash/PLIST b/multimedia/gnash/PLIST index 3b439c5bc82..cb5519a6aed 100644 --- a/multimedia/gnash/PLIST +++ b/multimedia/gnash/PLIST @@ -1,7 +1,9 @@ -@comment $NetBSD: PLIST,v 1.8 2010/10/29 14:15:02 obache Exp $ +@comment $NetBSD: PLIST,v 1.9 2011/04/12 13:15:01 obache Exp $ ${PLIST.gstreamer}bin/findmicrophones ${PLIST.gstreamer}bin/findwebcams bin/gnash +${PLIST.gtk}bin/gnash-gtk-launcher +${PLIST.kde4}bin/gnash-qt-launcher bin/gprocessor ${PLIST.gtk}bin/gtk-gnash ${PLIST.kde3}bin/kde3-gnash @@ -10,8 +12,6 @@ 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 @@ -20,14 +20,13 @@ 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/GnashEnums.h include/gnash/GnashException.h include/gnash/GnashFactory.h include/gnash/GnashFileUtilities.h @@ -41,6 +40,7 @@ include/gnash/GnashSystemNetHeaders.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 @@ -49,15 +49,22 @@ include/gnash/Point_as.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 @@ -68,18 +75,18 @@ 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/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 @@ -110,6 +117,7 @@ include/gnash/asobj/RGBA.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 @@ -117,7 +125,6 @@ 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 @@ -134,10 +141,7 @@ 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 @@ -153,7 +157,6 @@ 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 @@ -164,14 +167,12 @@ 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 @@ -189,24 +190,30 @@ man/man1/cygnal.1 man/man1/findmicrophones.1 man/man1/findwebcams.1 man/man1/flvdumper.1 +${PLIST.gtk}man/man1/gnash-gtk-launcher.1 +${PLIST.kde4}man/man1/gnash-qt-launcher.1 man/man1/gnash.1 man/man1/gprocessor.1 -man/man1/gtk-gnash.1 -man/man1/kde4-gnash.1 +${PLIST.gtk}man/man1/gtk-gnash.1 +${PLIST.kde4}man/man1/kde4-gnash.1 man/man1/rtmpget.1 man/man1/soldumper.1 -share/doc/gnash/gnashref.html -share/doc/gnash/gnashuser.html -share/doc/gnash/images/car_crash.png -share/doc/gnash/images/rtmp.png +${PLIST.gtk}share/applications/gnash.desktop +${PLIST.kde4}share/applications/klash.desktop share/examples/gnash/gnashpluginrc share/examples/gnash/gnashrc share/gnash/GnashG.png +share/gnash/doc/gnash/C/gnashref.html +share/gnash/doc/gnash/C/gnashuser.html +share/gnash/doc/gnash/C/images/rtmp.png +share/gnash/gnash-splash.swf 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 +${PLIST.gtk}share/icons/hicolor/32x32/apps/gnash.xpm +${PLIST.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 diff --git a/multimedia/gnash/distinfo b/multimedia/gnash/distinfo index 66802fb2cdb..6aed03fa6bc 100644 --- a/multimedia/gnash/distinfo +++ b/multimedia/gnash/distinfo @@ -1,8 +1,13 @@ -$NetBSD: distinfo,v 1.15 2010/10/29 14:15:02 obache Exp $ +$NetBSD: distinfo,v 1.16 2011/04/12 13:15:01 obache Exp $ -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 +SHA1 (gnash-0.8.9.tar.bz2) = 585c320c98b3304fcbba230f2c4b1fdf2a52aee0 +RMD160 (gnash-0.8.9.tar.bz2) = 34bb51cfe5b8593dc14bc2c21c0085277dbb23f1 +Size (gnash-0.8.9.tar.bz2) = 3777140 bytes +SHA1 (patch-aa) = 5d2e5ac763bfa6480f246743c5eee88c6a2a0d21 +SHA1 (patch-ae) = 67c5093f417b0faa78e6fac2e5a16cb5aea8588e +SHA1 (patch-libbase_Makefile.in) = 14101fcd56d0913901be82b9653a157ca85da441 +SHA1 (patch-libcore_Makefile.in) = afbcf74085ea4276735cd117a18263ff716f3014 +SHA1 (patch-libmedia_Makefile.in) = c59307744f0d85f239607ddb8a465bda9172ffd0 +SHA1 (patch-librender_Makefile.in) = 60101200612d3cd2d803652705b6e015d1a72ec1 +SHA1 (patch-libsound_Makefile.in) = 399b6f053c8415dd85e9cb825324871366065bfa +SHA1 (patch-plugin_klash4_Makefile.in) = 086b08bd6ba5ddfa09297e6636e9f00acb6cd990 diff --git a/multimedia/gnash/options.mk b/multimedia/gnash/options.mk index 57eaa33f52d..8bed9f7d189 100644 --- a/multimedia/gnash/options.mk +++ b/multimedia/gnash/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.13 2011/02/23 12:15:52 shattered Exp $ +# $NetBSD: options.mk,v 1.14 2011/04/12 13:15:01 obache Exp $ # # @@ -25,13 +25,17 @@ PLIST_VARS+= gtk kde kde3 kde4 plugin gstreamer GNASH_GUIS+= gtk PLIST.gtk= yes .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libXv/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mkde) -#.include "../../devel/nspr/buildlink3.mk" -CONFIGURE_ARGS+= --with-npapi-plugins-install=system +BUILDLINK_DEPMETHOD.xulrunner= build +.include "../../devel/xulrunner/buildlink3.mk" +CONFIGURE_ARGS+= --with-npapi-install=system CONFIGURE_ARGS+= --with-npapi-plugindir=${PREFIX}/lib/netscape/plugins PLIST.plugin= yes +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .endif .if !empty(PKG_OPTIONS:Mkde) @@ -106,6 +110,8 @@ PLIST.gstreamer= yes .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" DEPENDS+= gst-ffmpeg-0.10.[0-9]*:../../multimedia/gst-plugins0.10-ffmpeg +DEPENDS+= gst-plugins0.10-mad-[0-9]*:../../audio/gst-plugins0.10-mad +DEPENDS+= gst-plugins0.10-vorbis-[0-9]*:../../audio/gst-plugins0.10-vorbis .endif CONFIGURE_ARGS+= --enable-media=${GNASH_MEDIA:Unone:tW:S/ /,/} @@ -114,6 +120,5 @@ CONFIGURE_ARGS+= --enable-media=${GNASH_MEDIA:Unone:tW:S/ /,/} .include "../../multimedia/ffmpeg/buildlink3.mk" CONFIGURE_ARGS+= --enable-hwaccel=VAAPI .else -.include "../../x11/libXv/buildlink3.mk" -CONFIGURE_ARGS+= --enable-hwaccel=xvideo +CONFIGURE_ARGS+= --enable-hwaccel=none .endif diff --git a/multimedia/gnash/patches/patch-aa b/multimedia/gnash/patches/patch-aa index 85fb4060f8e..3b88b84506d 100644 --- a/multimedia/gnash/patches/patch-aa +++ b/multimedia/gnash/patches/patch-aa @@ -1,8 +1,17 @@ -$NetBSD: patch-aa,v 1.11 2010/10/29 14:15:03 obache Exp $ +$NetBSD: patch-aa,v 1.12 2011/04/12 13:15:01 obache Exp $ ---- configure.orig 2010-08-21 17:30:15.000000000 +0000 +--- configure.orig 2011-03-18 13:50:30.000000000 +0000 +++ configure -@@ -39826,7 +39826,7 @@ else +@@ -27796,7 +27796,7 @@ fi + KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config" + fi + if test x"${KDE4_APPSDATADIR}" = x ; then +- KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash" ++ KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde/apps/klash" + fi + + if test x"${ac_cv_path_kde4_incl}" != x ; then +@@ -27986,7 +27986,7 @@ else ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11,7 +20,7 @@ $NetBSD: patch-aa,v 1.11 2010/10/29 14:15:03 obache Exp $ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. -@@ -40128,9 +40128,9 @@ fi +@@ -28281,9 +28281,9 @@ fi fi KDE3_PLUGINDIR="${KDE3_PREFIX}/lib/kde3" @@ -21,21 +30,6 @@ $NetBSD: patch-aa,v 1.11 2010/10/29 14:15:03 obache Exp $ + KDE3_SERVICESDIR="${KDE3_PREFIX}/share/kde/services" + KDE3_CONFIGDIR="${KDE3_PREFIX}/share/kde/config" + KDE3_APPSDATADIR="${KDE3_PREFIX}/share/kde/apps/klash" - fi + 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-ae b/multimedia/gnash/patches/patch-ae index ea31dd66506..61635ebeabe 100644 --- a/multimedia/gnash/patches/patch-ae +++ b/multimedia/gnash/patches/patch-ae @@ -1,24 +1,24 @@ -$NetBSD: patch-ae,v 1.2 2010/10/29 14:15:03 obache Exp $ +$NetBSD: patch-ae,v 1.3 2011/04/12 13:15:01 obache Exp $ ---- gui/Makefile.in.orig 2010-08-21 18:04:41.000000000 +0000 +--- gui/Makefile.in.orig 2011-03-18 13:50:23.000000000 +0000 +++ gui/Makefile.in -@@ -1815,8 +1815,8 @@ GUI_SRCS = gnash.cpp \ +@@ -1413,8 +1413,8 @@ GUI_SRCS = gnash.cpp \ @BUILD_QTOPIA3_GUI_TRUE@ $(GNASH_LIBS) $(AM_LDFLAGS) \ - @BUILD_QTOPIA3_GUI_TRUE@ $(am__append_19) $(am__append_22) + @BUILD_QTOPIA3_GUI_TRUE@ $(am__append_13) $(am__append_16) @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@ $(am__append_20) $(am__append_23) @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_KDE3_GUI_TRUE@ $(am__append_22) $(am__append_25) +@@ -1429,8 +1429,8 @@ GUI_SRCS = gnash.cpp \ + @BUILD_KDE4_GUI_TRUE@ $(am__append_30) $(am__append_33) \ + @BUILD_KDE4_GUI_TRUE@ $(am__append_36) @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 + @BUILD_KDE4_GUI_TRUE@ $(am__append_28) $(am__append_31) \ + @BUILD_KDE4_GUI_TRUE@ $(am__append_34) + @BUILD_KDE4_GUI_TRUE@kde4_gnash_LDFLAGS = -export-dynamic diff --git a/multimedia/gnash/patches/patch-ah b/multimedia/gnash/patches/patch-ah deleted file mode 100644 index bdd01e960de..00000000000 --- a/multimedia/gnash/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$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 diff --git a/multimedia/gnash/patches/patch-libbase_Makefile.in b/multimedia/gnash/patches/patch-libbase_Makefile.in new file mode 100644 index 00000000000..608c445c847 --- /dev/null +++ b/multimedia/gnash/patches/patch-libbase_Makefile.in @@ -0,0 +1,17 @@ +$NetBSD: patch-libbase_Makefile.in,v 1.1 2011/04/12 13:15:01 obache Exp $ + +* let not to remove libtoo .la files, to maintain PLIST easier. + +--- libbase/Makefile.in.orig 2011-04-10 12:30:08.000000000 +0000 ++++ libbase/Makefile.in +@@ -1461,10 +1461,6 @@ mudflap: + @echo "Rebuilding with GCC Mudflap support" + $(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) -lmudflap" + +-# Remove libtool .la files +-install-exec-hook: +- $(RM) $(DESTDIR)$(libdir)/gnash/libgnashbase.la +- + uninstall-local: + $(RM) $(DESTDIR)$(libdir)/gnash/libgnashbase-*.so + diff --git a/multimedia/gnash/patches/patch-libcore_Makefile.in b/multimedia/gnash/patches/patch-libcore_Makefile.in new file mode 100644 index 00000000000..24774fc2a1e --- /dev/null +++ b/multimedia/gnash/patches/patch-libcore_Makefile.in @@ -0,0 +1,17 @@ +$NetBSD: patch-libcore_Makefile.in,v 1.1 2011/04/12 13:15:01 obache Exp $ + +* let not to remove libtoo .la files, to maintain PLIST easier. + +--- libcore/Makefile.in.orig 2011-04-10 12:30:08.000000000 +0000 ++++ libcore/Makefile.in +@@ -2686,10 +2686,6 @@ mudflap: + clean-hook: + -rm -f core.* + +-# Remove libtool .la files +-install-exec-hook: +- $(RM) $(DESTDIR)$(libdir)/gnash/libgnashcore.la +- + uninstall-local: + $(RM) $(DESTDIR)$(libdir)/gnash/libgnashcore-*.so + diff --git a/multimedia/gnash/patches/patch-libmedia_Makefile.in b/multimedia/gnash/patches/patch-libmedia_Makefile.in new file mode 100644 index 00000000000..6972e61211c --- /dev/null +++ b/multimedia/gnash/patches/patch-libmedia_Makefile.in @@ -0,0 +1,17 @@ +$NetBSD: patch-libmedia_Makefile.in,v 1.1 2011/04/12 13:15:01 obache Exp $ + +* let not to remove libtoo .la files, to maintain PLIST easier. + +--- libmedia/Makefile.in.orig 2011-04-10 12:30:09.000000000 +0000 ++++ libmedia/Makefile.in +@@ -1416,10 +1416,6 @@ mudflap: + clean-hook: + -rm -f core.* *.obj + +-# Remove libtool .la files +-install-exec-hook: +- $(RM) $(DESTDIR)$(libdir)/gnash/libgnashmedia.la +- + uninstall-local: + $(RM) $(DESTDIR)$(libdir)/gnash/libgnashmedia-*.so + diff --git a/multimedia/gnash/patches/patch-librender_Makefile.in b/multimedia/gnash/patches/patch-librender_Makefile.in new file mode 100644 index 00000000000..3667eaca40f --- /dev/null +++ b/multimedia/gnash/patches/patch-librender_Makefile.in @@ -0,0 +1,17 @@ +$NetBSD: patch-librender_Makefile.in,v 1.1 2011/04/12 13:15:01 obache Exp $ + +* let not to remove libtoo .la files, to maintain PLIST easier. + +--- librender/Makefile.in.orig 2011-04-10 12:30:09.000000000 +0000 ++++ librender/Makefile.in +@@ -990,10 +990,6 @@ mudflap: + clean-hook: + -rm -f core.* + +-# Remove libtool .la files +-install-exec-hook: +- $(RM) $(DESTDIR)$(libdir)/gnash/libgnashrender.la +- + uninstall-local: + $(RM) $(DESTDIR)$(libdir)/gnash/libgnashrender-*.so + diff --git a/multimedia/gnash/patches/patch-libsound_Makefile.in b/multimedia/gnash/patches/patch-libsound_Makefile.in new file mode 100644 index 00000000000..b55101261c7 --- /dev/null +++ b/multimedia/gnash/patches/patch-libsound_Makefile.in @@ -0,0 +1,17 @@ +$NetBSD: patch-libsound_Makefile.in,v 1.1 2011/04/12 13:15:01 obache Exp $ + +* let not to remove libtoo .la files, to maintain PLIST easier. + +--- libsound/Makefile.in.orig 2011-04-10 12:30:09.000000000 +0000 ++++ libsound/Makefile.in +@@ -972,10 +972,6 @@ mudflap: + clean-hook: + -rm -f core.* *.obj + +-# Remove libtool .la files +-install-exec-hook: +- $(RM) $(DESTDIR)$(libdir)/gnash/libgnashsound.la +- + uninstall-local: + $(RM) $(DESTDIR)$(libdir)/gnash/libgnashsound-*.so + diff --git a/multimedia/gnash/patches/patch-plugin_klash4_Makefile.in b/multimedia/gnash/patches/patch-plugin_klash4_Makefile.in new file mode 100644 index 00000000000..c2a99483a4f --- /dev/null +++ b/multimedia/gnash/patches/patch-plugin_klash4_Makefile.in @@ -0,0 +1,16 @@ +$NetBSD: patch-plugin_klash4_Makefile.in,v 1.1 2011/04/12 13:15:01 obache Exp $ + +* install libtool archive as usual manner. + +--- plugin/klash4/Makefile.in.orig 2011-04-11 08:03:43.000000000 +0000 ++++ plugin/klash4/Makefile.in +@@ -1014,8 +1014,7 @@ uninstall-am: uninstall-dist_kde_appsdat + @KPARTS4_TRUE@ install-dist_kde_appsdataDATA install-dist_kde_rcDATA \ + @KPARTS4_TRUE@ install-dist_kde_servicesDATA + @KPARTS4_TRUE@ test -d $(DESTDIR)$(plugindir) || $(mkinstalldirs) $(DESTDIR)$(plugindir) +-@KPARTS4_TRUE@ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) libklashpart.* $(DESTDIR)$(plugindir) +-@KPARTS4_TRUE@ $(RM) $(DESTDIR)$(plugindir)/libklashpart.la ++@KPARTS4_TRUE@ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $(plugin_LTLIBRARIES) $(DESTDIR)$(plugindir) + + @KPARTS4_TRUE@uninstall-plugins: + @KPARTS4_TRUE@ $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.so -- cgit v1.2.3