pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc move libmpeg3 to multimedia/



details:   https://anonhg.NetBSD.org/pkgsrc/rev/57c164059cf8
branches:  trunk
changeset: 477084:57c164059cf8
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Jun 26 18:00:21 2004 +0000

description:
move libmpeg3 to multimedia/

diffstat:

 devel/Makefile                       |    3 +-
 devel/libmpeg3/DESCR                 |   12 -
 devel/libmpeg3/Makefile              |   64 -------
 devel/libmpeg3/PLIST                 |   27 ---
 devel/libmpeg3/buildlink3.mk         |   20 --
 devel/libmpeg3/distinfo              |   12 -
 devel/libmpeg3/patches/patch-aa      |   22 --
 devel/libmpeg3/patches/patch-ab      |   13 -
 devel/libmpeg3/patches/patch-ac      |   19 --
 devel/libmpeg3/patches/patch-ad      |   22 --
 devel/libmpeg3/patches/patch-ae      |   55 ------
 devel/libmpeg3/patches/patch-af      |   22 --
 devel/libmpeg3/patches/patch-ag      |   45 -----
 devel/libmpeg3/patches/patch-ah      |  310 -----------------------------------
 multimedia/Makefile                  |    3 +-
 multimedia/libmpeg3/DESCR            |   12 +
 multimedia/libmpeg3/Makefile         |   64 +++++++
 multimedia/libmpeg3/PLIST            |   27 +++
 multimedia/libmpeg3/buildlink3.mk    |   20 ++
 multimedia/libmpeg3/distinfo         |   12 +
 multimedia/libmpeg3/patches/patch-aa |   22 ++
 multimedia/libmpeg3/patches/patch-ab |   13 +
 multimedia/libmpeg3/patches/patch-ac |   19 ++
 multimedia/libmpeg3/patches/patch-ad |   22 ++
 multimedia/libmpeg3/patches/patch-ae |   55 ++++++
 multimedia/libmpeg3/patches/patch-af |   22 ++
 multimedia/libmpeg3/patches/patch-ag |   45 +++++
 multimedia/libmpeg3/patches/patch-ah |  310 +++++++++++++++++++++++++++++++++++
 multimedia/transcode/Makefile        |    4 +-
 29 files changed, 648 insertions(+), 648 deletions(-)

diffs (truncated from 1442 to 300 lines):

diff -r 41eda25a8657 -r 57c164059cf8 devel/Makefile
--- a/devel/Makefile    Sat Jun 26 17:50:59 2004 +0000
+++ b/devel/Makefile    Sat Jun 26 18:00:21 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.508 2004/06/26 09:16:10 grant Exp $
+# $NetBSD: Makefile,v 1.509 2004/06/26 18:00:21 grant Exp $
 #
 
 COMMENT=       Development utilities
@@ -209,7 +209,6 @@
 SUBDIR+=       libjit
 SUBDIR+=       libmemmgr
 SUBDIR+=       libmm
-SUBDIR+=       libmpeg3
 SUBDIR+=       libnet
 SUBDIR+=       libntlm
 SUBDIR+=       libole2
