Update to libdvdnav version 4.1.3. libdvdnav is now maintained by the

mplayer project, and the next release after 0.1.10 (the one we're coming
from) was 4.1.1.

libdvdnav (4.1.3)
  * an embarassing amount of fixes regarding potential memory and resource leaks
    (patches contributed by Erik Hovland)
  * added dvdread-config (dvdnav-config's younger brother)
  * added pkg-config support
  * split dvdread to a separate tree; now you need to check it out
    and install it before building libdvdnav.
    In order to configure libdvdnav We need the executable dvdread-config
    somewhere in the PATH or explicitly specified to configure[2] with
    --with-dvdread-config=~/bin/dvdread-config

libdvdnav (4.1.2)
  * multiple build system fixes
  * added dvdnav_describe_title_chapters(title) to get title and chapters
    duration

libdvdnav (4.1.1)
  * added dvdnav_audio_stream_channels() to return number of channels
  * fixed dvdnav_time_search() in multi-angle dvds (but it still needs
    improvements)
  * added dvdnav_audio_stream_format() to identify the codec used
    in audio streams
  * starting DVD playback at specific title/part positions with
    dvdnav_{title,part}_play() works again
  * removed wrong SPU stream change event filter
    (fixes unwanted subtitles in the trailer of "Girl, interrupted", RC2)
  * fixed error "Expected NAV packet but none found." occuring sometimes
    on resume from menu

8 files changed, 21 insertions, 96 deletions

diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index 7dcb8ad9713..eebc09de713 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -1,19 +1,24 @@
-# $NetBSD: Makefile,v 1.7 2007/07/01 16:00:10 heinz Exp $
+# $NetBSD: Makefile,v 1.8 2009/01/14 22:30:46 jmcneill Exp $
 #
 
-DISTNAME=	libdvdnav-0.1.10
-PKGREVISION=	1
+DISTNAME=	libdvdnav-4.1.3
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dvd/}
+MASTER_SITES=	http://www.mplayerhq.hu/MPlayer/releases/dvdnav/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://dvd.sourceforge.net/
+HOMEPAGE=	http://www.mplayerhq.hu/
 COMMENT=	Library to navigate DVDs
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
+USE_TOOLS+=		automake autoconf aclocal autoreconf
 
+pre-configure:
+	cd ${WRKSRC} && autoreconf -vi
+
+.include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdvdnav/PLIST b/multimedia/libdvdnav/PLIST
index 9cf7945448e..d866b313b45 100644
--- a/multimedia/libdvdnav/PLIST
+++ b/multimedia/libdvdnav/PLIST
@@ -1,15 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/04 16:24:52 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/01/14 22:30:46 jmcneill Exp $
 bin/dvdnav-config
-include/dvdnav/dvd_reader.h
 include/dvdnav/dvd_types.h
 include/dvdnav/dvdnav.h
 include/dvdnav/dvdnav_events.h
-include/dvdnav/ifo_print.h
-include/dvdnav/ifo_read.h
-include/dvdnav/ifo_types.h
-include/dvdnav/nav_print.h
-include/dvdnav/nav_read.h
-include/dvdnav/nav_types.h
 lib/libdvdnav.la
+lib/libdvdnavmini.la
+lib/pkgconfig/dvdnav.pc
+lib/pkgconfig/dvdnavmini.pc
 share/aclocal/dvdnav.m4
 @dirrm include/dvdnav
diff --git a/multimedia/libdvdnav/buildlink3.mk b/multimedia/libdvdnav/buildlink3.mk
index 18809ba31f9..fa51c8538e5 100644
--- a/multimedia/libdvdnav/buildlink3.mk
+++ b/multimedia/libdvdnav/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/01/14 22:30:46 jmcneill Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBDVDNAV_BUILDLINK3_MK:=	${LIBDVDNAV_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	libdvdnav
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdvdnav
 
 .if !empty(LIBDVDNAV_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libdvdnav+=	libdvdnav>=0.1.9
-BUILDLINK_ABI_DEPENDS.libdvdnav+=	libdvdnav>=0.1.9nb1
+BUILDLINK_API_DEPENDS.libdvdnav+=	libdvdnav>=4.1.3
+BUILDLINK_ABI_DEPENDS.libdvdnav+=	libdvdnav>=4.1.3
 BUILDLINK_PKGSRCDIR.libdvdnav?=	../../multimedia/libdvdnav
 .endif	# LIBDVDNAV_BUILDLINK3_MK
 
diff --git a/multimedia/libdvdnav/distinfo b/multimedia/libdvdnav/distinfo
index 37172c4c431..edbffd6d3e8 100644
--- a/multimedia/libdvdnav/distinfo
+++ b/multimedia/libdvdnav/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.5 2007/01/09 14:44:11 drochner Exp $
+$NetBSD: distinfo,v 1.6 2009/01/14 22:30:46 jmcneill Exp $
 
-SHA1 (libdvdnav-0.1.10.tar.gz) = 22289cb8f297664ce36551b818c0083e936632a7
-RMD160 (libdvdnav-0.1.10.tar.gz) = 75e7878ab6fd99294b5a1c8fca1391bdbf113616
-Size (libdvdnav-0.1.10.tar.gz) = 539803 bytes
-SHA1 (patch-aa) = d8170dcb91c08384a6f77f69d3d960e8144686cd
-SHA1 (patch-ab) = cd8a866df5c037b2f882939048ed1e368d55a384
-SHA1 (patch-ac) = 7c9e28af8ed74ab6d1a31923556aa3aefa32510e
-SHA1 (patch-ad) = f4b42e53b8e955dc926b458b2a38a549b562ad00
+SHA1 (libdvdnav-4.1.3.tar.bz2) = d1b95eb8a7caee1fa7580a1abad84d6cb3cad046
+RMD160 (libdvdnav-4.1.3.tar.bz2) = 7c6437230af699f6b1c2d73f05f304f03aba9dce
+Size (libdvdnav-4.1.3.tar.bz2) = 110843 bytes
diff --git a/multimedia/libdvdnav/patches/patch-aa b/multimedia/libdvdnav/patches/patch-aa
deleted file mode 100644
index 8f6fcdb0dd4..00000000000
--- a/multimedia/libdvdnav/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/01/03 14:35:32 joerg Exp $
-
---- configure.orig	2006-01-03 14:22:24.000000000 +0000
-+++ configure
-@@ -21228,13 +21228,13 @@ case $host in
-   *mingw32* | *cygwin*)
-     ;;
-   *)
--    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+    echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -21293,7 +21293,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
- if test $ac_cv_lib_pthread_pthread_create = yes; then
--  THREAD_LIBS="-lpthread"
-+  THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
- else
-   { { echo "$as_me:$LINENO: error: pthread needed" >&5
- echo "$as_me: error: pthread needed" >&2;}
diff --git a/multimedia/libdvdnav/patches/patch-ab b/multimedia/libdvdnav/patches/patch-ab
deleted file mode 100644
index b918e3b3306..00000000000
--- a/multimedia/libdvdnav/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/01/03 14:35:32 joerg Exp $
-
---- src/dvdread/bswap.h.orig	2006-01-03 14:25:33.000000000 +0000
-+++ src/dvdread/bswap.h
-@@ -53,7 +53,7 @@
- #define B2N_32(x) x = swap32(x)
- #define B2N_64(x) x = swap64(x)
- 
--#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000
-+#elif defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD_version >= 470000)
- #include <sys/endian.h>
- #define B2N_16(x) x = be16toh(x)
- #define B2N_32(x) x = be32toh(x)
diff --git a/multimedia/libdvdnav/patches/patch-ac b/multimedia/libdvdnav/patches/patch-ac
deleted file mode 100644
index 19a6b4a3998..00000000000
--- a/multimedia/libdvdnav/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/01/09 14:44:11 drochner Exp $
-
---- src/dvdread/dvd_reader.c.orig	2007-01-09 00:15:00.000000000 +0100
-+++ src/dvdread/dvd_reader.c
-@@ -585,10 +585,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/libdvdnav/patches/patch-ad b/multimedia/libdvdnav/patches/patch-ad
deleted file mode 100644
index 6d139c7f515..00000000000
--- a/multimedia/libdvdnav/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/01/09 14:44:11 drochner Exp $
-
---- src/dvdread/dvd_input.c.orig	2007-01-09 00:16:53.000000000 +0100
-+++ src/dvdread/dvd_input.c
-@@ -246,6 +246,7 @@ static int file_read(dvd_input_t dev, vo
-       return (int) (bytes / DVD_VIDEO_LB_LEN);
-     }
-     
-+    buffer += ret;
-     len -= ret;
-   }
-