pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pkg/39015: Update multimedia/gnash to 0.8.3
>Number: 39015
>Category: pkg
>Synopsis: Update multimedia/gnash to 0.8.3
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sun Jun 22 08:55:00 +0000 2008
>Originator: Kouichirou Hiratsuka
>Release: NetBSD 4.99.66
>Organization:
>Environment:
System: NetBSD firefly.localdomain 4.99.66 NetBSD 4.99.66 (X32) #2: Sun Jun 22
16:51:59 JST 2008
root%firefly.localdomain@localhost:/obj/i386/usr/src/sys/arch/i386/compile/X32
i386
Architecture: i386
Machine: i386
>Description:
Gnash 0.8.3 has been released on 17 June.
>How-To-Repeat:
>Fix:
Apply the following patch.
diff -ruN gnash.orig/Makefile gnash/Makefile
--- gnash.orig/Makefile 2008-04-30 05:16:08.000000000 +0900
+++ gnash/Makefile 2008-06-22 00:58:50.000000000 +0900
@@ -1,10 +1,9 @@
# $NetBSD: Makefile,v 1.15 2008/04/29 20:16:08 wiz Exp $
#
-DISTNAME= gnash-0.8.2
-PKGREVISION= 1
+DISTNAME= gnash-0.8.3
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_GNU:=gnash/0.8.2/}
+MASTER_SITES= ${MASTER_SITE_GNU:=gnash/0.8.3/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= matias%dotbsd.org@localhost
@@ -22,6 +21,15 @@
# for appending below
INSTALL_TARGET= install
+EGDIR= ${PREFIX}/share/examples/gnash
+CONF_FILES+= ${EGDIR}/gnashrc ${PKG_SYSCONFDIR}/gnashrc
+CONF_FILES+= ${EGDIR}/gnashpluginrc ${PKG_SYSCONFDIR}/gnashpluginrc
+
+SUBST_CLASSES+= egdir
+SUBST_STAGE.egdir= post-patch
+SUBST_FILES.egdir= libbase/Makefile.in
+SUBST_SED.egdir= -e 's|@EGDIR@|${EGDIR}|g'
+
# /bin/sh finds a syntax error without line number
CONFIG_SHELL= ${TOOLS_BASH}
diff -ruN gnash.orig/PLIST gnash/PLIST
--- gnash.orig/PLIST 2008-04-27 15:44:52.000000000 +0900
+++ gnash/PLIST 2008-06-22 01:43:56.000000000 +0900
@@ -6,7 +6,9 @@
lib/gnash/libgnashamf.la
lib/gnash/libgnashbase.la
lib/gnash/libgnashmedia.la
+lib/gnash/libgnashnet.la
lib/gnash/libgnashserver.la
+lib/gnash/libmozsdk.la
man/man1/cygnal.1
man/man1/dumpshm.1
man/man1/gnash.1
@@ -16,6 +18,8 @@
share/doc/gnash/gnashuser.html
share/doc/gnash/images/car_crash.png
share/doc/gnash/images/rtmp.png
+share/examples/gnash/gnashrc
+share/examples/gnash/gnashpluginrc
share/${KDE}gnash/GnashG.png
share/${KDE}gnash/gnash_128_96.ico
share/${KDE}locale/cs/LC_MESSAGES/gnash.mo
@@ -24,8 +28,10 @@
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
@dirrm share/${KDE}gnash
+@dirrm share/examples/gnash
@dirrm share/doc/gnash/images
@dirrm share/doc/gnash
@dirrm lib/gnash
diff -ruN gnash.orig/distinfo gnash/distinfo
--- gnash.orig/distinfo 2008-04-27 15:44:52.000000000 +0900
+++ gnash/distinfo 2008-06-22 02:01:01.000000000 +0900
@@ -1,7 +1,9 @@
$NetBSD: distinfo,v 1.9 2008/04/27 06:44:52 wiz Exp $
-SHA1 (gnash-0.8.2.tar.bz2) = 1d524f9a5e96037db4159fe6142b0c228b6130be
-RMD160 (gnash-0.8.2.tar.bz2) = 63466362edae138bc976f9c025f36703c7edce9f
-Size (gnash-0.8.2.tar.bz2) = 2637636 bytes
+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-ae) = d4f18032bc091e5ef84fcb81f16ea649c5c20701
SHA1 (patch-ag) = f4f82df7bff71464cdb3a76b91c4b2475a8e9eef
+SHA1 (patch-ah) = 8ab719ec6bb6ac5be10f56bca16476935e9d1d60
+SHA1 (patch-ai) = 7473bc27b69f191cd4eaa00eb92a125e747c3e70
diff -ruN gnash.orig/options.mk gnash/options.mk
--- gnash.orig/options.mk 2008-05-23 05:58:32.000000000 +0900
+++ gnash/options.mk 2008-06-22 02:44:09.000000000 +0900
@@ -7,8 +7,9 @@
PKG_OPTIONS_VAR= PKG_OPTIONS.gnash
PKG_SUPPORTED_OPTIONS= gtk kde agg cairo mitshm opengl
-PKG_OPTIONS_OPTIONAL_GROUPS= gnash-media
+PKG_OPTIONS_OPTIONAL_GROUPS= gnash-media gnash-render
PKG_OPTIONS_GROUP.gnash-media= ffmpeg gstreamer
+PKG_OPTIONS_GROUP.gnash-render= agg cairo opengl
PKG_SUGGESTED_OPTIONS+= agg gstreamer gtk mitshm
.include "../../mk/bsd.options.mk"
@@ -43,24 +44,26 @@
### Select renderers.
###
.if !empty(PKG_OPTIONS:Magg)
-GNASH_RENDERS+= agg
+GNASH_RENDER= agg
+CONFIGURE_ARGS+= --enable-aag
.include "../../graphics/agg/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mcairo)
-GNASH_RENDERS+= cairo
+GNASH_RENDER= cairo
+CONFIGURE_ARGS+= --enable-cairo
.include "../../graphics/cairo/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mopengl)
-GNASH_RENDERS+= ogl
+GNASH_RENDER= ogl
.include "../../x11/glproto/buildlink3.mk"
.if !empty(PKG_OPTIONS:Mgtk)
.include "../../graphics/gtkglext/buildlink3.mk"
.endif
.endif
-CONFIGURE_ARGS+= --enable-renderer=${GNASH_RENDERS:tW:S/ /,/}
+CONFIGURE_ARGS+= --enable-renderer=${GNASH_RENDER}
###
### Select a media handler
@@ -69,6 +72,7 @@
CONFIGURE_ARGS+= --enable-media=ffmpeg
.include "../../audio/SDL_mixer/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
+.include "../../audio/libdca/buildlink3.mk"
.include "../../multimedia/ffmpeg-devel/buildlink3.mk"
.endif
diff -ruN gnash.orig/patches/patch-ah gnash/patches/patch-ah
--- gnash.orig/patches/patch-ah 1970-01-01 09:00:00.000000000 +0900
+++ gnash/patches/patch-ah 2008-06-22 00:39:33.000000000 +0900
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- libbase/ref_counted.h.orig 2008-05-30 01:41:10.000000000 +0900
++++ libbase/ref_counted.h 2008-05-30 01:41:23.000000000 +0900
+@@ -26,7 +26,7 @@
+ #include "dsodefs.h" // for DSOEXPORT
+
+ #include <cassert>
+-#include <boost/detail/atomic_count.hpp>
++#include <boost/detail/atomic_count_pthreads.hpp>
+
+ namespace gnash {
+
diff -ruN gnash.orig/patches/patch-ai gnash/patches/patch-ai
--- gnash.orig/patches/patch-ai 1970-01-01 09:00:00.000000000 +0900
+++ gnash/patches/patch-ai 2008-06-22 02:00:51.000000000 +0900
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- libbase/Makefile.in.orig 2008-06-22 00:39:51.000000000 +0900
++++ libbase/Makefile.in 2008-06-22 00:40:45.000000000 +0900
+@@ -949,12 +950,12 @@
+ -rm -rf .libs _libs
+ install-sysconfDATA: $(sysconf_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
++ test -z "@EGDIR@" || $(MKDIR_P) "$(DESTDIR)@EGDIR@"
+ @list='$(sysconf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+- echo " $(sysconfDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(sysconfdir)/$$f'"; \
+- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
++ echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)@EGDIR@/$$f'"; \
++ $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)@EGDIR@/$$f"; \
+ done
+
+ uninstall-sysconfDATA:
Home |
Main Index |
Thread Index |
Old Index