[vlc-devel] commit: Fix libdvdnav compilation ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Jun 10 02:08:15 2008 +0200| [a690954e568e8445fa42108fb6f85825b5bc58a9]

Fix libdvdnav compilation

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a690954e568e8445fa42108fb6f85825b5bc58a9
---

 extras/contrib/src/Makefile                |    2 ++
 extras/contrib/src/Patches/libdvdnav.patch |   28 +++++-----------------------
 extras/contrib/src/packages.mak            |    2 ++
 3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index de9d221..e166f62 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1174,6 +1174,8 @@ ifdef SVN
 libdvdnav:
 	$(SVN) co $(LIBDVDNAV_SVN)  libdvdnav
 	patch -d libdvdnav -p1 < Patches/libdvdnav.patch
+	$(WGET) $(LIBDVDREAD_URL)
+	(cd $@/src; tar xf ../../libdvdread-$(LIBDVDREAD_VERSION).tar.gz; mv libdvdread-$(LIBDVDREAD_VERSION)/dvdread libdvdread)
 	(cd $@; ./autogen.sh noconfig)
 else
 libdvdnav-$(LIBDVDNAV_VERSION).tar.gz:
diff --git a/extras/contrib/src/Patches/libdvdnav.patch b/extras/contrib/src/Patches/libdvdnav.patch
index 145b3c4..956af3f 100644
--- a/extras/contrib/src/Patches/libdvdnav.patch
+++ b/extras/contrib/src/Patches/libdvdnav.patch
@@ -82,35 +82,17 @@ index e5ee5c4..b381093 100644
  
  dnl ---------------------------------------------
  dnl cflags
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index 3cfda2f..3015dd5 100644
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -8,7 +8,7 @@ noinst_PROGRAMS = menus
+--- a/examples/Makefile.am.orig	2008-06-10 01:56:16.000000000 +0200
++++ b/examples/Makefile.am	2008-06-10 01:57:04.000000000 +0200
+@@ -8,7 +8,7 @@
  
  menus_SOURCES = menus.c
- menus_LDFLAGS = -L$(top_srcdir)/src/
+ menus_LDFLAGS = -L$(top_srcdir)/src/ -ldvdread
 -menus_LDADD   = $(DVDNAV_LIB)
-+menus_LDADD   = $(DVDNAV_LIB) $(CSS_LIBS)  
++menus_LDADD   = $(DVDNAV_LIB) $(CSS_LIBS)
  
  $(DVDNAV_LIB):
  	@cd $(top_builddir)/src/ && $(MAKE) libdvdnav.la
-diff --git a/src/libdvdread/dvd_input.c b/src/libdvdread/dvd_input.c
-index d55aac7..63b416f 100644
---- a/src/libdvdread/dvd_input.c
-+++ b/src/libdvdread/dvd_input.c
-@@ -27,6 +27,11 @@
- #include "dvd_reader.h"
- #include "dvd_input.h"
- 
-+#ifdef WIN32
-+#   define lseek _lseeki64
-+#   undef off_t
-+#   define off_t int64_t
-+#endif
- 
- /* The function pointers that is the exported interface of this file. */
- dvd_input_t (*dvdinput_open)  (const char *);
 diff --git a/src/vm/vm.c b/src/vm/vm.c
 index 53bef88..db855c7 100644
 --- a/src/vm/vm.c
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index bb55815..075344e 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -109,6 +109,8 @@ LIBDVDCSS_URL=$(VIDEOLAN)/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_V
 LIBDVDNAV_VERSION=4.1.1
 LIBDVDNAV_URL=http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
 LIBDVDNAV_SVN=svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav
+LIBDVDREAD_VERSION=0.9.4
+LIBDVDREAD_URL=$(VIDEOLAN)/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.gz
 LIBDVBPSI_VERSION=0.1.6
 LIBDVBPSI_URL=$(VIDEOLAN)/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz
 LIVEDOTCOM_VERSION=latest