From d7dd1b8ad113b56cac164df50f521e0684263624 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 25 Jun 2016 09:49:13 +0200 Subject: [PATCH] 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 [Thomas: replace += by =.] Signed-off-by: Thomas Petazzoni --- package/libdvdread/Config.in | 1 + package/libdvdread/libdvdread.mk | 9 ++------- 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)) -- 2.30.2