diff options
| -rw-r--r-- | meta-multimedia/classes/juce.bbclass | 3 | ||||
| -rw-r--r-- | meta-multimedia/recipes-multimedia/juce/projucer.inc | 12 |
2 files changed, 7 insertions, 8 deletions
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 @@ | |||
| 1 | inherit pkgconfig | 1 | inherit pkgconfig |
| 2 | 2 | ||
| 3 | # List of JUCE modules that requires external dependencies | ||
| 3 | JUCE_MODULES ??= " \ | 4 | JUCE_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 | ||
| 12 | PACKAGECONFIG_prepend= "${JUCE_MODULES} " | 12 | PACKAGECONFIG_prepend= "${JUCE_MODULES} " |
| 13 | PACKAGECONFIG[juce_core] = ",,curl," | 13 | PACKAGECONFIG[juce_core] = ",,curl," |
| 14 | PACKAGECONFIG[juce_events] = ",,libx11," | ||
| 15 | PACKAGECONFIG[juce_audio_devices] = ",,alsa-lib," | 14 | PACKAGECONFIG[juce_audio_devices] = ",,alsa-lib," |
| 16 | PACKAGECONFIG[juce_graphics] = ",,${JUCE_X11_DEPS} freetype," | 15 | PACKAGECONFIG[juce_graphics] = ",,${JUCE_X11_DEPS} freetype," |
| 17 | PACKAGECONFIG[juce_gui_basics] = ",,${JUCE_X11_DEPS}," | 16 | 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 | |||
| 3 | JUCE supported platforms, including Linux and Embedded Linux." | 3 | JUCE supported platforms, including Linux and Embedded Linux." |
| 4 | SECTION = "utils" | 4 | SECTION = "utils" |
| 5 | HOMEPAGE = "http://juce.com/" | 5 | HOMEPAGE = "http://juce.com/" |
| 6 | LICENSE = "GPLv2" | 6 | LICENSE = "GPLv3" |
| 7 | LIC_FILES_CHKSUM = "file://README.txt;md5=9ab765ccda8890efc753f287911a1958" | 7 | LIC_FILES_CHKSUM = "file://README.md;md5=65c50b4ff3522b99436da100536ccd1c" |
| 8 | 8 | ||
| 9 | inherit pkgconfig | 9 | inherit pkgconfig |
| 10 | 10 | ||
| 11 | DEPENDS = "libx11 libxext libxinerama libxrandr libxcursor freetype alsa-lib curl" | 11 | DEPENDS = "libx11 libxext libxinerama libxrandr libxcursor freetype alsa-lib curl" |
| 12 | 12 | ||
| 13 | SRCREV = "a8a7fa28e2e9cb19db6a27fcccb567a8ccfe6109" | 13 | SRCREV = "4f41f28b47d01b939559123d145b4e5860528bb7" |
| 14 | BRANCH = "develop" | 14 | BRANCH = "master" |
| 15 | SRC_URI = "git://github.com/julianstorer/JUCE.git;protocol=https;branch=${BRANCH}" | 15 | SRC_URI = "git://github.com/WeAreROLI/JUCE.git;protocol=https;branch=${BRANCH}" |
| 16 | 16 | ||
| 17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
| 18 | PV = "4.2.3+git${SRCPV}" | 18 | PV = "5.0.1" |
| 19 | 19 | ||
| 20 | JUCE_PROJUCER_BUILD_PATH = "${B}/extras/Projucer/Builds" | 20 | JUCE_PROJUCER_BUILD_PATH = "${B}/extras/Projucer/Builds" |
| 21 | JUCE_PROJUCER_MAKEFILE_PATH = "${JUCE_PROJUCER_BUILD_PATH}/LinuxMakefile" | 21 | JUCE_PROJUCER_MAKEFILE_PATH = "${JUCE_PROJUCER_BUILD_PATH}/LinuxMakefile" |
