diff options
author | Florian Franzmann | 2020-04-06 19:25:04 +0200 |
---|---|---|
committer | Florian Franzmann | 2020-04-06 22:17:06 +0200 |
commit | 06ae32fd62a9b817163ac14b043b9dddd3816567 (patch) | |
tree | 258791a97257d6e56a62de64190c7b25afb8db86 /video | |
parent | 03c36e8d58ca7c7e7c841660cc8783ec89063aa8 (diff) |
video/dvdbackup: fix compile error
Diffstat (limited to 'video')
-rw-r--r-- | video/dvdbackup/HISTORY | 3 | ||||
-rwxr-xr-x | video/dvdbackup/PRE_BUILD | 4 | ||||
-rw-r--r-- | video/dvdbackup/dvdbackup-dvdread-6.1.patch | 87 |
3 files changed, 94 insertions, 0 deletions
diff --git a/video/dvdbackup/HISTORY b/video/dvdbackup/HISTORY index 3165c2937f..c8582c8722 100644 --- a/video/dvdbackup/HISTORY +++ b/video/dvdbackup/HISTORY @@ -1,3 +1,6 @@ +2020-04-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * PRE_BUILD, dvdbackup-dvdread-6.1.patch: fix compile error + 2016-09-14 David C. Haley <khoralin@gmail.com> * DETAILS: version bump 0.1.1 -> 0.4.2 Updated SOURCE_URL & WEB_SITE diff --git a/video/dvdbackup/PRE_BUILD b/video/dvdbackup/PRE_BUILD new file mode 100755 index 0000000000..668c98b8e2 --- /dev/null +++ b/video/dvdbackup/PRE_BUILD @@ -0,0 +1,4 @@ +default_pre_build && +cd "$SOURCE_DIRECTORY" && + +patch -p0 < "$SPELL_DIRECTORY/dvdbackup-dvdread-6.1.patch" diff --git a/video/dvdbackup/dvdbackup-dvdread-6.1.patch b/video/dvdbackup/dvdbackup-dvdread-6.1.patch new file mode 100644 index 0000000000..4cf90229c1 --- /dev/null +++ b/video/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); +----- |