Move swfdec and swfdec-gtk2 from graphics to multimedia.

Suggested by wiz@.

14 files changed, 1 insertions, 223 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index ceadde86961..681f21a59df 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.384 2005/05/18 22:39:00 wiz Exp $
+# $NetBSD: Makefile,v 1.385 2005/06/04 10:41:41 jmmv Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -261,8 +261,6 @@ SUBDIR+=	skencil
 SUBDIR+=	snx101view
 SUBDIR+=	sodipodi
 SUBDIR+=	spcaview
-SUBDIR+=	swfdec
-SUBDIR+=	swfdec-gtk2
 SUBDIR+=	tgif
 SUBDIR+=	tiff
 SUBDIR+=	tkpiechart
diff --git a/graphics/swfdec-gtk2/DESCR b/graphics/swfdec-gtk2/DESCR
deleted file mode 100644
index 8ca0443a1ac..00000000000
--- a/graphics/swfdec-gtk2/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-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/graphics/swfdec-gtk2/Makefile b/graphics/swfdec-gtk2/Makefile
deleted file mode 100644
index 971c2d7734e..00000000000
--- a/graphics/swfdec-gtk2/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2005/03/27 15:43:37 wiz Exp $
-#
-
-PKGREVISION=		2
-
-.include "../../graphics/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 "../../graphics/swfdec/buildlink3.mk"
-.include "../../x11/gtk2/modules.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/swfdec-gtk2/PLIST b/graphics/swfdec-gtk2/PLIST
deleted file mode 100644
index f19f36dd6d6..00000000000
--- a/graphics/swfdec-gtk2/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:38 jlam 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/graphics/swfdec/DESCR b/graphics/swfdec/DESCR
deleted file mode 100644
index dca3b18623c..00000000000
--- a/graphics/swfdec/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-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/graphics/swfdec/MESSAGE b/graphics/swfdec/MESSAGE
deleted file mode 100644
index 914486ba438..00000000000
--- a/graphics/swfdec/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2004/01/22 12:48:32 jmmv Exp $
-
-You should install the swfdec-gtk2 package, which provides an SWF
-gdk-pixbuf loader for the GTK2 toolkit.
-
-===========================================================================
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
deleted file mode 100644
index f5b34723feb..00000000000
--- a/graphics/swfdec/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2005/03/27 15:43:37 wiz 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/graphics/swfdec/Makefile.common b/graphics/swfdec/Makefile.common
deleted file mode 100644
index 39de7c0395d..00000000000
--- a/graphics/swfdec/Makefile.common
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile.common,v 1.8 2005/06/04 00:21:05 wiz Exp $
-#
-
-DISTNAME=		swfdec-0.2.2
-CATEGORIES=		graphics
-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}/../../graphics/swfdec/distinfo
-PATCHDIR=		${.CURDIR}/../../graphics/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/graphics/swfdec/PLIST b/graphics/swfdec/PLIST
deleted file mode 100644
index 195e4ccdc0d..00000000000
--- a/graphics/swfdec/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:38 jlam 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/graphics/swfdec/buildlink3.mk b/graphics/swfdec/buildlink3.mk
deleted file mode 100644
index 8c4b4db6960..00000000000
--- a/graphics/swfdec/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:14:58 tv 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/graphics/swfdec/distinfo b/graphics/swfdec/distinfo
deleted file mode 100644
index bc14984c72f..00000000000
--- a/graphics/swfdec/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 08:45:13 agc 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/graphics/swfdec/patches/patch-aa b/graphics/swfdec/patches/patch-aa
deleted file mode 100644
index f93b602e525..00000000000
--- a/graphics/swfdec/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/04/23 08:15:40 rh 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/graphics/swfdec/patches/patch-ab b/graphics/swfdec/patches/patch-ab
deleted file mode 100644
index 91f2e905289..00000000000
--- a/graphics/swfdec/patches/patch-ab
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/05/12 20:17:48 jmc 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/graphics/swfdec/patches/patch-ac b/graphics/swfdec/patches/patch-ac
deleted file mode 100644
index 5925c37c250..00000000000
--- a/graphics/swfdec/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/01/22 12:48:32 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: