[pkgsrc/pkgsrc-2004Q2]: pkgsrc/multimedia/libdvdread Pullup ticket 41 to the ...

[agc <agc%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/412fc7a791c5
branches:  pkgsrc-2004Q2
changeset: 476703:412fc7a791c5
user:      agc <agc%pkgsrc.org@localhost>
date:      Tue Jul 06 22:20:58 2004 +0000

description:
Pullup ticket 41 to the pkgsrc-2004Q2 branch, requested by Matthias Drochner.

        Module Name:    pkgsrc
        Committed By:   drochner
        Date:           Mon Jun 21 16:14:14 UTC 2004

        Modified Files:
                pkgsrc/multimedia/libdvdread: distinfo
                pkgsrc/multimedia/libdvdread/patches: patch-ab
        Added Files:
                pkgsrc/multimedia/libdvdread/patches: patch-ac

        Log Message:
        apply some minor fixes from libdvdread CVS

diffstat:

 multimedia/libdvdread/distinfo         |   5 +++--
 multimedia/libdvdread/patches/patch-ab |  22 ++++++++++++++++++++--
 multimedia/libdvdread/patches/patch-ac |  14 ++++++++++++++
 3 files changed, 37 insertions(+), 4 deletions(-)

diffs (65 lines):

diff -r 5877f75bf4ad -r 412fc7a791c5 multimedia/libdvdread/distinfo
--- a/multimedia/libdvdread/distinfo    Tue Jul 06 22:16:19 2004 +0000
+++ b/multimedia/libdvdread/distinfo    Tue Jul 06 22:20:58 2004 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2004/05/18 15:51:21 drochner Exp $
+$NetBSD: distinfo,v 1.2.2.1 2004/07/06 22:20:58 agc 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 -r 5877f75bf4ad -r 412fc7a791c5 multimedia/libdvdread/patches/patch-ab
--- a/multimedia/libdvdread/patches/patch-ab    Tue Jul 06 22:16:19 2004 +0000
+++ b/multimedia/libdvdread/patches/patch-ab    Tue Jul 06 22:20:58 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2004/05/18 15:51:21 drochner Exp $
+$NetBSD: patch-ab,v 1.1.2.1 2004/07/06 22:20:58 agc 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 @@
        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 -r 5877f75bf4ad -r 412fc7a791c5 multimedia/libdvdread/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/libdvdread/patches/patch-ac    Tue Jul 06 22:20:58 2004 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1.2.2 2004/07/06 22:20:58 agc 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;