kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Actually add patch (forgotten in previous commit). Also mention that parallel

Browse source 
to the launchpad bug a PR was created.

PR:		245228
Submitted by:	felix@palmen-it.de
This commit is contained in:
Emanuel Haupt 2020-04-01 08:52:40 +00:00
parent 0c29806abd
commit 75d7fd5db6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=530205
3 changed files with 103 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysutils/dvdbackup/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= dvdbackup
PORTVERSION= 0.4.2
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= sysutils multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

18
sysutils/dvdbackup/files/patch-src__dvdbackup.c
View file

@ -1,18 +0,0 @@
--- ./src/dvdbackup.c.orig 2012-06-24 03:10:29.000000000 +0200
+++ ./src/dvdbackup.c 2012-07-28 13:57:54.000000000 +0200
@@ -1546,7 +1546,6 @@
title_set_info = DVDGetFileSet(_dvd);
if (!title_set_info) {
- DVDClose(_dvd);
return(1);
}
@@ -1573,7 +1572,6 @@
title_set_info = DVDGetFileSet(_dvd);
if (!title_set_info) {
- DVDClose(_dvd);
return(1);
}

102
sysutils/dvdbackup/files/patch-src_dvdbackup.c Normal file
View file

@ -0,0 +1,102 @@
--- 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) {
@@ -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);
@@ -1546,7 +1546,6 @@ int DVDMirror(dvd_reader_t * _dvd, char * targetdir,ch
title_set_info = DVDGetFileSet(_dvd);
if (!title_set_info) {
- DVDClose(_dvd);
return(1);
}
@@ -1573,7 +1572,6 @@ int DVDMirrorTitleSet(dvd_reader_t * _dvd, char * targ
title_set_info = DVDGetFileSet(_dvd);
if (!title_set_info) {
- DVDClose(_dvd);
return(1);
}