From fcf4ca384c94e61ef458f14ab1192f6de2b7ee73 Mon Sep 17 00:00:00 2001 From: "eu@felipetonello.com" Date: Thu, 4 May 2017 17:28:07 +0100 Subject: 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 Signed-off-by: Martin Jansa --- meta-multimedia/classes/juce.bbclass | 3 +-- meta-multimedia/recipes-multimedia/juce/projucer.inc | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'meta-multimedia') diff --git a/meta-multimedia/classes/juce.bbclass b/meta-multimedia/classes/juce.bbclass index 715282fd15..3927235ef1 100644 --- a/meta-multimedia/classes/juce.bbclass +++ b/meta-multimedia/classes/juce.bbclass @@ -1,8 +1,8 @@ inherit pkgconfig +# List of JUCE modules that requires external dependencies 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)} \ @@ -11,7 +11,6 @@ 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}," diff --git a/meta-multimedia/recipes-multimedia/juce/projucer.inc b/meta-multimedia/recipes-multimedia/juce/projucer.inc index 6f696e26f9..63ed9e90e0 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 JUCE supported platforms, including Linux and Embedded Linux." SECTION = "utils" HOMEPAGE = "http://juce.com/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://README.txt;md5=9ab765ccda8890efc753f287911a1958" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://README.md;md5=65c50b4ff3522b99436da100536ccd1c" inherit pkgconfig DEPENDS = "libx11 libxext libxinerama libxrandr libxcursor freetype alsa-lib curl" -SRCREV = "a8a7fa28e2e9cb19db6a27fcccb567a8ccfe6109" -BRANCH = "develop" -SRC_URI = "git://github.com/julianstorer/JUCE.git;protocol=https;branch=${BRANCH}" +SRCREV = "4f41f28b47d01b939559123d145b4e5860528bb7" +BRANCH = "master" +SRC_URI = "git://github.com/WeAreROLI/JUCE.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" -PV = "4.2.3+git${SRCPV}" +PV = "5.0.1" JUCE_PROJUCER_BUILD_PATH = "${B}/extras/Projucer/Builds" JUCE_PROJUCER_MAKEFILE_PATH = "${JUCE_PROJUCER_BUILD_PATH}/LinuxMakefile" -- cgit 1.2.3-korg