aboutsummaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authoreu@felipetonello.com <eu@felipetonello.com>2016-07-20 15:24:00 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-07-29 11:00:59 +0200
commit639864337308268996c648d1fc607f54554f59e6 (patch)
tree7792cf23e3b6b2e6adb41236e9792ced111616c4 /meta-multimedia
parent3bbc28d7c76cf0a8aab18096420d0b52209103c7 (diff)
downloadmeta-openembedded-contrib-639864337308268996c648d1fc607f54554f59e6.tar.gz
meta-openembedded-contrib-639864337308268996c648d1fc607f54554f59e6.tar.bz2
meta-openembedded-contrib-639864337308268996c648d1fc607f54554f59e6.zip
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@felipetonello.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r--meta-multimedia/classes/juce.bbclass23
-rw-r--r--meta-multimedia/recipes-multimedia/juce/nativesdk-projucer_git.bb1
-rw-r--r--meta-multimedia/recipes-multimedia/juce/projucer-native_git.bb1
3 files changed, 19 insertions, 6 deletions
diff --git a/meta-multimedia/classes/juce.bbclass b/meta-multimedia/classes/juce.bbclass
index ac97ca348c..715282fd15 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 93b23b1b5a..7836bae691 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 b919a7dcb3..fb54fb9e98 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"