From 17467da604ccf57ce12fd037b7fa4e9edef7e291 Mon Sep 17 00:00:00 2001
From: abs <abs@pkgsrc.org>
Date: Sat, 22 Aug 2009 21:44:27 +0000
Subject: Fix lsdvd so it can ready the dvd title under NetBSD. Bump
 pkgrevision

---
 multimedia/lsdvd/Makefile         |  4 ++--
 multimedia/lsdvd/distinfo         |  4 ++--
 multimedia/lsdvd/patches/patch-ab | 32 +++++++++++++++++++++++++++-----
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile
index 67d672c5119..672f4c7b15b 100644
--- a/multimedia/lsdvd/Makefile
+++ b/multimedia/lsdvd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2009/04/10 10:35:16 abs Exp $
+# $NetBSD: Makefile,v 1.16 2009/08/22 21:44:27 abs Exp $
 
 DISTNAME=	lsdvd-0.16
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lsdvd/}
 DIST_SUBDIR=	${PKGNAME_NOREV}
diff --git a/multimedia/lsdvd/distinfo b/multimedia/lsdvd/distinfo
index 5fe13e65e58..d46c436740b 100644
--- a/multimedia/lsdvd/distinfo
+++ b/multimedia/lsdvd/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2009/01/20 00:34:35 snj Exp $
+$NetBSD: distinfo,v 1.9 2009/08/22 21:44:27 abs Exp $
 
 SHA1 (lsdvd-0.16/lsdvd-0.16.tar.gz) = d5c0d32bfb220807ebdc0bfbb17679e7294791f4
 RMD160 (lsdvd-0.16/lsdvd-0.16.tar.gz) = fcd0993aea6ad2203c8be019ec31ba7c8660ca25
 Size (lsdvd-0.16/lsdvd-0.16.tar.gz) = 100495 bytes
 SHA1 (patch-aa) = 41ac6688a47ca1f7f20d17c4fd3d2934eecd369c
-SHA1 (patch-ab) = 4beb67fad17313ab2dc200c3efdcbc7fd2495526
+SHA1 (patch-ab) = 25520f6221ee506b2f6bc343f708e383a58a9332
diff --git a/multimedia/lsdvd/patches/patch-ab b/multimedia/lsdvd/patches/patch-ab
index d4992af8c1e..7c52362c3d8 100644
--- a/multimedia/lsdvd/patches/patch-ab
+++ b/multimedia/lsdvd/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2007/02/26 17:55:14 snj Exp $
+$NetBSD: patch-ab,v 1.4 2009/08/22 21:44:27 abs Exp $
 
---- lsdvd.c.orig	2006-08-24 11:51:58.000000000 +0200
-+++ lsdvd.c	2006-08-24 11:52:09.000000000 +0200
+--- lsdvd.c.orig	2006-03-02 13:48:11.000000000 +0000
++++ lsdvd.c
 @@ -13,6 +13,7 @@
   *  2003-04-19  Cleanups get_title_name, added dvdtime2msec, added helper macros,
   *			  output info structures in form of a Perl module, by Henk Vergonet.
@@ -47,8 +47,22 @@ $NetBSD: patch-ab,v 1.3 2007/02/26 17:55:14 snj Exp $
  
  	program_name = argv[0];
  
-@@ -309,8 +318,6 @@ int main(int argc, char *argv[])
+@@ -276,6 +285,9 @@ int main(int argc, char *argv[])
+ 		fprintf(stderr, "Can't find device %s\n", dvd_device);
+ 		return 1;
+ 	}
++
++	/* On at least NetBSD this fails if called after DVDOpen */
++	has_title = get_title_name(dvd_device, title);
+ 	
+ 	dvd = DVDOpen(dvd_device);
+ 	if( !dvd ) {
+@@ -305,12 +317,8 @@ int main(int argc, char *argv[])
+ 		return 5;
+ 	}
  
+-	has_title = get_title_name(dvd_device, title);
+-
  	vmgi_mat = ifo_zero->vmgi_mat;
  
 -	struct dvd_info dvd_info;
@@ -56,7 +70,7 @@ $NetBSD: patch-ab,v 1.3 2007/02/26 17:55:14 snj Exp $
  	dvd_info.discinfo.device = dvd_device;
  	dvd_info.discinfo.disc_title = has_title ? "unknown" : title;
  	dvd_info.discinfo.vmg_id =  vmgi_mat->vmg_identifier;
-@@ -409,14 +416,16 @@ int main(int argc, char *argv[])
+@@ -409,14 +417,16 @@ int main(int argc, char *argv[])
  
  		cell = 0;
  		if (opt_c) {
@@ -75,3 +89,11 @@ $NetBSD: patch-ab,v 1.3 2007/02/26 17:55:14 snj Exp $
  				if (i == pgc->nr_of_programs - 1) next = pgc->nr_of_cells + 1;
  
  				while (cell < next - 1)
+@@ -500,6 +510,7 @@ int main(int argc, char *argv[])
+ 
+ 	for (i=1; i <= ifo_zero->vts_atrt->nr_of_vtss; i++) { ifoClose(ifo[i]);	}
+ 
++
+ 	ifoClose(ifo_zero);
+ 	DVDClose(dvd);
+ 
-- 
cgit v1.2.3