From 6c699b513c8defe6d4b01ec760185865a29d4582 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 12 Mar 2014 15:47:00 +0800 Subject: alsa-tools: update to version 1.0.27 Update alsa-tools to latest version 1.0.27: * remove PR * update autotools.patch * add build dependency gkt+3 that hdajackretask requires it. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- .../alsa/alsa-tools/autotools.patch | 15 ++++----- .../recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb | 37 ---------------------- meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb | 35 ++++++++++++++++++++ 3 files changed, 41 insertions(+), 46 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch index 294e970cd1..5aec84c60d 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch +++ b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch @@ -19,17 +19,14 @@ 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,9 @@ - VERSION = 1.0.26.1 +@@ -1,8 +1,8 @@ + VERSION = 1.0.27 TOP = . --SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \ -- mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ +-SUBDIRS = as10k1 envy24control hdsploader hdspconf hdspmixer \ ++SUBDIRS = as10k1 envy24control \ + mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ - us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \ -- hwmixvolume hdajackretask hda-verb -+SUBDIRS = ac3dec as10k1 envy24control \ -+ mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ + us428control usx2yloader vxloader echomixer \ -+ hwmixvolume hda-verb + hwmixvolume hdajackretask hda-verb all: - @for i in $(SUBDIRS); do \ diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb deleted file mode 100644 index b1542332de..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Advanced tools for certain ALSA sound card drivers" -HOMEPAGE = "http://www.alsa-project.org" -BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php" -SECTION = "console/utils" -LICENSE = "GPLv2 & LGPLv2+" -DEPENDS = "alsa-lib ncurses" - -PR = "r1" - -LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \ - file://mips_has_no_io_h.patch \ - file://autotools.patch \ - ${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)}" - -SRC_URI[md5sum] = "805526ea5d6c40e1f2c94cee86141230" -SRC_URI[sha256sum] = "553338693707fe6ddfc430b9edc4cd2677390e200c9e38de82ede3394e733841" - -inherit autotools-brokensep - -EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}'" - -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}" -PACKAGECONFIG[gtk+] = ",,gtk+," - -# configure.ac/.in doesn't exist so force copy -AUTOTOOLS_COPYACLOCAL = "1" - -do_compile_prepend () { - #Automake dir is not correctly detected in cross compilation case - export AUTOMAKE_DIR="$(automake --print-libdir)" - export ACLOCAL_FLAGS="--system-acdir=${ACLOCALDIR}/" -} - -FILES_${PN} += "${datadir}/ld10k1" diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb new file mode 100644 index 0000000000..b3c02b3888 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb @@ -0,0 +1,35 @@ +SUMMARY = "Advanced tools for certain ALSA sound card drivers" +HOMEPAGE = "http://www.alsa-project.org" +BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php" +SECTION = "console/utils" +LICENSE = "GPLv2 & LGPLv2+" +DEPENDS = "alsa-lib ncurses gtk+3" + +LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \ + file://mips_has_no_io_h.patch \ + file://autotools.patch \ + ${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)}" + +SRC_URI[md5sum] = "1ea381d00a6069a98613aa7effa4cb51" +SRC_URI[sha256sum] = "6562611b5a6560712f109e09740a9d4fa47296b07ed9590cb44139c5f154ada2" + +inherit autotools-brokensep + +EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}'" + +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}" +PACKAGECONFIG[gtk+] = ",,gtk+," + +# configure.ac/.in doesn't exist so force copy +AUTOTOOLS_COPYACLOCAL = "1" + +do_compile_prepend () { + #Automake dir is not correctly detected in cross compilation case + export AUTOMAKE_DIR="$(automake --print-libdir)" + export ACLOCAL_FLAGS="--system-acdir=${ACLOCALDIR}/" +} + +FILES_${PN} += "${datadir}/ld10k1" -- cgit 1.2.3-korg