From nobody Wed Jul 20 18:42:50 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Lp4MG2Q6zz4Wgbm; Wed, 20 Jul 2022 18:42:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lp4MG1sfnz3HrD; Wed, 20 Jul 2022 18:42:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658342570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YyjOGsyWDPDQQXKNv81Najab9hu1CKc+y6/RVOcdmYQ=; b=ujsCVmpDPYrauH5wB/GA/RcSQ8bft5c8UL39gVXqBUSNnFAYlR6xB3UeUUk1X+BwdBnGIi yMVat37ILBJEN6uYzWlGAFkeutvBBMOiRgDkt5UTxYOiyBGYMTXhQcQvwwBvP+XBEMBYD4 mVRfmVREw7+0s/aV6VM4qmlQjQ4k8bm3gN+PdkYS8eE5cm/Jy4QQlEnvLJ672Pc4OpGqXp gbo9ZVqi+pNCxlajZw8HJAyB6NNulNwtutVnhlFh1Brcbei9UCLRbtj0gYTEhCIQ94JzHU zjT5PV9zqnus08AMkrols5mHcErOhwiSxBitNH5Uh5InBcxoFgPPI9h1vEmNqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lp4MG0v6Nz17ZZ; Wed, 20 Jul 2022 18:42:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26KIgosZ058095; Wed, 20 Jul 2022 18:42:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26KIgol0058094; Wed, 20 Jul 2022 18:42:50 GMT (envelope-from git) Date: Wed, 20 Jul 2022 18:42:50 GMT Message-Id: <202207201842.26KIgol0058094@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: a65ad175973f - 2022Q3 - audio/dexed: Fix build on armv7, arm64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: a65ad175973f24a0308f31d3578137f88238d327 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658342570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YyjOGsyWDPDQQXKNv81Najab9hu1CKc+y6/RVOcdmYQ=; b=n4e4OGcpf55E1/sAqbci/Nb6bYZGqz20/NC54DW1zKoUjyuzBsA0YX+u9rtobGsFA2BZop UHzJEi+m7k28EY7FdlwUKDyakG6HtbRq/6GdsGe+Vp9cyEbj6lAs3Li8eTA9eKuwdDWZhC rYnA3P333Ey1MVMkChcUkETVs6udMggQnbBw+3rCV1jS0DYJ9gi8pni4p10dJk8FKveXEi BVpeaQVMUdILR9Zk09X0Hs8+YvCnM0DuZ1UMtlaMzqkG/1BmTON/W4JOF7EsxDGUCr+zMN fTm6IWLRHAIHG1LvSso45ogMGOTlZB9gsBjeiiQHKtBPDwdUK89XwFApFR1Dqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658342570; a=rsa-sha256; cv=none; b=WlqGsxxAcm5siaRhLJ+bIPnYSBTnOpJqW4+ctoGwO54d6zWWJj8znWqCPK3WxpHsXiXjui O+BxVJ4U3ZAdN+0q02rRYtwIo3D+YZJwfaHfhVWnOxHFvQzG19MjqkP448G3qJjXifUbOY PRdQdQlJ8F+m3McIzEIIt4ywhMscwo1HWsKY4zGTi9M8gB1WFdcRL0be7huHVDTru3Yr1X NM94Z1lAMsY3HQJOfRVmSQKKDXi6mVkt0/9Buc09oR+MHhyNFfh/TmIP/Hvwz912JY24Iy by1ib9IgBa728lIO72QJcvTZ9nqB69TnsP1ZITbjHWWykJ44wIKASGdRCNLJEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=a65ad175973f24a0308f31d3578137f88238d327 commit a65ad175973f24a0308f31d3578137f88238d327 Author: Robert Clausecker AuthorDate: 2022-07-20 17:10:00 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-20 18:42:47 +0000 audio/dexed: Fix build on armv7, arm64 PR: 265342 (cherry picked from commit 9f17ff970a755a8b6ba2388f9caf959ac8c46427) --- audio/dexed/Makefile | 4 +--- audio/dexed/files/patch-CMakeLists.txt | 12 +++++++++++ audio/dexed/files/patch-Source_PluginData.cpp | 26 ++++++++++++++++++++++++ audio/dexed/files/patch-Source_PluginProcessor.h | 13 ++++++++++++ 4 files changed, 52 insertions(+), 3 deletions(-) diff --git a/audio/dexed/Makefile b/audio/dexed/Makefile index 3bc019179bd1..9321a2f48517 100644 --- a/audio/dexed/Makefile +++ b/audio/dexed/Makefile @@ -2,7 +2,7 @@ PORTNAME= dexed DISTVERSIONPREFIX= v DISTVERSION= 0.9.6-16 DISTVERSIONSUFFIX= -g1df9a58 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio PKGNAMESUFFIX= -synth @@ -12,8 +12,6 @@ COMMENT= DX7 FM multi plaform/multi format plugin LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_aarch64= fails to compile due to a seemingly clang issue: https://github.com/llvm/llvm-project/issues/55604 - BUILD_DEPENDS= libX11>0:x11/libX11 \ libXcursor>0:x11/libXcursor \ libXinerama>0:x11/libXinerama \ diff --git a/audio/dexed/files/patch-CMakeLists.txt b/audio/dexed/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..8e696b6a6e6b --- /dev/null +++ b/audio/dexed/files/patch-CMakeLists.txt @@ -0,0 +1,12 @@ +- from Bug 265342 - audio/dexed: fix build on armv7 arm64 + +--- CMakeLists.txt.orig 2022-07-20 04:50:04 UTC ++++ CMakeLists.txt +@@ -52,7 +52,6 @@ target_compile_options(${PROJECT_NAME} PUBLIC + ) + elseif(UNIX AND NOT APPLE) + target_compile_options(${PROJECT_NAME} PUBLIC +- -Werror + -Wno-deprecated-declarations + -Wno-unused-value + ) diff --git a/audio/dexed/files/patch-Source_PluginData.cpp b/audio/dexed/files/patch-Source_PluginData.cpp new file mode 100644 index 000000000000..978d97954d32 --- /dev/null +++ b/audio/dexed/files/patch-Source_PluginData.cpp @@ -0,0 +1,26 @@ +- from Bug 265342 - audio/dexed: fix build on armv7 arm64 + +--- Source/PluginData.cpp.orig 2022-07-20 04:30:35 UTC ++++ Source/PluginData.cpp +@@ -103,18 +103,14 @@ void Cartridge::packProgram(uint8_t *src, int idx, Str + * This function normalize data that comes from corrupted sysex. + * It used to avoid engine crashing upon extreme values + */ +-char normparm(char value, char max, int id) { +- if ( value <= max && value >= 0 ) ++uint8_t normparm(uint8_t value, uint8_t max, int id) { ++ if ( value <= max ) + return value; + + // if this is beyond the max, we expect a 0-255 range, normalize this + // to the expected return value; and this value as a random data. + +- value = abs(value); +- +- char v = ((float)value)/255 * max; +- +- return v; ++ return ((float)value)/255 * max; + } + + void Cartridge::unpackProgram(uint8_t *unpackPgm, int idx) { diff --git a/audio/dexed/files/patch-Source_PluginProcessor.h b/audio/dexed/files/patch-Source_PluginProcessor.h new file mode 100644 index 000000000000..6b093f3d31cb --- /dev/null +++ b/audio/dexed/files/patch-Source_PluginProcessor.h @@ -0,0 +1,13 @@ +- from Bug 265342 - audio/dexed: fix build on armv7 arm64 + +--- Source/PluginProcessor.h.orig 2022-07-20 04:35:43 UTC ++++ Source/PluginProcessor.h +@@ -120,7 +120,7 @@ class DexedAudioProcessor : public AudioProcessor, pu + EngineOpl engineOpl; + + char clipboard[161]; +- char clipboardContent; ++ signed char clipboardContent; + + void resolvAppDir(); +