diff options
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/libdvdread/Makefile | 7 | ||||
-rw-r--r-- | multimedia/libdvdread/PLIST | 3 | ||||
-rw-r--r-- | multimedia/libdvdread/distinfo | 14 | ||||
-rw-r--r-- | multimedia/libdvdread/patches/patch-aa | 40 | ||||
-rw-r--r-- | multimedia/libdvdread/patches/patch-ab | 37 | ||||
-rw-r--r-- | multimedia/libdvdread/patches/patch-ac | 14 | ||||
-rw-r--r-- | multimedia/libdvdread/patches/patch-ad | 22 | ||||
-rw-r--r-- | multimedia/libdvdread/patches/patch-ae | 35 |
8 files changed, 15 insertions, 157 deletions
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile index 2b21567b094..560cd2a51c0 100644 --- a/multimedia/libdvdread/Makefile +++ b/multimedia/libdvdread/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2005/05/25 17:07:53 drochner Exp $ +# $NetBSD: Makefile,v 1.9 2006/01/23 22:09:26 wiz Exp $ -DISTNAME= libdvdread-0.9.4 -PKGREVISION= 2 +DISTNAME= libdvdread-0.9.5 CATEGORIES= multimedia MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ @@ -15,6 +14,6 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LIBTOOL= yes -MESSAGE_SUBST+= PKGBASE=${PKGBASE} +MESSAGE_SUBST+= PKGBASE=${PKGBASE:Q} .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/libdvdread/PLIST b/multimedia/libdvdread/PLIST index 3d304cfe43a..8d545d943f1 100644 --- a/multimedia/libdvdread/PLIST +++ b/multimedia/libdvdread/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:45 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2006/01/23 22:09:26 wiz Exp $ +include/dvdread/cmd_print.h include/dvdread/dvd_reader.h include/dvdread/ifo_print.h include/dvdread/ifo_read.h diff --git a/multimedia/libdvdread/distinfo b/multimedia/libdvdread/distinfo index 6e5a3c874eb..3a9599f1516 100644 --- a/multimedia/libdvdread/distinfo +++ b/multimedia/libdvdread/distinfo @@ -1,10 +1,6 @@ -$NetBSD: distinfo,v 1.7 2005/05/25 17:11:52 drochner Exp $ +$NetBSD: distinfo,v 1.8 2006/01/23 22:09:26 wiz Exp $ -SHA1 (libdvdread-0.9.4.tar.gz) = a4b626e49ba8bd33857693c3abe8b34196bc3360 -RMD160 (libdvdread-0.9.4.tar.gz) = 9f7f82e14fb5d458686e5cb2e5f364bad19dd08e -Size (libdvdread-0.9.4.tar.gz) = 256858 bytes -SHA1 (patch-aa) = 2b5a308a24e2ba17109f8c4978d0a972864d2a72 -SHA1 (patch-ab) = 52416442f5988b28c109d623d2ac4ee61a802db2 -SHA1 (patch-ac) = 971dc8802bf8f815821e8ad5f279a5148fcf26f7 -SHA1 (patch-ad) = f6d44ffc3434e79499a807daa8daa7f22eba54ab -SHA1 (patch-ae) = 99d296d4c1c49f1ff4747109dfc8b3d07647ffc4 +SHA1 (libdvdread-0.9.5.tar.gz) = 7f10287953edb6f00667e12fee3a8b101be9f1cd +RMD160 (libdvdread-0.9.5.tar.gz) = a558dad42487fb39771c89862075bc29c2d054ca +Size (libdvdread-0.9.5.tar.gz) = 381006 bytes +SHA1 (patch-ab) = 9aef0b8418a947df46ee66439bed4690a6b3633d diff --git a/multimedia/libdvdread/patches/patch-aa b/multimedia/libdvdread/patches/patch-aa deleted file mode 100644 index 8bd878a28fc..00000000000 --- a/multimedia/libdvdread/patches/patch-aa +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2005/05/25 17:11:52 drochner Exp $ - ---- dvdread/bswap.h.orig 2002-12-15 01:09:12.000000000 +0100 -+++ dvdread/bswap.h -@@ -53,19 +53,33 @@ - #define B2N_32(x) x = swap32(x) - #define B2N_64(x) x = swap64(x) - --#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000 -+#elif defined(__DragonFly__) - #include <sys/endian.h> - #define B2N_16(x) x = be16toh(x) - #define B2N_32(x) x = be32toh(x) - #define B2N_64(x) x = be64toh(x) - -+#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000 -+#include <sys/endian.h> -+#define B2N_16(x) x = be16toh(x) -+#define B2N_32(x) x = be32toh(x) -+#define B2N_64(x) x = \ -+ ((((x) & 0xff00000000000000) >> 56) | \ -+ (((x) & 0x00ff000000000000) >> 40) | \ -+ (((x) & 0x0000ff0000000000) >> 24) | \ -+ (((x) & 0x000000ff00000000) >> 8) | \ -+ (((x) & 0x00000000ff000000) << 8) | \ -+ (((x) & 0x0000000000ff0000) << 24) | \ -+ (((x) & 0x000000000000ff00) << 40) | \ -+ (((x) & 0x00000000000000ff) << 56)) -+ - /* This is a slow but portable implementation, it has multiple evaluation - * problems so beware. - * Old FreeBSD's and Solaris don't have <byteswap.h> or any other such - * functionality! - */ - --#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) -+#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(__INTERIX) - #define B2N_16(x) \ - x = ((((x) & 0xff00) >> 8) | \ - (((x) & 0x00ff) << 8)) diff --git a/multimedia/libdvdread/patches/patch-ab b/multimedia/libdvdread/patches/patch-ab index 25305c071f0..c0eb90bc6b3 100644 --- a/multimedia/libdvdread/patches/patch-ab +++ b/multimedia/libdvdread/patches/patch-ab @@ -1,40 +1,13 @@ -$NetBSD: patch-ab,v 1.3 2005/05/25 17:11:52 drochner Exp $ +$NetBSD: patch-ab,v 1.4 2006/01/23 22:09:26 wiz Exp $ ---- dvdread/dvd_reader.c.orig 2003-02-13 23:31:21.000000000 +0100 +--- dvdread/dvd_reader.c.orig 2006-01-22 16:45:29.000000000 +0100 +++ dvdread/dvd_reader.c -@@ -32,7 +32,7 @@ +@@ -33,7 +33,7 @@ #include <limits.h> #include <dirent.h> --#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__) -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__) || defined(__DragonFly__) +-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(__DARWIN__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(__DARWIN__) || defined(__DragonFly__) #define SYS_BSD 1 #endif -@@ -282,7 +282,7 @@ static char *bsd_block2char( const char - char *new_path; - - /* If it doesn't start with "/dev/" or does start with "/dev/r" exit */ -- if( !strncmp( path, "/dev/", 5 ) || strncmp( path, "/dev/r", 6 ) ) -+ if( strncmp( path, "/dev/", 5 ) || !strncmp( path, "/dev/r", 6 ) ) - return (char *) strdup( path ); - - /* Replace "/dev/" with "/dev/r" */ -@@ -915,7 +915,7 @@ ssize_t DVDReadBlocks( dvd_file_t *dvd_f - return (ssize_t)ret; - } - --int32_t DVDFileSeek( dvd_file_t *dvd_file, int32_t offset ) -+int32_t DVDFileSeek( dvd_file_t *dvd_file, int offset ) - { - /* Check arguments. */ - if( dvd_file == NULL || offset < 0 ) -@@ -1033,7 +1033,7 @@ int DVDISOVolumeInfo( dvd_reader_t *dvd, - - /* Check arguments. */ - if( dvd == NULL ) -- return 0; -+ return -1; - - if( dvd->dev == NULL ) { - /* No block access, so no ISO... */ diff --git a/multimedia/libdvdread/patches/patch-ac b/multimedia/libdvdread/patches/patch-ac deleted file mode 100644 index ebad152a7d3..00000000000 --- a/multimedia/libdvdread/patches/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2004/06/21 16:14:14 drochner Exp $ - ---- dvdread/ifo_types.h.orig 2004-05-19 21:26:26.000000000 +0200 -+++ dvdread/ifo_types.h -@@ -407,8 +407,8 @@ typedef struct { - uint16_t next_pgc_nr; - uint16_t prev_pgc_nr; - uint16_t goup_pgc_nr; -- uint8_t still_time; - uint8_t pg_playback_mode; -+ uint8_t still_time; - uint32_t palette[16]; /* New type struct {zero_1, Y, Cr, Cb} ? */ - uint16_t command_tbl_offset; - uint16_t program_map_offset; diff --git a/multimedia/libdvdread/patches/patch-ad b/multimedia/libdvdread/patches/patch-ad deleted file mode 100644 index 8df79b44a7a..00000000000 --- a/multimedia/libdvdread/patches/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2005/05/25 17:07:53 drochner Exp $ - ---- dvdread/dvd_input.c.orig 2005-05-24 18:41:21.000000000 +0200 -+++ dvdread/dvd_input.c -@@ -74,7 +74,7 @@ static dvd_input_t css_open(const char * - dvd_input_t dev; - - /* Allocate the handle structure */ -- dev = (dvd_input_t) malloc(sizeof(dvd_input_t)); -+ dev = (dvd_input_t) malloc(sizeof(struct dvd_input_s)); - if(dev == NULL) { - fprintf(stderr, "libdvdread: Could not allocate memory.\n"); - return NULL; -@@ -154,7 +154,7 @@ static dvd_input_t file_open(const char - dvd_input_t dev; - - /* Allocate the library structure */ -- dev = (dvd_input_t) malloc(sizeof(dvd_input_t)); -+ dev = (dvd_input_t) malloc(sizeof(struct dvd_input_s)); - if(dev == NULL) { - fprintf(stderr, "libdvdread: Could not allocate memory.\n"); - return NULL; diff --git a/multimedia/libdvdread/patches/patch-ae b/multimedia/libdvdread/patches/patch-ae deleted file mode 100644 index 877fd234335..00000000000 --- a/multimedia/libdvdread/patches/patch-ae +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2005/05/25 17:07:53 drochner Exp $ - ---- dvdread/ifo_read.c.orig 2003-01-17 21:49:16.000000000 +0100 -+++ dvdread/ifo_read.c -@@ -257,6 +257,7 @@ void ifoClose(ifo_handle_t *ifofile) { - ifoFree_FP_PGC(ifofile); - ifoFree_PGCIT(ifofile); - ifoFree_VTS_PTT_SRPT(ifofile); -+ ifoFree_VTS_TMAPT(ifofile); - - if(ifofile->vmgi_mat) - free(ifofile->vmgi_mat); -@@ -1624,8 +1625,8 @@ static int ifoRead_PGCIT_internal(ifo_ha - } - ptr = data; - for(i = 0; i < pgcit->nr_of_pgci_srp; i++) { -- memcpy(&pgcit->pgci_srp[i], ptr, PGCI_LU_SIZE); -- ptr += PGCI_LU_SIZE; -+ memcpy(&pgcit->pgci_srp[i], ptr, PGCI_SRP_SIZE); -+ ptr += PGCI_SRP_SIZE; - B2N_16(pgcit->pgci_srp[i].ptl_id_mask); - B2N_32(pgcit->pgci_srp[i].pgc_start_byte); - CHECK_VALUE(pgcit->pgci_srp[i].unknown1 == 0); -@@ -1663,8 +1664,10 @@ static int ifoRead_PGCIT_internal(ifo_ha - static void ifoFree_PGCIT_internal(pgcit_t *pgcit) { - if(pgcit) { - int i; -- for(i = 0; i < pgcit->nr_of_pgci_srp; i++) -+ for(i = 0; i < pgcit->nr_of_pgci_srp; i++) { - ifoFree_PGC(pgcit->pgci_srp[i].pgc); -+ free(pgcit->pgci_srp[i].pgc); -+ } - free(pgcit->pgci_srp); - } - } |