dvdbackup: add patch from arch linux for new libdvdread

4 files changed, 95 insertions, 4 deletions

diff --git a/manualPorts/dvdbackup/.md5sum b/manualPorts/dvdbackup/.md5sum
index 590cc15..173b4cf 100644
--- a/manualPorts/dvdbackup/.md5sum
+++ b/manualPorts/dvdbackup/.md5sum
@@ -1 +1,2 @@
 28f273b2f27a3afea3a3c965ddbede86  dvdbackup-0.4.2.tar.xz
+0964cd4ca1c3e7e34bd0995abe92c838  dvdbackup-dvdread-6.1.patch
diff --git a/manualPorts/dvdbackup/.signature b/manualPorts/dvdbackup/.signature
index 60abb78..2f59d16 100644
--- a/manualPorts/dvdbackup/.signature
+++ b/manualPorts/dvdbackup/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/deepthought.pub
-RWQxCptPusLGGm2yEsRWwAHG7BvPxCvv6DSzf5ymtvMHK7mhvNBBqY5saK3f7oRishhcrOm6Mb5pmLiB/dh/PeAGcAvjYFohIgw=
-SHA256 (Pkgfile) = bc3a1db4a6bb1cddb2791639e5bbe578ef9edc9fda615413499b281375b188b0
+RWQxCptPusLGGsbL2fvroLaZrgo3GdoVNKWk6yzKGCBya3Q3Uv1ZzPEBgB5Fim+XFj2RHCjhCNQyarGEATmQAuHxJc9cWHdGVwY=
+SHA256 (Pkgfile) = 369c49c6ed8983d0f7931a1a161a2e0b786868e07d3d2ba2f8bec99f813bfab9
 SHA256 (.footprint) = c12c753f9739101ce2b564e7edcfae7d79a537a713abc88a53248226caeeb923
 SHA256 (dvdbackup-0.4.2.tar.xz) = ef8c56fbb82b15b7eef00d2d3118c8253f9770009ed7bb2a5d4849acf88183e6
+SHA256 (dvdbackup-dvdread-6.1.patch) = 182021a2f1ad8ca30fa92c28e700a577a0e347b608e4ad339538b22ebb935c6b
diff --git a/manualPorts/dvdbackup/Pkgfile b/manualPorts/dvdbackup/Pkgfile
index f1db44b..6e2ccd3 100644
--- a/manualPorts/dvdbackup/Pkgfile
+++ b/manualPorts/dvdbackup/Pkgfile
@@ -6,11 +6,13 @@
 
 name=dvdbackup
 version=0.4.2
-release=1
-source=(http://downloads.sourceforge.net/dvdbackup/dvdbackup-$version.tar.xz)
+release=2
+source=(http://downloads.sourceforge.net/dvdbackup/dvdbackup-$version.tar.xz
+dvdbackup-dvdread-6.1.patch)
 
 build(){
 	cd $name-$version
+	patch -p0 -i ../dvdbackup-dvdread-6.1.patch
 	./configure \
 		--prefix=/usr \
 		--disable-nls
diff --git a/manualPorts/dvdbackup/dvdbackup-dvdread-6.1.patch b/manualPorts/dvdbackup/dvdbackup-dvdread-6.1.patch
new file mode 100644
index 0000000..4cf9022
--- /dev/null
+++ b/manualPorts/dvdbackup/dvdbackup-dvdread-6.1.patch
@@ -0,0 +1,87 @@
+--- src/dvdbackup.c.orig 2012-06-24 01:10:29 UTC
++++ src/dvdbackup.c
+@@ -1132,7 +1132,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 	int size;
+ 
+ 	/* DVD handler */
+-	ifo_handle_t* ifo_file = NULL;
++	dvd_file_t* ifo_file = NULL;
+ 
+ 	if (title_set_info->number_of_title_sets + 1 < title_set) {
+ 		return(1);
+@@ -1181,7 +1181,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 	if ((streamout_ifo = open(targetname_ifo, O_WRONLY | O_CREAT | O_TRUNC, 0666)) == -1) {
+ 		fprintf(stderr, _("Error creating %s\n"), targetname_ifo);
+ 		perror(PACKAGE);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+@@ -1191,7 +1191,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 	if ((streamout_bup = open(targetname_bup, O_WRONLY | O_CREAT | O_TRUNC, 0666)) == -1) {
+ 		fprintf(stderr, _("Error creating %s\n"), targetname_bup);
+ 		perror(PACKAGE);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+@@ -1200,31 +1200,31 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 
+ 	/* Copy VIDEO_TS.IFO, since it's a small file try to copy it in one shot */
+ 
+-	if ((ifo_file = ifoOpen(dvd, title_set))== 0) {
++	if ((ifo_file = DVDOpenFile(dvd, title_set, DVD_READ_INFO_FILE))== 0) {
+ 		fprintf(stderr, _("Failed opening IFO for title set %d\n"), title_set);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+ 		return 1;
+ 	}
+ 
+-	size = DVDFileSize(ifo_file->file) * DVD_VIDEO_LB_LEN;
++	size = DVDFileSize(ifo_file) * DVD_VIDEO_LB_LEN;
+ 
+ 	if ((buffer = (unsigned char *)malloc(size * sizeof(unsigned char))) == NULL) {
+ 		perror(PACKAGE);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+ 		return 1;
+ 	}
+ 
+-	DVDFileSeek(ifo_file->file, 0);
++	DVDFileSeek(ifo_file, 0);
+ 
+-	if (DVDReadBytes(ifo_file->file,buffer,size) != size) {
++	if (DVDReadBytes(ifo_file,buffer,size) != size) {
+ 		fprintf(stderr, _("Error reading IFO for title set %d\n"), title_set);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+@@ -1234,7 +1234,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 
+ 	if (write(streamout_ifo,buffer,size) != size) {
+ 		fprintf(stderr, _("Error writing %s\n"),targetname_ifo);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+@@ -1243,7 +1243,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 
+ 	if (write(streamout_bup,buffer,size) != size) {
+ 		fprintf(stderr, _("Error writing %s\n"),targetname_bup);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		close(streamout_ifo);
+ 		close(streamout_bup);
+-----