From b737335fcc0a9c4d9af6fb95c94573b6471f5d9d Mon Sep 17 00:00:00 2001
From: dbj <dbj@pkgsrc.org>
Date: Sun, 20 Jul 2008 23:38:17 +0000
Subject: add UDFFindFile to exported symbol set

---
 multimedia/libdvdread/Makefile         |  3 ++-
 multimedia/libdvdread/distinfo         |  5 ++++-
 multimedia/libdvdread/patches/patch-aa | 13 +++++++++++++
 multimedia/libdvdread/patches/patch-ab | 13 +++++++++++++
 multimedia/libdvdread/patches/patch-ac | 15 +++++++++++++++
 5 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 multimedia/libdvdread/patches/patch-aa
 create mode 100644 multimedia/libdvdread/patches/patch-ab
 create mode 100644 multimedia/libdvdread/patches/patch-ac

(limited to 'multimedia')

diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index a39886837fd..d29d5b6c638 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2006/11/05 17:25:35 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2008/07/20 23:38:17 dbj Exp $
 
 DISTNAME=	libdvdread-0.9.7
+PKGREVISION=   1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
diff --git a/multimedia/libdvdread/distinfo b/multimedia/libdvdread/distinfo
index 6c0f995903e..15045fd5e9a 100644
--- a/multimedia/libdvdread/distinfo
+++ b/multimedia/libdvdread/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.14 2006/10/17 16:41:10 drochner Exp $
+$NetBSD: distinfo,v 1.15 2008/07/20 23:38:17 dbj Exp $
 
 SHA1 (libdvdread-0.9.7.tar.gz) = b2c2ede36cff9d56205747d3740c50fd32669e21
 RMD160 (libdvdread-0.9.7.tar.gz) = 7233064f35d86a27202ca1bef165f6972e20b3e8
 Size (libdvdread-0.9.7.tar.gz) = 389113 bytes
+SHA1 (patch-aa) = 1eba4b76ad030ebfe43ff082304599d7815fa947
+SHA1 (patch-ab) = 57fde8d79d911f2bb162b70223a493076c3aa12d
+SHA1 (patch-ac) = 900b46bfbb3c18f1731852161f0d87fe89e3f6a8
diff --git a/multimedia/libdvdread/patches/patch-aa b/multimedia/libdvdread/patches/patch-aa
new file mode 100644
index 00000000000..d2c44ddc89f
--- /dev/null
+++ b/multimedia/libdvdread/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.8 2008/07/20 23:38:17 dbj Exp $
+
+--- dvdread/Makefile.am.orig	2006-10-06 01:12:31.000000000 -0700
++++ dvdread/Makefile.am	2007-05-09 09:53:33.000000000 -0700
+@@ -6,7 +6,7 @@
+ 	dvdread_internal.h cmd_print.c \
+ 	md5.c md5.h
+ libdvdread_la_LIBADD = @DL_LIBS@ @CSS_LIBS@
+-libdvdread_la_LDFLAGS = -version-info 5:1:2 -export-symbols-regex "(DVD.*|ifo.*|nav.*|cmd.*)"
++libdvdread_la_LDFLAGS = -version-info 5:1:2 -export-symbols-regex "(DVD.*|ifo.*|nav.*|cmd.*|UDFFindFile)"
+ 
+ pkgincludedir = $(includedir)/dvdread
+ 
diff --git a/multimedia/libdvdread/patches/patch-ab b/multimedia/libdvdread/patches/patch-ab
new file mode 100644
index 00000000000..c749607e0cb
--- /dev/null
+++ b/multimedia/libdvdread/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.7 2008/07/20 23:38:17 dbj Exp $
+
+--- dvdread/Makefile.in.orig	2006-10-06 01:14:22.000000000 -0700
++++ dvdread/Makefile.in	2007-05-09 09:53:51.000000000 -0700
+@@ -190,7 +190,7 @@
+ 	md5.c md5.h
+ 
+ libdvdread_la_LIBADD = @DL_LIBS@ @CSS_LIBS@
+-libdvdread_la_LDFLAGS = -version-info 5:1:2 -export-symbols-regex "(DVD.*|ifo.*|nav.*|cmd.*)"
++libdvdread_la_LDFLAGS = -version-info 5:1:2 -export-symbols-regex "(DVD.*|ifo.*|nav.*|cmd.*|UDFFindFile)"
+ pkginclude_HEADERS = dvd_reader.h ifo_types.h ifo_read.h \
+ 	ifo_print.h nav_types.h nav_read.h nav_print.h cmd_print.h
+ 
diff --git a/multimedia/libdvdread/patches/patch-ac b/multimedia/libdvdread/patches/patch-ac
new file mode 100644
index 00000000000..e200e317572
--- /dev/null
+++ b/multimedia/libdvdread/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.3 2008/07/20 23:38:17 dbj Exp $
+
+--- dvdread/dvd_input.c.orig	2005-09-19 06:43:08.000000000 -0700
++++ dvdread/dvd_input.c	2007-05-09 11:14:08.000000000 -0700
+@@ -333,6 +333,10 @@
+ #else
+ 
+   dvdcss_library = dlopen("libdvdcss.so.2", RTLD_LAZY);
++#ifdef __APPLE__
++  if (!dvdcss_library)
++    dvdcss_library = dlopen("libdvdcss.2.dylib", RTLD_LAZY);
++#endif
+ 
+   if(dvdcss_library != NULL) {
+ #if defined(__OpenBSD__) && !defined(__ELF__)
-- 
cgit v1.2.3