Bump to new releases.
libdvdread can now use an official libdvdcss.
This commit is contained in:
espie
parent
2bce308240
commit
171bba4675
@ -1,10 +1,10 @@
|
|||||||
# $OpenBSD: Makefile,v 1.2 2001/11/02 16:03:59 wilfried Exp $
|
# $OpenBSD: Makefile,v 1.3 2002/05/28 14:14:15 espie Exp $
|
||||||
CATEGORIES=converters
|
CATEGORIES=converters
|
||||||
|
|
||||||
COMMENT="Descramble DVDs"
|
COMMENT="Descramble DVDs"
|
||||||
DISTNAME=libdvdcss-0.0.3.ogle3
|
DISTNAME=libdvdcss-1.2.0
|
||||||
|
|
||||||
MASTER_SITES=http://www.dtek.chalmers.se/groups/dvd/dist/
|
MASTER_SITES=http://www.videolan.org/pub/videolan/libdvdcss/1.2.0/
|
||||||
|
|
||||||
CONFIGURE_STYLE= gnu
|
CONFIGURE_STYLE= gnu
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
MD5 (libdvdcss-0.0.3.ogle3.tar.gz) = 7f1760aa357c6837d1fd39f5d35a40df
|
MD5 (libdvdcss-1.2.0.tar.gz) = 7dc1a6c714363d28c379e13bbf1412f0
|
||||||
RMD160 (libdvdcss-0.0.3.ogle3.tar.gz) = 974b6204bb420e30211698ad821c5231e092e1ce
|
RMD160 (libdvdcss-1.2.0.tar.gz) = 4fd999cd867eb8557a1c9c41d5fc964516a35521
|
||||||
SHA1 (libdvdcss-0.0.3.ogle3.tar.gz) = 97058e3251167e3cd3bde80f8f060c2ee0e3a7f4
|
SHA1 (libdvdcss-1.2.0.tar.gz) = 6c0ab85cd6bb6f22ff4647bc1f4cbe0a168d4bba
|
||||||
|
|||||||
@ -1,82 +0,0 @@
|
|||||||
$OpenBSD: patch-extras_libdvdcss_css_c,v 1.1.1.1 2001/11/02 15:22:08 espie Exp $
|
|
||||||
--- extras/libdvdcss/css.c.orig Mon Oct 22 14:53:44 2001
|
|
||||||
+++ extras/libdvdcss/css.c Mon Oct 22 14:59:37 2001
|
|
||||||
@@ -393,8 +393,11 @@ int CSSGetTitleKey( dvdcss_handle dvdcss
|
|
||||||
}
|
|
||||||
memcpy( p_key, p_buffer, KEY_SIZE );
|
|
||||||
|
|
||||||
- fprintf( stderr, "libdvdcss debug: title key is" );
|
|
||||||
- printHex( p_key, KEY_SIZE );
|
|
||||||
+ if (dvdcss->b_debug)
|
|
||||||
+ {
|
|
||||||
+ fprintf( stderr, "libdvdcss debug: title key is" );
|
|
||||||
+ printHex( p_key, KEY_SIZE );
|
|
||||||
+ }
|
|
||||||
|
|
||||||
_dvdcss_debug( dvdcss, "got title key" );
|
|
||||||
return 1;
|
|
||||||
@@ -650,9 +653,9 @@ static int CSSAttackPattern( u8 p_sec[0x
|
|
||||||
|
|
||||||
DVD specifies that there must only be one type of data in every sector.
|
|
||||||
Every sector is one pack and so must obviously be 2048 bytes long.
|
|
||||||
- For the last pice of video data before a VOBU boundary there might not
|
|
||||||
- be exactly the right amount of data to fill a sector. They one has to
|
|
||||||
- pad the pack to 2048 bytes. For just a few bytes this is doen in the
|
|
||||||
+ For the last piece of video data before a VOBU boundary there might not
|
|
||||||
+ be exactly the right amount of data to fill a sector. Then one has to
|
|
||||||
+ pad the pack to 2048 bytes. For just a few bytes this is done in the
|
|
||||||
header but for any large amount you insert a PES packet from the
|
|
||||||
Padding stream. This looks like 0x00 00 01 be xx xx ff ff ...
|
|
||||||
where xx xx is the length of the padding stream.
|
|
||||||
@@ -665,7 +668,7 @@ static int CSSAttackPadding( u8 p_sec[0x
|
|
||||||
|
|
||||||
i_pes_length = (p_sec[0x12]<<8) | p_sec[0x13];
|
|
||||||
|
|
||||||
- // Coverd by the test below but usfull for debuging
|
|
||||||
+ // Covered by the test below but useful for debuging
|
|
||||||
if( i_pes_length == 0x800 - 0x14 ) return 0;
|
|
||||||
|
|
||||||
/* There must be room for at least 4? bytes of padding stream,
|
|
||||||
@@ -676,13 +679,13 @@ static int CSSAttackPadding( u8 p_sec[0x
|
|
||||||
p_sec[0x14 + i_pes_length + 1] == 0x00 &&
|
|
||||||
p_sec[0x14 + i_pes_length + 2] == 0x01 ) )
|
|
||||||
{
|
|
||||||
- fprintf( stderr, "plain %d %02x %02x %02x %02x (type %02x sub %02x)\n",
|
|
||||||
- 0x800 - 0x14 - 4 - 2 - i_pes_length,
|
|
||||||
- p_sec[0x14 + i_pes_length + 0],
|
|
||||||
- p_sec[0x14 + i_pes_length + 1],
|
|
||||||
- p_sec[0x14 + i_pes_length + 2],
|
|
||||||
- p_sec[0x14 + i_pes_length + 3],
|
|
||||||
- p_sec[0x11], p_sec[0x17 + p_sec[0x16]]);
|
|
||||||
+// fprintf( stderr, "plain %d %02x %02x %02x %02x (type %02x sub %02x)\n",
|
|
||||||
+// 0x800 - 0x14 - 4 - 2 - i_pes_length,
|
|
||||||
+// p_sec[0x14 + i_pes_length + 0],
|
|
||||||
+// p_sec[0x14 + i_pes_length + 1],
|
|
||||||
+// p_sec[0x14 + i_pes_length + 2],
|
|
||||||
+// p_sec[0x14 + i_pes_length + 3],
|
|
||||||
+// p_sec[0x11], p_sec[0x17 + p_sec[0x16]]);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -716,9 +719,9 @@ static int CSSAttackPadding( u8 p_sec[0x
|
|
||||||
{
|
|
||||||
//fprintf( stderr, "key is %02x %02x %02x %02x %02x ",
|
|
||||||
// p_key[0], p_key[1], p_key[2], p_key[3], p_key[4] );
|
|
||||||
- fprintf( stderr, "at block %5d padding len %4d "
|
|
||||||
- "type %02x sub %02x\n", i_pos, i_pes_length,
|
|
||||||
- p_sec[0x11], p_sec[0x17 + p_sec[0x16]]);
|
|
||||||
+// fprintf( stderr, "at block %5d padding len %4d "
|
|
||||||
+// "type %02x sub %02x\n", i_pos, i_pes_length,
|
|
||||||
+// p_sec[0x11], p_sec[0x17 + p_sec[0x16]]);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
@@ -777,7 +780,7 @@ int CSSGetKey( dvdcss_handle dvdcss, int
|
|
||||||
}
|
|
||||||
|
|
||||||
if( p_buf[0x0d] & 0x07 )
|
|
||||||
- fprintf( stderr, "stuffing in pack header\n" );
|
|
||||||
+ _dvdcss_debug( dvdcss, "stuffing in pack header" );
|
|
||||||
|
|
||||||
/* PES_scrambling_control does not exist in a system_header or
|
|
||||||
a padding stream or a private_stream2. (and others). */
|
|
||||||
@ -1,7 +1,6 @@
|
|||||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/11/02 15:22:08 espie Exp $
|
@comment $OpenBSD: PLIST,v 1.2 2002/05/28 14:14:15 espie Exp $
|
||||||
include/videolan/dvdcss.h
|
include/dvdcss/dvdcss.h
|
||||||
lib/libdvdcss.a
|
lib/libdvdcss.a
|
||||||
lib/libdvdcss.so
|
lib/libdvdcss.la
|
||||||
lib/libdvdcss.so.0
|
%%SHARED%%
|
||||||
lib/libdvdcss.so.0.0.3
|
@dirrm include/dvdcss
|
||||||
@dirrm include/videolan
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
#$OpenBSD: Makefile,v 1.3 2001/10/16 17:00:08 naddy Exp $
|
#$OpenBSD: Makefile,v 1.4 2002/05/28 14:14:15 espie Exp $
|
||||||
CATEGORIES= devel
|
CATEGORIES= devel
|
||||||
NEED_VERSION= 1.474
|
NEED_VERSION= 1.474
|
||||||
|
|
||||||
COMMENT= "accessing DVD files"
|
COMMENT= "accessing DVD files"
|
||||||
DISTNAME= libdvdread-0.9.2
|
DISTNAME= libdvdread-0.9.3
|
||||||
HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/
|
HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/
|
||||||
MASTER_SITES= ${HOMEPAGE}dist/
|
MASTER_SITES= ${HOMEPAGE}dist/
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
MD5 (libdvdread-0.9.2.tar.gz) = 8898bad22d8183233f5c3d814fff5151
|
MD5 (libdvdread-0.9.3.tar.gz) = 761db1225098c0834485396d9285e5ff
|
||||||
RMD160 (libdvdread-0.9.2.tar.gz) = 55f8694d3e90c1abb562a644d6e9a26a20f15130
|
RMD160 (libdvdread-0.9.3.tar.gz) = 5c2cc223eb19a938240228c3929d4d68aef98516
|
||||||
SHA1 (libdvdread-0.9.2.tar.gz) = 68fbd4a583b82b052f8a766c918f7814e805ae28
|
SHA1 (libdvdread-0.9.3.tar.gz) = 8098fd5f03e3b521b58ac1a5eb838b2e5ceb0426
|
||||||
|
|||||||
47
devel/libdvdread/patches/patch-dvdread_dvd_input_c
Normal file
47
devel/libdvdread/patches/patch-dvdread_dvd_input_c
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
$OpenBSD: patch-dvdread_dvd_input_c,v 1.1 2002/05/28 14:14:15 espie Exp $
|
||||||
|
--- dvdread/dvd_input.c.orig Thu May 9 23:32:46 2002
|
||||||
|
+++ dvdread/dvd_input.c Tue May 28 16:05:10 2002
|
||||||
|
@@ -237,6 +237,32 @@ static int file_close(dvd_input_t dev)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef __OpenBSD__
|
||||||
|
+#include <dirent.h>
|
||||||
|
+#include <string.h>
|
||||||
|
+static void *findlibrary(char *base)
|
||||||
|
+{
|
||||||
|
+ DIR *d;
|
||||||
|
+ struct dirent *de;
|
||||||
|
+ size_t len;
|
||||||
|
+ void *lib = NULL;
|
||||||
|
+
|
||||||
|
+ len = strlen(base);
|
||||||
|
+
|
||||||
|
+ d = opendir(".");
|
||||||
|
+ if (!d)
|
||||||
|
+ return lib;
|
||||||
|
+ while ((de = readdir(d)) != NULL) {
|
||||||
|
+ if (strncmp(de->d_name, base, len) != 0)
|
||||||
|
+ continue;
|
||||||
|
+ lib = dlopen(de->d_name, RTLD_LAZY);
|
||||||
|
+ if (lib)
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ closedir(d);
|
||||||
|
+ return lib;
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Setup read functions with either libdvdcss or minimal DVD access.
|
||||||
|
@@ -247,6 +273,10 @@ int DVDInputSetup(void)
|
||||||
|
char **dvdcss_version = NULL;
|
||||||
|
|
||||||
|
dvdcss_library = dlopen("libdvdcss.so.2", RTLD_LAZY);
|
||||||
|
+#if defined(__OpenBSD__)
|
||||||
|
+ if (!dvdcss_library)
|
||||||
|
+ dvdcss_library = findlibrary("libdvdcss.so.2.");
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
if(dvdcss_library != NULL) {
|
||||||
|
#if defined(__OpenBSD__) && !defined(__ELF__)
|
||||||
@ -1,21 +0,0 @@
|
|||||||
$OpenBSD: patch-dvdread_dvd_reader_c,v 1.2 2002/01/07 00:55:31 pvalchev Exp $
|
|
||||||
--- dvdread/dvd_reader.c.orig Tue Oct 9 14:07:40 2001
|
|
||||||
+++ dvdread/dvd_reader.c Mon Dec 3 11:15:08 2001
|
|
||||||
@@ -116,7 +116,7 @@ static void setupCSS( void )
|
|
||||||
fprintf( stderr, "libdvdread: Can't open libdvdcss: %s.\n",
|
|
||||||
dlerror() );
|
|
||||||
} else {
|
|
||||||
-#if defined(__OpenBSD__)
|
|
||||||
+#if defined(__OpenBSD__) && !defined (__ELF__)
|
|
||||||
#define U_S "_"
|
|
||||||
#else
|
|
||||||
#define U_S
|
|
||||||
@@ -844,7 +844,7 @@ static int64_t DVDReadBlocksUDF( dvd_fil
|
|
||||||
block_count, data, DVDCSS_READ_DECRYPT );
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int64_t DVDReadBlocksPath( dvd_file_t *dvd_file, size_t offset,
|
|
||||||
+static int64_t DVDReadBlocksPath( dvd_file_t *dvd_file, uint32_t offset,
|
|
||||||
size_t block_count, unsigned char *data )
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
@ -1,3 +1,3 @@
|
|||||||
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2001/10/14 15:24:50 espie Exp $
|
@comment $OpenBSD: PFRAG.shared,v 1.2 2002/05/28 14:14:15 espie Exp $
|
||||||
lib/libdvdread.so.2.1
|
lib/libdvdread.so.2.2
|
||||||
DYNLIBDIR(%D/lib)
|
DYNLIBDIR(%D/lib)
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/10/14 15:24:50 espie Exp $
|
@comment $OpenBSD: PLIST,v 1.2 2002/05/28 14:14:15 espie Exp $
|
||||||
include/dvdread/dvd_reader.h
|
include/dvdread/dvd_reader.h
|
||||||
include/dvdread/ifo_print.h
|
include/dvdread/ifo_print.h
|
||||||
include/dvdread/ifo_read.h
|
include/dvdread/ifo_read.h
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user