* [Buildroot] svn commit: trunk/buildroot/package/multimedia/alsa-lib
@ 2009-01-12 7:40 ulf at uclibc.org
2009-01-12 7:59 ` Peter Korsgaard
0 siblings, 1 reply; 16+ messages in thread
From: ulf at uclibc.org @ 2009-01-12 7:40 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-12 07:40:08 +0000 (Mon, 12 Jan 2009)
New Revision: 24780
Log:
Disable use of python in alsa-lib, if not configured
Modified:
trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk
Changeset:
Modified: trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk
===================================================================
--- trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2009-01-12 07:28:50 UTC (rev 24779)
+++ trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2009-01-12 07:40:08 UTC (rev 24780)
@@ -19,6 +19,8 @@
ifeq ($(BR2_PACKAGE_PYTHON),y)
ALSA_LIB_CONFIGURE_OPTS += --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR)
+else
+ALSA_LIB_CONFIGURE_OPTS += --disable-python
endif
ifeq ($(BR2_SOFT_FLOAT),y)
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/multimedia/alsa-lib
@ 2009-02-23 13:37 jacmet at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: jacmet at uclibc.org @ 2009-02-23 13:37 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-23 13:37:48 +0000 (Mon, 23 Feb 2009)
New Revision: 25428
Log:
alsa-lib: convert to Makefile.autotools.in format
Modified:
trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk
Changeset:
Modified: trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk
===================================================================
--- trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2009-02-23 13:01:26 UTC (rev 25427)
+++ trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2009-02-23 13:37:48 UTC (rev 25428)
@@ -3,16 +3,26 @@
# alsa-lib
#
#############################################################
-ALSA_LIB_VERSION:=1.0.18
-ALSA_LIB_SOURCE:=alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
-ALSA_LIB_SITE:=ftp://ftp.alsa-project.org/pub/lib
-ALSA_LIB_DIR:=$(BUILD_DIR)/alsa-lib-$(ALSA_LIB_VERSION)
-ALSA_LIB_CAT:=$(BZCAT)
-ALSA_LIB_BINARY:=libasound.so.2.0.0
-ALSA_LIB_TARGET_BINARY:=usr/lib/$(ALSA_LIB_BINARY)
+ALSA_LIB_VERSION = 1.0.18
+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_INSTALL_TARGET = YES
ALSA_LIB_CFLAGS=$(TARGET_CFLAGS)
+ALSA_LIB_DEPENDENCIES = uclibc
+
+ALSA_LIB_CONF_OPT = --enable-shared \
+ --enable-static \
+ --without-versioned
+
+ifeq ($(BR2_ENABLE_DEBUG),y)
+# install-exec doesn't install the config files
+ALSA_LIB_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+ALSA_LIB_CONF_OPT += --enable-debug
+endif
+
ifeq ($(BR2_arm),y)
ALSA_LIB_CFLAGS+=-mabi=aapcs-linux
endif
@@ -22,82 +32,19 @@
endif
ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)
-ALSA_LIB_CONFIGURE_OPTS += --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR)
+ALSA_LIB_CONF_OPT += --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR)
ALSA_LIB_CFLAGS+=-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
-ALSA_LIB_DEPS = libpython
+ALSA_LIB_DEPENDENCIES += libpython
else
-ALSA_LIB_CONFIGURE_OPTS += --disable-python
+ALSA_LIB_CONF_OPT += --disable-python
endif
ifeq ($(BR2_SOFT_FLOAT),y)
- SOFT_FLOAT=--with-softfloat
+ALSA_LIB_CONF_OPT += --with-softfloat
endif
-$(DL_DIR)/$(ALSA_LIB_SOURCE):
- $(call DOWNLOAD,$(ALSA_LIB_SITE),$(ALSA_LIB_SOURCE))
+ALSA_LIB_CONF_ENV = CFLAGS="$(ALSA_LIB_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS) -lm"
-$(ALSA_LIB_DIR)/.unpacked: $(DL_DIR)/$(ALSA_LIB_SOURCE)
- $(ALSA_LIB_CAT) $(DL_DIR)/$(ALSA_LIB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(ALSA_LIB_DIR) package/multimedia/alsa-lib/ alsa-lib-$(ALSA_LIB_VERSION)\*.patch*
- $(CONFIG_UPDATE) $(ALSA_LIB_DIR)
- touch $@
+$(eval $(call AUTOTARGETS,package/multimedia,alsa-lib))
-$(ALSA_LIB_DIR)/.configured: $(ALSA_LIB_DIR)/.unpacked
- (cd $(ALSA_LIB_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_ARGS) \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(ALSA_LIB_CFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS) -lm" \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --sysconfdir=/etc \
- --enable-shared \
- --enable-static \
- --disable-docs \
- --without-versioned \
- $(ALSA_LIB_CONFIGURE_OPTS) \
- $(SOFT_FLOAT) \
- $(DISABLE_NLS) \
- )
- touch $@
-
-$(ALSA_LIB_DIR)/src/.libs/$(ALSA_LIB_BINARY): $(ALSA_LIB_DIR)/.configured
- $(MAKE) -C $(ALSA_LIB_DIR)
- touch -c $@
-
-$(STAGING_DIR)/$(ALSA_LIB_TARGET_BINARY): $(ALSA_LIB_DIR)/src/.libs/$(ALSA_LIB_BINARY)
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(ALSA_LIB_DIR) install
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libasound.la
-
-$(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY): $(STAGING_DIR)/$(ALSA_LIB_TARGET_BINARY)
- mkdir -p $(TARGET_DIR)/usr/share/alsa $(TARGET_DIR)/usr/lib/alsa-lib
- cp -dpf $(STAGING_DIR)/usr/lib/libasound.so* $(TARGET_DIR)/usr/lib/
- cp -rdpf $(STAGING_DIR)/usr/share/alsa/* $(TARGET_DIR)/usr/share/alsa/
- cp -rdpf $(STAGING_DIR)/usr/lib/alsa-lib/* $(TARGET_DIR)/usr/lib/alsa-lib/
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libasound.so*
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/alsa-lib/smixer/*.so
- touch -c $@
-
-alsa-lib: uclibc $(ALSA_LIB_DEPS) $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY)
-
-alsa-lib-unpacked: $(ALSA_LIB_DIR)/.unpacked
-
-alsa-lib-source: $(DL_DIR)/$(ALSA_LIB_SOURCE)
-
-alsa-lib-clean:
- rm -f $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY)
- -$(MAKE) -C $(ALSA_LIB_DIR) clean
-
-alsa-lib-dirclean:
- rm -rf $(ALSA_LIB_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
-TARGETS+=alsa-lib
-endif
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/multimedia/alsa-lib
@ 2009-02-23 13:01 jacmet at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: jacmet at uclibc.org @ 2009-02-23 13:01 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-23 13:01:26 +0000 (Mon, 23 Feb 2009)
New Revision: 25427
Log:
alsa-lib: don't use versioned symbols
As reported by Dirk Vermaak and Daniel Mack. Fixes runtime issues with
alsa-lib, see
http://mailman.alsa-project.org/pipermail/alsa-devel/2009-February/014999.html
for details.
Modified:
trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk
Changeset:
Modified: trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk
===================================================================
--- trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2009-02-23 11:18:30 UTC (rev 25426)
+++ trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2009-02-23 13:01:26 UTC (rev 25427)
@@ -57,6 +57,7 @@
--enable-shared \
--enable-static \
--disable-docs \
+ --without-versioned \
$(ALSA_LIB_CONFIGURE_OPTS) \
$(SOFT_FLOAT) \
$(DISABLE_NLS) \
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/multimedia/alsa-lib
@ 2009-02-07 6:57 jacmet at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: jacmet at uclibc.org @ 2009-02-07 6:57 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-07 06:57:29 +0000 (Sat, 07 Feb 2009)
New Revision: 25259
Log:
alsa-lib: make python option depend on python
As discussed on the list.
Modified:
trunk/buildroot/package/multimedia/alsa-lib/Config.in
Changeset:
Modified: trunk/buildroot/package/multimedia/alsa-lib/Config.in
===================================================================
--- trunk/buildroot/package/multimedia/alsa-lib/Config.in 2009-02-06 17:38:05 UTC (rev 25258)
+++ trunk/buildroot/package/multimedia/alsa-lib/Config.in 2009-02-07 06:57:29 UTC (rev 25259)
@@ -9,7 +9,7 @@
config BR2_PACKAGE_ALSA_LIB_PYTHON
bool "Python support for alsa-lib"
depends on BR2_PACKAGE_ALSA_LIB
- select BR2_PACKAGE_PYTHON
+ depends on BR2_PACKAGE_PYTHON
help
Add python support for alsa-lib.
Python will be built and libpython will be installed
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/multimedia/alsa-lib
@ 2009-02-04 23:15 jacmet at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: jacmet at uclibc.org @ 2009-02-04 23:15 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-04 23:15:42 +0000 (Wed, 04 Feb 2009)
New Revision: 25238
Log:
alsa-lib: fix with with BR2_PACKAGE_ALSA_LIB_PYTHON
Tell it where to find the python headers.
Modified:
trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk
Changeset:
Modified: trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk
===================================================================
--- trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2009-02-04 13:42:40 UTC (rev 25237)
+++ trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2009-02-04 23:15:42 UTC (rev 25238)
@@ -23,6 +23,7 @@
ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)
ALSA_LIB_CONFIGURE_OPTS += --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR)
+ALSA_LIB_CFLAGS+=-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
ALSA_LIB_DEPS = libpython
else
ALSA_LIB_CONFIGURE_OPTS += --disable-python
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/multimedia/alsa-lib
@ 2009-02-01 19:37 jacmet at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: jacmet at uclibc.org @ 2009-02-01 19:37 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-01 19:37:14 +0000 (Sun, 01 Feb 2009)
New Revision: 25209
Log:
alsa-lib: clean up makefile
As discussed on the list. I suspect the ARM abi thing isn't needed anymore
now we use the correct abi in the first place, but I'll leave it in until
after the release.
Modified:
trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk
Changeset:
Modified: trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk
===================================================================
--- trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2009-02-01 19:37:09 UTC (rev 25208)
+++ trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2009-02-01 19:37:14 UTC (rev 25209)
@@ -11,16 +11,14 @@
ALSA_LIB_BINARY:=libasound.so.2.0.0
ALSA_LIB_TARGET_BINARY:=usr/lib/$(ALSA_LIB_BINARY)
+ALSA_LIB_CFLAGS=$(TARGET_CFLAGS)
+
ifeq ($(BR2_arm),y)
-ALSA_LIB_ABI+=-mabi=aapcs-linux
-else
-ALSA_LIB_ABI+=
+ALSA_LIB_CFLAGS+=-mabi=aapcs-linux
endif
ifeq ($(BR2_avr32),y)
-ALSA_LIB_ABI+=-DAVR32_INLINE_BUG
-else
-ALSA_LIB_ABI+=
+ALSA_LIB_CFLAGS+=-DAVR32_INLINE_BUG
endif
ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)
@@ -47,7 +45,7 @@
(cd $(ALSA_LIB_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_ARGS) \
$(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS) $(ALSA_LIB_ABI)" \
+ CFLAGS="$(ALSA_LIB_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS) -lm" \
./configure \
--target=$(GNU_TARGET_NAME) \
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/multimedia/alsa-lib
@ 2009-01-31 10:18 ulf at uclibc.org
2009-01-31 12:29 ` Peter Korsgaard
2009-02-02 6:09 ` Hans-Christian Egtvedt
0 siblings, 2 replies; 16+ messages in thread
From: ulf at uclibc.org @ 2009-01-31 10:18 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-31 10:18:23 +0000 (Sat, 31 Jan 2009)
New Revision: 25175
Log:
Workaround for AVR32 compiler issue affecting inlining, causing alsa-lib to break, feedback to AVR32 compiler team will be sent
Added:
trunk/buildroot/package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch
Modified:
trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk
Changeset:
Added: trunk/buildroot/package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch
===================================================================
--- trunk/buildroot/package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch (rev 0)
+++ trunk/buildroot/package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch 2009-01-31 10:18:23 UTC (rev 25175)
@@ -0,0 +1,91 @@
+diff -urN alsa-lib-1.0.18-0rig//src/pcm/pcm_local.h alsa-lib-1.0.18/src/pcm/pcm_local.h
+--- alsa-lib-1.0.18-0rig//src/pcm/pcm_local.h 2009-01-31 11:02:12.000000000 +0100
++++ alsa-lib-1.0.18/src/pcm/pcm_local.h 2009-01-31 11:03:24.000000000 +0100
+@@ -611,6 +611,13 @@
+ snd_pcm_hw_param_t var);
+ int _snd_pcm_hw_param_set(snd_pcm_hw_params_t *params,
+ snd_pcm_hw_param_t var, unsigned int val, int dir);
++
++#if defined(AVR32_INLINE_BUG)
++int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
++ snd_pcm_format_t val);
++int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t *params,
++ snd_pcm_subformat_t val);
++#else
+ static inline int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
+ snd_pcm_format_t val)
+ {
+@@ -624,7 +631,7 @@
+ return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_SUBFORMAT,
+ (unsigned long) val, 0);
+ }
+-
++#endif
+ int _snd_pcm_hw_param_set_min(snd_pcm_hw_params_t *params,
+ snd_pcm_hw_param_t var, unsigned int val, int dir);
+ int _snd_pcm_hw_param_set_max(snd_pcm_hw_params_t *params,
+diff -urN alsa-lib-1.0.18-0rig//src/pcm/pcm_route.c alsa-lib-1.0.18/src/pcm/pcm_route.c
+--- alsa-lib-1.0.18-0rig//src/pcm/pcm_route.c 2009-01-31 11:02:12.000000000 +0100
++++ alsa-lib-1.0.18/src/pcm/pcm_route.c 2009-01-31 11:03:18.000000000 +0100
+@@ -26,6 +26,7 @@
+ *
+ */
+
++
+ #include <byteswap.h>
+ #include <math.h>
+ #include "pcm_local.h"
+@@ -106,6 +107,23 @@
+
+ #endif /* DOC_HIDDEN */
+
++
++#if defined(AVR32_INLINE_BUG)
++int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
++ snd_pcm_format_t val)
++{
++ return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_FORMAT,
++ (unsigned long) val, 0);
++}
++
++int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t *params,
++ snd_pcm_subformat_t val)
++{
++ return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_SUBFORMAT,
++ (unsigned long) val, 0);
++}
++#endif
++
+ static void snd_pcm_route_convert1_zero(const snd_pcm_channel_area_t *dst_area,
+ snd_pcm_uframes_t dst_offset,
+ const snd_pcm_channel_area_t *src_areas ATTRIBUTE_UNUSED,
+@@ -483,6 +501,8 @@
+ snd_pcm_uframes_t frames,
+ snd_pcm_route_params_t *params)
+ {
++#if defined(AVR32_INLINE_BUG)
++#endif
+ unsigned int dst_channel;
+ snd_pcm_route_ttable_dst_t *dstp;
+ const snd_pcm_channel_area_t *dst_area;
+@@ -551,8 +571,20 @@
+ _snd_pcm_hw_param_set_mask(sparams, SND_PCM_HW_PARAM_ACCESS,
+ &saccess_mask);
+ if (route->sformat != SND_PCM_FORMAT_UNKNOWN) {
++#if defined(AVR32_INLINE_BUG)
++/* Start of of problem */
++#endif
+ _snd_pcm_hw_params_set_format(sparams, route->sformat);
+ _snd_pcm_hw_params_set_subformat(sparams, SND_PCM_SUBFORMAT_STD);
++#if 0
++ _snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_FORMAT,
++ (unsigned long) route->sformat, 0);
++ _snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_SUBFORMAT,
++ (unsigned long) SND_PCM_SUBFORMAT_STD, 0);
++#endif
++#if defined(AVR32_INLINE_BUG)
++/* End of problem */
++#endif
+ }
+ if (route->schannels >= 0) {
+ _snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_CHANNELS,
Modified: trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk
===================================================================
--- trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2009-01-31 01:07:05 UTC (rev 25174)
+++ trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2009-01-31 10:18:23 UTC (rev 25175)
@@ -12,11 +12,17 @@
ALSA_LIB_TARGET_BINARY:=usr/lib/$(ALSA_LIB_BINARY)
ifeq ($(BR2_arm),y)
-ALSA_LIB_ABI:=-mabi=aapcs-linux
+ALSA_LIB_ABI+=-mabi=aapcs-linux
else
-ALSA_LIB_ABI:=
+ALSA_LIB_ABI+=
endif
+ifeq ($(BR2_avr32),y)
+ALSA_LIB_ABI+=-DAVR32_INLINE_BUG
+else
+ALSA_LIB_ABI+=
+endif
+
ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)
ALSA_LIB_CONFIGURE_OPTS += --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR)
ALSA_LIB_DEPS = libpython
@@ -77,6 +83,8 @@
alsa-lib: uclibc $(ALSA_LIB_DEPS) $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY)
+alsa-lib-unpacked: $(ALSA_LIB_DIR)/.unpacked
+
alsa-lib-source: $(DL_DIR)/$(ALSA_LIB_SOURCE)
alsa-lib-clean:
^ permalink raw reply [flat|nested] 16+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/multimedia/alsa-lib
2009-01-31 10:18 ulf at uclibc.org
@ 2009-01-31 12:29 ` Peter Korsgaard
2009-02-02 6:09 ` Hans-Christian Egtvedt
1 sibling, 0 replies; 16+ messages in thread
From: Peter Korsgaard @ 2009-01-31 12:29 UTC (permalink / raw)
To: buildroot
>>>>> "ulf" == ulf <ulf@uclibc.org> writes:
ulf> Author: ulf
ulf> Date: 2009-01-31 10:18:23 +0000 (Sat, 31 Jan 2009)
ulf> New Revision: 25175
ulf> Log:
ulf> Workaround for AVR32 compiler issue affecting inlining, causing alsa-lib to break, feedback to AVR32 compiler team will be sent
ulf> +++ trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2009-01-31 10:18:23 UTC (rev 25175)
ulf> @@ -12,11 +12,17 @@
ulf> ALSA_LIB_TARGET_BINARY:=usr/lib/$(ALSA_LIB_BINARY)
ulf> ifeq ($(BR2_arm),y)
ulf> -ALSA_LIB_ABI:=-mabi=aapcs-linux
ulf> +ALSA_LIB_ABI+=-mabi=aapcs-linux
ulf> else
ulf> -ALSA_LIB_ABI:=
ulf> +ALSA_LIB_ABI+=
ulf> endif
ulf> +ifeq ($(BR2_avr32),y)
ulf> +ALSA_LIB_ABI+=-DAVR32_INLINE_BUG
ulf> +else
ulf> +ALSA_LIB_ABI+=
ulf> +endif
Please rename that variable to something sensible when you start to
use it for other things, something like ALSA_CFLAGS.
And now we're at it, is the arm abi handling needed after the fix in
r25164? Could you give it a try (with an internal toolchain ofcourse)?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/multimedia/alsa-lib
2009-01-31 10:18 ulf at uclibc.org
2009-01-31 12:29 ` Peter Korsgaard
@ 2009-02-02 6:09 ` Hans-Christian Egtvedt
2009-02-02 6:34 ` Ulf Samuelsson
1 sibling, 1 reply; 16+ messages in thread
From: Hans-Christian Egtvedt @ 2009-02-02 6:09 UTC (permalink / raw)
To: buildroot
On Sat, 31 Jan 2009 10:18:25 +0000 (UTC)
ulf at uclibc.org wrote:
> Author: ulf
> Date: 2009-01-31 10:18:23 +0000 (Sat, 31 Jan 2009)
> New Revision: 25175
>
> Log:
> Workaround for AVR32 compiler issue affecting inlining, causing
> alsa-lib to break, feedback to AVR32 compiler team will be sent
>
Huh? Inline bug?
> ++#if defined(AVR32_INLINE_BUG)
> ++int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
> ++ snd_pcm_format_t
> val); ++int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t
> *params, ++ snd_pcm_subformat_t
> val); ++#else
Do you have a test case where this is needed to work?
<snipp>
--
Best regards,
Hans-Christian Egtvedt
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/multimedia/alsa-lib
2009-02-02 6:09 ` Hans-Christian Egtvedt
@ 2009-02-02 6:34 ` Ulf Samuelsson
2009-02-02 7:59 ` Hans-Christian Egtvedt
0 siblings, 1 reply; 16+ messages in thread
From: Ulf Samuelsson @ 2009-02-02 6:34 UTC (permalink / raw)
To: buildroot
m?n 2009-02-02 klockan 07:09 +0100 skrev Hans-Christian Egtvedt:
> On Sat, 31 Jan 2009 10:18:25 +0000 (UTC)
> ulf at uclibc.org wrote:
>
> > Author: ulf
> > Date: 2009-01-31 10:18:23 +0000 (Sat, 31 Jan 2009)
> > New Revision: 25175
> >
> > Log:
> > Workaround for AVR32 compiler issue affecting inlining, causing
> > alsa-lib to break, feedback to AVR32 compiler team will be sent
> >
>
> Huh? Inline bug?
If I download the latest trunk and build atstk100x/alsa-lib
(without the patch) then I get an error which to me indicates
that the compiler issues a jump instruction with a limited
jump range, and then it turns out that the jump is
longer than allowed.
Same happens on www.atmel.no/buildroot-avr32-2.3.0
I am running OpenSuSE 11.0
There are other applications which show the same problem,
but I don't have a list of those.
BR
Ulf Samuelsson
> > ++#if defined(AVR32_INLINE_BUG)
> > ++int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
> > ++ snd_pcm_format_t
> > val); ++int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t
> > *params, ++ snd_pcm_subformat_t
> > val); ++#else
>
> Do you have a test case where this is needed to work?
>
> <snipp>
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/multimedia/alsa-lib
2009-02-02 6:34 ` Ulf Samuelsson
@ 2009-02-02 7:59 ` Hans-Christian Egtvedt
0 siblings, 0 replies; 16+ messages in thread
From: Hans-Christian Egtvedt @ 2009-02-02 7:59 UTC (permalink / raw)
To: buildroot
On Mon, 02 Feb 2009 07:34:03 +0100
Ulf Samuelsson <ulf.samuelsson@atmel.com> wrote:
> m?n 2009-02-02 klockan 07:09 +0100 skrev Hans-Christian Egtvedt:
> > On Sat, 31 Jan 2009 10:18:25 +0000 (UTC)
> > ulf at uclibc.org wrote:
> >
> > > Author: ulf
> > > Date: 2009-01-31 10:18:23 +0000 (Sat, 31 Jan 2009)
> > > New Revision: 25175
> > >
> > > Log:
> > > Workaround for AVR32 compiler issue affecting inlining, causing
> > > alsa-lib to break, feedback to AVR32 compiler team will be sent
> > >
> >
> > Huh? Inline bug?
>
> If I download the latest trunk and build atstk100x/alsa-lib
> (without the patch) then I get an error which to me indicates
> that the compiler issues a jump instruction with a limited
> jump range, and then it turns out that the jump is
> longer than allowed.
>
> Same happens on www.atmel.no/buildroot-avr32-2.3.0
>
> I am running OpenSuSE 11.0
>
I've heard other complain about OpenSUSE triggering "bugs" here and
there as well.
Weird that I am unable to trigger this when compiling on Ubuntu 8.10.
Which .config are you running? atstk100something in uclibc.org
repository?
> There are other applications which show the same problem,
> but I don't have a list of those.
>
--
Best regards,
Hans-Christian Egtvedt
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/multimedia/alsa-lib
@ 2009-01-28 15:33 jacmet at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: jacmet at uclibc.org @ 2009-01-28 15:33 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-28 15:33:08 +0000 (Wed, 28 Jan 2009)
New Revision: 25101
Log:
alsa-lib: fix build with largefile on 32bit archs
Thanks to Will Wagner <will_wagner@carallon.com> for reporting and working
with upstream to get it fixed. Patch from alsa-lib.git.
Added:
trunk/buildroot/package/multimedia/alsa-lib/alsa-lib-1.0.18-fix-off_t-in-kernel-struct.patch
Changeset:
Added: trunk/buildroot/package/multimedia/alsa-lib/alsa-lib-1.0.18-fix-off_t-in-kernel-struct.patch
===================================================================
--- trunk/buildroot/package/multimedia/alsa-lib/alsa-lib-1.0.18-fix-off_t-in-kernel-struct.patch (rev 0)
+++ trunk/buildroot/package/multimedia/alsa-lib/alsa-lib-1.0.18-fix-off_t-in-kernel-struct.patch 2009-01-28 15:33:08 UTC (rev 25101)
@@ -0,0 +1,30 @@
+From c821f2e7f2534ece24a10402df3f501536a09cbd Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Wed, 28 Jan 2009 15:00:35 +0100
+Subject: [PATCH] Fix off_t in kernel struct
+
+The off_t in kernel struct (for ioctls) is actually different from the
+definition of user-space off_t. The kernel off_t is equial with long
+while user-space off_t depends on the large-file support.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ include/sound/asound.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/include/sound/asound.h b/include/sound/asound.h
+index 977b2d6..62d1e57 100644
+--- a/include/sound/asound.h
++++ b/include/sound/asound.h
+@@ -402,7 +402,7 @@ struct sndrv_pcm_sw_params {
+
+ struct sndrv_pcm_channel_info {
+ unsigned int channel;
+- off_t offset; /* mmap offset */
++ long offset; /* mmap offset */
+ unsigned int first; /* offset to first sample in bits */
+ unsigned int step; /* samples distance in bits */
+ };
+--
+1.5.6.5
+
^ permalink raw reply [flat|nested] 16+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/multimedia/alsa-lib
@ 2009-01-27 5:43 jacmet at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: jacmet at uclibc.org @ 2009-01-27 5:43 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-27 05:43:29 +0000 (Tue, 27 Jan 2009)
New Revision: 25072
Log:
alsa-lib: fix typo in -source target
Modified:
trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk
Changeset:
Modified: trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk
===================================================================
--- trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2009-01-26 23:52:31 UTC (rev 25071)
+++ trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2009-01-27 05:43:29 UTC (rev 25072)
@@ -77,7 +77,7 @@
alsa-lib: uclibc $(ALSA_LIB_DEPS) $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY)
-alsa-lib-source: $(DL_DIR)/$(ALSA-LIB_SOURCE)
+alsa-lib-source: $(DL_DIR)/$(ALSA_LIB_SOURCE)
alsa-lib-clean:
rm -f $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY)
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/multimedia/alsa-lib
@ 2009-01-11 20:10 ulf at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: ulf at uclibc.org @ 2009-01-11 20:10 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-11 20:10:57 +0000 (Sun, 11 Jan 2009)
New Revision: 24754
Log:
Make sure alsa-lib build with correct python version
Modified:
trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk
Changeset:
Modified: trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk
===================================================================
--- trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2009-01-11 20:08:47 UTC (rev 24753)
+++ trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2009-01-11 20:10:57 UTC (rev 24754)
@@ -17,6 +17,10 @@
ALSA_LIB_ABI:=
endif
+ifeq ($(BR2_PACKAGE_PYTHON),y)
+ALSA_LIB_CONFIGURE_OPTS += --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR)
+endif
+
ifeq ($(BR2_SOFT_FLOAT),y)
SOFT_FLOAT=--with-softfloat
endif
@@ -45,6 +49,7 @@
--enable-shared \
--enable-static \
--disable-docs \
+ $(ALSA_LIB_CONFIGURE_OPTS) \
$(SOFT_FLOAT) \
$(DISABLE_NLS) \
)
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/multimedia/alsa-lib
@ 2008-12-05 9:46 egtvedt at uclibc.org
0 siblings, 0 replies; 16+ messages in thread
From: egtvedt at uclibc.org @ 2008-12-05 9:46 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2008-12-05 01:46:17 -0800 (Fri, 05 Dec 2008)
New Revision: 24280
Log:
alsa-lib: bump version to 1.0.18
Modified:
trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk
Changeset:
Modified: trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk
===================================================================
--- trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2008-12-04 20:09:13 UTC (rev 24279)
+++ trunk/buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2008-12-05 09:46:17 UTC (rev 24280)
@@ -3,7 +3,7 @@
# alsa-lib
#
#############################################################
-ALSA_LIB_VERSION:=1.0.14a
+ALSA_LIB_VERSION:=1.0.18
ALSA_LIB_SOURCE:=alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
ALSA_LIB_SITE:=ftp://ftp.alsa-project.org/pub/lib
ALSA_LIB_DIR:=$(BUILD_DIR)/alsa-lib-$(ALSA_LIB_VERSION)
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2009-02-23 13:37 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-12 7:40 [Buildroot] svn commit: trunk/buildroot/package/multimedia/alsa-lib ulf at uclibc.org
2009-01-12 7:59 ` Peter Korsgaard
-- strict thread matches above, loose matches on Subject: below --
2009-02-23 13:37 jacmet at uclibc.org
2009-02-23 13:01 jacmet at uclibc.org
2009-02-07 6:57 jacmet at uclibc.org
2009-02-04 23:15 jacmet at uclibc.org
2009-02-01 19:37 jacmet at uclibc.org
2009-01-31 10:18 ulf at uclibc.org
2009-01-31 12:29 ` Peter Korsgaard
2009-02-02 6:09 ` Hans-Christian Egtvedt
2009-02-02 6:34 ` Ulf Samuelsson
2009-02-02 7:59 ` Hans-Christian Egtvedt
2009-01-28 15:33 jacmet at uclibc.org
2009-01-27 5:43 jacmet at uclibc.org
2009-01-11 20:10 ulf at uclibc.org
2008-12-05 9:46 egtvedt at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox