[SCM] libdvdread/master: debian/patches: patchset re-worked against v4.9.9
mfv-guest at users.alioth.debian.org
mfv-guest at users.alioth.debian.org
Tue Apr 22 10:13:23 UTC 2014
The following commit has been merged in the master branch:
commit 82681b191cc0e6c5da3b6d68ded559f09aad6a48
Author: Matteo F. Vescovi <mfvescovi at gmail.com>
Date: Tue Apr 22 12:01:51 2014 +0200
debian/patches: patchset re-worked against v4.9.9
diff --git a/debian/patches/0001-libdvdcss.patch b/debian/patches/0001-libdvdcss.patch
index 28dcb76..bb696aa 100644
--- a/debian/patches/0001-libdvdcss.patch
+++ b/debian/patches/0001-libdvdcss.patch
@@ -1,9 +1,17 @@
-Author: Daniel Baumann <mail at daniel-baumann.ch>
-Description: Print information about the CSS README.
+From: Daniel Baumann <mail at daniel-baumann.ch>
+Date: Tue, 22 Apr 2014 11:14:26 +0200
+Subject: libdvdcss
+Print information about the CSS README.
+---
+ src/dvd_input.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/dvd_input.c b/src/dvd_input.c
+index d7e2252..705207f 100644
--- a/src/dvd_input.c
+++ b/src/dvd_input.c
-@@ -341,7 +341,14 @@
+@@ -343,7 +343,14 @@ int dvdinput_setup(void)
return 1;
} else {
diff --git a/debian/patches/0002-md5-symbols.patch b/debian/patches/0002-md5-symbols.patch
index 9521814..9004ea4 100644
--- a/debian/patches/0002-md5-symbols.patch
+++ b/debian/patches/0002-md5-symbols.patch
@@ -1,7 +1,16 @@
-Author: Daniel Baumann <mail at daniel-baumann.ch>
-Description:
- Fixing symbol conflicts with other MD5 implementations (Closes: #522512).
+From: Daniel Baumann <mail at daniel-baumann.ch>
+Date: Tue, 22 Apr 2014 11:15:48 +0200
+Subject: md5-symbols
+Fixing symbol conflicts with other MD5 implementations.
+
+Closes: #522512
+---
+ src/md5.h | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/md5.h b/src/md5.h
+index 3daaf1a..3a52661 100644
--- a/src/md5.h
+++ b/src/md5.h
@@ -21,6 +21,15 @@
diff --git a/debian/patches/0003-endian.patch b/debian/patches/0003-endian.patch
index b71e753..318bbe3 100644
--- a/debian/patches/0003-endian.patch
+++ b/debian/patches/0003-endian.patch
@@ -1,6 +1,16 @@
-Author: Lorenz Minder <lminder at gmx.net>
-Description: Use correct endianess on big-endian machines (Closes: #531621).
+From: Lorenz Minder <lminder at gmx.net>
+Date: Tue, 22 Apr 2014 11:17:11 +0200
+Subject: endian
+Use correct endianess on big-endian machines.
+
+Closes: #531621
+---
+ src/bswap.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/bswap.h b/src/bswap.h
+index fdf53dc..e69f7e8 100644
--- a/src/bswap.h
+++ b/src/bswap.h
@@ -22,6 +22,11 @@
diff --git a/debian/patches/0004-version.patch b/debian/patches/0004-version.patch
index 232cb1f..d82e39c 100644
--- a/debian/patches/0004-version.patch
+++ b/debian/patches/0004-version.patch
@@ -1,6 +1,16 @@
-Author: Daniel Baumann <mail at daniel-baumann.ch>
-Description: Bumping version to match original upstream (Closes: #532438).
+From: Daniel Baumann <mail at daniel-baumann.ch>
+Date: Tue, 22 Apr 2014 11:18:21 +0200
+Subject: version
+Bumping version to match original upstream.
+
+Closes: #532438
+---
+ src/dvdread/dvd_reader.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dvdread/dvd_reader.h b/src/dvdread/dvd_reader.h
+index c68a035..080a783 100644
--- a/src/dvdread/dvd_reader.h
+++ b/src/dvdread/dvd_reader.h
@@ -43,7 +43,7 @@
diff --git a/debian/patches/0005-hurd.patch b/debian/patches/0005-hurd.patch
index 8a72fb3..72c9137 100644
--- a/debian/patches/0005-hurd.patch
+++ b/debian/patches/0005-hurd.patch
@@ -1,20 +1,32 @@
-Author: Svante Signell <svante.signell at telia.com>
-Description:
- libdvdread FTBFS on hurd-i386 due to PATH_MAX usage, which is not defined on
- GNU/Hurd. The attached patch fixes these problems by using dynamic buffer
- allocation (Closes: #640803).
+From: Svante Signell <svante.signell at telia.com>
+Date: Tue, 22 Apr 2014 11:47:57 +0200
+Subject: hurd
+libdvdread FTBFS on hurd-i386 due to PATH_MAX usage,
+which is not defined on GNU/Hurd.
+The attached patch fixes these problems by using
+dynamic buffer allocation.
+
+Closes: #640803
+
+Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
+---
+ src/dvd_reader.c | 62 +++++++++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 48 insertions(+), 14 deletions(-)
+
+diff --git a/src/dvd_reader.c b/src/dvd_reader.c
+index 170b911..fbdabb0 100644
--- a/src/dvd_reader.c
+++ b/src/dvd_reader.c
-@@ -30,6 +30,7 @@
- #include <string.h>
- #include <strings.h>
- #include <ctype.h>
-+#define _GNU_SOURCE
- #include <unistd.h>
- #include <limits.h>
- #include <dirent.h>
-@@ -426,6 +427,12 @@
+@@ -29,6 +29,7 @@
+ #include <stdio.h> /* fprintf */
+ #include <errno.h> /* errno, EIN* */
+ #include <string.h> /* memcpy, strlen */
++#define _GNU_SOURCE /* Hurd support */
+ #include <unistd.h> /* chdir, getcwd */
+ #include <limits.h> /* PATH_MAX */
+ #include <dirent.h> /* opendir, readdir */
+@@ -436,6 +437,12 @@ dvd_reader_t *DVDOpen( const char *ppath )
if( chdir( path_copy ) == -1 ) {
goto DVDOpen_error;
}
@@ -27,7 +39,7 @@ Description:
new_path = malloc(PATH_MAX+1);
if(!new_path) {
goto DVDOpen_error;
-@@ -433,6 +440,7 @@
+@@ -443,6 +450,7 @@ dvd_reader_t *DVDOpen( const char *ppath )
if( getcwd( new_path, PATH_MAX ) == NULL ) {
goto DVDOpen_error;
}
@@ -35,7 +47,7 @@ Description:
retval = fchdir( cdir );
close( cdir );
cdir = -1;
-@@ -627,17 +635,23 @@
+@@ -658,17 +666,23 @@ static dvd_file_t *DVDOpenFileUDF( dvd_reader_t *dvd, char *filename )
* or -1 on file not found.
* or -2 on path not found.
*/
@@ -61,7 +73,7 @@ Description:
( ( path[ strlen( path ) - 1 ] == '/' ) ? "" : "/" ),
ent->d_name );
closedir(dir);
-@@ -648,9 +662,9 @@
+@@ -679,9 +693,9 @@ static int findDirFile( const char *path, const char *file, char *filename )
return -1;
}
@@ -73,7 +85,7 @@ Description:
const char *nodirfile;
int ret;
-@@ -664,6 +678,8 @@
+@@ -695,6 +709,8 @@ static int findDVDFile( dvd_reader_t *dvd, const char *file, char *filename )
ret = findDirFile( dvd->path_root, nodirfile, filename );
if( ret < 0 ) {
/* Try also with adding the path, just in case. */
@@ -82,7 +94,7 @@ Description:
sprintf( video_path, "%s/VIDEO_TS/", dvd->path_root );
ret = findDirFile( video_path, nodirfile, filename );
if( ret < 0 ) {
-@@ -671,9 +687,11 @@
+@@ -702,9 +718,11 @@ static int findDVDFile( dvd_reader_t *dvd, const char *file, char *filename )
sprintf( video_path, "%s/video_ts/", dvd->path_root );
ret = findDirFile( video_path, nodirfile, filename );
if( ret < 0 ) {
@@ -94,7 +106,7 @@ Description:
}
return 1;
-@@ -684,20 +702,22 @@
+@@ -715,20 +733,22 @@ static int findDVDFile( dvd_reader_t *dvd, const char *file, char *filename )
*/
static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename )
{
@@ -107,35 +119,35 @@ Description:
/* Get the full path of the file. */
- if( !findDVDFile( dvd, filename, full_path ) ) {
+ if( !findDVDFile( dvd, filename, &full_path ) ) {
- fprintf( stderr, "libdvdnav:DVDOpenFilePath:findDVDFile %s failed\n", filename );
+ fprintf( stderr, "libdvdread:DVDOpenFilePath:findDVDFile %s failed\n", filename );
+ free( full_path );
return NULL;
}
dev = dvdinput_open( full_path );
if( !dev ) {
- fprintf( stderr, "libdvdnav:DVDOpenFilePath:dvdinput_open %s failed\n", full_path );
+ fprintf( stderr, "libdvdread:DVDOpenFilePath:dvdinput_open %s failed\n", full_path );
+ free( full_path );
return NULL;
}
-@@ -705,6 +725,7 @@
+@@ -736,6 +756,7 @@ static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename )
if( !dvd_file ) {
- fprintf( stderr, "libdvdnav:DVDOpenFilePath:dvd_file malloc failed\n" );
+ fprintf( stderr, "libdvdread:DVDOpenFilePath:dvd_file malloc failed\n" );
dvdinput_close(dev);
+ free( full_path );
return NULL;
}
dvd_file->dvd = dvd;
-@@ -716,6 +737,7 @@
+@@ -747,6 +768,7 @@ static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename )
if( stat( full_path, &fileinfo ) < 0 ) {
fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename );
+ free( full_path );
free( dvd_file );
+ dvdinput_close( dev );
return NULL;
- }
-@@ -723,6 +745,7 @@
+@@ -755,6 +777,7 @@ static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename )
dvd_file->title_devs[ 0 ] = dev;
dvd_file->filesize = dvd_file->title_sizes[ 0 ];
@@ -143,7 +155,7 @@ Description:
return dvd_file;
}
-@@ -778,7 +801,7 @@
+@@ -810,7 +833,7 @@ static dvd_file_t *DVDOpenVOBUDF( dvd_reader_t *dvd, int title, int menu )
static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
{
char filename[ MAX_UDF_FILE_NAME_LEN ];
@@ -152,7 +164,7 @@ Description:
struct stat fileinfo;
dvd_file_t *dvd_file;
int i;
-@@ -801,13 +824,15 @@
+@@ -833,13 +856,15 @@ static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
} else {
sprintf( filename, "VTS_%02i_0.VOB", title );
}
@@ -169,7 +181,7 @@ Description:
free( dvd_file );
return NULL;
}
-@@ -815,6 +840,7 @@
+@@ -847,6 +872,7 @@ static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
if( stat( full_path, &fileinfo ) < 0 ) {
fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename );
dvdinput_close(dev);
@@ -177,7 +189,7 @@ Description:
free( dvd_file );
return NULL;
}
-@@ -827,7 +853,7 @@
+@@ -859,7 +885,7 @@ static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
for( i = 0; i < TITLES_MAX; ++i ) {
sprintf( filename, "VTS_%02i_%i.VOB", title, i + 1 );
@@ -186,7 +198,7 @@ Description:
break;
}
-@@ -842,11 +868,12 @@
+@@ -874,11 +900,13 @@ static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
dvd_file->filesize += dvd_file->title_sizes[ i ];
}
if( !dvd_file->title_devs[ 0 ] ) {
@@ -195,12 +207,12 @@ Description:
return NULL;
}
}
--
+
+ free( full_path );
return dvd_file;
}
-@@ -968,7 +995,7 @@
+@@ -1000,7 +1028,7 @@ static int DVDFileStatVOBPath( dvd_reader_t *dvd, int title,
int menu, dvd_stat_t *statbuf )
{
char filename[ MAX_UDF_FILE_NAME_LEN ];
@@ -209,7 +221,7 @@ Description:
struct stat fileinfo;
off_t tot_size;
off_t parts_size[ 9 ];
-@@ -980,11 +1007,14 @@
+@@ -1012,11 +1040,14 @@ static int DVDFileStatVOBPath( dvd_reader_t *dvd, int title,
else
sprintf( filename, "VTS_%02d_%d.VOB", title, menu ? 0 : 1 );
@@ -225,7 +237,7 @@ Description:
return -1;
}
-@@ -996,7 +1026,7 @@
+@@ -1028,7 +1059,7 @@ static int DVDFileStatVOBPath( dvd_reader_t *dvd, int title,
int cur;
for( cur = 2; cur < 10; cur++ ) {
sprintf( filename, "VTS_%02d_%d.VOB", title, cur );
@@ -234,7 +246,7 @@ Description:
break;
if( stat( full_path, &fileinfo ) < 0 ) {
-@@ -1015,6 +1045,7 @@
+@@ -1047,6 +1078,7 @@ static int DVDFileStatVOBPath( dvd_reader_t *dvd, int title,
for( n = 0; n < nr_parts; n++ )
statbuf->parts_size[ n ] = parts_size[ n ];
@@ -242,7 +254,7 @@ Description:
return 0;
}
-@@ -1023,7 +1054,7 @@
+@@ -1055,7 +1087,7 @@ int DVDFileStat( dvd_reader_t *dvd, int titlenum,
dvd_read_domain_t domain, dvd_stat_t *statbuf )
{
char filename[ MAX_UDF_FILE_NAME_LEN ];
@@ -251,7 +263,7 @@ Description:
struct stat fileinfo;
uint32_t size;
-@@ -1079,17 +1110,19 @@
+@@ -1111,17 +1143,19 @@ int DVDFileStat( dvd_reader_t *dvd, int titlenum,
return 0;
}
} else {
diff --git a/debian/patches/0006-descriptor.patch b/debian/patches/0006-descriptor.patch
index 5d85f68..a4b9bb0 100644
--- a/debian/patches/0006-descriptor.patch
+++ b/debian/patches/0006-descriptor.patch
@@ -1,27 +1,35 @@
-Author: Mario Holbe <mario.holbe at tu-ilmenau.de>
-Description:
- libdvdread is very likely to fail on discs/images that store their File
- System Descriptor at the end of the disc/image rather than at the
- beginning. This is due to the "strategy" libdvdread uses to find it:
- libdvdread scans sequentially from the beginning of the disc/image for
- the File System Descriptor and identifies it by a single byte tag.
- .
- Aside from wasting lots of time on discs/images that store their File
- System Descriptor at the end there is quite a good chance to stumble
- across a random data block that accidentally starts with this tag (and
- failing on it) before finding the real File System Descriptor.
- .
- As far as I can see, at least CDBurnerXP seems to (be able to) create
- such images - at least if my interpretation of the Implementation
- Identifier "NMS DVDProLib" is correct.
- .
- This... well, let's call it ugly hack fixes this by obtaining
- the File System Descriptor location from the Logical Volume Descriptor
- (Closes: #663512).
+From: Mario Holbe <mario.holbe at tu-ilmenau.de>
+Date: Tue, 22 Apr 2014 11:49:42 +0200
+Subject: descriptor
+libdvdread is very likely to fail on discs/images that store their File
+System Descriptor at the end of the disc/image rather than at the
+beginning. This is due to the "strategy" libdvdread uses to find it:
+libdvdread scans sequentially from the beginning of the disc/image for
+the File System Descriptor and identifies it by a single byte tag.
+
+Aside from wasting lots of time on discs/images that store their File
+System Descriptor at the end there is quite a good chance to stumble
+across a random data block that accidentally starts with this tag (and
+failing on it) before finding the real File System Descriptor.
+
+As far as I can see, at least CDBurnerXP seems to (be able to) create
+such images - at least if my interpretation of the Implementation
+Identifier "NMS DVDProLib" is correct.
+
+This... well, let's call it ugly hack fixes this by obtaining
+the File System Descriptor location from the Logical Volume Descriptor
+
+Closes: #663512
+---
+ src/dvd_udf.c | 37 ++++++++++++++++++++++++++++++++++---
+ 1 file changed, 34 insertions(+), 3 deletions(-)
+
+diff --git a/src/dvd_udf.c b/src/dvd_udf.c
+index dc5f9af..e44240a 100644
--- a/src/dvd_udf.c
+++ b/src/dvd_udf.c
-@@ -81,6 +81,8 @@
+@@ -82,6 +82,8 @@ struct Partition {
uint32_t AccessType;
uint32_t Start;
uint32_t Length;
@@ -30,7 +38,7 @@ Description:
};
struct AD {
-@@ -100,6 +102,12 @@
+@@ -101,6 +103,12 @@ struct avdp_t {
struct extent_ad rvds;
};
@@ -43,7 +51,7 @@ Description:
struct pvd_t {
uint8_t VolumeIdentifier[32];
uint8_t VolumeSetIdentifier[128];
-@@ -424,6 +432,16 @@
+@@ -425,6 +433,16 @@ static int UDFLogVolume( uint8_t *data, char *VolumeDescriptor )
return 0;
}
@@ -60,7 +68,7 @@ Description:
static int UDFFileEntry( uint8_t *data, uint8_t *FileType,
struct Partition *partition, struct AD *ad )
{
-@@ -768,8 +786,18 @@
+@@ -771,8 +789,18 @@ static int UDFFindPartition( dvd_reader_t *device, int partnum,
/* Logical Volume Descriptor */
if( UDFLogVolume( LogBlock, part->VolumeDesc ) ) {
/* TODO: sector size wrong! */
@@ -81,7 +89,7 @@ Description:
}
} while( ( lbnum <= MVDS_location + ( MVDS_length - 1 )
-@@ -812,7 +840,10 @@
+@@ -815,7 +843,10 @@ uint32_t UDFFindFile( dvd_reader_t *device, char *filename,
SetUDFCache(device, PartitionCache, 0, &partition);
/* Find root dir ICB */
diff --git a/debian/patches/0007-segfault.patch b/debian/patches/0007-segfault.patch
index 488eb6e..c992c39 100644
--- a/debian/patches/0007-segfault.patch
+++ b/debian/patches/0007-segfault.patch
@@ -1,13 +1,25 @@
-Author: Peter Van Eynde <pvaneynd at debian.org>
-Description: Fix miscompilation leading to a segfault (Closes: #688574).
+From: Peter Van Eynde <pvaneynd at debian.org>
+Date: Tue, 22 Apr 2014 11:52:53 +0200
+Subject: segfault
+Fix miscompilation leading to a segfault.
+
+Closes: #688574
+
+Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
+---
+ src/dvd_reader.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/dvd_reader.c b/src/dvd_reader.c
+index fbdabb0..4db135d 100644
--- a/src/dvd_reader.c
+++ b/src/dvd_reader.c
-@@ -31,6 +31,7 @@
- #include <strings.h>
- #include <ctype.h>
- #define _GNU_SOURCE
-+#define __USE_GNU
- #include <unistd.h>
- #include <limits.h>
- #include <dirent.h>
+@@ -30,6 +30,7 @@
+ #include <errno.h> /* errno, EIN* */
+ #include <string.h> /* memcpy, strlen */
+ #define _GNU_SOURCE /* Hurd support */
++#define __USE_GNU /* Fix segfault */
+ #include <unistd.h> /* chdir, getcwd */
+ #include <limits.h> /* PATH_MAX */
+ #include <dirent.h> /* opendir, readdir */
diff --git a/debian/patches/add-man-page.patch b/debian/patches/0008-dvdread-config_manpage.patch
similarity index 59%
rename from debian/patches/add-man-page.patch
rename to debian/patches/0008-dvdread-config_manpage.patch
index a32c90d..63cb9df 100644
--- a/debian/patches/add-man-page.patch
+++ b/debian/patches/0008-dvdread-config_manpage.patch
@@ -1,14 +1,32 @@
-Description: Add a man page for dvdread-config
-Author: Benjamin Drung <bdrung at debian.org>
+From: Benjamin Drung <bdrung at debian.org>
+Date: Tue, 22 Apr 2014 11:57:27 +0200
+Subject: dvdread-config_manpage
---- a/misc/Makefile.am
-+++ b/misc/Makefile.am
-@@ -6,3 +6,5 @@
-
+Add a man page for dvdread-config.
+
+Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
+---
+ Makefile.am | 2 ++
+ misc/dvdread-config.1 | 29 +++++++++++++++++++++++++++++
+ 2 files changed, 31 insertions(+)
+ create mode 100644 misc/dvdread-config.1
+
+diff --git a/Makefile.am b/Makefile.am
+index 2d055bf..e3fdeb2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -51,6 +51,8 @@ pkginclude_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = dvdread.pc
+ pkgconfig_DATA = misc/dvdread.pc
+
++dist_man_MANS = misc/dvdread-config.1
+
-+dist_man_MANS = dvdread-config.1
+ if APIDOC
+ all-local: apidoc
+ install-data-local: install-apidoc
+diff --git a/misc/dvdread-config.1 b/misc/dvdread-config.1
+new file mode 100644
+index 0000000..946e66f
--- /dev/null
+++ b/misc/dvdread-config.1
@@ -0,0 +1,29 @@
diff --git a/debian/patches/series b/debian/patches/series
index 6d362a2..900b70a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
0005-hurd.patch
0006-descriptor.patch
0007-segfault.patch
+0008-dvdread-config_manpage.patch
--
libdvdread packaging
More information about the pkg-multimedia-commits
mailing list