[SCM] libdvdread/master: Refresh patches, drop merged patches
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Aug 16 13:17:20 UTC 2014
The following commit has been merged in the master branch:
commit eb7208fa2d220b69d730933bb2563b5d1ec1f1cf
Author: Reinhard Tartler <siretart at tauware.de>
Date: Fri Aug 15 21:59:46 2014 -0400
Refresh patches, drop merged patches
Discussion with j-b on IRC in private query
03:56 <j-b> for libdvdread, 0002 can be dropped
03:56 <j-b> 0003 too
03:56 <j-b> 0004 too
03:56 <j-b> 0005 is rejected
03:56 <j-b> 0006 is not merged
03:56 <j-b> 0007 is rejected because of 0005
03:57 <j-b> those are the debian patches
03:57 <siretart> so you don't like the hurd patch?
03:58 <siretart> what's the problem with that?
03:59 <j-b> it's just wrong
04:02 <j-b> 22:38 < courmisch> bdrung: 0006 violates glibc spec; you should probably move the _GNU_SOURCE definition upward
04:03 <j-b> and he meant 0005
04:03 <j-b> 0006 is not mergeable, but author does not answer
04:05 <siretart> do you remember what's wrong with the patch?
04:06 <j-b> it's not mergeable now
04:06 <j-b> and is sub-optimal
04:06 <j-b> I made a better patch
04:06 <j-b> but I cannot test
04:06 <siretart> ah, ok, thanks
04:06 <j-b> I mailed the guy
04:06 <j-b> but the email is mailer-daemond
04:07 <j-b> I will fix those in 5.0.1
04:08 <j-b> my opinion is that you keep 0001, 0005-6-7
04:08 <j-b> until we find a better solution for 5-6-7
04:09 <j-b> I will make a solution
diff --git a/debian/patches/0001-libdvdcss.patch b/debian/patches/0001-libdvdcss.patch
index bb696aa..70ecd62 100644
--- a/debian/patches/0001-libdvdcss.patch
+++ b/debian/patches/0001-libdvdcss.patch
@@ -7,11 +7,9 @@ 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
-@@ -343,7 +343,14 @@ int dvdinput_setup(void)
+@@ -344,7 +344,14 @@ int dvdinput_setup(void)
return 1;
} else {
diff --git a/debian/patches/0002-md5-symbols.patch b/debian/patches/0002-md5-symbols.patch
deleted file mode 100644
index 9004ea4..0000000
--- a/debian/patches/0002-md5-symbols.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 @@
- #ifndef LIBDVDREAD_MD5_H
- #define LIBDVDREAD_MD5_H
-
-+/* Change function names to prevent symbol conflicts */
-+#define md5_init_ctx _DVD_md5_init_ctx
-+#define md5_process_block _DVD_md5_process_block
-+#define md5_process_bytes _DVD_md5_process_bytes
-+#define md5_finish_ctx _DVD_md5_finish_ctx
-+#define md5_read_ctx _DVD_md5_read_ctx
-+#define md5_stream _DVD_md5_stream
-+#define md5_buffer _DVD_md5_buffer
-+
- #include <stdio.h>
-
- #if defined HAVE_LIMITS_H || defined _LIBC
diff --git a/debian/patches/0003-endian.patch b/debian/patches/0003-endian.patch
deleted file mode 100644
index 318bbe3..0000000
--- a/debian/patches/0003-endian.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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 @@
- #ifndef LIBDVDREAD_BSWAP_H
- #define LIBDVDREAD_BSWAP_H
-
-+#include <endian.h>
-+#if BYTE_ORDER == BIG_ENDIAN
-+#define WORDS_BIGENDIAN
-+#endif
-+
- #include <config.h>
-
- #if defined(WORDS_BIGENDIAN)
diff --git a/debian/patches/0004-version.patch b/debian/patches/0004-version.patch
deleted file mode 100644
index d82e39c..0000000
--- a/debian/patches/0004-version.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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 @@
- /**
- * The current version.
- */
--#define DVDREAD_VERSION 904
-+#define DVDREAD_VERSION 907
-
- /**
- * The length of one Logical Block of a DVD.
diff --git a/debian/patches/0005-hurd.patch b/debian/patches/0005-hurd.patch
index 72c9137..e7ef816 100644
--- a/debian/patches/0005-hurd.patch
+++ b/debian/patches/0005-hurd.patch
@@ -14,8 +14,6 @@ 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
@@ -29,6 +29,7 @@
@@ -26,7 +24,7 @@ index 170b911..fbdabb0 100644
#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 )
+@@ -437,6 +438,12 @@ dvd_reader_t *DVDOpen( const char *ppath
if( chdir( path_copy ) == -1 ) {
goto DVDOpen_error;
}
@@ -39,7 +37,7 @@ index 170b911..fbdabb0 100644
new_path = malloc(PATH_MAX+1);
if(!new_path) {
goto DVDOpen_error;
-@@ -443,6 +450,7 @@ dvd_reader_t *DVDOpen( const char *ppath )
+@@ -444,6 +451,7 @@ dvd_reader_t *DVDOpen( const char *ppath
if( getcwd( new_path, PATH_MAX ) == NULL ) {
goto DVDOpen_error;
}
@@ -47,7 +45,7 @@ index 170b911..fbdabb0 100644
retval = fchdir( cdir );
close( cdir );
cdir = -1;
-@@ -658,17 +666,23 @@ static dvd_file_t *DVDOpenFileUDF( dvd_reader_t *dvd, char *filename )
+@@ -659,17 +667,23 @@ static dvd_file_t *DVDOpenFileUDF( dvd_r
* or -1 on file not found.
* or -2 on path not found.
*/
@@ -73,7 +71,7 @@ index 170b911..fbdabb0 100644
( ( path[ strlen( path ) - 1 ] == '/' ) ? "" : "/" ),
ent->d_name );
closedir(dir);
-@@ -679,9 +693,9 @@ static int findDirFile( const char *path, const char *file, char *filename )
+@@ -680,9 +694,9 @@ static int findDirFile( const char *path
return -1;
}
@@ -85,7 +83,7 @@ index 170b911..fbdabb0 100644
const char *nodirfile;
int ret;
-@@ -695,6 +709,8 @@ static int findDVDFile( dvd_reader_t *dvd, const char *file, char *filename )
+@@ -696,6 +710,8 @@ static int findDVDFile( dvd_reader_t *dv
ret = findDirFile( dvd->path_root, nodirfile, filename );
if( ret < 0 ) {
/* Try also with adding the path, just in case. */
@@ -94,7 +92,7 @@ index 170b911..fbdabb0 100644
sprintf( video_path, "%s/VIDEO_TS/", dvd->path_root );
ret = findDirFile( video_path, nodirfile, filename );
if( ret < 0 ) {
-@@ -702,9 +718,11 @@ static int findDVDFile( dvd_reader_t *dvd, const char *file, char *filename )
+@@ -703,9 +719,11 @@ static int findDVDFile( dvd_reader_t *dv
sprintf( video_path, "%s/video_ts/", dvd->path_root );
ret = findDirFile( video_path, nodirfile, filename );
if( ret < 0 ) {
@@ -106,7 +104,7 @@ index 170b911..fbdabb0 100644
}
return 1;
-@@ -715,20 +733,22 @@ static int findDVDFile( dvd_reader_t *dvd, const char *file, char *filename )
+@@ -716,20 +734,22 @@ static int findDVDFile( dvd_reader_t *dv
*/
static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename )
{
@@ -131,7 +129,7 @@ index 170b911..fbdabb0 100644
return NULL;
}
-@@ -736,6 +756,7 @@ static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename )
+@@ -737,6 +757,7 @@ static dvd_file_t *DVDOpenFilePath( dvd_
if( !dvd_file ) {
fprintf( stderr, "libdvdread:DVDOpenFilePath:dvd_file malloc failed\n" );
dvdinput_close(dev);
@@ -139,7 +137,7 @@ index 170b911..fbdabb0 100644
return NULL;
}
dvd_file->dvd = dvd;
-@@ -747,6 +768,7 @@ static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename )
+@@ -748,6 +769,7 @@ static dvd_file_t *DVDOpenFilePath( dvd_
if( stat( full_path, &fileinfo ) < 0 ) {
fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename );
@@ -147,7 +145,7 @@ index 170b911..fbdabb0 100644
free( dvd_file );
dvdinput_close( dev );
return NULL;
-@@ -755,6 +777,7 @@ static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename )
+@@ -756,6 +778,7 @@ static dvd_file_t *DVDOpenFilePath( dvd_
dvd_file->title_devs[ 0 ] = dev;
dvd_file->filesize = dvd_file->title_sizes[ 0 ];
@@ -155,7 +153,7 @@ index 170b911..fbdabb0 100644
return dvd_file;
}
-@@ -810,7 +833,7 @@ static dvd_file_t *DVDOpenVOBUDF( dvd_reader_t *dvd, int title, int menu )
+@@ -811,7 +834,7 @@ static dvd_file_t *DVDOpenVOBUDF( dvd_re
static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
{
char filename[ MAX_UDF_FILE_NAME_LEN ];
@@ -164,7 +162,7 @@ index 170b911..fbdabb0 100644
struct stat fileinfo;
dvd_file_t *dvd_file;
int i;
-@@ -833,13 +856,15 @@ static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
+@@ -834,13 +857,15 @@ static dvd_file_t *DVDOpenVOBPath( dvd_r
} else {
sprintf( filename, "VTS_%02i_0.VOB", title );
}
@@ -181,7 +179,7 @@ index 170b911..fbdabb0 100644
free( dvd_file );
return NULL;
}
-@@ -847,6 +872,7 @@ static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
+@@ -848,6 +873,7 @@ static dvd_file_t *DVDOpenVOBPath( dvd_r
if( stat( full_path, &fileinfo ) < 0 ) {
fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename );
dvdinput_close(dev);
@@ -189,7 +187,7 @@ index 170b911..fbdabb0 100644
free( dvd_file );
return NULL;
}
-@@ -859,7 +885,7 @@ static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
+@@ -860,7 +886,7 @@ static dvd_file_t *DVDOpenVOBPath( dvd_r
for( i = 0; i < TITLES_MAX; ++i ) {
sprintf( filename, "VTS_%02i_%i.VOB", title, i + 1 );
@@ -198,7 +196,7 @@ index 170b911..fbdabb0 100644
break;
}
-@@ -874,11 +900,13 @@ static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
+@@ -875,11 +901,13 @@ static dvd_file_t *DVDOpenVOBPath( dvd_r
dvd_file->filesize += dvd_file->title_sizes[ i ];
}
if( !dvd_file->title_devs[ 0 ] ) {
@@ -212,7 +210,7 @@ index 170b911..fbdabb0 100644
return dvd_file;
}
-@@ -1000,7 +1028,7 @@ static int DVDFileStatVOBPath( dvd_reader_t *dvd, int title,
+@@ -1001,7 +1029,7 @@ static int DVDFileStatVOBPath( dvd_reade
int menu, dvd_stat_t *statbuf )
{
char filename[ MAX_UDF_FILE_NAME_LEN ];
@@ -221,7 +219,7 @@ index 170b911..fbdabb0 100644
struct stat fileinfo;
off_t tot_size;
off_t parts_size[ 9 ];
-@@ -1012,11 +1040,14 @@ static int DVDFileStatVOBPath( dvd_reader_t *dvd, int title,
+@@ -1013,11 +1041,14 @@ static int DVDFileStatVOBPath( dvd_reade
else
sprintf( filename, "VTS_%02d_%d.VOB", title, menu ? 0 : 1 );
@@ -237,7 +235,7 @@ index 170b911..fbdabb0 100644
return -1;
}
-@@ -1028,7 +1059,7 @@ static int DVDFileStatVOBPath( dvd_reader_t *dvd, int title,
+@@ -1029,7 +1060,7 @@ static int DVDFileStatVOBPath( dvd_reade
int cur;
for( cur = 2; cur < 10; cur++ ) {
sprintf( filename, "VTS_%02d_%d.VOB", title, cur );
@@ -246,7 +244,7 @@ index 170b911..fbdabb0 100644
break;
if( stat( full_path, &fileinfo ) < 0 ) {
-@@ -1047,6 +1078,7 @@ static int DVDFileStatVOBPath( dvd_reader_t *dvd, int title,
+@@ -1048,6 +1079,7 @@ static int DVDFileStatVOBPath( dvd_reade
for( n = 0; n < nr_parts; n++ )
statbuf->parts_size[ n ] = parts_size[ n ];
@@ -254,7 +252,7 @@ index 170b911..fbdabb0 100644
return 0;
}
-@@ -1055,7 +1087,7 @@ int DVDFileStat( dvd_reader_t *dvd, int titlenum,
+@@ -1056,7 +1088,7 @@ int DVDFileStat( dvd_reader_t *dvd, int
dvd_read_domain_t domain, dvd_stat_t *statbuf )
{
char filename[ MAX_UDF_FILE_NAME_LEN ];
@@ -263,7 +261,7 @@ index 170b911..fbdabb0 100644
struct stat fileinfo;
uint32_t size;
-@@ -1111,17 +1143,19 @@ int DVDFileStat( dvd_reader_t *dvd, int titlenum,
+@@ -1112,17 +1144,19 @@ int DVDFileStat( dvd_reader_t *dvd, int
return 0;
}
} else {
diff --git a/debian/patches/0006-descriptor.patch b/debian/patches/0006-descriptor.patch
index a4b9bb0..83df829 100644
--- a/debian/patches/0006-descriptor.patch
+++ b/debian/patches/0006-descriptor.patch
@@ -25,8 +25,6 @@ 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
@@ -82,6 +82,8 @@ struct Partition {
@@ -51,7 +49,7 @@ index dc5f9af..e44240a 100644
struct pvd_t {
uint8_t VolumeIdentifier[32];
uint8_t VolumeSetIdentifier[128];
-@@ -425,6 +433,16 @@ static int UDFLogVolume( uint8_t *data, char *VolumeDescriptor )
+@@ -427,6 +435,16 @@ static int UDFLogVolume( uint8_t *data,
return 0;
}
@@ -68,7 +66,7 @@ index dc5f9af..e44240a 100644
static int UDFFileEntry( uint8_t *data, uint8_t *FileType,
struct Partition *partition, struct AD *ad )
{
-@@ -771,8 +789,18 @@ static int UDFFindPartition( dvd_reader_t *device, int partnum,
+@@ -773,8 +791,18 @@ static int UDFFindPartition( dvd_reader_
/* Logical Volume Descriptor */
if( UDFLogVolume( LogBlock, part->VolumeDesc ) ) {
/* TODO: sector size wrong! */
@@ -89,7 +87,7 @@ index dc5f9af..e44240a 100644
}
} while( ( lbnum <= MVDS_location + ( MVDS_length - 1 )
-@@ -815,7 +843,10 @@ uint32_t UDFFindFile( dvd_reader_t *device, char *filename,
+@@ -817,7 +845,10 @@ uint32_t UDFFindFile( dvd_reader_t *devi
SetUDFCache(device, PartitionCache, 0, &partition);
/* Find root dir ICB */
diff --git a/debian/patches/series b/debian/patches/series
index 6d362a2..b2b6d71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
0001-libdvdcss.patch
-0002-md5-symbols.patch
-0003-endian.patch
-0004-version.patch
0005-hurd.patch
0006-descriptor.patch
0007-segfault.patch
--
libdvdread packaging
More information about the pkg-multimedia-commits
mailing list