summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2015-10-12 19:07:54 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-10-12 22:01:17 +0200
commitebd1ce786af1ee6d4b7f285f3b7d04b9d262bf54 (patch)
treeaa8ef1726d6df92570f9fd5872027cd4374098c4
parent4730df02cf236eefeaf00bec197e398ad12cfeaa (diff)
downloadbuildroot-ebd1ce786af1ee6d4b7f285f3b7d04b9d262bf54.tar.gz
buildroot-ebd1ce786af1ee6d4b7f285f3b7d04b9d262bf54.zip
package/vlc: Add optional dependency to libtaglib
taglib is an optional dependency to vlc: http://git.videolan.org/gitweb.cgi?p=vlc.git;a=blob;f=configure.ac;h=b9bd76a829da8ee8b8ea69a141827abd87c47cb2;hb=HEAD#l4020 $ output/host/usr/bin/i586-buildroot-linux-uclibc-readelf -a output/target/usr/lib/vlc/plugins/meta_engine/libtaglib_plugin.so | grep NEEDED 0x00000001 (NEEDED) Shared library: [libvlccore.so.8] 0x00000001 (NEEDED) Shared library: [librt.so.1] 0x00000001 (NEEDED) Shared library: [libpthread.so.1] 0x00000001 (NEEDED) Shared library: [libdl.so.1] 0x00000001 (NEEDED) Shared library: [libtag.so.1] 0x00000001 (NEEDED) Shared library: [libz.so.1] 0x00000001 (NEEDED) Shared library: [libstdc++.so.6] 0x00000001 (NEEDED) Shared library: [libm.so.1] 0x00000001 (NEEDED) Shared library: [libc.so.1] 0x00000001 (NEEDED) Shared library: [libgcc_s.so.1] Add it to vlc.mk to get reproducable builds. For taglib itself zlib is only an optional dependency http://git.buildroot.net/buildroot/tree/package/taglib/taglib.mk#n13 But taglib support in vlc depends on zlib: http://git.videolan.org/gitweb.cgi?p=vlc.git;a=blob;f=modules/meta_engine/Makefile.am;h=003d292cdc9a80762a6515e0ced77552f13b5120;hb=HEAD#l10 so we select BR2_PACKAGE_ZLIB if BR2_PACKAGE_TAGLIB is selected. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/vlc/Config.in1
-rw-r--r--package/vlc/vlc.mk7
2 files changed, 8 insertions, 0 deletions
diff --git a/package/vlc/Config.in b/package/vlc/Config.in
index 71e4f34742..e2b8da9b55 100644
--- a/package/vlc/Config.in
+++ b/package/vlc/Config.in
@@ -13,6 +13,7 @@ config BR2_PACKAGE_VLC
select BR2_PACKAGE_LIBVORBIS if BR2_PACKAGE_OPUS
select BR2_PACKAGE_VLC_OPENCV_BACKEND if BR2_PACKAGE_OPENCV
select BR2_PACKAGE_VLC_OPENCV3_BACKEND if BR2_PACKAGE_OPENCV3
+ select BR2_PACKAGE_ZLIB if BR2_PACKAGE_TAGLIB
help
VLC is a free and open source cross-platform multimedia player
and framework that plays most multimedia files as well as DVD,
diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
index 4e84b1285e..ca1f09c85c 100644
--- a/package/vlc/vlc.mk
+++ b/package/vlc/vlc.mk
@@ -326,6 +326,13 @@ else
VLC_CONF_OPTS += --disable-speex
endif
+ifeq ($(BR2_PACKAGE_TAGLIB),y)
+VLC_CONF_OPTS += --enable-taglib
+VLC_DEPENDENCIES += taglib
+else
+VLC_CONF_OPTS += --disable-taglib
+endif
+
ifeq ($(BR2_PACKAGE_TREMOR),y)
VLC_CONF_OPTS += --enable-tremor
VLC_DEPENDENCIES += tremor
OpenPOWER on IntegriCloud