summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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
19diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile 19diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile
20--- alsa-tools-1.0.24.1-orig//Makefile 2011-07-06 11:27:40.207665000 +0800 20--- alsa-tools-1.0.24.1-orig//Makefile 2011-07-06 11:27:40.207665000 +0800
21+++ alsa-tools-1.0.24.1/Makefile 2011-07-14 15:08:08.877665009 +0800 21+++ alsa-tools-1.0.24.1/Makefile 2011-07-14 15:08:08.877665009 +0800
22@@ -1,9 +1,8 @@ 22@@ -1,9 +1,9 @@
23 VERSION = 1.0.24.1 23 VERSION = 1.0.26.1
24 TOP = . 24 TOP = .
25-SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \ 25-SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \
26- mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ 26- mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \
27- us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \ 27- us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \
28- hwmixvolume 28- hwmixvolume hdajackretask hda-verb
29+SUBDIRS = ac3dec as10k1 hdsploader mixartloader pcxhrloader sb16_csp \ 29+SUBDIRS = ac3dec as10k1 envy24control \
30+ seq sscape_ctl us428control usx2yloader vxloader ld10k1 \ 30+ mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \
31+ hwmixvolume 31+ us428control usx2yloader vxloader echomixer \
32+ hwmixvolume hda-verb
32 33
33 all: 34 all:
34 @for i in $(SUBDIRS); do \ 35 @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 @@
1BROKEN = "1"
2
3DESCRIPTION = "Alsa Tools package contains advanced tools for certain sound cards." 1DESCRIPTION = "Alsa Tools package contains advanced tools for certain sound cards."
4HOMEPAGE = "http://www.alsa-project.org" 2HOMEPAGE = "http://www.alsa-project.org"
5BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php" 3BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php"
@@ -15,11 +13,16 @@ LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae1
15SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \ 13SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \
16 file://autotools.patch" 14 file://autotools.patch"
17 15
18SRC_URI[md5sum] = "57bfec98a814d12e0f7ab379aaeccd87" 16SRC_URI[md5sum] = "805526ea5d6c40e1f2c94cee86141230"
19SRC_URI[sha256sum] = "a974d0f3e837796f67d04df88c783aebcf4ac3c5f9ac31e2b65c10e8cb4b1dca" 17SRC_URI[sha256sum] = "553338693707fe6ddfc430b9edc4cd2677390e200c9e38de82ede3394e733841"
20 18
21inherit autotools 19inherit autotools
22 20
23EXTRA_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'" 21EXTRA_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'"
24 22
23do_compile_prepend () {
24 #Automake dir is not correctly detected in cross compilation case
25 export AUTOMAKE_DIR=${STAGING_DATADIR_NATIVE}/$(ls ${STAGING_DATADIR_NATIVE} | grep automake)
26}
27
25FILES_${PN} += "${datadir}/ld10k1" 28FILES_${PN} += "${datadir}/ld10k1"