summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBradley Sepos <[email protected]>2017-07-10 17:18:47 -0400
committerBradley Sepos <[email protected]>2017-07-22 14:08:11 -0400
commitd4e6855eaa5e7ed205ef85d5b5b1ff0af88e46a0 (patch)
tree9ad22a9efcabc9b73f33af47b0e54e648f1cdacd
parent71a2a621e0dd8736c3a478ab00749b41ba21db29 (diff)
contrib: Update to libdvdread 5.0.3.
-rw-r--r--contrib/libdvdread/P00-mingw-dlfcn.patch11
-rw-r--r--contrib/libdvdread/module.defs11
2 files changed, 14 insertions, 8 deletions
diff --git a/contrib/libdvdread/P00-mingw-dlfcn.patch b/contrib/libdvdread/P00-mingw-dlfcn.patch
new file mode 100644
index 000000000..430e817e8
--- /dev/null
+++ b/contrib/libdvdread/P00-mingw-dlfcn.patch
@@ -0,0 +1,11 @@
+--- libdvdread-5.0.3/src/dvd_input.c.orig 2015-01-28 11:17:27.000000000 -0500
++++ libdvdread-5.0.3/src/dvd_input.c 2017-07-10 19:12:12.000000000 -0400
+@@ -55,7 +55,7 @@
+ # else
+ # if defined(WIN32)
+ /* Only needed on MINGW at the moment */
+-# include "../msvc/contrib/dlfcn.c"
++# include "msvc/msvc/contrib/dlfcn.c"
+ # endif
+ #endif
+
diff --git a/contrib/libdvdread/module.defs b/contrib/libdvdread/module.defs
index 7789a0f3c..f226365cf 100644
--- a/contrib/libdvdread/module.defs
+++ b/contrib/libdvdread/module.defs
@@ -1,14 +1,9 @@
$(eval $(call import.MODULE.defs,LIBDVDREAD,libdvdread,PKGCONFIG))
$(eval $(call import.CONTRIB.defs,LIBDVDREAD))
-LIBDVDREAD.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libdvdread-5.0.0-6-gcb1ae87.tar.gz
-LIBDVDREAD.FETCH.sha256 = d2e4200c3c5d5f812892f9c14851c94e2f707d54e7328946c6397ac999f15f17
-
-# TODO: libdvdread >= 5.0.3
-#LIBDVDREAD.FETCH.url = https://download.videolan.org/pub/videolan/libdvdread/5.0.3/libdvdread-5.0.3.tar.bz2
-#LIBDVDREAD.FETCH.sha256 = 321cdf2dbdc83c96572bc583cd27d8c660ddb540ff16672ecb28607d018ed82b
-
-LIBDVDREAD.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -I m4 -fiv;
+LIBDVDREAD.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libdvdread-5.0.3.tar.bz2
+LIBDVDREAD.FETCH.url += https://download.videolan.org/pub/videolan/libdvdread/5.0.3/libdvdread-5.0.3.tar.bz2
+LIBDVDREAD.FETCH.sha256 = 321cdf2dbdc83c96572bc583cd27d8c660ddb540ff16672ecb28607d018ed82b
ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
LIBDVDREAD.CONFIGURE.extra = --enable-dlfcn