From patchwork Tue Dec 3 17:31:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 180734 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp1804147ile; Tue, 3 Dec 2019 09:31:25 -0800 (PST) X-Google-Smtp-Source: APXvYqxQQfvowasPyIoH9Qf4HZAh2zXtEAl++GhkjWQKlRscuTkqwRfhiPMu0wrlpvQY45okMcNJ X-Received: by 2002:a17:902:409:: with SMTP id 9mr5964680ple.306.1575394285715; Tue, 03 Dec 2019 09:31:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575394285; cv=none; d=google.com; s=arc-20160816; b=dc7QNtFf7XWMnxkbXqOrjzZZF1ensZPSDt800TzXrIShJUZMrHNFtfcJLcuPkqLFux +DmvMtpHXElRQxxknrv7uXqZLeF+XWPGbjaekuyWPQX6yEYwm3BAOKsjGJLMKNqPyJxZ udbs0TZGXFH2tlHkp+Z7OzImm1O2aqJFj+MObwm7UR7av3ql7htEsDILJ7zIBBvPeiMO 9bvd/P0fPQx6TTgG0GylsaNOZeboZgP07uREuBSmBqJF49oNhWeg+O6s7hIvC6aUisEU dTtEylgiVYPOpqvwi0sq7YjkzVaR/quZ9E1sw7+t/psnTvfjnEE4tEPt9IbqnN0lNkCR OvvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=8fck6r6hgn2t41ze4dNGmMdFny6jxQwlnCi+S8IkKl8=; b=0TThZevC1av0McpDMf2deEZlYMpZniJ4X+7JkRZNXH+mEYFzA/rKTYkiev0pOqQSbu OSV17FfDPr+IuoeFiAFnf5JWKLrBSWwkMaEFyD8jsvQcxyu8bDpqzhYGeO0enqTF1Xkp CBxRITgluw+c3VoYbETrE1IluyQgdUqommcMffID9mNLuVb0XV0FPoBp9J7AZjxXef/a 8QvUYQBCeKdIKhkRfmTu1UnX7VrAl/mPI4oGgKGaiX7eu25Z2bhEBu6vGth7+tmv+W+P lblo85L58xMiTaiLwW9mgJz7QMYIGUEfExU89rLXAQzWMRJp1JmMKnt3i28XxEd6M0+r cLIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pVB0IOwa; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a4si3418457pfi.181.2019.12.03.09.31.25; Tue, 03 Dec 2019 09:31:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pVB0IOwa; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1AC657D27B; Tue, 3 Dec 2019 17:31:22 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mail.openembedded.org (Postfix) with ESMTP id 1A5A17D27B for ; Tue, 3 Dec 2019 17:31:20 +0000 (UTC) Received: by mail-pj1-f46.google.com with SMTP id n96so1796214pjc.3 for ; Tue, 03 Dec 2019 09:31:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AUtk5G9ddq3io0cPoZMwxidvJbIaTA4XJHX85q3s4Ps=; b=pVB0IOwaQO4dLFrXopD79dfhzBMqM9HfQv60Jol7j+U+GplHh7b27Ai5eyG6EqBsEe xBh0KBesegmMuzD6JLvKhfiNYicv4XssJFYRIwJ3FHG13Ln1RtcoCnZwcHjYBFhKbtp4 +QGOzHU2LDY5CAGb1Hf7vik3nrEBJPzvrJB5/LB/AX+XpLzxDm3NMTeu4RKmy6wI18Ur SUh89OAjxKMB/CQduxy8ycssmjPL45ma4/2GH65LU+y+MDaEZhSt19jJJRc8zkvqZPFh 9wHjrI/mMUom5MMwgDRu7RwwJuqTktAqycNdVvbbRQ9sKtdM7gTd15WUiqSz51kHvRTD 27+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AUtk5G9ddq3io0cPoZMwxidvJbIaTA4XJHX85q3s4Ps=; b=LRJyjSy3t6PoU/UxhxS/DGsqToutKZJdR9npAx8WqxXPer5b1hkH8FDkCFyb2inF5c H70A2HsoW5oFvSgu4RpJkmsGHjRuYoxl1+1i8iBzqRn6nG2vB9MP0gjBwys9zwqa5q1r PzuvdvzKVTvGLgO4G558j9l3H4ugdIfD++Qerbi3dBP6H4J+gqTXyBChAcpBAJfwhciy 0mO5K3ofQYNWUqdTaPk3q4Qh3n5q37aCOEVl9s8lANZhs5hhKF242YKjVsb/P0AF6bNt 8cxQGsaOiYdvHkrmFS/gJSNYU+WAgMues78oNqmA04tnmj8mzJ+dvn+KZLDM9RUsgpg7 3OqQ== X-Gm-Message-State: APjAAAXPXSqCwZ53kMfZQLHLEUhmHOGgybezUORxc5GtjFy4Y2OGrWRn PQz6TZ+CSh/SSk2u/ctRLWi3Em4K8LE= X-Received: by 2002:a17:90a:380d:: with SMTP id w13mr6663309pjb.133.1575394281311; Tue, 03 Dec 2019 09:31:21 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:1c20::2797]) by smtp.gmail.com with ESMTPSA id k4sm4229507pfa.25.2019.12.03.09.31.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 09:31:20 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 3 Dec 2019 09:31:07 -0800 Message-Id: <20191203173108.87041-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [oe] [meta-multimedia][PATCH 1/2] projucer: Upgrade to 5.4.5 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org 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 Signed-off-by: Khem Raj --- .../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 -- 2.24.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-multimedia/recipes-multimedia/juce/nativesdk-projucer_git.bb b/meta-multimedia/recipes-multimedia/juce/nativesdk-projucer_git.bb deleted file mode 100644 index 7836bae691..0000000000 --- a/meta-multimedia/recipes-multimedia/juce/nativesdk-projucer_git.bb +++ /dev/null @@ -1,3 +0,0 @@ -inherit nativesdk -include projucer.inc -BBCLASSEXTEND = "nativesdk" diff --git a/meta-multimedia/recipes-multimedia/juce/projucer-native_git.bb b/meta-multimedia/recipes-multimedia/juce/projucer-native_git.bb deleted file mode 100644 index fb54fb9e98..0000000000 --- a/meta-multimedia/recipes-multimedia/juce/projucer-native_git.bb +++ /dev/null @@ -1,3 +0,0 @@ -inherit native -include projucer.inc -BBCLASSEXTEND = "native" diff --git a/meta-multimedia/recipes-multimedia/juce/projucer.inc b/meta-multimedia/recipes-multimedia/juce/projucer.inc index 63ed9e90e0..8199e9668f 100644 --- a/meta-multimedia/recipes-multimedia/juce/projucer.inc +++ b/meta-multimedia/recipes-multimedia/juce/projucer.inc @@ -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" diff --git a/meta-multimedia/recipes-multimedia/juce/projucer/0001-Disable-webkit-component.patch b/meta-multimedia/recipes-multimedia/juce/projucer/0001-Disable-webkit-component.patch new file mode 100644 index 0000000000..3728439c71 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/juce/projucer/0001-Disable-webkit-component.patch @@ -0,0 +1,83 @@ +From df7190f430f30ee522f56f9714d42ee796f0d5ff Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 2 Dec 2019 22:18:41 -0800 +Subject: [PATCH] Disable webkit component + +It asks for enable JUCER_ENABLE_GPL_MODE + +Signed-off-by: Khem Raj +--- + extras/Projucer/Builds/LinuxMakefile/Makefile | 10 +++++----- + extras/Projucer/JuceLibraryCode/AppConfig.h | 4 ++-- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/extras/Projucer/Builds/LinuxMakefile/Makefile b/extras/Projucer/Builds/LinuxMakefile/Makefile +index 25b490460..8960f5bc6 100644 +--- a/extras/Projucer/Builds/LinuxMakefile/Makefile ++++ b/extras/Projucer/Builds/LinuxMakefile/Makefile +@@ -35,13 +35,13 @@ ifeq ($(CONFIG),Debug) + TARGET_ARCH := -march=native + endif + +- JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.4.5 -DJUCE_APP_VERSION_HEX=0x50405 $(shell pkg-config --cflags x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) ++ JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.4.5 -DJUCE_APP_VERSION_HEX=0x50405 $(shell pkg-config --cflags x11 xinerama xext freetype2) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 -DJucePlugin_Build_Unity=0 + JUCE_TARGET_APP := Projucer + + JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) + JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) +- JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -lrt -ldl -lpthread $(LDFLAGS) ++ JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs x11 xinerama xext freetype2) -lrt -ldl -lpthread $(LDFLAGS) + + CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) + endif +@@ -56,13 +56,13 @@ ifeq ($(CONFIG),Release) + TARGET_ARCH := -march=native + endif + +- JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.4.5 -DJUCE_APP_VERSION_HEX=0x50405 $(shell pkg-config --cflags x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) ++ JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.4.5 -DJUCE_APP_VERSION_HEX=0x50405 $(shell pkg-config --cflags x11 xinerama xext freetype2) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 -DJucePlugin_Build_Unity=0 + JUCE_TARGET_APP := Projucer + + JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) + JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) +- JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -fvisibility=hidden -lrt -ldl -lpthread $(LDFLAGS) ++ JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs x11 xinerama xext freetype2) -fvisibility=hidden -lrt -ldl -lpthread $(LDFLAGS) + + CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) + endif +@@ -136,7 +136,7 @@ all : $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) + + $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : $(OBJECTS_APP) $(RESOURCES) + @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } +- @pkg-config --print-errors x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 ++ @pkg-config --print-errors x11 xinerama xext freetype2 + @echo Linking "Projucer - App" + -$(V_AT)mkdir -p $(JUCE_BINDIR) + -$(V_AT)mkdir -p $(JUCE_LIBDIR) +diff --git a/extras/Projucer/JuceLibraryCode/AppConfig.h b/extras/Projucer/JuceLibraryCode/AppConfig.h +index dffd5af75..53302bd24 100644 +--- a/extras/Projucer/JuceLibraryCode/AppConfig.h ++++ b/extras/Projucer/JuceLibraryCode/AppConfig.h +@@ -32,7 +32,7 @@ + // BEGIN SECTION A + + #ifndef JUCER_ENABLE_GPL_MODE +- #define JUCER_ENABLE_GPL_MODE 0 ++ #define JUCER_ENABLE_GPL_MODE 1 + #endif + + // END SECTION A +@@ -180,7 +180,7 @@ + // juce_gui_extra flags: + + #ifndef JUCE_WEB_BROWSER +- //#define JUCE_WEB_BROWSER 1 ++ #define JUCE_WEB_BROWSER 0 + #endif + + #ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR +-- +2.24.0 + diff --git a/meta-multimedia/recipes-multimedia/juce/projucer_git.bb b/meta-multimedia/recipes-multimedia/juce/projucer_git.bb new file mode 100644 index 0000000000..f408f6f1bc --- /dev/null +++ b/meta-multimedia/recipes-multimedia/juce/projucer_git.bb @@ -0,0 +1,2 @@ +include projucer.inc +BBCLASSEXTEND = "native nativesdk"