vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Tue Sep 4 11:25:39 2012 +0200| [d84b8db93bce76f078f190505226924c0c4cd3cc] | committer: Jean-Baptiste Kempf
Contribs: use dvdnav fork on github Bored as hell of those crashes... > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d84b8db93bce76f078f190505226924c0c4cd3cc --- ...-searching.c-check-cellnr-before-indexing.patch | 17 ----------------- contrib/src/dvdnav/rules.mak | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/contrib/src/dvdnav/libdvdnav-searching.c-check-cellnr-before-indexing.patch b/contrib/src/dvdnav/libdvdnav-searching.c-check-cellnr-before-indexing.patch deleted file mode 100644 index 92f5494..0000000 --- a/contrib/src/dvdnav/libdvdnav-searching.c-check-cellnr-before-indexing.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/searching.c b/src/searching.c -index 3649e9d..0b5f22a 100644 ---- a/src/searching.c -+++ b/src/searching.c -@@ -640,7 +640,11 @@ uint32_t dvdnav_describe_title_chapters(dvdnav_t *this, int32_t title, uint64_t - goto fail; - } - -- cellnr = pgc->program_map[ptt[i].pgn-1]; -+ if ((cellnr = pgc->program_map[ptt[i].pgn-1]) == 0) { -+ printerr("Cell new row cannot be 0"); -+ continue; -+ } -+ - if(ptt[i].pgn < pgc->nr_of_programs) - endcellnr = pgc->program_map[ptt[i].pgn]; - else diff --git a/contrib/src/dvdnav/rules.mak b/contrib/src/dvdnav/rules.mak index c58cf3a..663c85d 100644 --- a/contrib/src/dvdnav/rules.mak +++ b/contrib/src/dvdnav/rules.mak @@ -1,7 +1,9 @@ # DVDNAV -LIBDVDNAV_VERSION := 4.2.0 -LIBDVDNAV_URL := http://dvdnav.mplayerhq.hu/releases/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 +# LIBDVDNAV_VERSION := 4.2.0 +# LIBDVDNAV_URL := http://dvdnav.mplayerhq.hu/releases/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 +DVDNAV_GITURL := git://github.com/microe/libdvdnav +LIBDVDNAV_VERSION := git ifdef BUILD_DISCS PKGS += dvdnav @@ -10,15 +12,19 @@ ifeq ($(call need_pkg,"dvdnav"),) PKGS_FOUND += dvdnav endif -$(TARBALLS)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2: - $(call download,$(LIBDVDNAV_URL)) +$(TARBALLS)/libdvdnav-git.tar.xz: + $(call download_git,$(DVDNAV_GITURL)) -.sum-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 +# $(TARBALLS)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2: +# $(call download,$(LIBDVDNAV_URL)) -dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 .sum-dvdnav +.sum-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.xz + $(warning $@ not implemented) + touch $@ + +dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.xz .sum-dvdnav $(UNPACK) $(APPLY) $(SRC)/dvdnav/dvdnav.patch - $(APPLY) $(SRC)/dvdnav/libdvdnav-searching.c-check-cellnr-before-indexing.patch $(MOVE) DEPS_dvdnav = dvdcss dvdread _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
