[oe-commits] [meta-openembedded] 23/30: juce: Improved juce class and recipes

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 1346637f186f1423c66cd3b751db0baa7b3c1b12
Author: eu at felipetonello.com <eu at felipetonello.com>
AuthorDate: Wed Jul 20 15:24:00 2016 +0100

    juce: Improved juce class and recipes
    
    This allows recipes that inherits juce class to have more modular
    dependencies and change it if necessary.
    
    Signed-off-by: Felipe F. Tonello <eu at felipetonello.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-multimedia/classes/juce.bbclass               | 23 ++++++++++++++++------
 .../juce/nativesdk-projucer_git.bb                 |  1 +
 .../recipes-multimedia/juce/projucer-native_git.bb |  1 +
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/meta-multimedia/classes/juce.bbclass b/meta-multimedia/classes/juce.bbclass
index ac97ca3..715282f 100644
--- a/meta-multimedia/classes/juce.bbclass
+++ b/meta-multimedia/classes/juce.bbclass
@@ -1,12 +1,23 @@
 inherit pkgconfig
 
-JUCE_X11_DEPS = "libx11 libxext libxinerama libxinerama libxrandr libxcursor freetype"
-JUCE_DEPS = " \
-  ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${JUCE_X11_DEPS}', '', d)} \
-  alsa-lib \
-  curl \
+JUCE_MODULES ??= " \
+  juce_core \
+  juce_events \
+  ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'juce_audio_devices', '', d)} \
+  ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'juce_graphics juce_gui_basics', '', d)} \
+  ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'juce_opengl', '', d)} \
 "
-DEPENDS_prepend = "projucer-native ${JUCE_DEPS} "
+JUCE_X11_DEPS = "libx11 libxext libxinerama libxrandr libxcursor"
+
+PACKAGECONFIG_prepend= "${JUCE_MODULES} "
+PACKAGECONFIG[juce_core] = ",,curl,"
+PACKAGECONFIG[juce_events] = ",,libx11,"
+PACKAGECONFIG[juce_audio_devices] = ",,alsa-lib,"
+PACKAGECONFIG[juce_graphics] = ",,${JUCE_X11_DEPS} freetype,"
+PACKAGECONFIG[juce_gui_basics] = ",,${JUCE_X11_DEPS},"
+PACKAGECONFIG[juce_opengl] = ",,virtual/libgl,"
+
+DEPENDS_prepend = "projucer-native "
 
 export OE_JUCE_PROJUCER = "${STAGING_BINDIR_NATIVE}/Projucer"
 
diff --git a/meta-multimedia/recipes-multimedia/juce/nativesdk-projucer_git.bb b/meta-multimedia/recipes-multimedia/juce/nativesdk-projucer_git.bb
index 93b23b1..7836bae 100644
--- a/meta-multimedia/recipes-multimedia/juce/nativesdk-projucer_git.bb
+++ b/meta-multimedia/recipes-multimedia/juce/nativesdk-projucer_git.bb
@@ -1,2 +1,3 @@
 inherit nativesdk
 include projucer.inc
+BBCLASSEXTEND = "nativesdk"
diff --git a/meta-multimedia/recipes-multimedia/juce/projucer-native_git.bb b/meta-multimedia/recipes-multimedia/juce/projucer-native_git.bb
index b919a7d..fb54fb9 100644
--- a/meta-multimedia/recipes-multimedia/juce/projucer-native_git.bb
+++ b/meta-multimedia/recipes-multimedia/juce/projucer-native_git.bb
@@ -1,2 +1,3 @@
 inherit native
 include projucer.inc
+BBCLASSEXTEND = "native"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.