summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-05-18 22:03:27 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2011-05-18 22:03:57 +0200
commit8b4f5f241071bbe71229e989b563c7817dc6da5f (patch)
tree7e5d79d98f586a72527beb94762ffbcd89cc080b
parent7234c23967fa70b760c64700e56bb1778019fbeb (diff)
mplayer: fix libmad check
Closes #3757 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES9
-rw-r--r--package/multimedia/mplayer/mplayer.mk2
2 files changed, 6 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index 9155e00ce..a15689bfb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -34,10 +34,10 @@
haserl, hostapd, icu, imagemagick, iproute2, iw, kismet, less,
libcap, libdnet, libglade, libglib2, libgtk2, libnl, libpng,
libxml2, libxml2, libxslt, lighttpd, lockfile-progs, makedevs,
- midori, mpg123, mpc, mpd, mpfr, mtd-utils, ncurses, netsnmp,
- openssh, openssl, openvpn, pango, pkg-config, popt, procps,
- proftpd, qt, quagga, readline, rsync, samba, sdl, socat,
- squashfs, squid, sudo, tslib, udev, usbutils, webkit,
+ midori, mpg123, mpc, mpd, mpfr, mplayer, mtd-utils, ncurses,
+ netsnmp, openssh, openssl, openvpn, pango, pkg-config, popt,
+ procps, proftpd, qt, quagga, readline, rsync, samba, sdl,
+ socat, squashfs, squid, sudo, tslib, udev, usbutils, webkit,
wpa_supplicant, xerces, xfont_font-misc-misc, xlib_libX11,
xlib_libXfont, xlib_xtrans, xorg-server, xterm, xz
@@ -59,6 +59,7 @@
#3571: u-boot: fw_printenv does not build
#3643: popt source url is not responding
#3733: dropbear: make zlib optional
+ #3757: Buildroot can't build mplayer with libmad
2011.02, Released February 28th, 2011:
diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 7d4596008..f735464d1 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -69,7 +69,7 @@ MPLAYER_DEPENDENCIES += tremor
MPLAYER_CONF_OPTS += --disable-tremor-internal --enable-tremor
endif
-ifeq ($(BR2_PACKAGE_MAD),y)
+ifeq ($(BR2_PACKAGE_LIBMAD),y)
MPLAYER_DEPENDENCIES += libmad
else
MPLAYER_CONF_OPTS += --disable-mad