aboutsummaryrefslogtreecommitdiff
path: root/package/libdvdread
diff options
context:
space:
mode:
authorGravatar Bernd Kuhls <bernd.kuhls@t-online.de>2016-06-25 09:49:13 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-07-02 15:42:00 +0200
commitd7dd1b8ad113b56cac164df50f521e0684263624 (patch)
tree35a2db1c1ddab4b87a0df741dc4c6b8b7feda3fe /package/libdvdread
parentf7b3b97d509994bf3e2110f548dd593c204ba02a (diff)
downloadbuildroot-d7dd1b8ad113b56cac164df50f521e0684263624.tar.gz
buildroot-d7dd1b8ad113b56cac164df50f521e0684263624.tar.bz2
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>
Diffstat (limited to 'package/libdvdread')
-rw-r--r--package/libdvdread/Config.in1
-rw-r--r--package/libdvdread/libdvdread.mk9
2 files changed, 3 insertions, 7 deletions
diff --git a/package/libdvdread/Config.in b/package/libdvdread/Config.in
index dea59eb055..91bec83a40 100644
--- 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 b8541faa7f..c92eca563f 100644
--- 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))