pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics libflash and flashplayer moved to the multime...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6f778c234403
branches:  trunk
changeset: 467167:6f778c234403
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Mon Jan 26 13:38:43 2004 +0000

description:
libflash and flashplayer moved to the multimedia category.

diffstat:

 graphics/Makefile                  |   4 +-
 graphics/flashplayer/DESCR         |   3 -
 graphics/flashplayer/Makefile      |  21 ------------
 graphics/flashplayer/PLIST         |   2 -
 graphics/libflash/DESCR            |   2 -
 graphics/libflash/Makefile         |  18 ----------
 graphics/libflash/Makefile.common  |  22 ------------
 graphics/libflash/PLIST            |  27 ---------------
 graphics/libflash/buildlink2.mk    |  25 --------------
 graphics/libflash/distinfo         |  12 -------
 graphics/libflash/patches/patch-ab |  34 -------------------
 graphics/libflash/patches/patch-ac |  12 -------
 graphics/libflash/patches/patch-ad |  65 --------------------------------------
 graphics/libflash/patches/patch-af |  26 ---------------
 graphics/libflash/patches/patch-ag |  17 ---------
 graphics/libflash/patches/patch-ah |  49 ----------------------------
 graphics/libflash/patches/patch-ai |  25 --------------
 graphics/libflash/patches/patch-aj |   9 -----
 18 files changed, 1 insertions(+), 372 deletions(-)

diffs (truncated from 462 to 300 lines):

diff -r 39454998a203 -r 6f778c234403 graphics/Makefile
--- a/graphics/Makefile Mon Jan 26 13:37:17 2004 +0000
+++ b/graphics/Makefile Mon Jan 26 13:38:43 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.281 2004/01/26 13:30:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.282 2004/01/26 13:38:43 jmmv Exp $
 #
 
 COMMENT=       Graphics tools and libraries
@@ -60,7 +60,6 @@
 SUBDIR+=       feh
 SUBDIR+=       ffmpeg
 SUBDIR+=       filmgimp
-SUBDIR+=       flashplayer
 SUBDIR+=       fly
 SUBDIR+=       fnlib
 SUBDIR+=       freetype
@@ -130,7 +129,6 @@
 SUBDIR+=       libdvbpsi
 SUBDIR+=       libexif
 SUBDIR+=       libexif-gtk
-SUBDIR+=       libflash
 SUBDIR+=       libgdgeda
 SUBDIR+=       libggi
 SUBDIR+=       libggigcp
