summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-04-01 16:42:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-04 11:53:50 +0100
commitcd13b76fb56f0c1b28cdc25caefbcb04bc6b7bda (patch)
treec25d422ecd3ced12a84f4efd43b55c8868ca111f /meta
parenta5775abb1951ec6cdc7afacd1ae87189e398cff8 (diff)
downloadpoky-cd13b76fb56f0c1b28cdc25caefbcb04bc6b7bda.tar.gz
alsa-tools: Fix build without x11
The patch had some new tool (hdajackretask) missing which were triggering build failures in O.S. Systems' builder as: ,----[ Build error in a clean tmp, without x11 ] | checking for GTK3... no | configure: error: Package requirements (gtk+-3.0) were not met: | | No package 'gtk+-3.0' found | | Consider adjusting the PKG_CONFIG_PATH environment variable if you | installed software in a non-standard prefix. | | Alternatively, you may set the environment variables GTK3_CFLAGS | and GTK3_LIBS to avoid the need to call pkg-config. | See the pkg-config man page for more details. | make: *** [all] Error 1 `---- (From OE-Core rev: be37edbdfe1e1ad833155154cabdff16f1d4267f) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch12
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb4
2 files changed, 10 insertions, 6 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch b/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch
index c6cb5b16ac..26657266a8 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch
+++ b/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch
@@ -1,21 +1,25 @@
1Remove some sub-components which need gtk+. 1Remove some sub-components which need gtk+.
2 2
3Signed-off-by: Rogerio Nunes <ronunes@gmail.com>
4
5Upstream-Status: Inappropriate [configuration] 3Upstream-Status: Inappropriate [configuration]
6 4
5Signed-off-by: Rogerio Nunes <ronunes@gmail.com>
6Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
7
7diff --git a/Makefile b/Makefile 8diff --git a/Makefile b/Makefile
9index 2457a1c..72346d9 100644
8--- a/Makefile 10--- a/Makefile
9+++ b/Makefile 11+++ b/Makefile
10@@ -1,8 +1,8 @@ 12@@ -1,9 +1,9 @@
11 VERSION = 1.0.27 13 VERSION = 1.0.27
12 TOP = . 14 TOP = .
13-SUBDIRS = as10k1 envy24control \ 15-SUBDIRS = as10k1 envy24control \
14- mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ 16- mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \
15- us428control usx2yloader vxloader echomixer \ 17- us428control usx2yloader vxloader echomixer \
18- hwmixvolume hdajackretask hda-verb
16+SUBDIRS = as10k1 \ 19+SUBDIRS = as10k1 \
17+ mixartloader pcxhrloader sb16_csp seq sscape_ctl \ 20+ mixartloader pcxhrloader sb16_csp seq sscape_ctl \
18+ us428control usx2yloader vxloader \ 21+ us428control usx2yloader vxloader \
19 hwmixvolume hdajackretask hda-verb 22+ hwmixvolume hda-verb
20 23
21 all: 24 all:
25 @for i in $(SUBDIRS); do \
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb
index 492f8a424f..4f64a387ec 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.alsa-project.org"
3BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php" 3BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php"
4SECTION = "console/utils" 4SECTION = "console/utils"
5LICENSE = "GPLv2 & LGPLv2+" 5LICENSE = "GPLv2 & LGPLv2+"
6DEPENDS = "alsa-lib ncurses ${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+3', '', d)}" 6DEPENDS = "alsa-lib ncurses"
7 7
8LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 8LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
9 file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" 9 file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34"
@@ -21,7 +21,7 @@ inherit autotools-brokensep
21EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}'" 21EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}'"
22 22
23PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}" 23PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
24PACKAGECONFIG[gtk+] = ",,gtk+," 24PACKAGECONFIG[gtk+] = ",,gtk+ gtk+3,"
25 25
26# configure.ac/.in doesn't exist so force copy 26# configure.ac/.in doesn't exist so force copy
27AUTOTOOLS_COPYACLOCAL = "1" 27AUTOTOOLS_COPYACLOCAL = "1"