summaryrefslogtreecommitdiffstats
path: root/package/mplayer/mplayer.mk
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2015-11-08 16:55:17 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-11-18 22:22:31 +0100
commit2619ccbb948c6c7c383e95607e82eb1c304992d1 (patch)
treeb4bc62b33726b4ff173d7c4c2f85c3223575220d /package/mplayer/mplayer.mk
parent97abbf210a9fbbddaec534faef7c6e86f0545bef (diff)
downloadbuildroot-2619ccbb948c6c7c383e95607e82eb1c304992d1.tar.gz
buildroot-2619ccbb948c6c7c383e95607e82eb1c304992d1.zip
package/mplayer: Fix linking with libvorbis/libdvdread
Fixes http://autobuild.buildroot.net/results/7f6/7f6e5396e95a3c3b676ca59bedc5317aa88e5f4c/ http://autobuild.buildroot.net/results/6ac/6acd9cf25c3088d313247510db47a214fff30c67/ http://autobuild.buildroot.net/results/a0d/a0da41bb734dbcdb17e13d852cfbdba5e069429e/ http://autobuild.buildroot.net/results/d0c/d0caf60c1ddf4e05086c93f646e32b5ddc75b6ce/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/mplayer/mplayer.mk')
-rw-r--r--package/mplayer/mplayer.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk
index 99fc469f6a..ad2d9dd613 100644
--- a/package/mplayer/mplayer.mk
+++ b/package/mplayer/mplayer.mk
@@ -117,9 +117,10 @@ endif
# https://github.com/pld-linux/mplayer/blob/master/mplayer-libcdio.patch
MPLAYER_CONF_OPTS += --disable-libcdio
+# We intentionally don't pass --enable-dvdread, to let the
+# autodetection find which library to link with.
ifeq ($(BR2_PACKAGE_LIBDVDREAD),y)
MPLAYER_CONF_OPTS += \
- --enable-dvdread \
--with-dvdread-config=$(STAGING_DIR)/usr/bin/dvdread-config
MPLAYER_DEPENDENCIES += libdvdread
endif
@@ -175,9 +176,10 @@ MPLAYER_DEPENDENCIES += tremor
MPLAYER_CONF_OPTS += --enable-tremor
endif
+# We intentionally don't pass --enable-libvorbis, to let the
+# autodetection find which library to link with.
ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
MPLAYER_DEPENDENCIES += libvorbis
-MPLAYER_CONF_OPTS += --enable-libvorbis
endif
ifeq ($(BR2_PACKAGE_LIBMAD),y)
OpenPOWER on IntegriCloud