diff -r 41eda25a8657 -r 57c164059cf8 devel/libmpeg3/DESCR
--- a/devel/libmpeg3/DESCR      Sat Jun 26 17:50:59 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-Libmpeg3 decodes
-                    MPEG-1 Layer II Audio
-                    MPEG-1 Layer III Audio
-                    MPEG-2 Layer III Audio
-                    MPEG-1 program streams
-                    MPEG-2 program streams
-                    MPEG-2 transport streams
-                    AC3 Audio
-                    MPEG-2 Video
-                    MPEG-1 Video
-                    IFO files
-                    VOB files
diff -r 41eda25a8657 -r 57c164059cf8 devel/libmpeg3/Makefile
--- a/devel/libmpeg3/Makefile   Sat Jun 26 17:50:59 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2004/06/12 04:34:49 grant Exp $
-#
-
-DISTNAME=      libmpeg3-1.3
-PKGREVISION=   4
-CATEGORIES=    devel audio graphics
-MASTER_SITES=  http://heroines.sourceforge.net/
-
-MAINTAINER=    tech-pkg%NetBSD.org@localhost
-HOMEPAGE=      http://heroines.sourceforge.net/libmpeg3.php3
-COMMENT=       MPEG decoding library
-
-.if (${MACHINE_ARCH} == "i386")
-BUILD_DEPENDS+=        nasm-[0-9]*:../../devel/nasm
-.else
-CONFIGURE_ARGS+= --no-mmx --no-css
-.endif
-
-USE_BUILDLINK3= yes
-HAS_CONFIGURE= yes
-USE_GNU_TOOLS+=        make
-
-ONLY_FOR_COMPILER=     gcc
-
-PTHREAD_OPTS+= require
-
-post-configure:
-       ${ECHO} "CFLAGS+=-O2" >>${WRKSRC}/global_config
-       ${ECHO} "CFLAGS+=-I${BUILDLINK_DIR}/include" >>${WRKSRC}/global_config
-       ${ECHO} "CFLAGS+=-D_FILE_OFFSET_BITS=64" >>${WRKSRC}/global_config
-
-INSTHDRS=      bitstream.h libmpeg3.h mpeg3atrack.h mpeg3css.h \
-               mpeg3demux.h mpeg3io.h mpeg3private.h \
-               mpeg3private.inc mpeg3title.h mpeg3vtrack.h timecode.h
-AINSTHDRS=     ac3.h mpeg3audio.h
-VINSTHDRS=     idct.h mpeg3video.h slice.h
-INSTBINS=      mpeg3cat mpeg3toc mpeg3split
-
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/work/dump ${PREFIX}/bin/mpeg3dump
-       for f in ${INSTBINS}; do \
-               ${INSTALL_PROGRAM} ${WRKSRC}/work/$$f ${PREFIX}/bin; \
-       done
-       ${INSTALL_DATA_DIR} ${PREFIX}/include/mpeg3
-       for f in ${INSTHDRS}; do \
-               ${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/include/mpeg3; \
-       done
-       ${INSTALL_DATA_DIR} ${PREFIX}/include/mpeg3/audio
-       for f in ${AINSTHDRS}; do \
-               ${INSTALL_DATA} ${WRKSRC}/audio/$$f \
-                       ${PREFIX}/include/mpeg3/audio; \
-       done
-       ${INSTALL_DATA_DIR} ${PREFIX}/include/mpeg3/video
-       for f in ${VINSTHDRS}; do \
-               ${INSTALL_DATA} ${WRKSRC}/video/$$f \
-                       ${PREFIX}/include/mpeg3/video; \
-       done
-       ${INSTALL_DATA} ${WRKSRC}/work/libmpeg3.a ${PREFIX}/lib
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/libmpeg3
-       ${INSTALL_DATA} ${WRKSRC}/docs/index.html \
-               ${PREFIX}/share/doc/html/libmpeg3
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 41eda25a8657 -r 57c164059cf8 devel/libmpeg3/PLIST
--- a/devel/libmpeg3/PLIST      Sat Jun 26 17:50:59 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/04/29 21:41:41 rh Exp $
-include/mpeg3/libmpeg3.h
-bin/mpeg3dump
-bin/mpeg3cat
-bin/mpeg3toc
-bin/mpeg3split
-include/mpeg3/bitstream.h
-include/mpeg3/mpeg3atrack.h
-include/mpeg3/mpeg3css.h
-include/mpeg3/mpeg3demux.h
-include/mpeg3/mpeg3io.h
-include/mpeg3/mpeg3private.h
-include/mpeg3/mpeg3private.inc
-include/mpeg3/mpeg3title.h
-include/mpeg3/mpeg3vtrack.h
-include/mpeg3/timecode.h
-include/mpeg3/audio/ac3.h
-include/mpeg3/audio/mpeg3audio.h
-include/mpeg3/video/idct.h
-include/mpeg3/video/mpeg3video.h
-include/mpeg3/video/slice.h
-lib/libmpeg3.a
-share/doc/html/libmpeg3/index.html
-@dirrm include/mpeg3/audio
-@dirrm include/mpeg3/video
-@dirrm include/mpeg3
-@dirrm share/doc/html/libmpeg3
diff -r 41eda25a8657 -r 57c164059cf8 devel/libmpeg3/buildlink3.mk
--- a/devel/libmpeg3/buildlink3.mk      Sat Jun 26 17:50:59 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/03/12 19:34:01 snj Exp $
-
-BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
-LIBMPEG3_BUILDLINK3_MK:=       ${LIBMPEG3_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=    libmpeg3
-.endif
-
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nlibmpeg3}
-BUILDLINK_PACKAGES+=   libmpeg3
-
-.if !empty(LIBMPEG3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmpeg3+=   libmpeg3>=1.3nb4
-BUILDLINK_PKGSRCDIR.libmpeg3?= ../../devel/libmpeg3
-.endif # LIBMPEG3_BUILDLINK3_MK
-
-.include "../../mk/pthread.buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 41eda25a8657 -r 57c164059cf8 devel/libmpeg3/distinfo
--- a/devel/libmpeg3/distinfo   Sat Jun 26 17:50:59 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.3 2004/05/04 13:50:57 mrg Exp $
-
-SHA1 (libmpeg3-1.3.tar.gz) = e7e8b03ab45d5593558b0d19e31f0694cfdfa2b5
-Size (libmpeg3-1.3.tar.gz) = 154062 bytes
-SHA1 (patch-aa) = a5665a330234b964aca00a5c4c6f00a9f1bd11ff
-SHA1 (patch-ab) = 844cfcbd99269f1f0b4bef76e0a8567522070707
-SHA1 (patch-ac) = fa32047a70936d0ab81100a4f4b3b0ccdcd3a708
-SHA1 (patch-ad) = 86edf9af264370bf89050b02e956b5bacc86881e
-SHA1 (patch-ae) = 55cf13476c59da1844fb4bc2bff7b50a78a6a4f1
-SHA1 (patch-af) = 7e62a236ee0a7398c1b1a3e994261ebb9be50bae
-SHA1 (patch-ag) = bf321ac689b82889ca1a2bb8a96cb6e387280f32
-SHA1 (patch-ah) = 58ffda3df9be3b089de362451ddf249a74fac5be
diff -r 41eda25a8657 -r 57c164059cf8 devel/libmpeg3/patches/patch-aa
--- a/devel/libmpeg3/patches/patch-aa   Sat Jun 26 17:50:59 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/02 17:34:00 drochner Exp $
-
---- Makefile.orig      Sun May 20 05:05:26 2001
-+++ Makefile   Tue Jul 31 17:34:17 2001
-@@ -2,7 +2,7 @@
- 
- CFLAGS += 
- 
--OBJDIR = $(shell uname --machine)
-+OBJDIR = work
- 
- $(shell sh -c 'if ! test -d $(OBJDIR)\; then \
-       mkdir $(OBJDIR)\; \
-@@ -69,7 +69,7 @@
- 
- OUTPUT = $(OBJDIR)/libmpeg3.a
- UTILS = $(OBJDIR)/dump $(OBJDIR)/mpeg3cat $(OBJDIR)/mpeg3toc $(OBJDIR)/mpeg3split
--LIBS = -lm -lpthread
-+LIBS = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lm -lpthread
- 
- all: $(OUTPUT) util
- 
diff -r 41eda25a8657 -r 57c164059cf8 devel/libmpeg3/patches/patch-ab
--- a/devel/libmpeg3/patches/patch-ab   Sat Jun 26 17:50:59 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/08/02 17:34:00 drochner Exp $
-
---- mpeg3css.c.orig    Tue Jul 31 17:16:17 2001
-+++ mpeg3css.c Tue Jul 31 17:16:44 2001
-@@ -45,7 +45,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/types.h>
--#include <linux/cdrom.h>
-+#include <sys/dvdio.h>
- 
- #ifndef FIBMAP
- #define FIBMAP           _IO(0x00,1)  /* bmap access */
diff -r 41eda25a8657 -r 57c164059cf8 devel/libmpeg3/patches/patch-ac
--- a/devel/libmpeg3/patches/patch-ac   Sat Jun 26 17:50:59 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/08/02 17:34:00 drochner Exp $
-
---- mpeg3ifo.c.orig    Tue Jul 31 17:18:25 2001
-+++ mpeg3ifo.c Tue Jul 31 17:18:56 2001
-@@ -1,9 +1,13 @@
--#include <byteswap.h>
- #include <dirent.h>
- #include <fcntl.h>
- #include <stdlib.h>
- #include <string.h>
- #include <sys/types.h>
-+
-+#include <sys/endian.h>
-+#include <machine/bswap.h>
-+#define bswap_16(x) bswap16(x)
-+#define bswap_32(x) bswap32(x)
- 
- #include "ifo.h"
- #include "mpeg3private.h"
diff -r 41eda25a8657 -r 57c164059cf8 devel/libmpeg3/patches/patch-ad
--- a/devel/libmpeg3/patches/patch-ad   Sat Jun 26 17:50:59 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/08/02 17:34:00 drochner Exp $
-
---- ifo.h.orig Tue Jul 31 17:19:54 2001
-+++ ifo.h      Tue Jul 31 17:20:47 2001
-@@ -193,7 +193,7 @@
-       u_char *data[10];
-       
-       int fd;         // file descriptor
--      __off64_t pos;  // offset of ifo file on device 
-+      off_t pos;      // offset of ifo file on device 
- } ifo_t;
- 
- 
-@@ -221,7 +221,7 @@
-  * Prototypes
-  */
- 
--ifo_t *ifoOpen (int fd, __off64_t pos);
-+ifo_t *ifoOpen (int fd, off_t pos);
- int ifoClose (ifo_t *ifo);
- 
- u_int ifoGetVOBStart  (ifo_t *ifo);
diff -r 41eda25a8657 -r 57c164059cf8 devel/libmpeg3/patches/patch-ae
--- a/devel/libmpeg3/patches/patch-ae   Sat Jun 26 17:50:59 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2004/05/04 13:50:57 mrg Exp $
-
---- mpeg3io.c.orig     2001-05-20 13:05:26.000000000 +1000
-+++ mpeg3io.c  2004-05-04 23:48:36.000000000 +1000
-@@ -1,11 +1,17 @@
- #include "mpeg3private.h"
- #include "mpeg3protos.h"
- 
--#include <mntent.h>
--#include <sys/stat.h>
-+#include <sys/param.h>
-+#include <sys/mount.h>
- #include <stdlib.h>
- #include <string.h>
- 
-+#ifdef __NetBSD__
-+# if __NetBSD_Version__ >= 200040000  /* 2.0D */
-+#  define statfs statvfs
-+# endif
-+#endif
-+
- mpeg3_fs_t* mpeg3_new_fs(char *path)
- {
-       mpeg3_fs_t *fs = calloc(1, sizeof(mpeg3_fs_t));
-@@ -88,27 +94,15 @@
- 
- int mpeg3io_device(char *path, char *device)
- {
--      struct stat file_st, device_st;
--    struct mntent *mnt;
--      FILE *fp;
-+      struct statfs file_st;



Home | Main Index | Thread Index | Old Index