summaryrefslogtreecommitdiff
path: root/multimedia/libdvdread
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2004-06-21 16:14:14 +0000
committerdrochner <drochner@pkgsrc.org>2004-06-21 16:14:14 +0000
commit6177902638ce295d52f8a441d3760423b7a1ca2b (patch)
tree6b2022b0909d24dd532a7bceda21b45f36d2e4ca /multimedia/libdvdread
parent2a33bd4fd61735fbaeec73fb45f7c61a14243a0a (diff)
downloadpkgsrc-6177902638ce295d52f8a441d3760423b7a1ca2b.tar.gz
apply some minor fixes from libdvdread CVS
Diffstat (limited to 'multimedia/libdvdread')
-rw-r--r--multimedia/libdvdread/distinfo5
-rw-r--r--multimedia/libdvdread/patches/patch-ab22
-rw-r--r--multimedia/libdvdread/patches/patch-ac14
3 files changed, 37 insertions, 4 deletions
diff --git a/multimedia/libdvdread/distinfo b/multimedia/libdvdread/distinfo
index a87ab8243fd..f6121f913f7 100644
--- a/multimedia/libdvdread/distinfo
+++ b/multimedia/libdvdread/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2004/05/18 15:51:21 drochner Exp $
+$NetBSD: distinfo,v 1.3 2004/06/21 16:14:14 drochner Exp $
SHA1 (libdvdread-0.9.4.tar.gz) = a4b626e49ba8bd33857693c3abe8b34196bc3360
Size (libdvdread-0.9.4.tar.gz) = 256858 bytes
SHA1 (patch-aa) = 9e508363db5fe7233d6074fdc2404e4618e78ff2
-SHA1 (patch-ab) = 2ad034555918259e6b9a3048656eddedb223d55b
+SHA1 (patch-ab) = a86a639adf22fe17c98db059e3fa542d0424d468
+SHA1 (patch-ac) = 971dc8802bf8f815821e8ad5f279a5148fcf26f7
diff --git a/multimedia/libdvdread/patches/patch-ab b/multimedia/libdvdread/patches/patch-ab
index 06f740363ec..2915292d86e 100644
--- a/multimedia/libdvdread/patches/patch-ab
+++ b/multimedia/libdvdread/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2004/05/18 15:51:21 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2004/06/21 16:14:14 drochner Exp $
---- dvdread/dvd_reader.c.orig 2004-05-18 15:53:26.000000000 +0200
+--- dvdread/dvd_reader.c.orig 2003-02-13 23:31:21.000000000 +0100
+++ dvdread/dvd_reader.c
@@ -282,7 +282,7 @@ static char *bsd_block2char( const char
char *new_path;
@@ -11,3 +11,21 @@ $NetBSD: patch-ab,v 1.1 2004/05/18 15:51:21 drochner Exp $
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
new file mode 100644
index 00000000000..ebad152a7d3
--- /dev/null
+++ b/multimedia/libdvdread/patches/patch-ac
@@ -0,0 +1,14 @@
+$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;