summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-11-04 12:09:14 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-11-04 12:10:23 (GMT)
commit209b3425314a868dca9bb21191881d2252b626e6 (patch)
tree153619048344dbb3b94eb5cca0c1dc0ed0f50dab
parent0dca70656855c1a343f0351e4e69ac6a2c112472 (diff)
downloadbuildroot-209b3425314a868dca9bb21191881d2252b626e6.tar.gz
buildroot-209b3425314a868dca9bb21191881d2252b626e6.tar.bz2
mplayer: tighten alsa dependency
mplayer needs pcm+mixer support in alsa, but this isn't checked by configure, so do it in mplayer.mk instead. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES10
-rw-r--r--package/multimedia/mplayer/mplayer.mk13
2 files changed, 15 insertions, 8 deletions
diff --git a/CHANGES b/CHANGES
index d92425d..e436f87 100644
--- a/CHANGES
+++ b/CHANGES
@@ -37,11 +37,11 @@
libintl, libmms, libmpd, libnl, liboil, libosip2, libpcap,
libpng, libtool, libungif, libxml2, libxslt, lighttpd, lite,
lm-sensors, lockfile-progs, logrotate, m4, mdadm, mesa3d,
- metacity, mtd-utils, mysql_client, nano, nbd, ncftp, neon,
- netperf, netsnmp, ng-spice-rework, ntfsprogs, ntp, openntpd,
- openssh, openssl, openvpn, oprofile, pango, patch, pcre, php,
- pkg-config, pppd, prboom, radvd, rdesktop, ruby, qt, quagga,
- samba, sawman, sdl_mixer, sdl_sound, setserial,
+ metacity, mplayer, mtd-utils, mysql_client, nano, nbd, ncftp,
+ neon, netperf, netsnmp, ng-spice-rework, ntfsprogs, ntp,
+ openntpd, openssh, openssl, openvpn, oprofile, pango, patch,
+ pcre, php, pkg-config, pppd, prboom, radvd, rdesktop, ruby,
+ qt, quagga, samba, sawman, sdl_mixer, sdl_sound, setserial,
shared-mime-info, speex, sqlite, squashfs,
startup-notification, strace, sylpheed, taglib, tcpdump,
thttpd, tiff, tn5250, torsmo, udev, udpcast, usbmount,
diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index ac3a67e..93e38da 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -11,9 +11,15 @@ MPLAYER_CAT:=$(BZCAT)
MPLAYER_BINARY:=mplayer
MPLAYER_TARGET_BINARY:=usr/bin/$(MPLAYER_BINARY)
-MPLAYER_DEPENDENCIES = \
- $(if $(BR2_PACKAGE_LIBMAD),libmad) \
- $(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib)
+MPLAYER_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBMAD),libmad)
+
+# mplayer needs pcm+mixer support, but configure fails to check for it
+ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yyy)
+MPLAYER_DEPENDENCIES += alsa-lib
+MPLAYER_ALSA:=--enable-alsa
+else
+MPLAYER_ALSA:=--disable-alsa
+endif
ifeq ($(BR2_ENDIAN),"BIG")
MPLAYER_ENDIAN:=--enable-big-endian
@@ -84,6 +90,7 @@ $(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked
$(MPLAYER_LARGEFILE) \
$(MPLAYER_SDL) \
$(MPLAYER_FREETYPE) \
+ $(MPLAYER_ALSA) \
--enable-cross-compile \
--disable-ivtv \
--disable-tv \