Move swfdec and swfdec-gtk2 from graphics to multimedia.

Suggested by wiz@.

3 files changed, 101 insertions, 0 deletions

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: