package/libdvdread: fix static compile by adding libdvdcss as dependency

If libdvdcss support was not found during configure libdvdread tries
to open libdvdcss.so nonetheless:
https://code.videolan.org/videolan/libdvdread/blob/master/src/dvd_input.c#L275

This will obviously fail in a static-only configuration. To fix the
problem add libdvdcss as hard dependency to this package.

Fixes
http://autobuild.buildroot.net/results/415/41534b70a66c6297652f0944f9ecc7e780b26c45/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[Thomas: replace += by =.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/libdvdread/Config.in b/package/libdvdread/Config.in
index dea59eb055a224483187af8a115a3e3b5047f9db..91bec83a40a1958e81279ae584555467ade25e49 100644 (file)
--- a/package/libdvdread/Config.in
+++ b/package/libdvdread/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBDVDREAD
        bool "libdvdread"
+       select BR2_PACKAGE_LIBDVDCSS
        help
          libdvdread provides a simple foundation for reading
          DVD-Video images.

diff --git a/package/libdvdread/libdvdread.mk b/package/libdvdread/libdvdread.mk
index b8541faa7fc6ab48adb62a87a1b7492b6f928079..c92eca563fdfc7bc9bc2692d924c5afbad17e4bc 100644 (file)
--- a/package/libdvdread/libdvdread.mk
+++ b/package/libdvdread/libdvdread.mk
@@ -10,12 +10,7 @@ LIBDVDREAD_SITE = http://www.videolan.org/pub/videolan/libdvdread/$(LIBDVDREAD_V
 LIBDVDREAD_INSTALL_STAGING = YES
 LIBDVDREAD_LICENSE = GPLv2+
 LIBDVDREAD_LICENSE_FILES = COPYING
-
-ifeq ($(BR2_PACKAGE_LIBDVDCSS),y)
-LIBDVDREAD_CONF_OPTS += --with-libdvdcss
-LIBDVDREAD_DEPENDENCIES += libdvdcss
-else
-LIBDVDREAD_CONF_OPTS += --without-libdvdcss
-endif
+LIBDVDREAD_CONF_OPTS = --with-libdvdcss
+LIBDVDREAD_DEPENDENCIES = libdvdcss
 
 $(eval $(autotools-package))