Subject: pkg/37639: update multimedia/gnash to 0.8.1
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: None <eschnoebelen@efjohnson.com>
List: pkgsrc-bugs
Date: 12/28/2007 22:50:00
>Number: 37639
>Category: pkg
>Synopsis: Update multimedia/gnash to 0.8.1, add plugin option
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Fri Dec 28 22:50:00 +0000 2007
>Originator: Eric Schnoebelen
>Release: NetBSD 4.99.34
>Organization:
Eric Schnoebelen eschnoebelen@efjohnson.com eric@cirr.com
"He made a lot of mistakes. But he made mistakes in good directions, so
eventually he got to the right answers. I tried to imitate him, but I
found out that it is very difficult to make good mistakes." -- Goro Simura
>Environment:
System: NetBSD duke 4.99.34 NetBSD 4.99.34 (GENERIC.MP) #17: Sat Nov 3 07:24:10 CDT 2007 eric@egsner.cirr.com:/work/eric/NetBSD-current/obj/amd64/sys/arch/amd64/compile/GENERIC.MP amd64
Architecture: x86_64
Machine: amd64
>Description:
Two items:
multimedia/gnash updated to 0.8.1
add option support to build the firefox plugin
>How-To-Repeat:
doc/TODO
>Fix:
(one file, PLIST.plugin, added;
one file, patches/patch-ab, removed.
)
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/gnash/Makefile,v
retrieving revision 1.11
diff -b -u -w -r1.11 Makefile
--- Makefile 21 Sep 2007 13:04:06 -0000 1.11
+++ Makefile 28 Dec 2007 22:44:12 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.11 2007/09/21 13:04:06 wiz Exp $
#
-DISTNAME= gnash-0.8.0
+DISTNAME= gnash-0.8.1
PKGREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GNU:=gnash/0.8.0/}
@@ -19,7 +19,8 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-mp3
CONFIGURE_ARGS+= --enable-media=mad
-USE_TOOLS+= bash msgfmt pkg-config
+CONFIGURE_ARGS+= --enable-renderer=cairo
+USE_TOOLS+= bash msgfmt pkg-config gmake
# /bin/sh finds a syntax error without line number
CONFIG_SHELL= ${TOOLS_BASH}
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/gnash/PLIST,v
retrieving revision 1.3
diff -b -u -w -r1.3 PLIST
--- PLIST 14 Jun 2007 06:01:29 -0000 1.3
+++ PLIST 28 Dec 2007 22:44:12 -0000
@@ -1,15 +1,14 @@
@comment $NetBSD: PLIST,v 1.3 2007/06/14 06:01:29 wiz Exp $
-bin/cygnal
bin/gnash
bin/gparser
bin/gprocessor
-lib/libgnashamf.la
-lib/libgnashbackend.la
-lib/libgnashbase.la
-lib/libgnashgeo.la
-lib/libgnashgui.la
-lib/libgnashplayer.la
-lib/libgnashserver.la
+lib/gnash/libgnashamf.la
+lib/gnash/libgnashbackend.la
+lib/gnash/libgnashbase.la
+lib/gnash/libgnashgeo.la
+@comment lib/gnash/libgnashgui.la
+@comment lib/gnash/libgnashplayer.la
+lib/gnash/libgnashserver.la
man/man1/gnash.1
share/gnash/GnashG.png
share/gnash/gnash_128_96.ico
Index: PLIST.klash
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/gnash/PLIST.klash,v
retrieving revision 1.2
diff -b -u -w -r1.2 PLIST.klash
--- PLIST.klash 12 Jun 2007 21:26:15 -0000 1.2
+++ PLIST.klash 28 Dec 2007 22:44:12 -0000
@@ -1,16 +1,11 @@
@comment $NetBSD: PLIST.klash,v 1.2 2007/06/12 21:26:15 ghen Exp $
bin/klash
lib/kde3/libklashpart.la
-lib/libklashplayer-0.8.0.so
-lib/libklashplayer.a
-lib/libklashplayer.la
-lib/libklashplayer.so
+lib/gnash/libklashplayer-0.8.1.so
+lib/gnash/libklashplayer.la
share/apps/klash/klashpartui.rc
-share/apps/klash/pluginsinfo
-share/gnash/plugins/libgnashplugin.la
share/services/klash_part.desktop
@dirrm share/apps/klash
@comment in kde: dirrm share/kde/services
-@dirrm share/gnash/plugins
@comment in kde: dirrm share/kde/config
@comment in kde: @dirrm lib/kde3
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/gnash/distinfo,v
retrieving revision 1.8
diff -b -u -w -r1.8 distinfo
--- distinfo 30 Jun 2007 15:11:24 -0000 1.8
+++ distinfo 28 Dec 2007 22:44:12 -0000
@@ -1,7 +1,6 @@
$NetBSD: distinfo,v 1.8 2007/06/30 15:11:24 joerg Exp $
-SHA1 (gnash-0.8.0.tar.bz2) = b03d3c03bb93b0ebaf5ad10cabd3d7fef2434f7e
-RMD160 (gnash-0.8.0.tar.bz2) = 6c885c283345973d27206f6e3f90635264a724ae
-Size (gnash-0.8.0.tar.bz2) = 2053076 bytes
-SHA1 (patch-aa) = 4774c9bd41ca69611f980c85e79763b159a262ed
-SHA1 (patch-ab) = c361305a5dd508907d4408f16ec7a748186a5f6e
+SHA1 (gnash-0.8.1.tar.bz2) = d83280752d0cdf5c4bbeab1c2e8af3dd0113297f
+RMD160 (gnash-0.8.1.tar.bz2) = 8872e58fb1b2915edd62a2a48fc076a0cda3ed2d
+Size (gnash-0.8.1.tar.bz2) = 1983596 bytes
+SHA1 (patch-aa) = 887fbc382f3e552943fdb0be6d6879f8a11df666
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/gnash/options.mk,v
retrieving revision 1.4
diff -b -u -w -r1.4 options.mk
--- options.mk 12 Jun 2007 08:51:14 -0000 1.4
+++ options.mk 28 Dec 2007 22:44:12 -0000
@@ -2,19 +2,29 @@
#
PKG_OPTIONS_VAR= PKG_OPTIONS.gnash
-PKG_SUPPORTED_OPTIONS= klash
+PKG_SUPPORTED_OPTIONS= klash plugin
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mklash)
PLIST_SRC+= ${PKGDIR}/PLIST.klash
+PKG_OPTIONS.gnash+= plugin
.include "../../x11/kdebase3/buildlink3.mk"
.include "../../meta-pkgs/kde3/kde3.mk"
-CONFIGURE_ARGS+= --datadir="${PREFIX}/share"
-CONFIGURE_ARGS+= \
- --with-plugindir=${PREFIX}/share/gnash/plugins
CONFIGURE_ARGS+= --enable-klash
+CONFIGURE_ARGS+= --enable-kparts
+CONFIGURE_ARGS+= --enable-gui=kde
.else
+CONFIGURE_ARGS+= --enable-gui=gtk
CONFIGURE_ARGS+= --disable-klash
+CONFIGURE_ARGS+= --disable-kparts
+.endif
+
+.if !empty(PKG_OPTIONS:Mplugin)
+PLIST_SRC+= ${PKGDIR}/PLIST.plugin
+CONFIGURE_ARGS+= --datadir="${PREFIX}/share"
+CONFIGURE_ARGS+= --with-plugindir=${PREFIX}/share/gnash/plugins
+CONFIGURE_ARGS+= --enable-plugin
+.else
CONFIGURE_ARGS+= --disable-plugin
.endif
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/gnash/patches/patch-aa,v
retrieving revision 1.8
diff -b -u -w -r1.8 patch-aa
--- patches/patch-aa 30 Jun 2007 15:11:24 -0000 1.8
+++ patches/patch-aa 28 Dec 2007 22:44:12 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2007/06/30 15:11:24 joerg Exp $
+$NetBSD$
---- configure.orig 2007-06-09 01:41:56.000000000 +0000
+--- configure.orig 2007-08-29 10:04:00.000000000 -0500
+++ configure
-@@ -8239,13 +8239,13 @@ echo $ECHO_N "checking for library file
+@@ -9060,13 +9060,13 @@ echo $ECHO_N "checking for library file
LIBPRE="lib"
if test "x$LIBPRE" != "x" ; then
@@ -18,7 +18,7 @@
LIBEXT="dll"
fi
fi
-@@ -20065,7 +20065,7 @@ echo $ECHO_N "checking for qt header...
+@@ -40821,7 +40821,7 @@ echo $ECHO_N "checking for qt header...
fi
done
@@ -27,16 +27,7 @@
for i in $incllist; do
for j in `ls -dr $i/qt[0-9] 2>/dev/null`; do
if test -f $j/qobject.h; then
-@@ -47951,7 +47951,7 @@ DLPREOPEN="-dlpreopen"
-
-
-
--if test x"$EXEEXT" == "exe"; then
-+if test x"$EXEEXT" = "exe"; then
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_WINSOCK 1
-@@ -48042,9 +48042,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -49304,9 +49304,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
pthreads=no
@@ -47,30 +38,3 @@
if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
save_CFLAGS="$CFLAGS"
-@@ -51973,7 +51971,7 @@ if $need_sdl; then
- echo " Install it from http://www.libsdl.org/download-1.2.php"
- echo " or .deb users: apt-get install libsdl1.2-dev"
- echo " or .rpm users: yum install SDL-devel"
-- x"$gui" == x"sdl" &&
-+ x"$gui" = x"sdl" &&
- echo " or select a different GUI with --enable-gui= "
- x"$media_handler" = x"ffmpeg" -o x"$media_handler" = x"mad" &&
- echo " or use --enable-media=gst"
-@@ -52057,7 +52055,7 @@ fi
- if test x"$BOOST_LIBS" != x; then
- # Only cygnal requires date_time at present, so it's OK if either
- # you don't want cygnal or do have date_time installed.
-- if test x"$cygnal" == xno -o x"$boost_date_time" = xyes; then
-+ if test x"$cygnal" = xno -o x"$boost_date_time" = xyes; then
- echo " BOOST flags are: $BOOST_CFLAGS"
- echo " BOOST libs are: $BOOST_LIBS"
- else
-@@ -52072,7 +52070,7 @@ else
- echo " ERROR: No BOOST development package installed!"
- echo " Install it from http://www.boost.org"
- echo " or .deb users: apt-get install libboost-thread-dev"
-- if test x"$cygnal" == xyes; then
-+ if test x"$cygnal" = xyes; then
- echo " and libboost-date-time-dev"
- fi
- echo " or .rpm users: yum install boost-devel"
--- patches/patch-ab.orig 2007-06-30 10:11:24.000000000 -0500
+++ patches/patch-ab 2007-12-28 16:18:56.000000000 -0600
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/06/30 15:11:24 joerg Exp $
-
---- plugin/Makefile.in.orig 2006-12-06 00:14:28.000000000 +0100
-+++ plugin/Makefile.in 2006-12-06 00:23:19.000000000 +0100
-@@ -929,7 +929,7 @@
- #if PLUGIN_LINK_UNDEFINED
- #cp $(DESTDIR)$(plugindir)/.libs/libgnashplugin.so.0.* $(DESTDIR)$(plugindir)/libgnashplugin.so
- #endif
-- $(RM) $(DESTDIR)$(plugindir)/libgnashplugin.*a $(DESTDIR)$(plugindir)/libgnashplugin.so.0 $(DESTDIR)$(plugindir)/libgnashplugin.*.T
-+ #$(RM) $(DESTDIR)$(plugindir)/libgnashplugin.*a $(DESTDIR)$(plugindir)/libgnashplugin.so.0 $(DESTDIR)$(plugindir)/libgnashplugin.*.T
-
- # install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
- # if test -d $(HOME)/.firefox ; then \
--- /dev/null 2007-12-28 16:18:56.000000000 -0600
+++ PLIST.plugin 2007-12-28 16:08:11.000000000 -0600
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.klash,v 1.2 2007/06/12 21:26:15 ghen Exp $
+share/gnash/plugins/libgnashplugin.so
+@dirrm share/gnash/plugins
>Unformatted:
pkgsrc as of 2007-12-28 22:45 UTC