contrib: dvdread: pull from branch with DVD-Audio, CPXM support

note: this commit should be removed once libdvdread, libdvdcss tarballs are added

contrib/src/dvdread/rules.mak

@@ -1,6 +1,9 @@
 # DVDREAD
-LIBDVDREAD_VERSION := 6.1.3
+LIBDVDREAD_VERSION := 7.0.0
 LIBDVDREAD_URL := $(VIDEOLAN)/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
+LIBDVDREAD_GITURL:=https://code.videolan.org/videolan/libdvdread.git
+LIBDVDREAD_BRANCH:=master
+LIBDVDREAD_GITVERSION:=fd8a73304597dc3a4fc187d0dd0cfb50af8f0a2d
 
 ifdef BUILD_DISCS
 ifdef GPL
@@ -13,15 +16,23 @@ ifeq ($(call need_pkg,"dvdread >= 6.1.0"),)
 PKGS_FOUND += dvdread
 endif
 
-$(TARBALLS)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2:
-	$(call download,$(LIBDVDREAD_URL))
+$(TARBALLS)/libdvdread-$(LIBDVDREAD_GITVERSION).tar.xz:
+	$(call download_git,$(LIBDVDREAD_GITURL),$(LIBDVDREAD_BRANCH),$(LIBDVDREAD_GITVERSION))
 
-.sum-dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
+.sum-dvdread: libdvdread-$(LIBDVDREAD_GITVERSION).tar.xz
+	$(call check_githash,$(LIBDVDREAD_GITVERSION))
+	touch $@
+
+# $(TARBALLS)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2:
+# 	$(call download,$(LIBDVDREAD_URL))
+
+# .sum-dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
 
-dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 .sum-dvdread
+# dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 .sum-dvdread
+dvdread: libdvdread-$(LIBDVDREAD_GITVERSION).tar.xz .sum-dvdread
 	$(UNPACK)
 	$(call update_autoconfig,.)
-	$(APPLY) $(SRC)/dvdread/0001-ifo_types-avoid-forcing-a-higher-length-in-bitfield-.patch
+	# $(APPLY) $(SRC)/dvdread/0001-ifo_types-avoid-forcing-a-higher-length-in-bitfield-.patch
 	$(call pkg_static,"misc/dvdread.pc.in")
 	$(MOVE)
 
@@ -31,6 +42,7 @@ DVDREAD_CONF := --with-libdvdcss
 
 .dvdread: dvdread
 	$(REQUIRE_GPL)
+	$(RECONF)
 	$(MAKEBUILDDIR)
 	$(MAKECONFIGURE) $(DVDREAD_CONF)
 	+$(MAKEBUILD)