diff options
| author |   Cristian Iorga <cristian.iorga@intel.com> | 2013-01-29 12:15:07 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-30 12:22:18 +0000 |
| commit | 9a148e6b100fe8bc3e162d79630552df5eb78fc0 (patch) | |
| tree | fb9946168865c78f9b2d8e71e658dc535fa3f796 /meta/recipes-multimedia/alsa | |
| parent | cf05c4578c99c0cb885cf2706f7f2b39b100aeb8 (diff) | |
| download | openembedded-core-contrib-9a148e6b100fe8bc3e162d79630552df5eb78fc0.tar.gz | |
alsa-tools: upgrade to 1.0.26.1
Removed the following tools:
- all related to hdsp (required gtk+ and fltk-config)
- ld10k1, qlo10k1 (required QT)
- hdajackretask
Fixed the automake issue for cross-compilation
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-multimedia/alsa')
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-tools/autotools.patch (renamed from meta/recipes-multimedia/alsa/alsa-tools-1.0.25/autotools.patch) | 13 | ||||
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb (renamed from meta/recipes-multimedia/alsa/alsa-tools_1.0.25.bb) | 11 |
2 files changed, 14 insertions, 10 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-tools-1.0.25/autotools.patch b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch index c7bc2d6bd0..294e970cd1 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools-1.0.25/autotools.patch +++ b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch @@ -19,16 +19,17 @@ diff -ruN alsa-tools-1.0.24.1-orig//ld10k1/gitcompile alsa-tools-1.0.24.1/ld10k1 diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile --- alsa-tools-1.0.24.1-orig//Makefile 2011-07-06 11:27:40.207665000 +0800 +++ alsa-tools-1.0.24.1/Makefile 2011-07-14 15:08:08.877665009 +0800 -@@ -1,9 +1,8 @@ - VERSION = 1.0.24.1 +@@ -1,9 +1,9 @@ + VERSION = 1.0.26.1 TOP = . -SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \ - mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ - us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \ -- hwmixvolume -+SUBDIRS = ac3dec as10k1 hdsploader mixartloader pcxhrloader sb16_csp \ -+ seq sscape_ctl us428control usx2yloader vxloader ld10k1 \ -+ hwmixvolume +- hwmixvolume hdajackretask hda-verb ++SUBDIRS = ac3dec as10k1 envy24control \ ++ mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ ++ us428control usx2yloader vxloader echomixer \ ++ hwmixvolume hda-verb all: @for i in $(SUBDIRS); do \ diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.25.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb index 7d96b853b9..0fe4bee4eb 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.25.bb +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb @@ -1,5 +1,3 @@ -BROKEN = "1" - DESCRIPTION = "Alsa Tools package contains advanced tools for certain sound cards." HOMEPAGE = "http://www.alsa-project.org" BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php" @@ -15,11 +13,16 @@ LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae1 SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \ file://autotools.patch" -SRC_URI[md5sum] = "57bfec98a814d12e0f7ab379aaeccd87" -SRC_URI[sha256sum] = "a974d0f3e837796f67d04df88c783aebcf4ac3c5f9ac31e2b65c10e8cb4b1dca" +SRC_URI[md5sum] = "805526ea5d6c40e1f2c94cee86141230" +SRC_URI[sha256sum] = "553338693707fe6ddfc430b9edc4cd2677390e200c9e38de82ede3394e733841" inherit autotools EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}' ACLOCAL_FLAGS='-I ${STAGING_DATADIR}/aclocal'" +do_compile_prepend () { + #Automake dir is not correctly detected in cross compilation case + export AUTOMAKE_DIR=${STAGING_DATADIR_NATIVE}/$(ls ${STAGING_DATADIR_NATIVE} | grep automake) +} + FILES_${PN} += "${datadir}/ld10k1" |