Browse Source

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>
Bernd Kuhls 9 years ago
parent
commit
bf5c464182
2 changed files with 4 additions and 5 deletions
  1. 0 5
      package/dvdauthor/Config.in
  2. 4 0
      package/dvdauthor/dvdauthor.mk

+ 0 - 5
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
-

+ 4 - 0
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