summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorRogerio Nunes <ronunes@gmail.com>2013-04-02 20:34:43 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-03 17:01:13 +0100
commit70a599a5f188c3d077d23740e762075dec57ffa3 (patch)
tree0bd8dc96e3e4a88a0660f2c521b6d67b2a4c36a9 /meta/recipes-multimedia
parent2d4f1fdadc24e2f8f707f964f3fab992427081ef (diff)
downloadpoky-70a599a5f188c3d077d23740e762075dec57ffa3.tar.gz
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>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch21
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb8
2 files changed, 27 insertions, 2 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
new file mode 100644
index 0000000000..51f934d8f6
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch
@@ -0,0 +1,21 @@
1Remove some sub-components which need gtk+.
2
3Signed-off-by: Rogerio Nunes <ronunes@gmail.com>
4
5Upstream-Status: Inappropriate [configuration]
6
7diff --git a/Makefile b/Makefile
8--- a/Makefile
9+++ b/Makefile
10@@ -1,8 +1,8 @@
11 VERSION = 1.0.26.1
12 TOP = .
13-SUBDIRS = ac3dec as10k1 envy24control \
14- mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \
15- us428control usx2yloader vxloader echomixer \
16+SUBDIRS = ac3dec as10k1 \
17+ mixartloader pcxhrloader sb16_csp seq sscape_ctl \
18+ us428control usx2yloader vxloader \
19 hwmixvolume hda-verb
20
21 all:
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb
index 2b46aaffdd..81ad55acd3 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb
@@ -5,14 +5,15 @@ SECTION = "console/utils"
5LICENSE = "GPLv2 & LGPLv2+" 5LICENSE = "GPLv2 & LGPLv2+"
6DEPENDS = "alsa-lib ncurses" 6DEPENDS = "alsa-lib ncurses"
7 7
8PR = "r0" 8PR = "r1"
9 9
10LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 10LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
11 file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" 11 file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34"
12 12
13SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \ 13SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \
14 file://mips_has_no_io_h.patch \ 14 file://mips_has_no_io_h.patch \
15 file://autotools.patch" 15 file://autotools.patch \
16 ${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)}"
16 17
17SRC_URI[md5sum] = "805526ea5d6c40e1f2c94cee86141230" 18SRC_URI[md5sum] = "805526ea5d6c40e1f2c94cee86141230"
18SRC_URI[sha256sum] = "553338693707fe6ddfc430b9edc4cd2677390e200c9e38de82ede3394e733841" 19SRC_URI[sha256sum] = "553338693707fe6ddfc430b9edc4cd2677390e200c9e38de82ede3394e733841"
@@ -21,6 +22,9 @@ inherit autotools
21 22
22EXTRA_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'" 23EXTRA_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'"
23 24
25PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
26PACKAGECONFIG[gtk+] = ",,gtk+,"
27
24do_compile_prepend () { 28do_compile_prepend () {
25 #Automake dir is not correctly detected in cross compilation case 29 #Automake dir is not correctly detected in cross compilation case
26 export AUTOMAKE_DIR=${STAGING_DATADIR_NATIVE}/$(ls ${STAGING_DATADIR_NATIVE} | grep automake) 30 export AUTOMAKE_DIR=${STAGING_DATADIR_NATIVE}/$(ls ${STAGING_DATADIR_NATIVE} | grep automake)