diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2015-05-19 09:08:12 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-20 21:40:13 +0100 |
| commit | 9174c8bfe1aba1b32417d52d923fe5fff996814e (patch) | |
| tree | 97619c7231500c39a52bb9646ea05809d2003b4d | |
| parent | dd06566f9bdc03da445226d250cbf220afbf0ba6 (diff) | |
| download | openembedded-core-contrib-9174c8bfe1aba1b32417d52d923fe5fff996814e.tar.gz | |
alsa-tools: upgrade to version 1.0.29
Upgrade alsa-tools from verion 1.0.28 to 1.0.29.
* update autotools.patch
* add file gitcompile which exists in git repo but missing in release
tar ball for sub-directory hdajacksensetest
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-tools/autotools.patch | 4 | ||||
| -rwxr-xr-x | meta/recipes-multimedia/alsa/alsa-tools/gitcompile_hdajacksensetest | 13 | ||||
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb (renamed from meta/recipes-multimedia/alsa/alsa-tools_1.0.28.bb) | 10 |
3 files changed, 22 insertions, 5 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch index 5aec84c60d..59391d6908 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch +++ b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch @@ -20,13 +20,13 @@ 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,8 +1,8 @@ - VERSION = 1.0.27 + VERSION = 1.0.29 TOP = . -SUBDIRS = as10k1 envy24control hdsploader hdspconf hdspmixer \ +SUBDIRS = as10k1 envy24control \ mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ - us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \ + us428control usx2yloader vxloader echomixer \ - hwmixvolume hdajackretask hda-verb + hwmixvolume hdajackretask hda-verb hdajacksensetest all: diff --git a/meta/recipes-multimedia/alsa/alsa-tools/gitcompile_hdajacksensetest b/meta/recipes-multimedia/alsa/alsa-tools/gitcompile_hdajacksensetest new file mode 100755 index 0000000000..58328bd3a5 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-tools/gitcompile_hdajacksensetest @@ -0,0 +1,13 @@ +#!/bin/bash + +aclocal $ACLOCAL_FLAGS || exit 1 +automake --foreign --add-missing || exit 1 +autoconf || exit 1 +export CFLAGS='-O2 -Wall -pipe -g' +echo "CFLAGS=$CFLAGS" +echo "./configure $@" +./configure $@ || exit 1 +unset CFLAGS +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.28.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb index d6842256dc..91330124de 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.28.bb +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb @@ -11,10 +11,12 @@ LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae1 SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/${BP}.tar.bz2 \ file://autotools.patch \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ - 'file://makefile_no_gtk.patch', d)}" + 'file://makefile_no_gtk.patch', d)} \ + file://gitcompile_hdajacksensetest \ + " -SRC_URI[md5sum] = "e6c929175d8ee729c06d49b51439bad6" -SRC_URI[sha256sum] = "76e59711c6d0f39cbddce83ce1ed8da00bad112fee021f94fa990d8685cc3761" +SRC_URI[md5sum] = "f339a3cd24f748c9d007bdff0e98775b" +SRC_URI[sha256sum] = "94abf0ab5a73f0710c70d4fb3dc1003af5bae2d2ed721d59d245b41ad0f2fbd1" inherit autotools-brokensep pkgconfig @@ -32,6 +34,8 @@ 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}/" + + cp ${WORKDIR}/gitcompile_hdajacksensetest ${S}/hdajacksensetest/gitcompile } FILES_${PN} += "${datadir}/ld10k1" |