Commit 82681b19 authored by Matteo F. Vescovi's avatar Matteo F. Vescovi

debian/patches: patchset re-worked against v4.9.9

parent a33cd961
Author: Daniel Baumann <mail@daniel-baumann.ch> From: Daniel Baumann <mail@daniel-baumann.ch>
Description: Print information about the CSS README. 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 --- a/src/dvd_input.c
+++ b/src/dvd_input.c +++ b/src/dvd_input.c
@@ -341,7 +341,14 @@ @@ -343,7 +343,14 @@ int dvdinput_setup(void)
return 1; return 1;
} else { } else {
......
Author: Daniel Baumann <mail@daniel-baumann.ch> From: Daniel Baumann <mail@daniel-baumann.ch>
Description: Date: Tue, 22 Apr 2014 11:15:48 +0200
Fixing symbol conflicts with other MD5 implementations (Closes: #522512). 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 --- a/src/md5.h
+++ b/src/md5.h +++ b/src/md5.h
@@ -21,6 +21,15 @@ @@ -21,6 +21,15 @@
......
Author: Lorenz Minder <lminder@gmx.net> From: Lorenz Minder <lminder@gmx.net>
Description: Use correct endianess on big-endian machines (Closes: #531621). 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 --- a/src/bswap.h
+++ b/src/bswap.h +++ b/src/bswap.h
@@ -22,6 +22,11 @@ @@ -22,6 +22,11 @@
......
Author: Daniel Baumann <mail@daniel-baumann.ch> From: Daniel Baumann <mail@daniel-baumann.ch>
Description: Bumping version to match original upstream (Closes: #532438). 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 --- a/src/dvdread/dvd_reader.h
+++ b/src/dvdread/dvd_reader.h +++ b/src/dvdread/dvd_reader.h
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
......
Author: Svante Signell <svante.signell@telia.com> From: Svante Signell <svante.signell@telia.com>
Description: Date: Tue, 22 Apr 2014 11:47:57 +0200
libdvdread FTBFS on hurd-i386 due to PATH_MAX usage, which is not defined on Subject: hurd
GNU/Hurd. The attached patch fixes these problems by using dynamic buffer
allocation (Closes: #640803).
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@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 --- a/src/dvd_reader.c
+++ b/src/dvd_reader.c +++ b/src/dvd_reader.c
@@ -30,6 +30,7 @@ @@ -29,6 +29,7 @@
#include <string.h> #include <stdio.h> /* fprintf */
#include <strings.h> #include <errno.h> /* errno, EIN* */
#include <ctype.h> #include <string.h> /* memcpy, strlen */
+#define _GNU_SOURCE +#define _GNU_SOURCE /* Hurd support */
#include <unistd.h> #include <unistd.h> /* chdir, getcwd */
#include <limits.h> #include <limits.h> /* PATH_MAX */
#include <dirent.h> #include <dirent.h> /* opendir, readdir */
@@ -426,6 +427,12 @@ @@ -436,6 +437,12 @@ dvd_reader_t *DVDOpen( const char *ppath )
if( chdir( path_copy ) == -1 ) { if( chdir( path_copy ) == -1 ) {
goto DVDOpen_error; goto DVDOpen_error;
} }
...@@ -27,7 +39,7 @@ Description: ...@@ -27,7 +39,7 @@ Description:
new_path = malloc(PATH_MAX+1); new_path = malloc(PATH_MAX+1);
if(!new_path) { if(!new_path) {
goto DVDOpen_error; 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 ) { if( getcwd( new_path, PATH_MAX ) == NULL ) {
goto DVDOpen_error; goto DVDOpen_error;
} }
...@@ -35,7 +47,7 @@ Description: ...@@ -35,7 +47,7 @@ Description:
retval = fchdir( cdir ); retval = fchdir( cdir );
close( cdir ); close( cdir );
cdir = -1; 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 -1 on file not found.
* or -2 on path not found. * or -2 on path not found.
*/ */
...@@ -61,7 +73,7 @@ Description: ...@@ -61,7 +73,7 @@ Description:
( ( path[ strlen( path ) - 1 ] == '/' ) ? "" : "/" ), ( ( path[ strlen( path ) - 1 ] == '/' ) ? "" : "/" ),
ent->d_name ); ent->d_name );
closedir(dir); closedir(dir);
@@ -648,9 +662,9 @@ @@ -679,9 +693,9 @@ static int findDirFile( const char *path, const char *file, char *filename )
return -1; return -1;
} }
...@@ -73,7 +85,7 @@ Description: ...@@ -73,7 +85,7 @@ Description:
const char *nodirfile; const char *nodirfile;
int ret; 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 ); ret = findDirFile( dvd->path_root, nodirfile, filename );
if( ret < 0 ) { if( ret < 0 ) {
/* Try also with adding the path, just in case. */ /* Try also with adding the path, just in case. */
...@@ -82,7 +94,7 @@ Description: ...@@ -82,7 +94,7 @@ Description:
sprintf( video_path, "%s/VIDEO_TS/", dvd->path_root ); sprintf( video_path, "%s/VIDEO_TS/", dvd->path_root );
ret = findDirFile( video_path, nodirfile, filename ); ret = findDirFile( video_path, nodirfile, filename );
if( ret < 0 ) { 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 ); sprintf( video_path, "%s/video_ts/", dvd->path_root );
ret = findDirFile( video_path, nodirfile, filename ); ret = findDirFile( video_path, nodirfile, filename );
if( ret < 0 ) { if( ret < 0 ) {
...@@ -94,7 +106,7 @@ Description: ...@@ -94,7 +106,7 @@ Description:
} }
return 1; 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 ) static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename )
{ {
...@@ -107,35 +119,35 @@ Description: ...@@ -107,35 +119,35 @@ Description:
/* Get the full path of the file. */ /* Get the full path of the file. */
- if( !findDVDFile( dvd, filename, full_path ) ) { - if( !findDVDFile( dvd, filename, full_path ) ) {
+ 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 ); + free( full_path );
return NULL; return NULL;
} }
dev = dvdinput_open( full_path ); dev = dvdinput_open( full_path );
if( !dev ) { 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 ); + free( full_path );
return NULL; return NULL;
} }
@@ -705,6 +725,7 @@ @@ -736,6 +756,7 @@ static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename )
if( !dvd_file ) { if( !dvd_file ) {
fprintf( stderr, "libdvdnav:DVDOpenFilePath:dvd_file malloc failed\n" ); fprintf( stderr, "libdvdread:DVDOpenFilePath:dvd_file malloc failed\n" );
dvdinput_close(dev); dvdinput_close(dev);
+ free( full_path ); + free( full_path );
return NULL; return NULL;
} }
dvd_file->dvd = dvd; 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 ) { if( stat( full_path, &fileinfo ) < 0 ) {
fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename ); fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename );
+ free( full_path ); + free( full_path );
free( dvd_file ); free( dvd_file );
dvdinput_close( dev );
return NULL; return NULL;
} @@ -755,6 +777,7 @@ static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename )
@@ -723,6 +745,7 @@
dvd_file->title_devs[ 0 ] = dev; dvd_file->title_devs[ 0 ] = dev;
dvd_file->filesize = dvd_file->title_sizes[ 0 ]; dvd_file->filesize = dvd_file->title_sizes[ 0 ];
...@@ -143,7 +155,7 @@ Description: ...@@ -143,7 +155,7 @@ Description:
return dvd_file; 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 ) static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
{ {
char filename[ MAX_UDF_FILE_NAME_LEN ]; char filename[ MAX_UDF_FILE_NAME_LEN ];
...@@ -152,7 +164,7 @@ Description: ...@@ -152,7 +164,7 @@ Description:
struct stat fileinfo; struct stat fileinfo;
dvd_file_t *dvd_file; dvd_file_t *dvd_file;
int i; int i;
@@ -801,13 +824,15 @@ @@ -833,13 +856,15 @@ static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu )
} else { } else {
sprintf( filename, "VTS_%02i_0.VOB", title ); sprintf( filename, "VTS_%02i_0.VOB", title );
} }
...@@ -169,7 +181,7 @@ Description: ...@@ -169,7 +181,7 @@ Description:
free( dvd_file ); free( dvd_file );
return NULL; 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 ) { if( stat( full_path, &fileinfo ) < 0 ) {
fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename ); fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename );
dvdinput_close(dev); dvdinput_close(dev);
...@@ -177,7 +189,7 @@ Description: ...@@ -177,7 +189,7 @@ Description:
free( dvd_file ); free( dvd_file );
return NULL; 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 ) { for( i = 0; i < TITLES_MAX; ++i ) {
sprintf( filename, "VTS_%02i_%i.VOB", title, i + 1 ); sprintf( filename, "VTS_%02i_%i.VOB", title, i + 1 );
...@@ -186,7 +198,7 @@ Description: ...@@ -186,7 +198,7 @@ Description:
break; 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 ]; dvd_file->filesize += dvd_file->title_sizes[ i ];
} }
if( !dvd_file->title_devs[ 0 ] ) { if( !dvd_file->title_devs[ 0 ] ) {
...@@ -195,12 +207,12 @@ Description: ...@@ -195,12 +207,12 @@ Description:
return NULL; return NULL;
} }
} }
-
+ free( full_path ); + free( full_path );
return dvd_file; 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 ) int menu, dvd_stat_t *statbuf )
{ {
char filename[ MAX_UDF_FILE_NAME_LEN ]; char filename[ MAX_UDF_FILE_NAME_LEN ];
...@@ -209,7 +221,7 @@ Description: ...@@ -209,7 +221,7 @@ Description:
struct stat fileinfo; struct stat fileinfo;
off_t tot_size; off_t tot_size;
off_t parts_size[ 9 ]; off_t parts_size[ 9 ];
@@ -980,11 +1007,14 @@ @@ -1012,11 +1040,14 @@ static int DVDFileStatVOBPath( dvd_reader_t *dvd, int title,
else else
sprintf( filename, "VTS_%02d_%d.VOB", title, menu ? 0 : 1 ); sprintf( filename, "VTS_%02d_%d.VOB", title, menu ? 0 : 1 );
...@@ -225,7 +237,7 @@ Description: ...@@ -225,7 +237,7 @@ Description:
return -1; return -1;
} }
@@ -996,7 +1026,7 @@ @@ -1028,7 +1059,7 @@ static int DVDFileStatVOBPath( dvd_reader_t *dvd, int title,
int cur; int cur;
for( cur = 2; cur < 10; cur++ ) { for( cur = 2; cur < 10; cur++ ) {
sprintf( filename, "VTS_%02d_%d.VOB", title, cur ); sprintf( filename, "VTS_%02d_%d.VOB", title, cur );
...@@ -234,7 +246,7 @@ Description: ...@@ -234,7 +246,7 @@ Description:
break; break;
if( stat( full_path, &fileinfo ) < 0 ) { 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++ ) for( n = 0; n < nr_parts; n++ )
statbuf->parts_size[ n ] = parts_size[ n ]; statbuf->parts_size[ n ] = parts_size[ n ];
...@@ -242,7 +254,7 @@ Description: ...@@ -242,7 +254,7 @@ Description:
return 0; 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 ) dvd_read_domain_t domain, dvd_stat_t *statbuf )
{ {
char filename[ MAX_UDF_FILE_NAME_LEN ]; char filename[ MAX_UDF_FILE_NAME_LEN ];
...@@ -251,7 +263,7 @@ Description: ...@@ -251,7 +263,7 @@ Description:
struct stat fileinfo; struct stat fileinfo;
uint32_t size; uint32_t size;
@@ -1079,17 +1110,19 @@ @@ -1111,17 +1143,19 @@ int DVDFileStat( dvd_reader_t *dvd, int titlenum,
return 0; return 0;
} }
} else { } else {
......
Author: Mario Holbe <mario.holbe@tu-ilmenau.de> From: Mario Holbe <mario.holbe@tu-ilmenau.de>
Description: Date: Tue, 22 Apr 2014 11:49:42 +0200
libdvdread is very likely to fail on discs/images that store their File Subject: descriptor
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).
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 --- a/src/dvd_udf.c
+++ b/src/dvd_udf.c +++ b/src/dvd_udf.c
@@ -81,6 +81,8 @@ @@ -82,6 +82,8 @@ struct Partition {
uint32_t AccessType; uint32_t AccessType;
uint32_t Start; uint32_t Start;
uint32_t Length; uint32_t Length;
...@@ -30,7 +38,7 @@ Description: ...@@ -30,7 +38,7 @@ Description:
}; };
struct AD { struct AD {
@@ -100,6 +102,12 @@ @@ -101,6 +103,12 @@ struct avdp_t {
struct extent_ad rvds; struct extent_ad rvds;
}; };
...@@ -43,7 +51,7 @@ Description: ...@@ -43,7 +51,7 @@ Description:
struct pvd_t { struct pvd_t {
uint8_t VolumeIdentifier[32]; uint8_t VolumeIdentifier[32];
uint8_t VolumeSetIdentifier[128]; uint8_t VolumeSetIdentifier[128];
@@ -424,6 +432,16 @@ @@ -425,6 +433,16 @@ static int UDFLogVolume( uint8_t *data, char *VolumeDescriptor )
return 0; return 0;
} }
...@@ -60,7 +68,7 @@ Description: ...@@ -60,7 +68,7 @@ Description:
static int UDFFileEntry( uint8_t *data, uint8_t *FileType, static int UDFFileEntry( uint8_t *data, uint8_t *FileType,
struct Partition *partition, struct AD *ad ) 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 */ /* Logical Volume Descriptor */
if( UDFLogVolume( LogBlock, part->VolumeDesc ) ) { if( UDFLogVolume( LogBlock, part->VolumeDesc ) ) {
/* TODO: sector size wrong! */ /* TODO: sector size wrong! */
...@@ -81,7 +89,7 @@ Description: ...@@ -81,7 +89,7 @@ Description:
} }
} while( ( lbnum <= MVDS_location + ( MVDS_length - 1 ) } 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); SetUDFCache(device, PartitionCache, 0, &partition);
/* Find root dir ICB */ /* Find root dir ICB */
......
Author: Peter Van Eynde <pvaneynd@debian.org> From: Peter Van Eynde <pvaneynd@debian.org>
Description: Fix miscompilation leading to a segfault (Closes: #688574). 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@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 --- a/src/dvd_reader.c
+++ b/src/dvd_reader.c +++ b/src/dvd_reader.c
@@ -31,6 +31,7 @@ @@ -30,6 +30,7 @@
#include <strings.h> #include <errno.h> /* errno, EIN* */
#include <ctype.h> #include <string.h> /* memcpy, strlen */
#define _GNU_SOURCE #define _GNU_SOURCE /* Hurd support */
+#define __USE_GNU +#define __USE_GNU /* Fix segfault */
#include <unistd.h> #include <unistd.h> /* chdir, getcwd */
#include <limits.h> #include <limits.h> /* PATH_MAX */
#include <dirent.h> #include <dirent.h> /* opendir, readdir */
Description: Add a man page for dvdread-config From: Benjamin Drung <bdrung@debian.org>
Author: Benjamin Drung <bdrung@debian.org> Date: Tue, 22 Apr 2014 11:57:27 +0200
Subject: dvdread-config_manpage
--- a/misc/Makefile.am Add a man page for dvdread-config.
+++ b/misc/Makefile.am
@@ -6,3 +6,5 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi@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 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 --- /dev/null
+++ b/misc/dvdread-config.1 +++ b/misc/dvdread-config.1
@@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
......
...@@ -5,3 +5,4 @@ ...@@ -5,3 +5,4 @@
0005-hurd.patch 0005-hurd.patch
0006-descriptor.patch 0006-descriptor.patch
0007-segfault.patch 0007-segfault.patch
0008-dvdread-config_manpage.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment