[v3] alsa-tools: fix build when x11 and gtk+ not available

Submitted by Simone Agresta on March 18, 2014, 3:27 p.m.

Details

Message ID 1395156450-7172-1-git-send-email-simone.agresta@bticino.it
State New
Headers show

Commit Message

Simone Agresta March 18, 2014, 3:27 p.m. 
Updated patch to work with alsa-tools version 1.0.27

Signed-off-by: Simone Agresta <simone.agresta@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(-)

Patch hide | download patch | download mbox 

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..81d12da 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"

Comments

Otavio Salvador March 20, 2014, 8:59 p.m. 
On Tue, Mar 18, 2014 at 12:27 PM, Simone Agresta
<simone.agresta@bticino.it> wrote:
>  Updated patch to work with alsa-tools version 1.0.27
>
> Signed-off-by: Simone Agresta <simone.agresta@bticino.it>

This still keeps the option floating so please add an enable/disable for it.