From 58ef923059f6f861022bb2b4f25b951800dc7f03 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 19 Jun 2016 18:20:29 +0200 Subject: [PATCH] package/gstreamer1/gst1-plugins-ugly: 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 Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-ugly/Config.in | 4 ---- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/Config.in b/package/gstreamer1/gst1-plugins-ugly/Config.in index 995835e41a..f30163aa0a 100644 --- a/package/gstreamer1/gst1-plugins-ugly/Config.in +++ b/package/gstreamer1/gst1-plugins-ugly/Config.in @@ -40,14 +40,10 @@ comment "plugins with external dependencies (there may be more available)" config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD bool "dvdread" - depends on !BR2_STATIC_LIBS # libdvdread select BR2_PACKAGE_LIBDVDREAD help Access a DVD with dvdread -comment "dvdread needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME bool "lame (*.mp3 audio encoder)" select BR2_PACKAGE_LAME diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index d37908c341..8864b04c71 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -59,6 +59,10 @@ GST1_PLUGINS_UGLY_CONF_OPTS += --disable-realmedia endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD),y) +# configure does not use pkg-config to detect libdvdread +ifeq ($(BR2_PACKAGE_LIBDVDCSS)$(BR2_STATIC_LIBS),yy) +GST1_PLUGINS_UGLY_CONF_ENV += LIBS="-ldvdcss" +endif GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdread GST1_PLUGINS_UGLY_DEPENDENCIES += libdvdread GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y -- 2.30.2