Attachment 235390 Details for Bug 265342 – audio/dexed: fix build on armv7 arm64

[patch] audio/dexed: fix build on armv7 arm64

0001-audio-dexed-fix-build-on-armv7-arm64.patch (text/plain), 3.68 KB, created by Robert Clausecker on 2022-07-20 14:21:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2022-07-20 14:21:34 UTC

Size: 3.68 KB

patch

obsolete

>From 9d4c19146a99f395039597e63e863808b08e6d4c Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Wed, 20 Jul 2022 15:56:04 +0200
>Subject: [PATCH] audio/dexed: fix build on armv7/arm64
>
>These platforms have unsigned character types.  Fix various
>pieces of code that assume otherwise.  While we are at it,
>kill -Werror as per policy.
>---
> audio/dexed/Makefile                          |  4 +---
> audio/dexed/files/patch-CMakeLists.txt        | 10 ++++++++
> audio/dexed/files/patch-Source_PluginData.cpp | 24 +++++++++++++++++++
> .../files/patch-Source_PluginProcessor.h      | 11 +++++++++
> 4 files changed, 46 insertions(+), 3 deletions(-)
> create mode 100644 audio/dexed/files/patch-CMakeLists.txt
> create mode 100644 audio/dexed/files/patch-Source_PluginData.cpp
> create mode 100644 audio/dexed/files/patch-Source_PluginProcessor.h
>
>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..0e5d03c15c7c
>--- /dev/null
>+++ b/audio/dexed/files/patch-CMakeLists.txt
>@@ -0,0 +1,10 @@
>+--- 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..8c9c3fbad56c
>--- /dev/null
>+++ b/audio/dexed/files/patch-Source_PluginData.cpp
>@@ -0,0 +1,24 @@
>+--- 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..81113a17fa91
>--- /dev/null
>+++ b/audio/dexed/files/patch-Source_PluginProcessor.h
>@@ -0,0 +1,11 @@
>+--- 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();
>+     
>-- 
>2.35.2
>

Flags:

fuz: maintainer-approval? (yuri)

Actions: View | Diff

Attachments on bug 265342: 235390