add the libdvdnav fixes we have applied to (all?) the other instances

here too, just for consistency. The code is not used, due to a
--disable-mpdvdkit configure option.

3 files changed, 32 insertions, 1 deletions

diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index ce9c2965f43..402707d676b 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2007/01/09 14:49:33 drochner Exp $
+$NetBSD: distinfo,v 1.37 2007/01/25 18:31:16 drochner Exp $
 
 SHA1 (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = a450c0b0749c343a8496ba7810363c9d46dfa73c
 RMD160 (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = 8cea02e832aec5d9e090829d61d0f131dcc177a2
@@ -8,6 +8,8 @@ SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
 SHA1 (patch-ad) = d0b72eaa5e63d2cfd7828ea1a9973f1728c607b5
 SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b
+SHA1 (patch-ai) = bcf45db81587d99fc69ae5fcf89ff4a4b8f6f53c
+SHA1 (patch-aj) = 40ba1625f85f0264628013ad0209aa095e8e5d3f
 SHA1 (patch-ba) = bdb20f4ead6f55c0847534b5b1f06ea865e438e6
 SHA1 (patch-bb) = 554ca2074716ada4f817f55be61e808e1dc5c93e
 SHA1 (patch-bc) = c073f6e5d2d71030346fda82ff3a1f474ad49c0f
diff --git a/multimedia/mplayer-share/patches/patch-ai b/multimedia/mplayer-share/patches/patch-ai
new file mode 100644
index 00000000000..73fcb2f98dd
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-ai
@@ -0,0 +1,17 @@
+$NetBSD: patch-ai,v 1.3 2007/01/25 18:31:16 drochner Exp $
+
+--- libmpdvdkit2/dvd_reader.c.orig	2007-01-24 22:25:53.000000000 +0100
++++ libmpdvdkit2/dvd_reader.c
+@@ -549,10 +549,12 @@ static int findDirFile( const char *path
+             sprintf( filename, "%s%s%s", path,
+                      ( ( path[ strlen( path ) - 1 ] == '/' ) ? "" : "/" ),
+                      ent->d_name );
++	    closedir( dir );
+             return 0;
+         }
+     }
+ 
++    closedir( dir );
+     return -1;
+ }
+ 
diff --git a/multimedia/mplayer-share/patches/patch-aj b/multimedia/mplayer-share/patches/patch-aj
new file mode 100644
index 00000000000..0840cfd521e
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-aj
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.3 2007/01/25 18:31:16 drochner Exp $
+
+--- libmpdvdkit2/dvd_input.c.orig	2007-01-24 22:27:49.000000000 +0100
++++ libmpdvdkit2/dvd_input.c
+@@ -238,6 +238,7 @@ static int file_read(dvd_input_t dev, vo
+       return (int) (bytes / DVD_VIDEO_LB_LEN);
+     }
+     
++    buffer += ret;
+     len -= ret;
+   }
+