Changeset a690954e568e8445fa42108fb6f85825b5bc58a9

Show
Ignore:
Timestamp:
06/10/08 02:08:40 (3 months ago)
Author:
Felix Paul Kühne <fkuehne@videolan.org>
git-committer:
Felix Paul Kühne <fkuehne@videolan.org> 1213056520 +0200
git-parent:

[b5983c975eb5e13c39310d889c291a8f290f2899]

git-author:
Felix Paul Kühne <fkuehne@videolan.org> 1213056495 +0200
Message:

Fix libdvdnav compilation

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/contrib/src/Makefile

    r40e5d0d ra690954  
    11751175    $(SVN) co $(LIBDVDNAV_SVN)  libdvdnav 
    11761176    patch -d libdvdnav -p1 < Patches/libdvdnav.patch 
     1177    $(WGET) $(LIBDVDREAD_URL) 
     1178    (cd $@/src; tar xf ../../libdvdread-$(LIBDVDREAD_VERSION).tar.gz; mv libdvdread-$(LIBDVDREAD_VERSION)/dvdread libdvdread) 
    11771179    (cd $@; ./autogen.sh noconfig) 
    11781180else 

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

    r25ef68b ra690954  
    8383 dnl --------------------------------------------- 
    8484 dnl cflags 
    85 diff --git a/examples/Makefile.am b/examples/Makefile.am 
    86 index 3cfda2f..3015dd5 100644 
    87 --- a/examples/Makefile.am 
    88 +++ b/examples/Makefile.am 
    89 @@ -8,7 +8,7 @@ noinst_PROGRAMS = menus 
     85--- a/examples/Makefile.am.orig 2008-06-10 01:56:16.000000000 +0200 
     86+++ b/examples/Makefile.am  2008-06-10 01:57:04.000000000 +0200 
     87@@ -8,7 +8,7 @@ 
    9088  
    9189 menus_SOURCES = menus.c 
    92  menus_LDFLAGS = -L$(top_srcdir)/src/ 
     90 menus_LDFLAGS = -L$(top_srcdir)/src/ -ldvdread 
    9391-menus_LDADD   = $(DVDNAV_LIB) 
    94 +menus_LDADD   = $(DVDNAV_LIB) $(CSS_LIBS)   
     92+menus_LDADD   = $(DVDNAV_LIB) $(CSS_LIBS) 
    9593  
    9694 $(DVDNAV_LIB): 
    9795    @cd $(top_builddir)/src/ && $(MAKE) libdvdnav.la 
    98 diff --git a/src/libdvdread/dvd_input.c b/src/libdvdread/dvd_input.c 
    99 index d55aac7..63b416f 100644 
    100 --- a/src/libdvdread/dvd_input.c 
    101 +++ b/src/libdvdread/dvd_input.c 
    102 @@ -27,6 +27,11 @@ 
    103  #include "dvd_reader.h" 
    104  #include "dvd_input.h" 
    105   
    106 +#ifdef WIN32 
    107 +#   define lseek _lseeki64 
    108 +#   undef off_t 
    109 +#   define off_t int64_t 
    110 +#endif 
    111   
    112  /* The function pointers that is the exported interface of this file. */ 
    113  dvd_input_t (*dvdinput_open)  (const char *); 
    11496diff --git a/src/vm/vm.c b/src/vm/vm.c 
    11597index 53bef88..db855c7 100644 

  • extras/contrib/src/packages.mak

    r876df3a ra690954  
    110110LIBDVDNAV_URL=http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-$(LIBDVDNAV_VERSION).tar.gz 
    111111LIBDVDNAV_SVN=svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav 
     112LIBDVDREAD_VERSION=0.9.4 
     113LIBDVDREAD_URL=$(VIDEOLAN)/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.gz 
    112114LIBDVBPSI_VERSION=0.1.6 
    113115LIBDVBPSI_URL=$(VIDEOLAN)/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz