Control: tags 955652 + patch
Control: tags 955652 + pending

Dear maintainer,

I've prepared an NMU for dvdbackup (versioned as 0.4.2-4.1) and uploaded
it to DELAYED/5. Please feel free to tell me if I should delay it
longer.

Cheers
-- 
Sebastian Ramacher
diff -Nru dvdbackup-0.4.2/debian/changelog dvdbackup-0.4.2/debian/changelog
--- dvdbackup-0.4.2/debian/changelog	2013-07-04 14:32:09.000000000 +0200
+++ dvdbackup-0.4.2/debian/changelog	2020-04-05 17:57:40.000000000 +0200
@@ -1,3 +1,12 @@
+dvdbackup (0.4.2-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/libdvdread6.1.0.patch: Adapt to API changes in libdvdread
+    6.1.0 (Closes: #955652)
+    Thanks to Felix Palmen for the patch.
+
+ -- Sebastian Ramacher <sramac...@debian.org>  Sun, 05 Apr 2020 17:57:40 +0200
+
 dvdbackup (0.4.2-4) unstable; urgency=low
 
   * remove-path_max-limitation.patch: Remove PATH_MAX limitation to fix build
diff -Nru dvdbackup-0.4.2/debian/patches/libdvdread6.1.0.patch dvdbackup-0.4.2/debian/patches/libdvdread6.1.0.patch
--- dvdbackup-0.4.2/debian/patches/libdvdread6.1.0.patch	1970-01-01 01:00:00.000000000 +0100
+++ dvdbackup-0.4.2/debian/patches/libdvdread6.1.0.patch	2020-04-05 17:53:42.000000000 +0200
@@ -0,0 +1,88 @@
+--- a/src/dvdbackup.c
++++ b/src/dvdbackup.c
+@@ -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);
+@@ -1268,9 +1268,9 @@
+ 
+ 	/* 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);
+ 		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);
diff -Nru dvdbackup-0.4.2/debian/patches/series dvdbackup-0.4.2/debian/patches/series
--- dvdbackup-0.4.2/debian/patches/series	2013-07-04 14:30:12.000000000 +0200
+++ dvdbackup-0.4.2/debian/patches/series	2020-04-05 17:45:32.000000000 +0200
@@ -1,2 +1,3 @@
 ignore-automake-warnings.patch
 remove-path_max-limitation.patch
+libdvdread6.1.0.patch

Attachment: signature.asc
Description: PGP signature

Reply via email to