diff -r 39454998a203 -r 6f778c234403 graphics/flashplayer/DESCR
--- a/graphics/flashplayer/DESCR        Mon Jan 26 13:37:17 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-Swfplayer is a standalone open source Flash(tm) player using libflash.
-You can use it to quickly play movies without starting Netscape.  It can
-also play movies in the root window (suitable for xscreensaver).
diff -r 39454998a203 -r 6f778c234403 graphics/flashplayer/Makefile
--- a/graphics/flashplayer/Makefile     Mon Jan 26 13:37:17 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2003/09/28 20:05:20 tron Exp $
-#
-
-.include "../libflash/Makefile.common"
-
-PKGNAME=       ${DISTNAME:C/-/player-/}
-PKGREVISION=   2
-COMMENT=       Standalone open source Flash(tm) player
-
-USE_BUILDLINK2=        yes
-BUILD_DIRS=    ${WRKSRC}/Player
-CPPFLAGS+=     -DDEV_DSP=\\\"${DEVOSSSOUND}\\\"
-
-.if defined(CC_VERSION) && !empty(CC_VERSION:Mgcc-3.*)
-MAKE_ENV+=     LIBSTDCPP=-lstdc++
-.else
-MAKE_ENV+=     LIBSTDCPP=
-.endif
-
-.include "../libflash/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 39454998a203 -r 6f778c234403 graphics/flashplayer/PLIST
--- a/graphics/flashplayer/PLIST        Mon Jan 26 13:37:17 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:36 zuntum Exp $
-bin/swfplayer
diff -r 39454998a203 -r 6f778c234403 graphics/libflash/DESCR
--- a/graphics/libflash/DESCR   Mon Jan 26 13:37:17 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Libflash is a GPL Flash(tm) library built around a core graphic renderer
-that is capable of playing Flash(tm) movies.
diff -r 39454998a203 -r 6f778c234403 graphics/libflash/Makefile
--- a/graphics/libflash/Makefile        Mon Jan 26 13:37:17 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2004/01/01 21:29:09 agc Exp $
-#
-
-.include "Makefile.common"
-
-PKGNAME=       lib${DISTNAME}
-PKGREVISION=   4
-COMMENT=       Open source Flash(tm) library
-
-USE_BUILDLINK2=        yes
-USE_LIBTOOL=   yes
-BUILD_DIRS=    ${WRKSRC}/Lib
-MAKE_ENV+=     LIBOSSAUDIO="${LIBOSSAUDIO}"
-MAKE_ENV+=     LIBSTDCPP=-lstdc++
-
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 39454998a203 -r 6f778c234403 graphics/libflash/Makefile.common
--- a/graphics/libflash/Makefile.common Mon Jan 26 13:37:17 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile.common,v 1.3 2003/07/17 21:41:30 grant Exp $
-#
-
-DISTNAME=      flash-0.4.10
-CATEGORIES=    graphics
-MASTER_SITES=  http://www.swift-tools.com/Flash/
-EXTRACT_SUFX=  .tgz
-
-MAINTAINER=    hubertf%NetBSD.org@localhost
-HOMEPAGE=      http://www.swift-tools.com/Flash/
-
-USE_X11=       yes
-
-DISTINFO_FILE= ${.CURDIR}/../libflash/distinfo
-PATCHDIR=      ${.CURDIR}/../libflash/patches
-
-post-extract: remove-subpackages
-
-remove-subpackages:
-       ${RM} -rf ${WRKSRC}/Jpeg ${WRKSRC}/Zlib
-
-.include "../../mk/ossaudio.buildlink2.mk"
diff -r 39454998a203 -r 6f778c234403 graphics/libflash/PLIST
--- a/graphics/libflash/PLIST   Mon Jan 26 13:37:17 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/30 10:24:41 jlam Exp $
-include/flash/adpcm.h
-include/flash/bitmap.h
-include/flash/button.h
-include/flash/character.h
-include/flash/cxform.h
-include/flash/displaylist.h
-include/flash/flash.h
-include/flash/font.h
-include/flash/graphic.h
-include/flash/matrix.h
-include/flash/movie.h
-include/flash/program.h
-include/flash/rect.h
-include/flash/script.h
-include/flash/shape.h
-include/flash/sound.h
-include/flash/sprite.h
-include/flash/sqrt.h
-include/flash/swf.h
-include/flash/text.h
-lib/libflash.a
-lib/libflash.la
-lib/libflash.so
-lib/libflash.so.0
-lib/libflash.so.0.4
-@dirrm include/flash
diff -r 39454998a203 -r 6f778c234403 graphics/libflash/buildlink2.mk
--- a/graphics/libflash/buildlink2.mk   Mon Jan 26 13:37:17 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/01/30 12:22:47 jlam Exp $
-
-.if !defined(LIBFLASH_BUILDLINK2_MK)
-LIBFLASH_BUILDLINK2_MK=        # defined
-
-BUILDLINK_PACKAGES+=           libflash
-BUILDLINK_DEPENDS.libflash?=   libflash>=0.4.10nb4
-BUILDLINK_PKGSRCDIR.libflash?= ../../graphics/libflash
-
-EVAL_PREFIX+=  BUILDLINK_PREFIX.libflash=libflash
-BUILDLINK_PREFIX.libflash_DEFAULT=     ${LOCALBASE}
-BUILDLINK_FILES.libflash+=     include/flash/*.h
-BUILDLINK_FILES.libflash+=     lib/libflash.*
-
-BUILDLINK_CPPFLAGS.libflash=   -I${BUILDLINK_PREFIX.libflash}/include/flash
-CPPFLAGS+=     ${BUILDLINK_CPPFLAGS.libflash}
-
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-
-BUILDLINK_TARGETS+=    libflash-buildlink
-
-libflash-buildlink: _BUILDLINK_USE
-
-.endif # LIBFLASH_BUILDLINK2_MK
diff -r 39454998a203 -r 6f778c234403 graphics/libflash/distinfo
--- a/graphics/libflash/distinfo        Mon Jan 26 13:37:17 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.15 2004/01/01 21:29:09 agc Exp $
-
-SHA1 (flash-0.4.10.tgz) = 41f2b8bba3e551e611913069e6e650bc4c8ab420
-Size (flash-0.4.10.tgz) = 358995 bytes
-SHA1 (patch-ab) = 29afb4393acc2c44e622d398dba05749fb5c581d
-SHA1 (patch-ac) = ce803268d7c85e0317c61dbd63c56028eaba82a8
-SHA1 (patch-ad) = a67db33d60bc5ce23241e5f445aabb9bdb1864c2
-SHA1 (patch-af) = b55169832b1475f41c7e7ecaf1abe1f7d4c93037
-SHA1 (patch-ag) = cc6277a63c4bfa54a35b74a1a66dea5923ae8637
-SHA1 (patch-ah) = ff644dd1c53b54a029adc870f69e128213e50635
-SHA1 (patch-ai) = a4f927b4698e7de7b46f2496b57c83a30a57fecb
-SHA1 (patch-aj) = d37351360b7e703747b4742e0378f89c528bdef7
diff -r 39454998a203 -r 6f778c234403 graphics/libflash/patches/patch-ab
--- a/graphics/libflash/patches/patch-ab        Mon Jan 26 13:37:17 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2004/01/01 21:29:09 agc Exp $
-
---- Lib/Makefile.orig  Sun Jun  4 02:49:23 2000
-+++ Lib/Makefile
-@@ -1,6 +1,5 @@
--CPPFLAGS=-I../Jpeg -I../Zlib
- # Comment out the following line if you use egcs :
--CXXFLAGS=-O3 -Wall -fno-rtti -fno-exceptions
-+CXXFLAGS+=-Wall -fno-rtti -fno-exceptions
- 
- INCLUDES= adpcm.h        cxform.h       graphic.h      script.h       sqrt.h\
-       bitmap.h       displaylist.h  matrix.h       shape.h        swf.h\
-@@ -34,7 +33,20 @@
- #     bitstream.o
- #     dump.o
- 
--all: libflash.a
-+.cc.o:
-+      ${LIBTOOL} --mode=compile ${CXX} -c ${CPPFLAGS} ${CXXFLAGS} $<
-+
-+all: libflash.la
-+
-+install: libflash.la
-+      ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libflash.la ${PREFIX}/lib
-+      ${BSD_INSTALL_DATA_DIR} ${PREFIX}/include/flash
-+      for file in ${INCLUDES}; do \
-+              ${BSD_INSTALL_DATA} $$file ${PREFIX}/include/flash; \
-+      done
-+
-+libflash.la: $(SWFOBJS)
-+      ${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${SWFOBJS:.o=.lo} -rpath ${PREFIX}/lib -ljpeg -lz ${LIBSTDCPP} ${LIBOSSAUDIO} -version-info 0:4
- 
- libflash.a: $(SWFOBJS) 
-       ar rcs $@ $(SWFOBJS)
diff -r 39454998a203 -r 6f778c234403 graphics/libflash/patches/patch-ac
--- a/graphics/libflash/patches/patch-ac        Mon Jan 26 13:37:17 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2002/07/11 14:24:00 abs Exp $
-
---- Lib/flash.cc.orig  Thu Jul 11 15:07:01 2002
-+++ Lib/flash.cc
-@@ -100,6 +100,7 @@ long FlashGraphicInit(FlashHandle flashH
-                       break;
-               default:
-                       fprintf(stderr, "Unsupported depth\n");
-+                      return 0;
-       }
- 
-       fh->gd->setMovieDimension(fh->main->frameRect.xmax - fh->main->frameRect.xmin,
diff -r 39454998a203 -r 6f778c234403 graphics/libflash/patches/patch-ad
--- a/graphics/libflash/patches/patch-ad        Mon Jan 26 13:37:17 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2003/01/30 12:22:48 jlam Exp $
-
---- Lib/sound.cc.orig  Wed Sep  1 08:10:03 1999
-+++ Lib/sound.cc
-@@ -26,7 +26,11 @@
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #ifndef NOSOUND
--#include <linux/soundcard.h>
-+#ifdef HAVE_SOUNDCARD_H
-+#include <soundcard.h>
-+#else
-+#include <sys/soundcard.h>
-+#endif
- #endif
- 
- #ifdef RCSID
-@@ -56,16 +60,16 @@ void
- Sound::setSoundFlags(long f) {
-       switch (GET_SOUND_RATE_CODE(f)) {
-               case 0:
--                      soundRate = 5500;
-+                      soundRate = 5512;
-                       break;
-               case 1:
--                      soundRate = 11000;
-+                      soundRate = 11025;
-                       break;
-               case 2:
--                      soundRate = 22000;
-+                      soundRate = 22050;
-                       break;
-               case 3:
--                      soundRate = 44000;
-+                      soundRate = 44100;
-                       break;
-       }
-       if (f & soundIs16bit) {
-@@ -162,7 +166,7 @@ SoundMixer::SoundMixer(char *device)
-       }
- 
-       // Reset device
--      status = ioctl(dsp, SNDCTL_DSP_RESET);
-+      status = ioctl(dsp, SNDCTL_DSP_RESET, NULL);
-       if (status < 0) perror("ioctl SNDCTL_DSP_RESET");
- 
-       // Set sample size
-@@ -187,7 +191,7 @@ SoundMixer::SoundMixer(char *device)
-       }



Home | Main Index | Thread Index | Old Index