package/dvdauthor: libdvdread can now be linked statically

After libdvdread bump to version 5.0.3 static linking works, tested
using this defconfig:
http://autobuild.buildroot.net/toolchains/configs/br-arm-full-static.config

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/dvdauthor/Config.in b/package/dvdauthor/Config.in
index 6f8e2e438046d558f306fc4d6e8b215f8c53511f..8b2bcb3d6fea31b51036722c1574c36bd9398cea 100644 (file)
--- a/package/dvdauthor/Config.in
+++ b/package/dvdauthor/Config.in
@@ -17,13 +17,8 @@ if BR2_PACKAGE_DVDAUTHOR
 config BR2_PACKAGE_DVDAUTHOR_DVDUNAUTHOR
        bool "dvdunauthor"
        select BR2_PACKAGE_LIBDVDREAD
-       depends on !BR2_STATIC_LIBS # libdvdread
        help
          This option enables the dvdunauthor program, which requires
          libdvdread.
 
-comment "dvdunauthor needs a toolchain w/ dynamic library"
-       depends on BR2_STATIC_LIBS
-
 endif
-

diff --git a/package/dvdauthor/dvdauthor.mk b/package/dvdauthor/dvdauthor.mk
index 6b90c43c3efee536c9ed0771c24eeb72d08cd91b..e982a40e40b7cf35e4ba9a2603f009c32e6df4f9 100644 (file)
--- a/package/dvdauthor/dvdauthor.mk
+++ b/package/dvdauthor/dvdauthor.mk
@@ -40,6 +40,10 @@ endif
 
 ifeq ($(BR2_PACKAGE_DVDAUTHOR_DVDUNAUTHOR),y)
 DVDAUTHOR_DEPENDENCIES += libdvdread
+# dvdauthor configure does not use pkg-config to detect libdvdread
+ifeq ($(BR2_PACKAGE_LIBDVDCSS)$(BR2_STATIC_LIBS),yy)
+DVDAUTHOR_CONF_ENV += LIBS="-ldvdcss"
+endif
 DVDAUTHOR_CONF_OPTS += --enable-dvdunauthor
 else
 DVDAUTHOR_CONF_OPTS += --disable-dvdunauthor