File use-system-libdvd.patch of Package kodi
--- a/lib/libdvd/Makefile.in
+++ b/lib/libdvd/Makefile.in
@@ -15,4 +15,14 @@
DVDCSS_A = @abs_top_srcdir@/tools/depends/target/libdvdcss/dvdcss-install/lib/libdvdcss.a
endif
+
+ifneq ($(strip @DVDNAV_STATIC@),)
+ DVDNAV_A = @DVDNAV_STATIC@
+endif
+ifneq ($(strip @DVDREAD_STATIC@),)
+ DVDREAD_A = @DVDREAD_STATIC@
+endif
+ifneq ($(strip @DVDCSS_STATIC@),)
+ DVDCSS_A = @DVDCSS_STATIC@
+endif
SYSDIR = @abs_top_srcdir@/system/players/VideoPlayer
@@ -91,14 +101,20 @@
$(MAKE) -C @abs_top_srcdir@/xbmc/cores/DllLoader/exports wrapper.def
$(DVDNAV_A): $(DVDREAD_A)
+ifneq ($(strip @DVDNAV_STATIC@), $(DVDNAV_A))
$(MAKE) -C @abs_top_srcdir@/tools/depends/target/libdvdnav
+endif
$(DVDREAD_A): $(DVDREAD_DEPS)
+ifneq ($(strip @DVDREAD_STATIC@), $(DVDREAD_A))
$(MAKE) -C @abs_top_srcdir@/tools/depends/target/libdvdread
+endif
ifeq ($(BUILD_DVDCSS),1)
$(DVDCSS_A):
+ifneq ($(strip @DVDCSS_STATIC@), $(DVDCSS_A))
$(MAKE) -C @abs_top_srcdir@/tools/depends/target/libdvdcss
+endif
endif
include @abs_top_srcdir@/Makefile.include
--- a/configure.ac
+++ b/configure.ac
@@ -221,4 +221,22 @@
[with_ffmpeg=force])
+AC_ARG_WITH([dvdread],
+ [AS_HELP_STRING([--with-dvdread],
+ [dvdread options: auto (search pkg-config or auto build), force (always build dvdread), system (use installed static library) [default=force]])],
+ [with_dvdread=$withval],
+ [with_dvdread=force])
+
+AC_ARG_WITH([dvdnav],
+ [AS_HELP_STRING([--with-dvdnav],
+ [dvdnav options: auto (search pkg-config or auto build), force (always build dvdnav), system (use installed static library) [default=force]])],
+ [with_dvdnav=$withval],
+ [with_dvdnav=force])
+
+AC_ARG_WITH([dvdcss],
+ [AS_HELP_STRING([--with-dvdcss],
+ [dvdcss options: auto (search pkg-config or auto build), force (always build dvdcss), system (use installed static library) [default=force]])],
+ [with_dvdcss=$withval],
+ [with_dvdcss=force])
+
AC_ARG_ENABLE([shared-lib],
[AS_HELP_STRING([--enable-shared-lib],
@@ -1630,4 +1648,53 @@
LIBS=$(${ECHO} ${LIBS} | ${SED} ':a;N;$!ba;s/\n/ /g')
fi
+
+SAVE_INCLUDES="$INCLUDES"
+SAVE_LIBS="$LIBS"
+echo "checking for libdvd files (dvdread: ${with_dvdread})"
+if test "$with_dvdread" = "auto" || test "$with_dvdread" = "system"; then
+ echo "Checking libdvdread..."
+ DVDREAD_LIBDIR=$(${PKG_CONFIG} --static --variable=libdir dvdread)
+ if test -f ${DVDREAD_LIBDIR}/libdvdread.a; then
+ #AC_DEFINE([DVDREAD_STATIC], [${DVDREAD_LIBDIR}/libdvdread.a], [libdvdread static library])
+ DVDREAD_STATIC="${DVDREAD_LIBDIR}/libdvdread.a"
+ AC_MSG_NOTICE("Found ${DVDREAD_LIBDIR}/libdvdread.a")
+ else
+ AC_MSG_NOTICE("${DVDREAD_LIBDIR}/libdvdread.a not found")
+ DVDREAD_FOUND="false"
+ unset DVDREAD_LIBS DVDREAD_CFLAGS DVDREAD_LIBDIR
+ fi
+fi
+
+if test "$with_dvdnav" = "auto" || test "$with_dvdnav" = "system"; then
+ echo "Checking libdvdnav..."
+ DVDNAV_LIBDIR=$(${PKG_CONFIG} --static --variable=libdir dvdnav)
+ if test -f ${DVDNAV_LIBDIR}/libdvdnav.a; then
+ #AC_DEFINE([DVDNAV_STATIC], [${DVDNAV_LIBDIR}/libdvdnav.a], [libdvdnav static library])
+ DVDNAV_STATIC="${DVDNAV_LIBDIR}/libdvdnav.a"
+ AC_MSG_NOTICE("Found ${DVDNAV_LIBDIR}/libdvdnav.a")
+ else
+ AC_MSG_NOTICE("${DVDNAV_LIBDIR}/libdvdnav.a not found")
+ DVDNAV_FOUND="false"
+ unset DVDNAV_LIBS DVDNAV_CFLAGS DVDNAV_LIBDIR
+ fi
+fi
+
+if test "$with_dvdcss" = "auto" || test "$with_dvdcss" = "system"; then
+ echo "Checking libdvdcss..."
+ DVDCSS_LIBDIR=$(${PKG_CONFIG} --static --variable=libdir libdvdcss)
+ if test -f ${DVDCSS_LIBDIR}/libdvdcss.a; then
+ #AC_DEFINE([DVDCSS_STATIC], [${DVDCSS_LIBDIR}/libdvdcss.a], [libdvdcss static library])
+ DVDCSS_STATIC="${DVDCSS_LIBDIR}/libdvdcss.a"
+ AC_MSG_NOTICE("Found ${DVDCSS_LIBDIR}/libdvdcss.a")
+ else
+ AC_MSG_NOTICE("${DVDCSS_LIBDIR}/libdvdcss.a not found")
+ DVDCSS_FOUND="false"
+ unset DVDCSS_LIBS DVDCSS_CFLAGS DVDCSS_LIBDIR
+ fi
+fi
+
+# restore includes and libs, the ones we found are invalid
+INCLUDES="$SAVE_INCLUDES"
+LIBS="$SAVE_LIBS"
echo "Checking for SWIG installation"
@@ -2290,4 +2357,7 @@
AC_SUBST(FFMPEG_LIBDIR)
AC_SUBST(USE_STATIC_FFMPEG)
+AC_SUBST(DVDREAD_STATIC)
+AC_SUBST(DVDNAV_STATIC)
+AC_SUBST(DVDCSS_STATIC)
AC_SUBST(GNUTLS_ALL_LIBS)
AC_SUBST(USE_LIBAV_HACKS)