<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dcb83a11bb8ef17668e9de650960ef1b15a6e468">https://github.com/macports/macports-ports/commit/dcb83a11bb8ef17668e9de650960ef1b15a6e468</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new dcb83a11bb8 dvdbackup: Fix build with libdvdread 6.1.0+
</span>dcb83a11bb8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dcb83a11bb8ef17668e9de650960ef1b15a6e468
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Feb 4 08:28:27 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> dvdbackup: Fix build with libdvdread 6.1.0+
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Increase revision to rebuild with libdvdread 6.1.0.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62221
</span>---
multimedia/dvdbackup/Portfile | 4 +-
multimedia/dvdbackup/files/libdvdread-6.1.0.patch | 89 +++++++++++++++++++++++
2 files changed, 92 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/dvdbackup/Portfile b/multimedia/dvdbackup/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 22b6f923f1d..44debe58053 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/dvdbackup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/dvdbackup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name dvdbackup
version 0.4.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories multimedia sysutils
platforms darwin
license GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,3 +20,5 @@ checksums rmd160 879f184dc585dafeb5a4c2c5d2d461c5ef99f7cd \
</span> sha256 0a37c31cc6f2d3c146ec57064bda8a06cf5f2ec90455366cb250506bab964550
depends_lib port:libdvdread
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles libdvdread-6.1.0.patch
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/dvdbackup/files/libdvdread-6.1.0.patch b/multimedia/dvdbackup/files/libdvdread-6.1.0.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3ee1a276b4e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/dvdbackup/files/libdvdread-6.1.0.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,89 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with libdvdread 6.1.0+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.launchpad.net/dvdbackup/+bug/1869226/comments/1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dvdbackup.c.orig 2012-06-24 01:10:29 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dvdbackup.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1132,7 +1132,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* DVD handler */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifo_handle_t* ifo_file = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dvd_file_t* ifo_file = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (title_set_info->number_of_title_sets + 1 < title_set) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1181,7 +1181,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((streamout_ifo = open(targetname_ifo, O_WRONLY | O_CREAT | O_TRUNC, 0666)) == -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, _("Error creating %s\n"), targetname_ifo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ perror(PACKAGE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifoClose(ifo_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DVDCloseFile(ifo_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(buffer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(streamout_ifo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(streamout_bup);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1191,7 +1191,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((streamout_bup = open(targetname_bup, O_WRONLY | O_CREAT | O_TRUNC, 0666)) == -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, _("Error creating %s\n"), targetname_bup);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ perror(PACKAGE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifoClose(ifo_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DVDCloseFile(ifo_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(buffer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(streamout_ifo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(streamout_bup);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1200,31 +1200,31 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Copy VIDEO_TS.IFO, since it's a small file try to copy it in one shot */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((ifo_file = ifoOpen(dvd, title_set))== 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((ifo_file = DVDOpenFile(dvd, title_set, DVD_READ_INFO_FILE))== 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, _("Failed opening IFO for title set %d\n"), title_set);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifoClose(ifo_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DVDCloseFile(ifo_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(buffer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(streamout_ifo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(streamout_bup);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- size = DVDFileSize(ifo_file->file) * DVD_VIDEO_LB_LEN;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size = DVDFileSize(ifo_file) * DVD_VIDEO_LB_LEN;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((buffer = (unsigned char *)malloc(size * sizeof(unsigned char))) == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ perror(PACKAGE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifoClose(ifo_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DVDCloseFile(ifo_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(buffer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(streamout_ifo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(streamout_bup);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DVDFileSeek(ifo_file->file, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DVDFileSeek(ifo_file, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (DVDReadBytes(ifo_file->file,buffer,size) != size) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (DVDReadBytes(ifo_file,buffer,size) != size) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, _("Error reading IFO for title set %d\n"), title_set);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifoClose(ifo_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DVDCloseFile(ifo_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(buffer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(streamout_ifo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(streamout_bup);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1234,7 +1234,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (write(streamout_ifo,buffer,size) != size) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, _("Error writing %s\n"),targetname_ifo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifoClose(ifo_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DVDCloseFile(ifo_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(buffer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(streamout_ifo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(streamout_bup);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1243,7 +1243,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (write(streamout_bup,buffer,size) != size) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, _("Error writing %s\n"),targetname_bup);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifoClose(ifo_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DVDCloseFile(ifo_file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(buffer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(streamout_ifo);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(streamout_bup);
</span></pre><pre style='margin:0'>
</pre>