mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
alsa-tools: fix build when x11 and gtk+ not available
Current verion of gtk+ (2.15.24) does not accept pure framebuffer as backend and some alsa-tools sub-modules depend on gtk+. This patch removes those sub-modules from the build only when x11 is not set in DISTRO_FEATURES. (From OE-Core rev: e611bba7bba02ba167b2ae3671b00cc99e4fb29c) Signed-off-by: Rogerio Nunes <ronunes@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
2d4f1fdadc
commit
70a599a5f1
@@ -0,0 +1,21 @@
|
||||
Remove some sub-components which need gtk+.
|
||||
|
||||
Signed-off-by: Rogerio Nunes <ronunes@gmail.com>
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,8 +1,8 @@
|
||||
VERSION = 1.0.26.1
|
||||
TOP = .
|
||||
-SUBDIRS = ac3dec as10k1 envy24control \
|
||||
- mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \
|
||||
- us428control usx2yloader vxloader echomixer \
|
||||
+SUBDIRS = ac3dec as10k1 \
|
||||
+ mixartloader pcxhrloader sb16_csp seq sscape_ctl \
|
||||
+ us428control usx2yloader vxloader \
|
||||
hwmixvolume hda-verb
|
||||
|
||||
all:
|
||||
@@ -5,14 +5,15 @@ SECTION = "console/utils"
|
||||
LICENSE = "GPLv2 & LGPLv2+"
|
||||
DEPENDS = "alsa-lib ncurses"
|
||||
|
||||
PR = "r0"
|
||||
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"
|
||||
file://autotools.patch \
|
||||
${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)}"
|
||||
|
||||
SRC_URI[md5sum] = "805526ea5d6c40e1f2c94cee86141230"
|
||||
SRC_URI[sha256sum] = "553338693707fe6ddfc430b9edc4cd2677390e200c9e38de82ede3394e733841"
|
||||
@@ -21,6 +22,9 @@ inherit autotools
|
||||
|
||||
EXTRA_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'"
|
||||
|
||||
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
|
||||
PACKAGECONFIG[gtk+] = ",,gtk+,"
|
||||
|
||||
do_compile_prepend () {
|
||||
#Automake dir is not correctly detected in cross compilation case
|
||||
export AUTOMAKE_DIR=${STAGING_DATADIR_NATIVE}/$(ls ${STAGING_DATADIR_NATIVE} | grep automake)
|
||||
|
||||
Reference in New Issue
Block a user