From deb11a823c32d4090b3724a589641810e06df6bc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 20 Mar 2022 21:41:42 -0700 Subject: 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 --- meta-multimedia/recipes-multimedia/juce/projucer.inc | 8 +++++--- .../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." SECTION = "utils" HOMEPAGE = "http://juce.com/" LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=12e9c2db7897c0349a4cc1c6d2a8c5d5" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eff9da77cdb81a803f8cbca6c16801d8" + +LICENSE_FLAGS = "commercial" inherit pkgconfig features_check @@ -13,13 +15,13 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS = "libx11 libxext libxinerama libxrandr libxcursor freetype alsa-lib curl bzip2 libpng harfbuzz glib-2.0 libpcre" DEPENDS:append:libc-musl = " libexecinfo" -SRCREV = "90e8da0cfb54ac593cdbed74c3d0c9b09bad3a9f" +SRCREV = "2f980209cc4091a4490bb1bafc5d530f16834e58" BRANCH = "master" SRC_URI = "git://github.com/WeAreROLI/JUCE.git;protocol=https;branch=${BRANCH} \ " S = "${WORKDIR}/git" -PV = "6.0.8" +PV = "6.1.6" JUCE_PROJUCER_BUILD_PATH = "${B}/extras/Projucer/Builds" 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 = "\ tearsofsteel-1080p \ schroedinger \ pipewire \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "projucer", "", d)} \ libcamera \ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libde265 openh264", "", d)} \ vorbis-tools \ -- cgit v1.2.3-54-g00ecf