Changeset 16bf23cb303dfa4e399d6d52336be8c8dfcbc2e3

Timestamp:

12/06/08 02:38:22 (4 months ago)

Author:

Felix Paul Kühne <fkuehne@videolan.org>

git-committer:

Felix Paul Kühne <fkuehne@videolan.org> 1213231102 +0200

git-parent:

[a02297fea0da8febdafbec72254a0869be58d13f]

git-author:

Felix Paul Kühne <fkuehne@videolan.org> 1213231039 +0200

Message:

Fix libdvdnav in a reliable and quite clean way.

Unsure about my sanity now though.

Files:

• extras/contrib/src/Makefile (modified) (5 diffs)
• extras/contrib/src/Patches/libdvdnav.patch (modified) (4 diffs)
• extras/contrib/src/packages.mak (modified) (1 diff)

extras/contrib/src/Makefile

@@ -1068 +1068 @@
-ifdef SVN
-ffmpeg:
-
+
+
-ifeq ($(HOST),i586-pc-beos)
-    (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
@@ -1090 +1091 @@
-    patch -p0 < Patches/ffmpeg-svn-libavformat.patch
-endif
+    (cd $@; patch -p0 < ../Patches/ffmpeg-svn-configure.patch )
-else
-ffmpeg-$(FFMPEG_VERSION).tar.gz:
@@ -1159 +1161 @@
-# dummy dvdread to trigger the INSTALL_NAME script
-# ***************************************************************************
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# ***************************************************************************
@@ -1172 +1194 @@
-libdvdnav:
-    $(SVN) co $(LIBDVDNAV_SVN)  libdvdnav
-
-
-
+
-    (cd $@; ./autogen.sh noconfig)
-else
@@ -1189 +1209 @@
-endif
-
-
+libdvdread .
-ifdef HAVE_WIN32    
-    (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install)

extras/contrib/src/Patches/libdvdnav.patch

@@ -1 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- AC_SUBST(THREAD_CFLAGS)
- 
@@ -35 +253 @@
-+       dvdcss_path=$withval
-+     fi])
-
+
-+if test x"$link_dvdcss" != xyes; then
-+dnl dlopen libdvdcss
@@ -80 +298 @@
-+AC_SUBST(CSS_CFLAGS)
-+ 
-
+
- dnl ---------------------------------------------
- dnl cflags
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-@@ -8,7 +8,7 @@
- 
@@ -94 +332 @@
- $(DVDNAV_LIB):
-    @cd $(top_builddir)/src/ && $(MAKE) libdvdnav.la
-diff --git a/src/vm/vm.c b/src/vm/vm.c
-index 53bef88..db855c7 100644
---- a/src/vm/vm.c
-+++ b/src/vm/vm.c
-@@ -134,24 +134,25 @@ static void vm_print_current_domain_state(vm_t *vm) {
- }
- #endif
- 
-+#include <libdvdread/dvd_input.h>
-+
- static void dvd_read_name(char *name, const char *device) {
-     /* Because we are compiling with _FILE_OFFSET_BITS=64
-      * all off_t are 64bit.
-      */
-     off_t off;
--    int fd, i;
-+    dvd_input_t fd; int i;
-     uint8_t data[DVD_VIDEO_LB_LEN];
- 
-     /* Read DVD name */
--    fd = open(device, O_RDONLY);
-+    fd = dvdinput_open(device);
-     if (fd > 0) { 
--      off = lseek( fd, 32 * (off_t) DVD_VIDEO_LB_LEN, SEEK_SET );
--      if( off == ( 32 * (off_t) DVD_VIDEO_LB_LEN ) ) {
--        off = read( fd, data, DVD_VIDEO_LB_LEN ); 
--        close(fd);
--        if (off == ( (off_t) DVD_VIDEO_LB_LEN )) {
-+      off = dvdinput_seek( fd, 16 );
-+      if( off == 16 ) {
-+        off = dvdinput_read( fd, data, 1, DVDINPUT_NOFLAGS ); 
-+        if (off == 1 ) {
-           fprintf(MSG_OUT, "libdvdnav: DVD Title: ");
--          for(i=25; i < 73; i++ ) {
-+          for(i=40; i < 73; i++ ) {
-             if((data[i] == 0)) break;
-             if((data[i] > 32) && (data[i] < 127)) {
-               fprintf(MSG_OUT, "%c", data[i]);
-@@ -159,10 +160,12 @@ static void dvd_read_name(char *name, const char *device) {
-               fprintf(MSG_OUT, " ");
-             }
-           }
--          strncpy(name, (char*) &data[25], 48);
--          name[48] = 0;
-+          strncpy(name, (char*) &data[40], 32);
-+          i=31;
-+          while( (i >= 0) && (name[i] <= ' ')) --i;
-+          name[i+1] = '\0';
-           fprintf(MSG_OUT, "\nlibdvdnav: DVD Serial Number: ");
--          for(i=73; i < 89; i++ ) {
-+          for(i=813; i < 829; i++ ) {
-             if((data[i] == 0)) break;
-             if((data[i] > 32) && (data[i] < 127)) {
-               fprintf(MSG_OUT, "%c", data[i]);
-@@ -186,7 +189,7 @@ static void dvd_read_name(char *name, const char *device) {
-       } else {
-         fprintf(MSG_OUT, "libdvdnav: Can't seek to block %u\n", 32 );
-       }
--      close(fd);
-+      dvdinput_close(fd);
-     } else {
-     fprintf(MSG_OUT, "NAME OPEN FAILED\n");
-   }

extras/contrib/src/packages.mak

@@ -110 +110 @@
-LIBDVDNAV_URL=http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
-LIBDVDNAV_SVN=svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav
-
-
+
+
+
-LIBDVBPSI_VERSION=0.1.6
-LIBDVBPSI_URL=$(VIDEOLAN)/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz