Changeset 25ef68ba9cdf9590433a0e2faf001dd2a1cc835c

Show
Ignore:
Timestamp:
06/05/08 17:36:15 (3 months ago)
Author:
Pavlov Konstantin <thresh@videolan.org>
git-committer:
Pavlov Konstantin <thresh@videolan.org> 1212680175 +0400
git-parent:

[ca2350877d158830421fa47f147387a11e2f0ba1]

git-author:
Pavlov Konstantin <thresh@videolan.org> 1212680175 +0400
Message:

Contrib: update bulk patch for libdvdnav.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/contrib/src/Makefile

    re0f21fb r25ef68b  
    11741174libdvdnav: 
    11751175    $(SVN) co $(LIBDVDNAV_SVN)  libdvdnav 
    1176     patch -p0 < Patches/libdvdnav.patch 
     1176    patch -d libdvdnav -p1 < Patches/libdvdnav.patch 
    11771177ifdef HAVE_WIN32 
    11781178    patch -p0 < Patches/libdvdnav-win32.patch 

  • extras/contrib/src/Patches/libdvdnav.patch

    r86c91e1 r25ef68b  
    1 diff -r -u libdvdnav-4.1.1/configure.ac libdvdnav/configure.ac 
    2 --- libdvdnav-4.1.1/configure.ac    2007-05-01 11:11:52.000000000 +0100 
    3 +++ libdvdnav/configure.ac  2007-11-12 11:40:20.406250000 +0000 
    4 @@ -130,6 +130,11 @@ 
    5  AC_C_BIGENDIAN 
    6   
    7  dnl --------------------------------------------- 
    8 +dnl Check for basic *nix fonction that we may emulate on other OS 
    9 +dnl --------------------------------------------- 
    10 +AC_CHECK_FUNCS(gettimeofday) 
    11 + 
    12 +dnl --------------------------------------------- 
    13  dnl threads 
    14  dnl --------------------------------------------- 
    15  case $host in 
    16 @@ -150,25 +155,61 @@ 
     1diff --git a/configure.ac b/configure.ac 
     2index e5ee5c4..b381093 100644 
     3--- a/configure.ac 
     4+++ b/configure.ac 
     5@@ -161,25 +166,61 @@ AC_SUBST(THREAD_LIBS) 
    176 AC_SUBST(THREAD_CFLAGS) 
    187  
    …… 
    9483 dnl --------------------------------------------- 
    9584 dnl cflags 
    96 diff -r -u libdvdnav-4.1.1/src/dvdnav_internal.h libdvdnav/src/dvdnav_internal.h 
    97 --- libdvdnav-4.1.1/src/dvdnav_internal.h   2007-04-21 12:56:41.000000000 +0100 
    98 +++ libdvdnav/src/dvdnav_internal.h 2007-11-12 11:42:26.046875000 +0000 
    99 @@ -39,6 +39,7 @@ 
    100  #define pthread_mutex_unlock(a)  LeaveCriticalSection(a) 
    101  #define pthread_mutex_destroy(a) 
     85diff --git a/examples/Makefile.am b/examples/Makefile.am 
     86index 3cfda2f..3015dd5 100644 
     87--- a/examples/Makefile.am 
     88+++ b/examples/Makefile.am 
     89@@ -8,7 +8,7 @@ noinst_PROGRAMS = menus 
    10290  
    103 +#ifndef HAVE_GETTIMEOFDAY 
    104  /* replacement gettimeofday implementation */ 
    105  #include <sys/timeb.h> 
    106  static inline int _private_gettimeofday( struct timeval *tv, void *tz ) 
    107 @@ -50,6 +51,8 @@ 
    108    return 0; 
    109  } 
    110  #define gettimeofday(TV, TZ) _private_gettimeofday((TV), (TZ)) 
    111 +#endif 
    112 + 
    113  #include <io.h> /* read() */ 
    114  #define lseek64 _lseeki64 
     91 menus_SOURCES = menus.c 
     92 menus_LDFLAGS = -L$(top_srcdir)/src/ 
     93-menus_LDADD   = $(DVDNAV_LIB) 
     94+menus_LDADD   = $(DVDNAV_LIB) $(CSS_LIBS)   
    11595  
    116 diff -r -u libdvdnav-4.1.1/src/libdvdread/dvd_input.c libdvdnav/src/libdvdread/dvd_input.c 
    117 --- libdvdnav-4.1.1/src/libdvdread/dvd_input.c  2007-04-19 16:45:30.000000000 +0100 
    118 +++ libdvdnav/src/libdvdread/dvd_input.c    2007-11-12 11:19:57.984375000 +0000 
     96 $(DVDNAV_LIB): 
     97    @cd $(top_builddir)/src/ && $(MAKE) libdvdnav.la 
     98diff --git a/src/libdvdread/dvd_input.c b/src/libdvdread/dvd_input.c 
     99index d55aac7..63b416f 100644 
     100--- a/src/libdvdread/dvd_input.c 
     101+++ b/src/libdvdread/dvd_input.c 
    119102@@ -27,6 +27,11 @@ 
    120103 #include "dvd_reader.h" 
    …… 
    129112 /* The function pointers that is the exported interface of this file. */ 
    130113 dvd_input_t (*dvdinput_open)  (const char *); 
    131 diff -r -u libdvdnav-4.1.1/src/vm/vm.c libdvdnav/src/vm/vm.c 
    132 --- libdvdnav-4.1.1/src/vm/vm.c 2007-04-25 00:06:22.000000000 +0100 
    133 +++ libdvdnav/src/vm/vm.c   2007-11-12 11:35:55.859375000 +0000 
    134 @@ -135,24 +135,25 @@ 
     114diff --git a/src/vm/vm.c b/src/vm/vm.c 
     115index 53bef88..db855c7 100644 
     116--- a/src/vm/vm.c 
     117+++ b/src/vm/vm.c 
     118@@ -134,24 +134,25 @@ static void vm_print_current_domain_state(vm_t *vm) { 
    135119 } 
    136120 #endif 
    …… 
    166150             if((data[i] > 32) && (data[i] < 127)) { 
    167151               fprintf(MSG_OUT, "%c", data[i]); 
    168 @@ -160,10 +161,12 @@ 
     152@@ -159,10 +160,12 @@ static void dvd_read_name(char *name, const char *device) { 
    169153               fprintf(MSG_OUT, " "); 
    170154             } 
    171155           } 
    172 -          strncpy(name, &data[25], 48); 
     156-          strncpy(name, (char*) &data[25], 48); 
    173157-          name[48] = 0; 
    174 +    strncpy(name, &data[40], 32); 
    175 +    i=31; 
    176 +    while( (i >= 0) && (name[i] <= ' ')) --i; 
    177 +    name[i+1] = '\0'; 
     158+          strncpy(name, (char*) &data[40], 32); 
     159+          i=31; 
     160+          while( (i >= 0) && (name[i] <= ' ')) --i; 
     161+          name[i+1] = '\0'; 
    178162           fprintf(MSG_OUT, "\nlibdvdnav: DVD Serial Number: "); 
    179163-          for(i=73; i < 89; i++ ) { 
    …… 
    182166             if((data[i] > 32) && (data[i] < 127)) { 
    183167               fprintf(MSG_OUT, "%c", data[i]); 
    184 @@ -187,7 +190,7 @@ 
     168@@ -186,7 +189,7 @@ static void dvd_read_name(char *name, const char *device) { 
    185169       } else { 
    186170         fprintf(MSG_OUT, "libdvdnav: Can't seek to block %u\n", 32 ); 
    …… 
    191175     fprintf(MSG_OUT, "NAME OPEN FAILED\n"); 
    192176   } 
    193 --- libdvdnav-4.1.1/examples/Makefile.am    2004-01-11 21:43:13.000000000 +0000 
    194 +++ libdvdnav/examples/Makefile.am  2007-11-12 12:44:09.328125000 +0000 
    195 @@ -8,7 +8,7 @@ 
    196   
    197  menus_SOURCES = menus.c 
    198  menus_LDFLAGS = -L$(top_srcdir)/src/ 
    199 -menus_LDADD   = $(DVDNAV_LIB) 
    200 +menus_LDADD   = $(DVDNAV_LIB) $(CSS_LIBS)   
    201   
    202  $(DVDNAV_LIB): 
    203     @cd $(top_builddir)/src/ && $(MAKE) libdvdnav.la