1. Fix the autoreconf error with gtk2 and alsa. 2. Add libtool sysroot path while configuration. 3. Remove one element in alsa-tools which depends on qt2.
[YOCTO #1038] Signed-off-by: Dongxiao Xu <[email protected]> --- .../alsa/alsa-tools-1.0.24.1/autotools.patch | 31 ++++++++++++++++++++ .../recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb | 16 ++++++++-- 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch diff --git a/meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch b/meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch new file mode 100644 index 0000000..27e887a --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch @@ -0,0 +1,31 @@ +Add aclocal path to the autoreconf command. +Remove qlo10k1 element which depends on qt2. + +Signed-off-by: Dongxiao Xu <[email protected]> + +Upstream-Status: Inappropriate [configuration] + +diff -ruN alsa-tools-1.0.24.1-orig//ld10k1/gitcompile alsa-tools-1.0.24.1/ld10k1/gitcompile +--- alsa-tools-1.0.24.1-orig//ld10k1/gitcompile 2011-07-06 11:27:40.227665002 +0800 ++++ alsa-tools-1.0.24.1/ld10k1/gitcompile 2011-07-08 09:49:11.177665001 +0800 +@@ -1,6 +1,6 @@ + #!/bin/bash + +-autoreconf -fi || exit 1 ++autoreconf -fi $ACLOCAL_FLAGS || exit 1 + export CFLAGS='-O2 -Wall -pipe -g' + echo "CFLAGS=$CFLAGS" + echo "./configure $@" +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-08 09:48:39.157665001 +0800 +@@ -2,8 +2,7 @@ + TOP = . + SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \ + mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ +- us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \ +- hwmixvolume ++ us428control usx2yloader vxloader echomixer ld10k1 hwmixvolume + + all: + @for i in $(SUBDIRS); do \ diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb index 5b3ea98..d370d3c 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb @@ -3,15 +3,25 @@ BROKEN = "1" DESCRIPTION = "Alsa Tools" SECTION = "console/utils" LICENSE = "GPLv2" -DEPENDS = "alsa-lib ncurses" +DEPENDS = "alsa-lib ncurses gtk+ fltk" -PR = "r1" +PR = "r2" LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2"; +SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \ + file://autotools.patch" SRC_URI[md5sum] = "08fe93a12006093e590d7ecc02b119dd" SRC_URI[sha256sum] = "17d43de93ab2db98886d89a53e45341daa46a4ef6edd405db87f4b5a5dc64a05" inherit autotools + +do_compile_prepend() { + subdirs="envy24control rmedigicontrol echomixer" + for i in $subdirs; do + mv ${S}/${i}/aclocal.m4 ${S}/${i}/acinclude.m4 + done +} + +EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST}' ACLOCAL_FLAGS='-I ${STAGING_DATADIR}/aclocal'" -- 1.7.1 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
