pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Move swfdec and swfdec-gtk2 from graphics to multimedia.
details: https://anonhg.NetBSD.org/pkgsrc/rev/b33914e2ec86
branches: trunk
changeset: 495192:b33914e2ec86
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Sat Jun 04 10:41:41 2005 +0000
description:
Move swfdec and swfdec-gtk2 from graphics to multimedia.
Suggested by wiz@.
diffstat:
doc/CHANGES | 4 +-
graphics/Makefile | 4 +-
graphics/swfdec-gtk2/DESCR | 6 ---
graphics/swfdec-gtk2/Makefile | 20 -----------
graphics/swfdec-gtk2/PLIST | 3 -
graphics/swfdec/DESCR | 7 ----
graphics/swfdec/MESSAGE | 7 ----
graphics/swfdec/Makefile | 13 -------
graphics/swfdec/Makefile.common | 25 --------------
graphics/swfdec/PLIST | 7 ----
graphics/swfdec/buildlink3.mk | 23 -------------
graphics/swfdec/distinfo | 8 ----
graphics/swfdec/patches/patch-aa | 12 -------
graphics/swfdec/patches/patch-ab | 65 --------------------------------------
graphics/swfdec/patches/patch-ac | 24 --------------
meta-pkgs/gtk2-extras/Makefile | 4 +-
multimedia/Makefile | 4 +-
multimedia/swfdec-gtk2/DESCR | 6 +++
multimedia/swfdec-gtk2/Makefile | 20 +++++++++++
multimedia/swfdec-gtk2/PLIST | 3 +
multimedia/swfdec/DESCR | 7 ++++
multimedia/swfdec/MESSAGE | 7 ++++
multimedia/swfdec/Makefile | 13 +++++++
multimedia/swfdec/Makefile.common | 25 ++++++++++++++
multimedia/swfdec/PLIST | 7 ++++
multimedia/swfdec/buildlink3.mk | 23 +++++++++++++
multimedia/swfdec/distinfo | 8 ++++
multimedia/swfdec/patches/patch-aa | 12 +++++++
multimedia/swfdec/patches/patch-ab | 65 ++++++++++++++++++++++++++++++++++++++
multimedia/swfdec/patches/patch-ac | 24 ++++++++++++++
30 files changed, 229 insertions(+), 227 deletions(-)
diffs (truncated from 613 to 300 lines):
diff -r d3df9cadaf32 -r b33914e2ec86 doc/CHANGES
--- a/doc/CHANGES Sat Jun 04 10:20:22 2005 +0000
+++ b/doc/CHANGES Sat Jun 04 10:41:41 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.10288 2005/06/04 09:36:23 wiz Exp $
+$NetBSD: CHANGES,v 1.10289 2005/06/04 10:41:41 jmmv Exp $
Changes to the packages collection and infrastructure in 2005:
@@ -2777,3 +2777,5 @@
Added comms/conserver8 version 8.1.11 [wiz 2005-06-03]
Updated security/systrace-policies to 1.1nb1 [kristerw 2005-06-04]
Updated net/rsync to 2.6.5 [wiz 2005-06-04]
+ Moved graphics/swfdec to multimedia/swfdec [jmmv 2005-06-04]
+ Moved graphics/swfdec-gtk2 to multimedia/swfdec-gtk2 [jmmv 2005-06-04]
diff -r d3df9cadaf32 -r b33914e2ec86 graphics/Makefile
--- a/graphics/Makefile Sat Jun 04 10:20:22 2005 +0000
+++ b/graphics/Makefile Sat Jun 04 10:41:41 2005 +0000
@@ -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+= snx101view
SUBDIR+= sodipodi
SUBDIR+= spcaview
-SUBDIR+= swfdec
-SUBDIR+= swfdec-gtk2
SUBDIR+= tgif
SUBDIR+= tiff
SUBDIR+= tkpiechart
diff -r d3df9cadaf32 -r b33914e2ec86 graphics/swfdec-gtk2/DESCR
--- a/graphics/swfdec-gtk2/DESCR Sat Jun 04 10:20:22 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r d3df9cadaf32 -r b33914e2ec86 graphics/swfdec-gtk2/Makefile
--- a/graphics/swfdec-gtk2/Makefile Sat Jun 04 10:20:22 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r d3df9cadaf32 -r b33914e2ec86 graphics/swfdec-gtk2/PLIST
--- a/graphics/swfdec-gtk2/PLIST Sat Jun 04 10:20:22 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r d3df9cadaf32 -r b33914e2ec86 graphics/swfdec/DESCR
--- a/graphics/swfdec/DESCR Sat Jun 04 10:20:22 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r d3df9cadaf32 -r b33914e2ec86 graphics/swfdec/MESSAGE
--- a/graphics/swfdec/MESSAGE Sat Jun 04 10:20:22 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r d3df9cadaf32 -r b33914e2ec86 graphics/swfdec/Makefile
--- a/graphics/swfdec/Makefile Sat Jun 04 10:20:22 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r d3df9cadaf32 -r b33914e2ec86 graphics/swfdec/Makefile.common
--- a/graphics/swfdec/Makefile.common Sat Jun 04 10:20:22 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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@localhost
-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 -r d3df9cadaf32 -r b33914e2ec86 graphics/swfdec/PLIST
--- a/graphics/swfdec/PLIST Sat Jun 04 10:20:22 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r d3df9cadaf32 -r b33914e2ec86 graphics/swfdec/buildlink3.mk
--- a/graphics/swfdec/buildlink3.mk Sat Jun 04 10:20:22 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r d3df9cadaf32 -r b33914e2ec86 graphics/swfdec/distinfo
--- a/graphics/swfdec/distinfo Sat Jun 04 10:20:22 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r d3df9cadaf32 -r b33914e2ec86 graphics/swfdec/patches/patch-aa
--- a/graphics/swfdec/patches/patch-aa Sat Jun 04 10:20:22 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r d3df9cadaf32 -r b33914e2ec86 graphics/swfdec/patches/patch-ab
--- a/graphics/swfdec/patches/patch-ab Sat Jun 04 10:20:22 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r d3df9cadaf32 -r b33914e2ec86 graphics/swfdec/patches/patch-ac
--- a/graphics/swfdec/patches/patch-ac Sat Jun 04 10:20:22 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 ; \
Home |
Main Index |
Thread Index |
Old Index