multimedia/dvdbackup: Fix build on -current.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 128 insertions, 0 deletions

diff --git a/multimedia/dvdbackup/patches/dvdbackup-build-with-new-libdvdread.patch b/multimedia/dvdbackup/patches/dvdbackup-build-with-new-libdvdread.patch
new file mode 100644
index 0000000000..dc30d2c31e
--- /dev/null
+++ b/multimedia/dvdbackup/patches/dvdbackup-build-with-new-libdvdread.patch
@@ -0,0 +1,102 @@
+diff -Naur dvdbackup-0.4.2/src/dvdbackup.c dvdbackup-0.4.2.new/src/dvdbackup.c
+--- dvdbackup-0.4.2/src/dvdbackup.c	2020-04-08 10:56:55.630771977 -0400
++++ dvdbackup-0.4.2.new/src/dvdbackup.c	2020-04-08 11:38:48.851465230 -0400
+@@ -1180,7 +1180,7 @@
+ 	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) {
+@@ -1245,7 +1245,7 @@
+ 	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);
+ 		free(targetname_ifo);
+ 		free(targetname_bup);
+@@ -1257,7 +1257,7 @@
+ 	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);
+ 		free(targetname_ifo);
+ 		free(targetname_bup);
+@@ -1270,7 +1270,7 @@
+ 
+ 	if ((ifo_file = ifoOpen(dvd, title_set))== 0) {
+ 		fprintf(stderr, _("Failed opening IFO for title set %d\n"), title_set);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		free(targetname_ifo);
+ 		free(targetname_bup);
+@@ -1279,11 +1279,11 @@
+ 		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);
+ 		free(targetname_ifo);
+ 		free(targetname_bup);
+@@ -1292,11 +1292,11 @@
+ 		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);
+ 		free(targetname_ifo);
+ 		free(targetname_bup);
+@@ -1308,7 +1308,7 @@
+ 
+ 	if (write(streamout_ifo,buffer,size) != size) {
+ 		fprintf(stderr, _("Error writing %s\n"),targetname_ifo);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		free(targetname_ifo);
+ 		free(targetname_bup);
+@@ -1319,7 +1319,7 @@
+ 
+ 	if (write(streamout_bup,buffer,size) != size) {
+ 		fprintf(stderr, _("Error writing %s\n"),targetname_bup);
+-		ifoClose(ifo_file);
++		DVDCloseFile(ifo_file);
+ 		free(buffer);
+ 		free(targetname_ifo);
+ 		free(targetname_bup);
+@@ -1626,7 +1626,6 @@
+ 
+ 	title_set_info = DVDGetFileSet(_dvd);
+ 	if (!title_set_info) {
+-		DVDClose(_dvd);
+ 		return(1);
+ 	}
+ 
+@@ -1653,7 +1652,6 @@
+ 	title_set_info = DVDGetFileSet(_dvd);
+ 
+ 	if (!title_set_info) {
+-		DVDClose(_dvd);
+ 		return(1);
+ 	}
+ 
diff --git a/multimedia/dvdbackup/patches/dvdbackup_no-convert-title.patch b/multimedia/dvdbackup/patches/dvdbackup_no-convert-title.patch
new file mode 100644
index 0000000000..aa515aad31
--- /dev/null
+++ b/multimedia/dvdbackup/patches/dvdbackup_no-convert-title.patch
@@ -0,0 +1,26 @@
+diff -Naur dvdbackup-0.4.2/src/dvdbackup.c dvdbackup-0.4.2.new/src/dvdbackup.c
+--- dvdbackup-0.4.2/src/dvdbackup.c	2012-06-23 21:10:29.000000000 -0400
++++ dvdbackup-0.4.2.new/src/dvdbackup.c	2020-01-19 10:13:23.689417434 -0500
+@@ -1326,22 +1326,6 @@
+ 		length--;
+ 	}
+ 
+-	/* convert title to lower case and replace underscores with spaces */
+-	for(i = 0; i < length; i++) {
+-		word_length++;
+-		if(word_length == 1) {
+-			title[i] = toupper(title[i]);
+-		} else {
+-			title[i] = tolower(title[i]);
+-		}
+-		if(title[i] == '_') {
+-			title[i] = ' ';
+-		}
+-		if(title[i] == ' ') {
+-			word_length = 0;
+-		}
+-	}
+-
+ 	return(0);
+ }
+