summaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authoreu@felipetonello.com <eu@felipetonello.com>2017-05-04 17:28:07 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2017-05-23 15:49:34 +0200
commitfcf4ca384c94e61ef458f14ab1192f6de2b7ee73 (patch)
treed8916f8d8d15e9a1375ea1bb99e4b09f5cf81714 /meta-multimedia
parent573fd1849fa3cd74f54d55652fd0e2b28876c1b7 (diff)
downloadmeta-openembedded-fcf4ca384c94e61ef458f14ab1192f6de2b7ee73.tar.gz
juce: Updated JUCE to 5.0.1
JUCE 5 doesn't require juce_events to have x11 dependency anymore. Also there were many improvements on Projucer. 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.bbclass3
-rw-r--r--meta-multimedia/recipes-multimedia/juce/projucer.inc12
2 files changed, 7 insertions, 8 deletions
diff --git a/meta-multimedia/classes/juce.bbclass b/meta-multimedia/classes/juce.bbclass
index 715282fd1..3927235ef 100644
--- a/meta-multimedia/classes/juce.bbclass
+++ b/meta-multimedia/classes/juce.bbclass
@@ -1,8 +1,8 @@
1inherit pkgconfig 1inherit pkgconfig
2 2
3# List of JUCE modules that requires external dependencies
3JUCE_MODULES ??= " \ 4JUCE_MODULES ??= " \
4 juce_core \ 5 juce_core \
5 juce_events \
6 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'juce_audio_devices', '', d)} \ 6 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'juce_audio_devices', '', d)} \
7 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'juce_graphics juce_gui_basics', '', d)} \ 7 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'juce_graphics juce_gui_basics', '', d)} \
8 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'juce_opengl', '', d)} \ 8 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'juce_opengl', '', d)} \
@@ -11,7 +11,6 @@ JUCE_X11_DEPS = "libx11 libxext libxinerama libxrandr libxcursor"
11 11
12PACKAGECONFIG_prepend= "${JUCE_MODULES} " 12PACKAGECONFIG_prepend= "${JUCE_MODULES} "
13PACKAGECONFIG[juce_core] = ",,curl," 13PACKAGECONFIG[juce_core] = ",,curl,"
14PACKAGECONFIG[juce_events] = ",,libx11,"
15PACKAGECONFIG[juce_audio_devices] = ",,alsa-lib," 14PACKAGECONFIG[juce_audio_devices] = ",,alsa-lib,"
16PACKAGECONFIG[juce_graphics] = ",,${JUCE_X11_DEPS} freetype," 15PACKAGECONFIG[juce_graphics] = ",,${JUCE_X11_DEPS} freetype,"
17PACKAGECONFIG[juce_gui_basics] = ",,${JUCE_X11_DEPS}," 16PACKAGECONFIG[juce_gui_basics] = ",,${JUCE_X11_DEPS},"
diff --git a/meta-multimedia/recipes-multimedia/juce/projucer.inc b/meta-multimedia/recipes-multimedia/juce/projucer.inc
index 6f696e26f..63ed9e90e 100644
--- a/meta-multimedia/recipes-multimedia/juce/projucer.inc
+++ b/meta-multimedia/recipes-multimedia/juce/projucer.inc
@@ -3,19 +3,19 @@ DESCRIPTION = "Projucer is used to build and generate support files and build in
3JUCE supported platforms, including Linux and Embedded Linux." 3JUCE supported platforms, including Linux and Embedded Linux."
4SECTION = "utils" 4SECTION = "utils"
5HOMEPAGE = "http://juce.com/" 5HOMEPAGE = "http://juce.com/"
6LICENSE = "GPLv2" 6LICENSE = "GPLv3"
7LIC_FILES_CHKSUM = "file://README.txt;md5=9ab765ccda8890efc753f287911a1958" 7LIC_FILES_CHKSUM = "file://README.md;md5=65c50b4ff3522b99436da100536ccd1c"
8 8
9inherit pkgconfig 9inherit pkgconfig
10 10
11DEPENDS = "libx11 libxext libxinerama libxrandr libxcursor freetype alsa-lib curl" 11DEPENDS = "libx11 libxext libxinerama libxrandr libxcursor freetype alsa-lib curl"
12 12
13SRCREV = "a8a7fa28e2e9cb19db6a27fcccb567a8ccfe6109" 13SRCREV = "4f41f28b47d01b939559123d145b4e5860528bb7"
14BRANCH = "develop" 14BRANCH = "master"
15SRC_URI = "git://github.com/julianstorer/JUCE.git;protocol=https;branch=${BRANCH}" 15SRC_URI = "git://github.com/WeAreROLI/JUCE.git;protocol=https;branch=${BRANCH}"
16 16
17S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
18PV = "4.2.3+git${SRCPV}" 18PV = "5.0.1"
19 19
20JUCE_PROJUCER_BUILD_PATH = "${B}/extras/Projucer/Builds" 20JUCE_PROJUCER_BUILD_PATH = "${B}/extras/Projucer/Builds"
21JUCE_PROJUCER_MAKEFILE_PATH = "${JUCE_PROJUCER_BUILD_PATH}/LinuxMakefile" 21JUCE_PROJUCER_MAKEFILE_PATH = "${JUCE_PROJUCER_BUILD_PATH}/LinuxMakefile"