Skip to contentSkip to conversation

projucer: Upgrade to 5.4.5

PATCH New Khem Raj 1 participant 2 messages Dec 3, 2019

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 projucer: Upgrade to 5.4.5

License-Update: https://github.com/WeAreROLI/JUCE/commit/d9dee4d87332bf9e3d12da2e032608698829dc14#diff-37854d19817c792316d481f5beb93cc7

Enbable GPL build and disable webkit component

Merge native and nativesdk component into single recipe using bbclassextend

Disable build on musl

---
 .../juce/nativesdk-projucer_git.bb            |  3 -
 .../juce/projucer-native_git.bb               |  3 -
 .../recipes-multimedia/juce/projucer.inc      | 15 +++-
 .../0001-Disable-webkit-component.patch       | 83 +++++++++++++++++++
 .../recipes-multimedia/juce/projucer_git.bb   |  2 +
 5 files changed, 96 insertions(+), 10 deletions(-)
 delete mode 100644 meta-multimedia/recipes-multimedia/juce/nativesdk-projucer_git.bb
 delete mode 100644 meta-multimedia/recipes-multimedia/juce/projucer-native_git.bb
 create mode 100644 meta-multimedia/recipes-multimedia/juce/projucer/0001-Disable-webkit-component.patch
 create mode 100644 meta-multimedia/recipes-multimedia/juce/projucer_git.bb
meta-multimedia/recipes-multimedia/juce/nativesdk-projucer_git.bb deleted +0 -3
deleted file mode 100644
index 7836bae691..0000000000
@@ -1,3 +0,0 @@
-inherit nativesdk
-include projucer.inc
-BBCLASSEXTEND = "nativesdk"
meta-multimedia/recipes-multimedia/juce/projucer-native_git.bb deleted +0 -3
deleted file mode 100644
index fb54fb9e98..0000000000
@@ -1,3 +0,0 @@
-inherit native
-include projucer.inc
-BBCLASSEXTEND = "native"
meta-multimedia/recipes-multimedia/juce/projucer.inc +11 -4
index 63ed9e90e0..8199e9668f 100644
@@ -4,23 +4,28 @@ JUCE supported platforms, including Linux and Embedded Linux."
 SECTION = "utils"
 HOMEPAGE = "http://juce.com/"
 LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://README.md;md5=65c50b4ff3522b99436da100536ccd1c"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a20f91622a47d4e4af9340d5d3f1a2d8"
 
 inherit pkgconfig
 
 DEPENDS = "libx11 libxext libxinerama libxrandr libxcursor freetype alsa-lib curl"
+DEPENDS_append_libc-musl = " libexecinfo"
 
-SRCREV = "4f41f28b47d01b939559123d145b4e5860528bb7"
+SRCREV = "724ae27c71ef809b836df06713cf9e50bc14162b"
 BRANCH = "master"
-SRC_URI = "git://github.com/WeAreROLI/JUCE.git;protocol=https;branch=${BRANCH}"
+SRC_URI = "git://github.com/WeAreROLI/JUCE.git;protocol=https;branch=${BRANCH} \
+           file://0001-Disable-webkit-component.patch \
+"
 
 S = "${WORKDIR}/git"
-PV = "5.0.1"
+PV = "5.4.5"
 
 JUCE_PROJUCER_BUILD_PATH = "${B}/extras/Projucer/Builds"
 JUCE_PROJUCER_MAKEFILE_PATH = "${JUCE_PROJUCER_BUILD_PATH}/LinuxMakefile"
 JUCE_PROJUCER = "${JUCE_PROJUCER_MAKEFILE_PATH}/build/Projucer"
 
+EXTRA_OEMAKE = "V=1 JUCE_ARCH_LABEL=${TARGET_ARCH} TARGET_ARCH='-g'"
+
 do_configure() {
   cd ${JUCE_PROJUCER_MAKEFILE_PATH}
   CONFIG=Release oe_runmake clean
@@ -35,3 +40,5 @@ do_install() {
   install -d ${D}${bindir}
   install -m 0755 ${JUCE_PROJUCER} ${D}${bindir}
 }
+# error: '_NL_IDENTIFICATION_LANGUAGE' was not declared in this scope
+COMPATIBLE_HOST_libc-musl = "null"
meta-multimedia/recipes-multimedia/juce/projucer/0001-Disable-webkit-component.patch new file +83 -0

83 lines not on this page · raw message

meta-multimedia/recipes-multimedia/juce/projucer_git.bb new file +2 -0
new file mode 100644
index 0000000000..f408f6f1bc
@@ -0,0 +1,2 @@
+include projucer.inc
+BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.24.0
author
#1 lore raw

PATCH 2/2 emlog: Use RRECOMMEND instead of RDEPEND

This helps with re-using sstate tasks when machines are similar

Fixes
Hash for dependent task emlog/kernel-module-emlog_git.bb:do_packagedata changed from a70b22026e418998e61d08b0b0ab64a3e26fd0da41a1d12f4356554b6b043794 to 7817106c7626c3c4b238f03771fc32dc8f3dc5e7496ff98cf8a812039939f915

---
 meta-oe/recipes-core/emlog/emlog_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-core/emlog/emlog_git.bb +1 -1
index 63d12477bf..22308d7e85 100644
@@ -19,4 +19,4 @@ do_install() {
    install -Dm 0755 ${S}/mkemlog ${D}${bindir}/mkemlog
 }
 
-RDEPENDS_${PN} += "kernel-module-emlog"
+RRECOMMENDS_${PN} += "kernel-module-emlog"
Signature · 1 line
2.24.0