patch to compile

5 files changed, 53 insertions, 4 deletions

diff --git a/media-libs/libdvdnav/ChangeLog b/media-libs/libdvdnav/ChangeLog
index 25a8038e0311..6e0490936e3d 100644
--- a/media-libs/libdvdnav/ChangeLog
+++ b/media-libs/libdvdnav/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-lib/libdvdnav
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/ChangeLog,v 1.3 2002/07/01 00:47:10 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/ChangeLog,v 1.4 2002/07/01 07:45:55 seemant Exp $
+
+*libdvdnav-0.1.2-r1 (1 Jul 2002)
+
+  1 Jul 2002; Seemant Kulleen <seemant@gentoo.org> libdvdnav-0.1.2-r1.ebuild
+  files/libdvdnav-0.1.2-gentoo.patch files/digest-libdvdnav-0.1.2-r1 :
+
+  Patch for read_cache applied, so this now actually compiles.  Patch
+  submitted by: Roman Weber <gentoo@gonzo.ch> in bug #4374 reported by
+  matt@oddprocess.org (Matthew Daubenspeck)
 
 *libdvdnav-0.1.2 (30 Jun 2002)
 
diff --git a/media-libs/libdvdnav/files/digest-libdvdnav-0.1.0 b/media-libs/libdvdnav/files/digest-libdvdnav-0.1.0
deleted file mode 100644
index 0e0ae275e38f..000000000000
--- a/media-libs/libdvdnav/files/digest-libdvdnav-0.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 01b5ffdbc834dc72317f57a3db959a0a libdvdnav-0.1.0.tar.gz 212081
diff --git a/media-libs/libdvdnav/files/digest-libdvdnav-0.1.2-r1 b/media-libs/libdvdnav/files/digest-libdvdnav-0.1.2-r1
new file mode 100644
index 000000000000..c4f909b4ba89
--- /dev/null
+++ b/media-libs/libdvdnav/files/digest-libdvdnav-0.1.2-r1
@@ -0,0 +1 @@
+MD5 07530ff242f90485f0aba9a85dad2836 libdvdnav-0.1.2.tar.gz 237104
diff --git a/media-libs/libdvdnav/files/libdvdnav-0.1.2-gentoo.patch b/media-libs/libdvdnav/files/libdvdnav-0.1.2-gentoo.patch
new file mode 100644
index 000000000000..03d5a4d3b694
--- /dev/null
+++ b/media-libs/libdvdnav/files/libdvdnav-0.1.2-gentoo.patch
@@ -0,0 +1,24 @@
+--- read_cache.c	26 Jun 2002 14:59:48 -0000	1.10
++++ read_cache.c	30 Jun 2002 16:02:55 -0000	1.11
+@@ -83,7 +83,7 @@
+ #define _MT_TRACE 1
+ 
+ #if _MT_TRACE
+-#define dprintf(fmt, args...) fprintf(stderr, "%s: " fmt,  __FUNCTION__, ##args);
++#define dprintf(fmt, args...) fprintf(stderr, "%s: "fmt,  ##__FUNCTION__##, ##args);
+ #else
+ #define dprintf(fmt, args...) /* Nowt */
+ #endif
+@@ -384,9 +384,9 @@
+    * This is so that fewer realloc's happen if at all.
+    */ 
+   if (self->cache_buffer) {
+-    if( block_count > self->cache_malloc_size) {
++    if(block_count > self->cache_malloc_size) {
+       self->cache_buffer = realloc(self->cache_buffer, block_count * DVD_VIDEO_LB_LEN);
+-      dprintf("libdvdnav:read_cache:pre_cache DVD read realloc happened\n"); 
++      dprintf("libdvdnav:read_cache:pre_cache DVD read realloc happened\n");
+       self->cache_malloc_size = block_count;
+     } 
+   } else {
+
diff --git a/media-libs/libdvdnav/libdvdnav-0.1.0.ebuild b/media-libs/libdvdnav/libdvdnav-0.1.2-r1.ebuild
index c1228b28628e..a0cdb4889dc7 100644
--- a/media-libs/libdvdnav/libdvdnav-0.1.0.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-0.1.2-r1.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2002 Arcady Genkin <agenkin@thpoon.com>
 # Distributed under the terms of the GNU General Public License, v2
-# Maintainer: Arcady Genkin <agenkin@thpoon.com>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-0.1.0.ebuild,v 1.4 2002/05/27 17:27:38 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-0.1.2-r1.ebuild,v 1.1 2002/07/01 07:45:55 seemant Exp $
 
 DESCRIPTION="Library for DVD navigation tools."
 HOMEPAGE="http://sourceforge.net/projects/dvd/"
@@ -10,8 +9,17 @@ SRC_URI="mirror://sourceforge/dvd/${P}.tar.gz"
 S=${WORKDIR}/${P}
 
 LICENSE="GPL"
+SLOT="0"
 
 DEPEND="media-libs/libdvdread"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}/src
+	patch < ${FILESDIR}/${P}-gentoo.patch || die
+}
 
 src_compile() {
 
@@ -27,3 +35,11 @@ src_install () {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS COPYING INSTALL NEWS README
 }
+
+pkg_postinst() {
+	einfo
+	einfo "Please remove old versions of libdvdnav manually,"
+	einfo "having multiple versions installed can cause problems."
+	einfo
+}
+