diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2012-03-11 18:48:08 -0300 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-03-11 23:23:58 +0100 |
| commit | b548f936ab695497bffa02a5a50a2c3d2edff816 (patch) | |
| tree | 1fab8acae762df5872f7d11556d9bdb54084d752 /package/multimedia | |
| parent | dd23a8f52ad9da062dcb1a578c071e2131056ac0 (diff) | |
alsa-lib: bump to version 1.0.25
[Peter: swapped static/shared test around]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/multimedia')
| -rw-r--r-- | package/multimedia/alsa-lib/alsa-lib-avr32-bad-inline.patch (renamed from package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch) | 0 | ||||
| -rw-r--r-- | package/multimedia/alsa-lib/alsa-lib.mk | 12 |
2 files changed, 9 insertions, 3 deletions
diff --git a/package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch b/package/multimedia/alsa-lib/alsa-lib-avr32-bad-inline.patch index 568ba40a4..568ba40a4 100644 --- a/package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch +++ b/package/multimedia/alsa-lib/alsa-lib-avr32-bad-inline.patch diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk index aa6ca512f..2d27c960c 100644 --- a/package/multimedia/alsa-lib/alsa-lib.mk +++ b/package/multimedia/alsa-lib/alsa-lib.mk @@ -3,18 +3,24 @@ # alsa-lib # ############################################################# -ALSA_LIB_VERSION = 1.0.24.1 + +ALSA_LIB_VERSION = 1.0.25 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib ALSA_LIB_INSTALL_STAGING = YES - ALSA_LIB_CFLAGS=$(TARGET_CFLAGS) - ALSA_LIB_CONF_OPT = --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \ --with-pcm-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS))" \ --with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))" \ --without-versioned +# Can't build with static & shared at the same time (1.0.25+) +ifeq ($(BR2_PREFER_STATIC),y) +ALSA_LIB_CONF_OPT += --enable-shared=no +else +ALSA_LIB_CONF_OPT += --enable-static=no +endif + ifneq ($(BR2_PACKAGE_ALSA_LIB_ALOAD),y) ALSA_LIB_CONF_OPT += --disable-aload endif |