* [Buildroot] [git commit] alsa-lib: bump to version 1.0.25
@ 2012-03-11 22:23 Peter Korsgaard
0 siblings, 0 replies; only message in thread
From: Peter Korsgaard @ 2012-03-11 22:23 UTC (permalink / raw
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=b548f936ab695497bffa02a5a50a2c3d2edff816
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
[Peter: swapped static/shared test around]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
...nline.patch => alsa-lib-avr32-bad-inline.patch} | 0
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
similarity index 100%
rename from package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch
rename to 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 aa6ca51..2d27c96 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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-03-11 22:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-11 22:23 [Buildroot] [git commit] alsa-lib: bump to version 1.0.25 Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.