Commit 5d772b7e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: Update dvdnav and dvdread to 4.2.0

They're alive!
parent 4c22ef2e
f9b9c52af870bc088bc8bbc7a64285dc55906dcfd11d6849d8a7b4046b083472c3e898609ec399a45059e10cffce0ef67ec2dec2ec4f0a1c904b9b6d2a85185f libdvdnav-4.2.0.tar.bz2
diff -ruN dvdnav-svn/Makefile.am dvdnav/Makefile.am
--- dvdnav-svn/Makefile.am 2008-06-18 17:06:33.000000000 +0200
+++ dvdnav/Makefile.am 2011-08-06 18:38:10.243875945 +0200
diff -ruN libdvdnav/Makefile.am libdvdnav.new/Makefile.am
--- libdvdnav/Makefile.am 2008-06-18 17:06:33.000000000 +0200
+++ libdvdnav.new/Makefile.am 2011-10-11 01:02:18.768524699 +0200
@@ -1,7 +1,7 @@
include $(top_srcdir)/misc/Makefile.common
......@@ -10,9 +10,9 @@ diff -ruN dvdnav-svn/Makefile.am dvdnav/Makefile.am
EXTRA_DIST = autogen.sh \
AUTHORS \
diff -ruN dvdnav-svn/src/vm/vm.c dvdnav/src/vm/vm.c
--- dvdnav-svn/src/vm/vm.c 2010-11-22 00:59:43.000000000 +0100
+++ dvdnav/src/vm/vm.c 2011-08-06 18:38:03.263841341 +0200
diff -ruN libdvdnav/src/vm/vm.c libdvdnav.new/src/vm/vm.c
--- libdvdnav/src/vm/vm.c 2010-11-22 00:59:43.000000000 +0100
+++ libdvdnav.new/src/vm/vm.c 2011-10-11 01:02:07.852470536 +0200
@@ -174,12 +174,11 @@
fd = open(device, O_RDONLY);
if (fd > 0) {
......
# DVDNAV
LIBDVDNAV_VERSION := 4.2.0
LIBDVDNAV_URL := http://dvdnav.mplayerhq.hu/releases/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
ifdef BUILD_DISCS
PKGS += dvdnav
endif
......@@ -7,16 +10,12 @@ ifeq ($(call need_pkg,"dvdnav"),)
PKGS_FOUND += dvdnav
endif
$(TARBALLS)/dvdnav-svn.tar.xz:
rm -Rf dvdnav-svn
$(SVN) export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav dvdnav-svn
tar cvJ dvdnav-svn > $@
$(TARBALLS)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
$(call download,$(LIBDVDNAV_URL))
.sum-dvdnav: dvdnav-svn.tar.xz
$(warning Integrity check skipped.)
touch $@
.sum-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
dvdnav: dvdnav-svn.tar.xz .sum-dvdnav
dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 .sum-dvdnav
$(UNPACK)
$(APPLY) $(SRC)/dvdnav/dvdnav.patch
$(MOVE)
......
192802a05f4b6561bd3d85ea54a29861d98ec947a5eeaa45a8d53389744c31570ee5dbdf3fbd0645ea8e6b254795e39d0948d54849dad99252155db00501b21f libdvdread-4.2.0.tar.bz2
# DVDREAD
LIBDVDREAD_VERSION := 4.2.0
LIBDVDREAD_URL := http://dvdnav.mplayerhq.hu/releases/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
ifdef BUILD_DISCS
PKGS += dvdread
endif
......@@ -7,16 +10,12 @@ ifeq ($(call need_pkg,"dvdread"),)
PKGS_FOUND += dvdread
endif
$(TARBALLS)/dvdread-svn.tar.xz:
rm -Rf dvdread-svn
$(SVN) export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread dvdread-svn
tar cvJ dvdread-svn > $@
$(TARBALLS)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2:
$(call download,$(LIBDVDREAD_URL))
.sum-dvdread: dvdread-svn.tar.xz
$(warning Integrity check skipped.)
touch $@
.sum-dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
dvdread: dvdread-svn.tar.xz .sum-dvdread
dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 .sum-dvdread
$(UNPACK)
$(APPLY) $(SRC)/dvdread/dvdread-css-static.patch
ifdef HAVE_WIN32
......
Index: src/vm/vm.c
===================================================================
--- src/vm/vm.c (revision 1199)
+++ src/vm/vm.c (working copy)
@@ -172,12 +172,11 @@
diff -ruN libdvdnav/Makefile.am libdvdnav.new/Makefile.am
--- libdvdnav/Makefile.am 2008-06-18 17:06:33.000000000 +0200
+++ libdvdnav.new/Makefile.am 2011-10-11 01:02:18.768524699 +0200
@@ -1,7 +1,7 @@
include $(top_srcdir)/misc/Makefile.common
-SUBDIRS = src examples doc misc m4
+SUBDIRS = src misc m4
EXTRA_DIST = autogen.sh \
AUTHORS \
diff -ruN libdvdnav/src/vm/vm.c libdvdnav.new/src/vm/vm.c
--- libdvdnav/src/vm/vm.c 2010-11-22 00:59:43.000000000 +0100
+++ libdvdnav.new/src/vm/vm.c 2011-10-11 01:02:07.852470536 +0200
@@ -174,12 +174,11 @@
fd = open(device, O_RDONLY);
if (fd > 0) {
off = lseek( fd, 32 * (off_t) DVD_VIDEO_LB_LEN, SEEK_SET );
......@@ -17,7 +28,7 @@ Index: src/vm/vm.c
if((data[i] == 0)) break;
if((data[i] > 32) && (data[i] < 127)) {
fprintf(MSG_OUT, "%c", data[i]);
@@ -185,10 +184,12 @@
@@ -187,10 +186,12 @@
fprintf(MSG_OUT, " ");
}
}
......@@ -33,16 +44,3 @@ Index: src/vm/vm.c
if((data[i] == 0)) break;
if((data[i] > 32) && (data[i] < 127)) {
fprintf(MSG_OUT, "%c", data[i]);
Index: Makefile.am
===================================================================
--- Makefile.am (revision 1199)
+++ Makefile.am (working copy)
@@ -1,7 +1,7 @@
include $(top_srcdir)/misc/Makefile.common
-SUBDIRS = src examples doc misc m4
+SUBDIRS = src misc m4
EXTRA_DIST = autogen.sh \
AUTHORS \
......@@ -1169,8 +1169,11 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2
# ***************************************************************************
# libdvdread: We use dvdnav's dvdread
# ***************************************************************************
libdvdread:
$(SVN) co -r $(LIBDVDREAD_SVN_REV) $(LIBDVDREAD_SVN) libdvdread
libdvdread-$(LIBDVDREAD_VERSION).tar.bz2:
$(WGET) $(LIBDVDREAD_URL)
libdvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
$(EXTRACT_BZ2)
(cd $@; patch -p 0 < ../Patches/libdvdread-dvdcss-static.patch)
ifdef HAVE_WIN32
(cd $@; patch -p 0 < ../Patches/libdvdread-win32.patch)
......@@ -1184,29 +1187,19 @@ endif
CLEAN_FILE += .libdvdread
CLEAN_PKG += libdvdread
#DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.gz
DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
# ***************************************************************************
# libdvdnav
# ***************************************************************************
ifdef SVN
libdvdnav:
$(SVN) co -r $(LIBDVDNAV_SVN_REV) $(LIBDVDNAV_SVN) libdvdnav
patch -d libdvdnav -p0 < Patches/libdvdnav.patch
(cd $@; ./autogen.sh noconfig)
else
libdvdnav-$(LIBDVDNAV_VERSION).tar.gz:
libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
$(WGET) $(LIBDVDNAV_URL)
libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
$(EXTRACT_GZ)
libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
$(EXTRACT_BZ2)
patch -p0 < Patches/libdvdnav.patch
ifdef HAVE_WIN32
patch -p0 < Patches/libdvdnav-win32.patch
endif
(cd $@; ./autogen.sh noconfig)
endif
.dvdnav: libdvdnav .libdvdread
ifdef HAVE_WIN32
......
......@@ -96,14 +96,10 @@ FFMPEG_GIT=git://git.videolan.org/ffmpeg.git
#FFMPEG_GIT=git://git.libav.org/libav.git
LIBDVDCSS_VERSION=1.2.10
LIBDVDCSS_URL=$(VIDEOLAN)/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2
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
LIBDVDNAV_SVN_REV=1211
LIBDVDREAD_SVN=svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread
LIBDVDREAD_SVN_REV=1218
LIBDVDREAD_VERSION=0.9.7
LIBDVDREAD_URL=http://www.dtek.chalmers.se/groups/dvd/dist/libdvdread-$(LIBDVDREAD_VERSION).tar.gz
LIBDVDNAV_VERSION=4.2.0
LIBDVDNAV_URL=http://dvdnav.mplayerhq.hu/releases/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
LIBDVDREAD_VERSION=4.2.0
LIBDVDREAD_URL=http://dvdnav.mplayerhq.hu/releases/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
#LIBDVDREAD_URL=$(VIDEOLAN)/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.gz
LIBDVBPSI_VERSION=0.2.1
LIBDVBPSI_URL=$(VIDEOLAN)/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi-$(LIBDVBPSI_VERSION).tar.gz
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment