[SCM] libdvdread/master: Refresh all patches.
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Sun Jan 5 18:01:29 UTC 2014
The following commit has been merged in the master branch:
commit 03133204f5521e546ce32416e8e1a2715494a3cc
Author: Benjamin Drung <bdrung at debian.org>
Date: Sun Jan 5 16:40:40 2014 +0100
Refresh all patches.
diff --git a/debian/patches/0001-libdvdcss.patch b/debian/patches/0001-libdvdcss.patch
index 7dbbc48..28dcb76 100644
--- a/debian/patches/0001-libdvdcss.patch
+++ b/debian/patches/0001-libdvdcss.patch
@@ -1,10 +1,9 @@
Author: Daniel Baumann <mail at daniel-baumann.ch>
Description: Print information about the CSS README.
-diff -Naurp libdvdread.orig/src/dvd_input.c libdvdread/src/dvd_input.c
---- libdvdread.orig/src/dvd_input.c
-+++ libdvdread/src/dvd_input.c
-@@ -351,7 +351,14 @@ int dvdinput_setup(void)
+--- a/src/dvd_input.c
++++ b/src/dvd_input.c
+@@ -341,7 +341,14 @@
return 1;
} else {
diff --git a/debian/patches/0002-md5-symbols.patch b/debian/patches/0002-md5-symbols.patch
index 70ed887..9521814 100644
--- a/debian/patches/0002-md5-symbols.patch
+++ b/debian/patches/0002-md5-symbols.patch
@@ -2,9 +2,8 @@ Author: Daniel Baumann <mail at daniel-baumann.ch>
Description:
Fixing symbol conflicts with other MD5 implementations (Closes: #522512).
-diff -Naurp libdvdread.orig/src/md5.h libdvdread/src/md5.h
---- libdvdread.orig/src/md5.h
-+++ libdvdread/src/md5.h
+--- a/src/md5.h
++++ b/src/md5.h
@@ -21,6 +21,15 @@
#ifndef LIBDVDREAD_MD5_H
#define LIBDVDREAD_MD5_H
diff --git a/debian/patches/0003-endian.patch b/debian/patches/0003-endian.patch
index 105bb85..b71e753 100644
--- a/debian/patches/0003-endian.patch
+++ b/debian/patches/0003-endian.patch
@@ -1,9 +1,8 @@
Author: Lorenz Minder <lminder at gmx.net>
Description: Use correct endianess on big-endian machines (Closes: #531621).
-diff -Naurp libdvdread.orig/src/bswap.h libdvdread/src/bswap.h
---- libdvdread.orig/src/bswap.h
-+++ libdvdread/src/bswap.h
+--- a/src/bswap.h
++++ b/src/bswap.h
@@ -22,6 +22,11 @@
#ifndef LIBDVDREAD_BSWAP_H
#define LIBDVDREAD_BSWAP_H
diff --git a/debian/patches/0004-version.patch b/debian/patches/0004-version.patch
index af059ca..232cb1f 100644
--- a/debian/patches/0004-version.patch
+++ b/debian/patches/0004-version.patch
@@ -1,9 +1,8 @@
Author: Daniel Baumann <mail at daniel-baumann.ch>
Description: Bumping version to match original upstream (Closes: #532438).
-diff -Naurp libdvdread.orig/src/dvdread/dvd_reader.h libdvdread/src/dvdread/dvd_reader.h
---- libdvdread.orig/src/dvdread/dvd_reader.h
-+++ libdvdread/src/dvdread/dvd_reader.h
+--- a/src/dvdread/dvd_reader.h
++++ b/src/dvdread/dvd_reader.h
@@ -43,7 +43,7 @@
/**
* The current version.
diff --git a/debian/patches/0005-hurd.patch b/debian/patches/0005-hurd.patch
index 714591f..8a72fb3 100644
--- a/debian/patches/0005-hurd.patch
+++ b/debian/patches/0005-hurd.patch
@@ -4,18 +4,17 @@ Description:
GNU/Hurd. The attached patch fixes these problems by using dynamic buffer
allocation (Closes: #640803).
-diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
---- libdvdread.orig/src/dvd_reader.c
-+++ libdvdread/src/dvd_reader.c
-@@ -29,6 +29,7 @@
- #include <errno.h>
+--- 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>
-@@ -429,6 +430,12 @@ dvd_reader_t *DVDOpen( const char *ppath
+@@ -426,6 +427,12 @@
if( chdir( path_copy ) == -1 ) {
goto DVDOpen_error;
}
@@ -28,7 +27,7 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
new_path = malloc(PATH_MAX+1);
if(!new_path) {
goto DVDOpen_error;
-@@ -436,6 +443,7 @@ dvd_reader_t *DVDOpen( const char *ppath
+@@ -433,6 +440,7 @@
if( getcwd( new_path, PATH_MAX ) == NULL ) {
goto DVDOpen_error;
}
@@ -36,7 +35,7 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
retval = fchdir( cdir );
close( cdir );
cdir = -1;
-@@ -651,17 +659,23 @@ static dvd_file_t *DVDOpenFileUDF( dvd_r
+@@ -627,17 +635,23 @@
* or -1 on file not found.
* or -2 on path not found.
*/
@@ -62,7 +61,7 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
( ( path[ strlen( path ) - 1 ] == '/' ) ? "" : "/" ),
ent->d_name );
closedir(dir);
-@@ -672,9 +686,9 @@ static int findDirFile( const char *path
+@@ -648,9 +662,9 @@
return -1;
}
@@ -74,7 +73,7 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
const char *nodirfile;
int ret;
-@@ -688,6 +702,8 @@ static int findDVDFile( dvd_reader_t *dv
+@@ -664,6 +678,8 @@
ret = findDirFile( dvd->path_root, nodirfile, filename );
if( ret < 0 ) {
/* Try also with adding the path, just in case. */
@@ -83,7 +82,7 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
sprintf( video_path, "%s/VIDEO_TS/", dvd->path_root );
ret = findDirFile( video_path, nodirfile, filename );
if( ret < 0 ) {
-@@ -695,9 +711,11 @@ static int findDVDFile( dvd_reader_t *dv
+@@ -671,9 +687,11 @@
sprintf( video_path, "%s/video_ts/", dvd->path_root );
ret = findDirFile( video_path, nodirfile, filename );
if( ret < 0 ) {
@@ -95,7 +94,7 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
}
return 1;
-@@ -708,20 +726,22 @@ static int findDVDFile( dvd_reader_t *dv
+@@ -684,20 +702,22 @@
*/
static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename )
{
@@ -120,7 +119,7 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
return NULL;
}
-@@ -729,6 +749,7 @@ static dvd_file_t *DVDOpenFilePath( dvd_
+@@ -705,6 +725,7 @@
if( !dvd_file ) {
fprintf( stderr, "libdvdnav:DVDOpenFilePath:dvd_file malloc failed\n" );
dvdinput_close(dev);
@@ -128,15 +127,15 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
return NULL;
}
dvd_file->dvd = dvd;
-@@ -740,6 +761,7 @@ static dvd_file_t *DVDOpenFilePath( dvd_
+@@ -716,6 +737,7 @@
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;
-@@ -748,6 +770,7 @@ static dvd_file_t *DVDOpenFilePath( dvd_
+ }
+@@ -723,6 +745,7 @@
dvd_file->title_devs[ 0 ] = dev;
dvd_file->filesize = dvd_file->title_sizes[ 0 ];
@@ -144,7 +143,7 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
return dvd_file;
}
-@@ -803,7 +826,7 @@ static dvd_file_t *DVDOpenVOBUDF( dvd_re
+@@ -778,7 +801,7 @@
static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
{
char filename[ MAX_UDF_FILE_NAME_LEN ];
@@ -153,7 +152,7 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
struct stat fileinfo;
dvd_file_t *dvd_file;
int i;
-@@ -826,13 +849,15 @@ static dvd_file_t *DVDOpenVOBPath( dvd_r
+@@ -801,13 +824,15 @@
} else {
sprintf( filename, "VTS_%02i_0.VOB", title );
}
@@ -170,7 +169,7 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
free( dvd_file );
return NULL;
}
-@@ -840,6 +865,7 @@ static dvd_file_t *DVDOpenVOBPath( dvd_r
+@@ -815,6 +840,7 @@
if( stat( full_path, &fileinfo ) < 0 ) {
fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename );
dvdinput_close(dev);
@@ -178,7 +177,7 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
free( dvd_file );
return NULL;
}
-@@ -852,7 +878,7 @@ static dvd_file_t *DVDOpenVOBPath( dvd_r
+@@ -827,7 +853,7 @@
for( i = 0; i < TITLES_MAX; ++i ) {
sprintf( filename, "VTS_%02i_%i.VOB", title, i + 1 );
@@ -187,7 +186,7 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
break;
}
-@@ -867,11 +893,12 @@ static dvd_file_t *DVDOpenVOBPath( dvd_r
+@@ -842,11 +868,12 @@
dvd_file->filesize += dvd_file->title_sizes[ i ];
}
if( !dvd_file->title_devs[ 0 ] ) {
@@ -201,7 +200,7 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
return dvd_file;
}
-@@ -993,7 +1020,7 @@ static int DVDFileStatVOBPath( dvd_reade
+@@ -968,7 +995,7 @@
int menu, dvd_stat_t *statbuf )
{
char filename[ MAX_UDF_FILE_NAME_LEN ];
@@ -210,7 +209,7 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
struct stat fileinfo;
off_t tot_size;
off_t parts_size[ 9 ];
-@@ -1005,11 +1032,14 @@ static int DVDFileStatVOBPath( dvd_reade
+@@ -980,11 +1007,14 @@
else
sprintf( filename, "VTS_%02d_%d.VOB", title, menu ? 0 : 1 );
@@ -226,7 +225,7 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
return -1;
}
-@@ -1021,7 +1051,7 @@ static int DVDFileStatVOBPath( dvd_reade
+@@ -996,7 +1026,7 @@
int cur;
for( cur = 2; cur < 10; cur++ ) {
sprintf( filename, "VTS_%02d_%d.VOB", title, cur );
@@ -235,7 +234,7 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
break;
if( stat( full_path, &fileinfo ) < 0 ) {
-@@ -1040,6 +1070,7 @@ static int DVDFileStatVOBPath( dvd_reade
+@@ -1015,6 +1045,7 @@
for( n = 0; n < nr_parts; n++ )
statbuf->parts_size[ n ] = parts_size[ n ];
@@ -243,7 +242,7 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
return 0;
}
-@@ -1048,7 +1079,7 @@ int DVDFileStat( dvd_reader_t *dvd, int
+@@ -1023,7 +1054,7 @@
dvd_read_domain_t domain, dvd_stat_t *statbuf )
{
char filename[ MAX_UDF_FILE_NAME_LEN ];
@@ -252,7 +251,7 @@ diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
struct stat fileinfo;
uint32_t size;
-@@ -1104,17 +1135,19 @@ int DVDFileStat( dvd_reader_t *dvd, int
+@@ -1079,17 +1110,19 @@
return 0;
}
} else {
diff --git a/debian/patches/0006-descriptor.patch b/debian/patches/0006-descriptor.patch
index 4a3c7ad..5d85f68 100644
--- a/debian/patches/0006-descriptor.patch
+++ b/debian/patches/0006-descriptor.patch
@@ -19,10 +19,9 @@ Description:
the File System Descriptor location from the Logical Volume Descriptor
(Closes: #663512).
-diff -Naurp libdvdread.orig/src/dvd_udf.c libdvdread/src/dvd_udf.c
---- libdvdread.orig/src/dvd_udf.c
-+++ libdvdread/src/dvd_udf.c
-@@ -80,6 +80,8 @@ struct Partition {
+--- a/src/dvd_udf.c
++++ b/src/dvd_udf.c
+@@ -81,6 +81,8 @@
uint32_t AccessType;
uint32_t Start;
uint32_t Length;
@@ -31,7 +30,7 @@ diff -Naurp libdvdread.orig/src/dvd_udf.c libdvdread/src/dvd_udf.c
};
struct AD {
-@@ -99,6 +101,12 @@ struct avdp_t {
+@@ -100,6 +102,12 @@
struct extent_ad rvds;
};
@@ -44,7 +43,7 @@ diff -Naurp libdvdread.orig/src/dvd_udf.c libdvdread/src/dvd_udf.c
struct pvd_t {
uint8_t VolumeIdentifier[32];
uint8_t VolumeSetIdentifier[128];
-@@ -423,6 +431,16 @@ static int UDFLogVolume( uint8_t *data,
+@@ -424,6 +432,16 @@
return 0;
}
@@ -61,7 +60,7 @@ diff -Naurp libdvdread.orig/src/dvd_udf.c libdvdread/src/dvd_udf.c
static int UDFFileEntry( uint8_t *data, uint8_t *FileType,
struct Partition *partition, struct AD *ad )
{
-@@ -767,8 +785,18 @@ static int UDFFindPartition( dvd_reader_
+@@ -768,8 +786,18 @@
/* Logical Volume Descriptor */
if( UDFLogVolume( LogBlock, part->VolumeDesc ) ) {
/* TODO: sector size wrong! */
@@ -82,7 +81,7 @@ diff -Naurp libdvdread.orig/src/dvd_udf.c libdvdread/src/dvd_udf.c
}
} while( ( lbnum <= MVDS_location + ( MVDS_length - 1 )
-@@ -811,7 +839,10 @@ uint32_t UDFFindFile( dvd_reader_t *devi
+@@ -812,7 +840,10 @@
SetUDFCache(device, PartitionCache, 0, &partition);
/* Find root dir ICB */
diff --git a/debian/patches/0007-segfault.patch b/debian/patches/0007-segfault.patch
index 4e1ca18..488eb6e 100644
--- a/debian/patches/0007-segfault.patch
+++ b/debian/patches/0007-segfault.patch
@@ -1,11 +1,10 @@
Author: Peter Van Eynde <pvaneynd at debian.org>
Description: Fix miscompilation leading to a segfault (Closes: #688574).
-diff -Naurp libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c
---- libdvdread.orig/src/dvd_reader.c
-+++ libdvdread/src/dvd_reader.c
-@@ -30,6 +30,7 @@
- #include <string.h>
+--- 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
--
libdvdread packaging
More information about the pkg-multimedia-commits
mailing list