diff options
| -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 | |||
| 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,8 +1,8 @@ | 22 | @@ -1,8 +1,8 @@ |
| 23 | VERSION = 1.0.27 | 23 | VERSION = 1.0.29 |
| 24 | TOP = . | 24 | TOP = . |
| 25 | -SUBDIRS = as10k1 envy24control hdsploader hdspconf hdspmixer \ | 25 | -SUBDIRS = as10k1 envy24control hdsploader hdspconf hdspmixer \ |
| 26 | +SUBDIRS = as10k1 envy24control \ | 26 | +SUBDIRS = as10k1 envy24control \ |
| 27 | mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ | 27 | mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ |
| 28 | - us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \ | 28 | - us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \ |
| 29 | + us428control usx2yloader vxloader echomixer \ | 29 | + us428control usx2yloader vxloader echomixer \ |
| 30 | hwmixvolume hdajackretask hda-verb | 30 | hwmixvolume hdajackretask hda-verb hdajacksensetest |
| 31 | 31 | ||
| 32 | all: | 32 | 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 @@ | |||
| 1 | #!/bin/bash | ||
| 2 | |||
| 3 | aclocal $ACLOCAL_FLAGS || exit 1 | ||
| 4 | automake --foreign --add-missing || exit 1 | ||
| 5 | autoconf || exit 1 | ||
| 6 | export CFLAGS='-O2 -Wall -pipe -g' | ||
| 7 | echo "CFLAGS=$CFLAGS" | ||
| 8 | echo "./configure $@" | ||
| 9 | ./configure $@ || exit 1 | ||
| 10 | unset CFLAGS | ||
| 11 | if [ -z "$GITCOMPILE_NO_MAKE" ]; then | ||
| 12 | make || exit 1 | ||
| 13 | 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 | |||
| 11 | SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/${BP}.tar.bz2 \ | 11 | SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/${BP}.tar.bz2 \ |
| 12 | file://autotools.patch \ | 12 | file://autotools.patch \ |
| 13 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ | 13 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ |
| 14 | 'file://makefile_no_gtk.patch', d)}" | 14 | 'file://makefile_no_gtk.patch', d)} \ |
| 15 | file://gitcompile_hdajacksensetest \ | ||
| 16 | " | ||
| 15 | 17 | ||
| 16 | SRC_URI[md5sum] = "e6c929175d8ee729c06d49b51439bad6" | 18 | SRC_URI[md5sum] = "f339a3cd24f748c9d007bdff0e98775b" |
| 17 | SRC_URI[sha256sum] = "76e59711c6d0f39cbddce83ce1ed8da00bad112fee021f94fa990d8685cc3761" | 19 | SRC_URI[sha256sum] = "94abf0ab5a73f0710c70d4fb3dc1003af5bae2d2ed721d59d245b41ad0f2fbd1" |
| 18 | 20 | ||
| 19 | inherit autotools-brokensep pkgconfig | 21 | inherit autotools-brokensep pkgconfig |
| 20 | 22 | ||
| @@ -32,6 +34,8 @@ do_compile_prepend () { | |||
| 32 | #Automake dir is not correctly detected in cross compilation case | 34 | #Automake dir is not correctly detected in cross compilation case |
| 33 | export AUTOMAKE_DIR="$(automake --print-libdir)" | 35 | export AUTOMAKE_DIR="$(automake --print-libdir)" |
| 34 | export ACLOCAL_FLAGS="--system-acdir=${ACLOCALDIR}/" | 36 | export ACLOCAL_FLAGS="--system-acdir=${ACLOCALDIR}/" |
| 37 | |||
| 38 | cp ${WORKDIR}/gitcompile_hdajacksensetest ${S}/hdajacksensetest/gitcompile | ||
| 35 | } | 39 | } |
| 36 | 40 | ||
| 37 | FILES_${PN} += "${datadir}/ld10k1" | 41 | FILES_${PN} += "${datadir}/ld10k1" |
