From 5db488865e114a6a3dedc5b391fc4c22852741b3 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Sat, 23 Oct 2010 18:25:47 +0000 Subject: [PATCH] add a patch that allows force disabling of dlfcn libdvdread's autodetection of this fails in some environments git-svn-id: svn://localhost/HandBrake/trunk@3616 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- contrib/libdvdread/P00-mingw-dlfcn.patch | 34 ++++++++++++++++++++++++++++++++ contrib/libdvdread/module.defs | 1 + 2 files changed, 35 insertions(+) create mode 100644 contrib/libdvdread/P00-mingw-dlfcn.patch diff --git a/contrib/libdvdread/P00-mingw-dlfcn.patch b/contrib/libdvdread/P00-mingw-dlfcn.patch new file mode 100644 index 00000000..811c366a --- /dev/null +++ b/contrib/libdvdread/P00-mingw-dlfcn.patch @@ -0,0 +1,34 @@ +Index: configure.ac +=================================================================== +--- libdvdread/configure.ac (revision 1168) ++++ libdvdread/configure.ac (working copy) +@@ -158,6 +158,16 @@ + ;; + esac + ++AC_ARG_ENABLE([local-dlfcn], ++ [AS_HELP_STRING([--enable-local-dlfcn], ++ [use local dlfcn for mingw (default is auto)])], ++ [use_local_dlfcn=$enableval], ++ [use_local_dlfcn=no]) ++ ++if [[ $use_local_dlfcn = "yes" ]]; then ++ AC_DEFINE([USING_LOCAL_DLFCN], [1], ["Define to 1 to use local dlfcn"]) ++fi ++ + dnl --------------------------------------------- + dnl cflags + dnl --------------------------------------------- +Index: src/dvd_input.c +=================================================================== +--- libdvdread/src/dvd_input.c (revision 1168) ++++ libdvdread/src/dvd_input.c (working copy) +@@ -50,7 +50,7 @@ + #else + + /* dlopening libdvdcss */ +-#ifdef HAVE_DLFCN_H ++#if defined(HAVE_DLFCN_H) && !defined(USING_LOCAL_DLFCN) + #include + #else + /* Only needed on MINGW at the moment */ diff --git a/contrib/libdvdread/module.defs b/contrib/libdvdread/module.defs index 3db333bb..1aea1e38 100644 --- a/contrib/libdvdread/module.defs +++ b/contrib/libdvdread/module.defs @@ -4,4 +4,5 @@ $(eval $(call import.CONTRIB.defs,LIBDVDREAD)) LIBDVDREAD.FETCH.url = http://download.m0k.org/handbrake/contrib/libdvdread-svn1168.tar.gz LIBDVDREAD.EXTRACT.tarbase = libdvdread +LIBDVDREAD.CONFIGURE.extra = --enable-local-dlfcn LIBDVDREAD.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; autoreconf -fiv; -- 2.11.0