diff options
author | abs <abs@pkgsrc.org> | 2009-01-29 17:53:49 +0000 |
---|---|---|
committer | abs <abs@pkgsrc.org> | 2009-01-29 17:53:49 +0000 |
commit | 2902b40f8ce95eefecc301e31f4f04f43d257881 (patch) | |
tree | 86fd4acc2287d45b7989c541c0942078a4688c0e | |
parent | c6ef77e854869ec7f667570444f8468eeb564c14 (diff) | |
download | pkgsrc-2902b40f8ce95eefecc301e31f4f04f43d257881.tar.gz |
Updated multimedia/libmpeg3 to 1.8
1.8 - Better table of contents generation & handling of ID3 tags.
pkgsrc changes:
- Fix broken build on NetBSD by reworking the mares nest of
non Linux #ifdefs in mpeg3io.c - build was broken by a
previous __DragonFly__ or __APPLE_ build fix
- Add new patch for 1.8 to avoid Linux DVD ioctls
-rw-r--r-- | multimedia/libmpeg3/Makefile | 4 | ||||
-rw-r--r-- | multimedia/libmpeg3/distinfo | 19 | ||||
-rw-r--r-- | multimedia/libmpeg3/patches/patch-aa | 12 | ||||
-rw-r--r-- | multimedia/libmpeg3/patches/patch-ab | 57 | ||||
-rw-r--r-- | multimedia/libmpeg3/patches/patch-ac | 6 | ||||
-rw-r--r-- | multimedia/libmpeg3/patches/patch-ad | 10 | ||||
-rw-r--r-- | multimedia/libmpeg3/patches/patch-ae | 57 | ||||
-rw-r--r-- | multimedia/libmpeg3/patches/patch-ah | 12 |
8 files changed, 121 insertions, 56 deletions
diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile index 49706873b56..a0a73ab9784 100644 --- a/multimedia/libmpeg3/Makefile +++ b/multimedia/libmpeg3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2009/01/24 12:29:51 tonio Exp $ +# $NetBSD: Makefile,v 1.14 2009/01/29 17:53:49 abs Exp $ # -DISTNAME= libmpeg3-1.7-src +DISTNAME= libmpeg3-1.8-src PKGNAME= ${DISTNAME:S/-src//} #PKGREVISION= 1 CATEGORIES= devel audio graphics multimedia diff --git a/multimedia/libmpeg3/distinfo b/multimedia/libmpeg3/distinfo index 244ebf2d0b1..98ba53ad056 100644 --- a/multimedia/libmpeg3/distinfo +++ b/multimedia/libmpeg3/distinfo @@ -1,13 +1,14 @@ -$NetBSD: distinfo,v 1.17 2009/01/24 12:29:51 tonio Exp $ +$NetBSD: distinfo,v 1.18 2009/01/29 17:53:49 abs Exp $ -SHA1 (libmpeg3-1.7-src.tar.bz2) = 577da1ddf77f1e1fcd1deb69829eec3567daed36 -RMD160 (libmpeg3-1.7-src.tar.bz2) = f1989c4b52d97ee29833edc79efd731b6219f126 -Size (libmpeg3-1.7-src.tar.bz2) = 320897 bytes -SHA1 (patch-aa) = c05dfda5b2b43593044af2328244858453add46c -SHA1 (patch-ac) = f83af5e90c93f7d02395923d2f93fb916057c434 -SHA1 (patch-ad) = 86edf9af264370bf89050b02e956b5bacc86881e -SHA1 (patch-ae) = ccd6908e29c779a83df9ef1e3b5cf785cfa1dcef +SHA1 (libmpeg3-1.8-src.tar.bz2) = dae3fc1d68533e71cb9f77adf124bfbfb4e13ae6 +RMD160 (libmpeg3-1.8-src.tar.bz2) = bc01d72b1e1b3e91ff206bae7a314b939c44b192 +Size (libmpeg3-1.8-src.tar.bz2) = 2452350 bytes +SHA1 (patch-aa) = 482586a3735b4b7a1d3eb23324e9dc9db11eefeb +SHA1 (patch-ab) = 4ca251c445658ad2844b7202ae3a4e1690573f18 +SHA1 (patch-ac) = cfee202be3b9ec53e597a53dc8a6708506c053ad +SHA1 (patch-ad) = e7d5164de3303346b2e92994fc25858323d455b5 +SHA1 (patch-ae) = 740c7ced0043c5476bb7fd1f2d21605cb332984b SHA1 (patch-ag) = bf321ac689b82889ca1a2bb8a96cb6e387280f32 -SHA1 (patch-ah) = d39f80c08cc0b624486389893c8e8ac061953fa2 +SHA1 (patch-ah) = fd039c1d2fdde4ea0e6f7b95cbf18027000fa015 SHA1 (patch-ai) = 859735f677cb469b782e27da2a14bacd3fd02003 SHA1 (patch-aj) = 48a5bcbce03d4ff91e8815b5813d2138b87bacb0 diff --git a/multimedia/libmpeg3/patches/patch-aa b/multimedia/libmpeg3/patches/patch-aa index 22139805d1f..2fcb72555ce 100644 --- a/multimedia/libmpeg3/patches/patch-aa +++ b/multimedia/libmpeg3/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.4 2008/02/20 09:56:44 xtraeme Exp $ +$NetBSD: patch-aa,v 1.5 2009/01/29 17:53:49 abs Exp $ ---- Makefile.orig 2006-02-15 06:09:31.000000000 +0100 -+++ Makefile 2008-02-19 19:35:28.000000000 +0100 +--- Makefile.orig 2008-08-07 04:33:09.000000000 +0100 ++++ Makefile @@ -1,7 +1,7 @@ CC = gcc NASM = nasm @@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.4 2008/02/20 09:56:44 xtraeme Exp $ A52DIR := $(shell expr a52dec* ) -@@ -16,7 +16,7 @@ +@@ -16,7 +16,7 @@ HAVE_CFLAGS := n endif @@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.4 2008/02/20 09:56:44 xtraeme Exp $ -@@ -147,19 +147,19 @@ +@@ -147,19 +147,19 @@ UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mp #$(OBJDIR)/mpeg3split @@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.4 2008/02/20 09:56:44 xtraeme Exp $ +LIBS = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} +all: prepare $(OUTPUT) $(UTILS) --$(shell if ! test -d $(OBJDIR) \; then mkdir -p $(OBJDIR) \; fi ) +-$(shell mkdir -p $(OBJDIR) ) +prepare: + mkdir -p $(OBJDIR) + mkdir -p $(OBJDIR)/audio diff --git a/multimedia/libmpeg3/patches/patch-ab b/multimedia/libmpeg3/patches/patch-ab new file mode 100644 index 00000000000..ad52500e6d4 --- /dev/null +++ b/multimedia/libmpeg3/patches/patch-ab @@ -0,0 +1,57 @@ +$NetBSD: patch-ab,v 1.4 2009/01/29 17:53:49 abs Exp $ + +--- mpeg3css.c.orig 2007-01-09 07:09:52.000000000 +0000 ++++ mpeg3css.c +@@ -41,7 +41,9 @@ + #include <unistd.h> + #include <fcntl.h> + // Must unlink /usr/include directories from the kernel source for this to work. +-#include <linux/cdrom.h> ++#ifdef linux ++# include <linux/cdrom.h> ++#endif + #include <stdlib.h> + #include <string.h> + #include <sys/ioctl.h> +@@ -572,6 +574,7 @@ static void crypt_bus_key(mpeg3_css_t *c + css_engine(perm_varient[varient], scratch, key); + } + ++#ifdef linux + static int get_asf(mpeg3_css_t *css) + { + dvd_authinfo ai; +@@ -588,6 +591,7 @@ static int get_asf(mpeg3_css_t *css) + + return 0; + } ++#endif /* linux */ + + static int authenticate_drive(mpeg3_css_t *css, const unsigned char *key) + { +@@ -611,6 +615,7 @@ static int authenticate_drive(mpeg3_css_ + return 0; + } + ++#ifdef linux + /* Simulation of a non-CSS compliant host (i.e. the authentication fails, + * but idea is here for a real CSS compliant authentication scheme). */ + static int hostauth(mpeg3_css_t *css, dvd_authinfo *ai) +@@ -801,6 +806,7 @@ static int validate(mpeg3_css_t *css, in + + return 0; + } ++#endif /* linux */ + + static int validate_path(mpeg3_css_t *css, int do_title) + { +@@ -831,7 +837,9 @@ static int validate_path(mpeg3_css_t *cs + if(!result) result = (css->fd = open(css->device_path, O_RDONLY | O_NONBLOCK)) < 0; + //printf("validate_path 2 %d\n", result); + ++#ifdef linux + if(!result) result = validate(css, lba, do_title); ++#endif /* linux */ + + //printf("validate_path 3 %d\n", result); + /* Definitely encrypted if we got here. */ diff --git a/multimedia/libmpeg3/patches/patch-ac b/multimedia/libmpeg3/patches/patch-ac index 5570a0d0fc1..c01b07c4207 100644 --- a/multimedia/libmpeg3/patches/patch-ac +++ b/multimedia/libmpeg3/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.4 2008/02/20 09:56:44 xtraeme Exp $ +$NetBSD: patch-ac,v 1.5 2009/01/29 17:53:49 abs Exp $ ---- mpeg3ifo.c.orig 2008-02-19 19:14:12.000000000 +0100 -+++ mpeg3ifo.c 2008-02-19 19:14:46.000000000 +0100 +--- mpeg3ifo.c.orig 2007-12-16 23:25:26.000000000 +0000 ++++ mpeg3ifo.c @@ -1,4 +1,3 @@ -#include <byteswap.h> #include <dirent.h> diff --git a/multimedia/libmpeg3/patches/patch-ad b/multimedia/libmpeg3/patches/patch-ad index 549eb529364..812151eb510 100644 --- a/multimedia/libmpeg3/patches/patch-ad +++ b/multimedia/libmpeg3/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1 2004/06/26 18:00:21 grant Exp $ +$NetBSD: patch-ad,v 1.2 2009/01/29 17:53:49 abs Exp $ ---- ifo.h.orig Tue Jul 31 17:19:54 2001 -+++ ifo.h Tue Jul 31 17:20:47 2001 -@@ -193,7 +193,7 @@ +--- ifo.h.orig 2007-01-09 07:09:52.000000000 +0000 ++++ ifo.h +@@ -193,7 +193,7 @@ typedef struct { u_char *data[10]; int fd; // file descriptor @@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1 2004/06/26 18:00:21 grant Exp $ } ifo_t; -@@ -221,7 +221,7 @@ +@@ -221,7 +221,7 @@ typedef struct { * Prototypes */ diff --git a/multimedia/libmpeg3/patches/patch-ae b/multimedia/libmpeg3/patches/patch-ae index d92d789cadf..644f4b1e045 100644 --- a/multimedia/libmpeg3/patches/patch-ae +++ b/multimedia/libmpeg3/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.12 2009/01/24 12:29:51 tonio Exp $ +$NetBSD: patch-ae,v 1.13 2009/01/29 17:53:49 abs Exp $ ---- mpeg3io.c.orig 2005-05-01 07:57:56.000000000 +0200 +--- mpeg3io.c.orig 2008-07-05 01:47:42.000000000 +0100 +++ mpeg3io.c -@@ -1,11 +1,34 @@ +@@ -1,10 +1,42 @@ #include "mpeg3private.h" #include "mpeg3protos.h" @@ -10,36 +10,43 @@ $NetBSD: patch-ae,v 1.12 2009/01/24 12:29:51 tonio Exp $ #include <stdint.h> #include <stdlib.h> #include <string.h> --#include <sys/stat.h> + -+#if defined(__NetBSD__) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__)) -+# include <sys/param.h> -+# include <sys/mount.h> ++#if defined(__NetBSD__) + -+# if defined(__APPLE__) && defined(__MACH__) -+#include <sys/cdefs.h> -+# endif -+# if (defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__)) -+# define fopen64 fopen -+# define fseeko64 fseek -+# if (defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN_64_BIT_INO_T) /* MacOSX < 10.5 */) -+# define stat64 stat -+# endif -+# endif -+# if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 /* 2.99.9 */ ++# include <sys/mount.h> ++# define fopen64 fopen ++# define fseeko64 fseek ++# define stat64 stat ++# if __NetBSD_Version__ >= 299000900 /* 2.99.9 */ +# define statfs statvfs +# endif + ++#elif defined(__DragonFly__) ++ ++# include <sys/param.h> ++# include <sys/mount.h> +# include <sys/types.h> -+# include <sys/stat.h> -+#else -+# include <mntent.h> -+# include <sys/stat.h> ++# define fopen64 fopen ++# define fseeko64 fseek ++ ++#elif defined(__APPLE__) && defined(__MACH__) ++ ++# include <sys/param.h> ++# include <sys/mount.h> ++# include <sys/cdefs.h> ++# include <sys/types.h> ++# if !defined(__DARWIN_64_BIT_INO_T /* MacOSX < 10.5 */) ++# define stat64 stat ++# endif ++# define fopen64 fopen ++# define fseeko64 fseek ++ +#endif ++ + #include <sys/stat.h> mpeg3_fs_t* mpeg3_new_fs(char *path) - { -@@ -215,16 +238,26 @@ void mpeg3io_complete_path(char *complet +@@ -215,16 +247,26 @@ void mpeg3io_complete_path(char *complet int mpeg3io_device(char *path, char *device) { @@ -66,7 +73,7 @@ $NetBSD: patch-ae,v 1.12 2009/01/24 12:29:51 tonio Exp $ fp = setmntent(MOUNTED, "r"); while(fp && (mnt = getmntent(fp))) { -@@ -236,6 +269,7 @@ int mpeg3io_device(char *path, char *dev +@@ -236,6 +278,7 @@ int mpeg3io_device(char *path, char *dev } } endmntent(fp); diff --git a/multimedia/libmpeg3/patches/patch-ah b/multimedia/libmpeg3/patches/patch-ah index c3740d39519..a1b662b2a75 100644 --- a/multimedia/libmpeg3/patches/patch-ah +++ b/multimedia/libmpeg3/patches/patch-ah @@ -1,13 +1,13 @@ -$NetBSD: patch-ah,v 1.7 2008/06/21 11:45:56 drochner Exp $ +$NetBSD: patch-ah,v 1.8 2009/01/29 17:53:49 abs Exp $ ---- mpeg3tocutil.c.orig 2008-02-19 19:21:30.000000000 +0100 -+++ mpeg3tocutil.c 2008-02-19 19:22:41.000000000 +0100 -@@ -5,8 +5,26 @@ +--- mpeg3tocutil.c.orig 2008-06-21 04:53:27.000000000 +0100 ++++ mpeg3tocutil.c +@@ -5,7 +5,27 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/stat.h> -- ++ +#if defined(__NetBSD__) || defined(__DragonFly__) || (defined(__APPLE__) && defined(__MACH__)) +# include <sys/param.h> +# include <sys/mount.h> @@ -29,5 +29,5 @@ $NetBSD: patch-ah,v 1.7 2008/06/21 11:45:56 drochner Exp $ +# include <sys/stat.h> +#endif + static FILE *test_file = 0; - #define PUT_INT32(x) \ |