Move swfdec and swfdec-gtk2 from graphics to multimedia.

Suggested by wiz@.

14 files changed, 223 insertions, 1 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index 70e74a9d191..07aa381c5dd 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2005/06/03 15:40:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.71 2005/06/04 10:41:41 jmmv Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -71,6 +71,8 @@ SUBDIR+=	realplayer-codecs
 SUBDIR+=	regionset
 SUBDIR+=	smpeg
 SUBDIR+=	smpeg-xmms
+SUBDIR+=	swfdec
+SUBDIR+=	swfdec-gtk2
 SUBDIR+=	totem
 SUBDIR+=	totem-xine
 SUBDIR+=	transcode
diff --git a/multimedia/swfdec-gtk2/DESCR b/multimedia/swfdec-gtk2/DESCR
new file mode 100644
index 00000000000..8ca0443a1ac
--- /dev/null
+++ b/multimedia/swfdec-gtk2/DESCR
@@ -0,0 +1,6 @@
+Swfdec is a library for rendering Flash(R) animations and games.  It was
+originally designed as a basis library for creating Flash plugins for
+GStreamer, but it is a fully standalone library which only use the libart
+library for drawing.  Swfdec is released under the LGPL.
+
+This package provides an SWF based pixbuf-loader for GTK.
diff --git a/multimedia/swfdec-gtk2/Makefile b/multimedia/swfdec-gtk2/Makefile
new file mode 100644
index 00000000000..253845524e2
--- /dev/null
+++ b/multimedia/swfdec-gtk2/Makefile
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2005/06/04 10:41:42 jmmv Exp $
+#
+
+PKGREVISION=		2
+
+.include "../../multimedia/swfdec/Makefile.common"
+
+PKGNAME=		${DISTNAME:S/-/-gtk2-/}
+COMMENT+=		(GTK2 modules)
+
+CONFIGURE_ARGS+=	--enable-pixbuf-loader
+
+BUILD_DIRS=		${WRKSRC}/pixbuf-loader
+INSTALL_DIRS=		${WRKSRC}/pixbuf-loader
+
+GTK2_LOADERS=		YES
+
+.include "../../multimedia/swfdec/buildlink3.mk"
+.include "../../x11/gtk2/modules.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/swfdec-gtk2/PLIST b/multimedia/swfdec-gtk2/PLIST
new file mode 100644
index 00000000000..c3df5572860
--- /dev/null
+++ b/multimedia/swfdec-gtk2/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2005/06/04 10:41:42 jmmv Exp $
+lib/gtk-2.0/2.4.0/loaders/swf_loader.la
+@comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/loaders
diff --git a/multimedia/swfdec/DESCR b/multimedia/swfdec/DESCR
new file mode 100644
index 00000000000..dca3b18623c
--- /dev/null
+++ b/multimedia/swfdec/DESCR
@@ -0,0 +1,7 @@
+Swfdec is a library for rendering Flash(R) animations and games.  It was
+originally designed as a basis library for creating Flash plugins for
+GStreamer, but it is a fully standalone library which only use the libart
+library for drawing.  Swfdec is released under the LGPL.
+
+This package provides the swfdec library, as well as an standalone SWF
+player.
diff --git a/multimedia/swfdec/MESSAGE b/multimedia/swfdec/MESSAGE
new file mode 100644
index 00000000000..f9ca13935de
--- /dev/null
+++ b/multimedia/swfdec/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2005/06/04 10:41:42 jmmv Exp $
+
+You should install the swfdec-gtk2 package, which provides an SWF
+gdk-pixbuf loader for the GTK2 toolkit.
+
+===========================================================================
diff --git a/multimedia/swfdec/Makefile b/multimedia/swfdec/Makefile
new file mode 100644
index 00000000000..9fd0f2846a8
--- /dev/null
+++ b/multimedia/swfdec/Makefile
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2005/06/04 10:41:42 jmmv Exp $
+#
+
+PKGREVISION=		2
+
+.include "Makefile.common"
+
+CONFIGURE_ARGS+=	--disable-pixbuf-loader
+
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/libart2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/swfdec/Makefile.common b/multimedia/swfdec/Makefile.common
new file mode 100644
index 00000000000..818134c0c35
--- /dev/null
+++ b/multimedia/swfdec/Makefile.common
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile.common,v 1.1 2005/06/04 10:41:42 jmmv Exp $
+#
+
+DISTNAME=		swfdec-0.2.2
+CATEGORIES=		multimedia
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=swfdec/}
+
+MAINTAINER=		jmmv@NetBSD.org
+HOMEPAGE=		http://swfdec.sourceforge.net/
+COMMENT=		Library for rendering Flash(R) animations and games
+
+DISTINFO_FILE=		${.CURDIR}/../../multimedia/swfdec/distinfo
+PATCHDIR=		${.CURDIR}/../../multimedia/swfdec/patches
+
+GNU_CONFIGURE=		yes
+USE_PKGINSTALL=		yes
+USE_PKGLOCALEDIR=	yes
+USE_LIBTOOL=		yes
+
+PKGCONFIG_OVERRIDE=	swfdec.pc.in
+
+pre-install:
+	${ECHO} "install:" >${WRKSRC}/plugin/Makefile
+
+.include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/multimedia/swfdec/PLIST b/multimedia/swfdec/PLIST
new file mode 100644
index 00000000000..352138ca491
--- /dev/null
+++ b/multimedia/swfdec/PLIST
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST,v 1.1 2005/06/04 10:41:42 jmmv Exp $
+bin/swf_play
+include/swfdec/swf.h
+include/swfdec/swfdec.h
+lib/libswfdec.la
+lib/pkgconfig/swfdec.pc
+@dirrm include/swfdec
diff --git a/multimedia/swfdec/buildlink3.mk b/multimedia/swfdec/buildlink3.mk
new file mode 100644
index 00000000000..9b3fa6ee89c
--- /dev/null
+++ b/multimedia/swfdec/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2005/06/04 10:41:42 jmmv Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+SWFDEC_BUILDLINK3_MK:=	${SWFDEC_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	swfdec
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nswfdec}
+BUILDLINK_PACKAGES+=	swfdec
+
+.if !empty(SWFDEC_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.swfdec+=	swfdec>=0.2.2
+BUILDLINK_RECOMMENDED.swfdec+=	swfdec>=0.2.2nb1
+BUILDLINK_PKGSRCDIR.swfdec?=	../../graphics/swfdec
+.endif	# SWFDEC_BUILDLINK3_MK
+
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/libart2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/swfdec/distinfo b/multimedia/swfdec/distinfo
new file mode 100644
index 00000000000..311ad4c2a6a
--- /dev/null
+++ b/multimedia/swfdec/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2005/06/04 10:41:42 jmmv Exp $
+
+SHA1 (swfdec-0.2.2.tar.gz) = f3cbc3fec455117d554d37ac4dda1d99fb592661
+RMD160 (swfdec-0.2.2.tar.gz) = e44e1d5890fd1b8e6b73fa0ed5d645dbb6203c88
+Size (swfdec-0.2.2.tar.gz) = 332280 bytes
+SHA1 (patch-aa) = ae2cd8ffb34d09c709378cc3b45510cb5d738305
+SHA1 (patch-ab) = 2a2a6b335ddb0ebce2aee38eb004d4b6e26f19b7
+SHA1 (patch-ac) = 96a9a5275e297088f326b729fde3feef79b323aa
diff --git a/multimedia/swfdec/patches/patch-aa b/multimedia/swfdec/patches/patch-aa
new file mode 100644
index 00000000000..2aff0e8cff2
--- /dev/null
+++ b/multimedia/swfdec/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2005/06/04 10:41:42 jmmv Exp $
+
+--- libswfdec/mpglib/clipconv_f32_s16.h.orig	2002-11-06 17:11:48.000000000 +1000
++++ libswfdec/mpglib/clipconv_f32_s16.h
+@@ -34,7 +34,6 @@ Half integers may be rounded to either n
+ //#include <sl_altivec.h>
+ #define f32 float
+ #define s16 short
+-#define HAVE_IEEE754_H
+ 
+ 
+ /* storage class */
diff --git a/multimedia/swfdec/patches/patch-ab b/multimedia/swfdec/patches/patch-ab
new file mode 100644
index 00000000000..4b980a44235
--- /dev/null
+++ b/multimedia/swfdec/patches/patch-ab
@@ -0,0 +1,65 @@
+$NetBSD: patch-ab,v 1.1 2005/06/04 10:41:42 jmmv Exp $
+
+--- player/swf_play.c.orig	Wed Feb  5 20:19:27 2003
++++ player/swf_play.c	Mon May 12 11:43:12 2003
+@@ -15,6 +15,8 @@
+ #include <signal.h>
+ #include <sys/wait.h>
+ #include <sys/time.h>
++#include <sys/signal.h>
++#include <errno.h>
+ #include <time.h>
+ #include <string.h>
+ 
+@@ -72,6 +74,15 @@
+ static gboolean render_idle(gpointer data);
+ 
+ /* fault handling stuff */
++#ifndef SI_USER
++typedef struct {
++        char *si_addr;
++        int si_signo;
++        int si_errno;
++        int si_code;
++} siginfo_t;
++#endif
++
+ void fault_handler(int signum, siginfo_t *si, void *misc);
+ void fault_restore(void);
+ void fault_setup(void);
+@@ -539,6 +550,20 @@
+ 	_exit(0);
+ }
+ 
++#ifndef SI_USER
++void si_handler(int sig, int code, struct sigcontext *scp)
++{
++	siginfo_t si;
++
++	si.si_addr = NULL;
++	si.si_signo = sig;
++	si.si_errno = errno;
++	si.si_code = code;
++
++	fault_handler(sig, &si, scp);
++}
++#endif
++
+ void fault_restore(void)
+ {
+ 	struct sigaction action;
+@@ -555,8 +580,13 @@
+ 	struct sigaction action;
+ 
+ 	memset(&action,0,sizeof(action));
++#ifdef SI_USER
+ 	action.sa_sigaction = fault_handler;
+-	action.sa_flags = SA_SIGINFO;
++	action.sa_flags = 0;
++#else
++	action.sa_handler = (void (*)(int))si_handler;
++	action.sa_flags = 0;
++#endif
+ 
+ 	sigaction(SIGSEGV, &action, NULL);
+ 	sigaction(SIGQUIT, &action, NULL);
diff --git a/multimedia/swfdec/patches/patch-ac b/multimedia/swfdec/patches/patch-ac
new file mode 100644
index 00000000000..3619296298e
--- /dev/null
+++ b/multimedia/swfdec/patches/patch-ac
@@ -0,0 +1,24 @@
+$NetBSD: patch-ac,v 1.1 2005/06/04 10:41:42 jmmv Exp $
+
+--- pixbuf-loader/Makefile.in.orig	2003-02-05 21:37:46.000000000 +0100
++++ pixbuf-loader/Makefile.in
+@@ -102,7 +102,7 @@ SDL_CFLAGS = @SDL_CFLAGS@
+ SDL_LIBS = @SDL_LIBS@
+ STRIP = @STRIP@
+ SWF_CFLAGS = @SWF_CFLAGS@
+-SWF_LIBS = @SWF_LIBS@
++SWF_LIBS = `pkg-config --libs swfdec glib-2.0` -lz
+ VERSION = @VERSION@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -391,10 +391,6 @@ uninstall-am: uninstall-info-am uninstal
+ 
+ 
+ install-data-local: 
+-	if [ -z "$(DESTDIR)" ] ; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
+-	  $(QUERYLOADERS) > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
+-	fi
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: