[OE-core] [PATCH v2] alsa-tools: fix build when x11 and gtk+ not available

Simone Agresta simone.agresta at bticino.it
Tue Mar 18 15:18:33 UTC 2014


 Updated patch to work with alsa-tools version 1.0.27

Signed-off-by: Simone Agresta <simone.agresta at bticino.it>
---
 meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch |    9 +++++----
 meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb             |    2 +-
 2 files changed, 6 insertions(+), 5 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 51f934d..11c5ad5 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch
+++ b/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch
@@ -8,14 +8,15 @@ diff --git a/Makefile b/Makefile
 --- a/Makefile
 +++ b/Makefile
 @@ -1,8 +1,8 @@
- VERSION = 1.0.26.1
+ VERSION = 1.0.27
  TOP = .
--SUBDIRS = ac3dec as10k1 envy24control \
+-SUBDIRS = as10k1 envy24control \
 -   mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \
 -   us428control usx2yloader vxloader echomixer \
-+SUBDIRS = ac3dec as10k1 \
+-    hwmixvolume hdajackretask hda-verb
++SUBDIRS = as10k1 \
 +   mixartloader pcxhrloader sb16_csp seq sscape_ctl \
 +   us428control usx2yloader vxloader \
-    hwmixvolume hda-verb
++    hwmixvolume hda-verb
  
  all:
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 b3c02b3..492f8a4 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"
 BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php"
 SECTION = "console/utils"
 LICENSE = "GPLv2 & LGPLv2+"
-DEPENDS = "alsa-lib ncurses gtk+3"
+DEPENDS = "alsa-lib ncurses ${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+3', '', d)}"
 
 LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34"
-- 
1.7.10.4



Ce message, ainsi que tous les fichiers joints à ce message,
peuvent contenir des informations sensibles et/ ou confidentielles
ne devant pas être divulguées. Si vous n'êtes pas le destinataire
de ce message (ou que vous recevez ce message par erreur), nous
vous remercions de le notifier immédiatement à son expéditeur, et
de détruire ce message. Toute copie, divulgation, modification,
utilisation ou diffusion, non autorisée, directe ou indirecte, de
tout ou partie de ce message, est strictement interdite.

This e-mail, and any document attached hereby, may contain
confidential and/or privileged information. If you are not the
intended recipient (or have received this e-mail in error) please
notify the sender immediately and destroy this e-mail. Any
unauthorized, direct or indirect, copying, disclosure, distribution
or other use of the material or parts thereof is strictly
forbidden.



More information about the Openembedded-core mailing list