diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-03-20 21:41:42 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-03-24 09:45:25 -0700 |
commit | deb11a823c32d4090b3724a589641810e06df6bc (patch) | |
tree | a5d422fb42a47e22aa8524977fba777c1b371f46 | |
parent | 4561782047fe461d200cacbbc695a9506e7cd8d4 (diff) | |
download | meta-openembedded-deb11a823c32d4090b3724a589641810e06df6bc.tar.gz |
projucer: Upgrade to 6.1.6
Consider the commercial aspects of JUCE 6 End User License Agreement [1]
[1] https://juce.com/juce-6-licence
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-multimedia/recipes-multimedia/juce/projucer.inc | 8 | ||||
-rw-r--r-- | meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/meta-multimedia/recipes-multimedia/juce/projucer.inc b/meta-multimedia/recipes-multimedia/juce/projucer.inc index 37680f498e..feb3564633 100644 --- a/meta-multimedia/recipes-multimedia/juce/projucer.inc +++ b/meta-multimedia/recipes-multimedia/juce/projucer.inc | |||
@@ -4,7 +4,9 @@ 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 = "GPL-3.0-only" | 6 | LICENSE = "GPL-3.0-only" |
7 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=12e9c2db7897c0349a4cc1c6d2a8c5d5" | 7 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eff9da77cdb81a803f8cbca6c16801d8" |
8 | |||
9 | LICENSE_FLAGS = "commercial" | ||
8 | 10 | ||
9 | inherit pkgconfig features_check | 11 | inherit pkgconfig features_check |
10 | 12 | ||
@@ -13,13 +15,13 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
13 | DEPENDS = "libx11 libxext libxinerama libxrandr libxcursor freetype alsa-lib curl bzip2 libpng harfbuzz glib-2.0 libpcre" | 15 | DEPENDS = "libx11 libxext libxinerama libxrandr libxcursor freetype alsa-lib curl bzip2 libpng harfbuzz glib-2.0 libpcre" |
14 | DEPENDS:append:libc-musl = " libexecinfo" | 16 | DEPENDS:append:libc-musl = " libexecinfo" |
15 | 17 | ||
16 | SRCREV = "90e8da0cfb54ac593cdbed74c3d0c9b09bad3a9f" | 18 | SRCREV = "2f980209cc4091a4490bb1bafc5d530f16834e58" |
17 | BRANCH = "master" | 19 | BRANCH = "master" |
18 | SRC_URI = "git://github.com/WeAreROLI/JUCE.git;protocol=https;branch=${BRANCH} \ | 20 | SRC_URI = "git://github.com/WeAreROLI/JUCE.git;protocol=https;branch=${BRANCH} \ |
19 | " | 21 | " |
20 | 22 | ||
21 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
22 | PV = "6.0.8" | 24 | PV = "6.1.6" |
23 | 25 | ||
24 | JUCE_PROJUCER_BUILD_PATH = "${B}/extras/Projucer/Builds" | 26 | JUCE_PROJUCER_BUILD_PATH = "${B}/extras/Projucer/Builds" |
25 | JUCE_PROJUCER_MAKEFILE_PATH = "${JUCE_PROJUCER_BUILD_PATH}/LinuxMakefile" | 27 | JUCE_PROJUCER_MAKEFILE_PATH = "${JUCE_PROJUCER_BUILD_PATH}/LinuxMakefile" |
diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index 62ca273160..2b7a43b93d 100644 --- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb | |||
@@ -55,7 +55,7 @@ RDEPENDS:packagegroup-meta-multimedia = "\ | |||
55 | tearsofsteel-1080p \ | 55 | tearsofsteel-1080p \ |
56 | schroedinger \ | 56 | schroedinger \ |
57 | pipewire \ | 57 | pipewire \ |
58 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d)} \ | 58 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "projucer", "", d)} \ |
59 | libcamera \ | 59 | libcamera \ |
60 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libde265 openh264", "", d)} \ | 60 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libde265 openh264", "", d)} \ |
61 | vorbis-tools \ | 61 | vorbis-tools \ |