Commit 1bf68fd6 authored by Benjamin Drung's avatar Benjamin Drung

Simply refresh remaining patches

parent 1f2024f6
...@@ -9,19 +9,19 @@ Print information about the CSS README. ...@@ -9,19 +9,19 @@ Print information about the CSS README.
--- a/src/dvd_input.c --- a/src/dvd_input.c
+++ b/src/dvd_input.c +++ b/src/dvd_input.c
@@ -344,7 +344,14 @@ int dvdinput_setup(void) @@ -366,7 +366,14 @@
return 1; return 1;
} else { } else {
- fprintf(stderr, "libdvdread: Encrypted DVD support unavailable.\n"); - fprintf(stderr, "libdvdread: Encrypted DVD support unavailable.\n");
+ fprintf(stderr, "libdvdread: Encrypted DVD support unavailable.\n" + fprintf(stderr, "libdvdread: Encrypted DVD support unavailable.\n"
+ "************************************************\n" + "************************************************\n"
+ "** **\n" + "** **\n"
+ "** No css library available. See **\n" + "** No css library available. See **\n"
+ "** /usr/share/doc/libdvdread4/README.css **\n" + "** /usr/share/doc/libdvdread4/README.css **\n"
+ "** for more information. **\n" + "** for more information. **\n"
+ "** **\n" + "** **\n"
+ "************************************************\n"); + "************************************************\n");
/* libdvdcss replacement functions */ /* libdvdcss replacement functions */
dvdinput_open = file_open; dvdinput_open = file_open;
...@@ -27,7 +27,7 @@ Closes: #663512 ...@@ -27,7 +27,7 @@ Closes: #663512
--- a/src/dvd_udf.c --- a/src/dvd_udf.c
+++ b/src/dvd_udf.c +++ b/src/dvd_udf.c
@@ -82,6 +82,8 @@ struct Partition { @@ -82,6 +82,8 @@
uint32_t AccessType; uint32_t AccessType;
uint32_t Start; uint32_t Start;
uint32_t Length; uint32_t Length;
...@@ -36,7 +36,7 @@ Closes: #663512 ...@@ -36,7 +36,7 @@ Closes: #663512
}; };
struct AD { struct AD {
@@ -101,6 +103,12 @@ struct avdp_t { @@ -101,6 +103,12 @@
struct extent_ad rvds; struct extent_ad rvds;
}; };
...@@ -49,7 +49,7 @@ Closes: #663512 ...@@ -49,7 +49,7 @@ Closes: #663512
struct pvd_t { struct pvd_t {
uint8_t VolumeIdentifier[32]; uint8_t VolumeIdentifier[32];
uint8_t VolumeSetIdentifier[128]; uint8_t VolumeSetIdentifier[128];
@@ -427,6 +435,16 @@ static int UDFLogVolume( uint8_t *data, @@ -427,6 +435,16 @@
return 0; return 0;
} }
...@@ -66,7 +66,7 @@ Closes: #663512 ...@@ -66,7 +66,7 @@ Closes: #663512
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 )
{ {
@@ -773,8 +791,18 @@ static int UDFFindPartition( dvd_reader_ @@ -775,8 +793,18 @@
/* Logical Volume Descriptor */ /* Logical Volume Descriptor */
if( UDFLogVolume( LogBlock, part->VolumeDesc ) ) { if( UDFLogVolume( LogBlock, part->VolumeDesc ) ) {
/* TODO: sector size wrong! */ /* TODO: sector size wrong! */
...@@ -87,7 +87,7 @@ Closes: #663512 ...@@ -87,7 +87,7 @@ Closes: #663512
} }
} while( ( lbnum <= MVDS_location + ( MVDS_length - 1 ) } while( ( lbnum <= MVDS_location + ( MVDS_length - 1 )
@@ -817,7 +845,10 @@ uint32_t UDFFindFile( dvd_reader_t *devi @@ -818,7 +846,10 @@
SetUDFCache(device, PartitionCache, 0, &partition); SetUDFCache(device, PartitionCache, 0, &partition);
/* Find root dir ICB */ /* Find root dir ICB */
......
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