From 43bf9a6553c88097e374c30a314078b8ad7bd942 Mon Sep 17 00:00:00 2001 From: IFoundSilentHouse Date: Tue, 19 Mar 2024 02:12:13 +0600 Subject: [PATCH 01/14] New package: helio-sequencer-3.12 New package: helio-sequencer --- srcpkgs/helio-sequencer/template | 51 ++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 srcpkgs/helio-sequencer/template diff --git a/srcpkgs/helio-sequencer/template b/srcpkgs/helio-sequencer/template new file mode 100644 index 00000000000000..6ae40e33b3fc0a --- /dev/null +++ b/srcpkgs/helio-sequencer/template @@ -0,0 +1,51 @@ +# Template file for 'helio-sequencer' +pkgname=helio-sequencer +version=3.12 +_gitrev="61f7db380f083b424418d65f4e26addc1370ddea" +revision=1 +archs="i686* x86_64* aarch64* armv[67]*" +hostmakedepends="git pkg-config" +makedepends="freetype-devel libX11-devel libXinerama-devel libXrandr-devel libXcursor-devel libXcomposite-devel MesaLib-devel libfreeglut-devel libcurl-devel alsa-lib-devel jack-devel libsigc++-devel" +depends="curl freetype libXinerama libglvnd alsa-lib" +short_desc="One music sequencer for all major platforms, desktop and mobile" +maintainer="IFoundSilentHouse " +license="GPL-3.0-or-later" +homepage="https://helio.fm/" +changelog="https://github.com/helio-fm/helio-sequencer/blob/develop/CHANGELOG.md" + +do_fetch() { + # commit 61f7db3 is a commit of stable version 3.12 + # helio-sequencer has thirdparty repos in its' github + # so we have to use this do_fetch() hack + git clone --recursive https://github.com/helio-fm/helio-sequencer.git $wrksrc + cd $wrksrc + git reset --hard ${_gitrev} +} + +do_build() { + case "$XBPS_TARGET_MACHINE" in + i686*|armv[67]*) export CONFIG=Release32 ;; + x86_64*|aarch64*) export CONFIG=Release64 ;; + esac + cd $wrksrc/Projects/LinuxMakefile/ + make all strip + cd $wrksrc/Docs +} + +do_install() { + cd $wrksrc + vbin Projects/LinuxMakefile/build/helio +} + +post_install() { + cd $wrksrc + vinstall Projects/Deployment/Linux/Debian/x64/usr/share/applications/Helio.desktop 644 usr/share/applications + cd $wrksrc/Projects/Deployment/Linux/Debian/x64/usr/share/icons/hicolor/ + vmkdir usr/share/icons/hicolor/ + for _i in 16 32 48 128 256; do + vinstall ${_i}x${_i}/apps/helio-workstation.png 644 usr/share/icons/hicolor/${_i}x${_i}/apps helio-workstation.png + done + cd $wrksrc + vlicense LICENSE +} + From 2b8dfbfb16b471679f9de4f390661f837d04ac33 Mon Sep 17 00:00:00 2001 From: IFoundSilentHouse Date: Tue, 19 Mar 2024 02:25:55 +0600 Subject: [PATCH 02/14] helio-sequencer: update to 3.12. New package: helio-sequencer --- srcpkgs/helio-sequencer/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/helio-sequencer/template b/srcpkgs/helio-sequencer/template index 6ae40e33b3fc0a..b75e65baf0c903 100644 --- a/srcpkgs/helio-sequencer/template +++ b/srcpkgs/helio-sequencer/template @@ -3,7 +3,7 @@ pkgname=helio-sequencer version=3.12 _gitrev="61f7db380f083b424418d65f4e26addc1370ddea" revision=1 -archs="i686* x86_64* aarch64* armv[67]*" +archs="i686 x86_64" hostmakedepends="git pkg-config" makedepends="freetype-devel libX11-devel libXinerama-devel libXrandr-devel libXcursor-devel libXcomposite-devel MesaLib-devel libfreeglut-devel libcurl-devel alsa-lib-devel jack-devel libsigc++-devel" depends="curl freetype libXinerama libglvnd alsa-lib" @@ -24,8 +24,8 @@ do_fetch() { do_build() { case "$XBPS_TARGET_MACHINE" in - i686*|armv[67]*) export CONFIG=Release32 ;; - x86_64*|aarch64*) export CONFIG=Release64 ;; + i686) export CONFIG=Release32 ;; + x86_64) export CONFIG=Release64 ;; esac cd $wrksrc/Projects/LinuxMakefile/ make all strip From 603eae6c5101490616b00ae18784fc01121f6b90 Mon Sep 17 00:00:00 2001 From: IFoundSilentHouse Date: Tue, 19 Mar 2024 02:31:01 +0600 Subject: [PATCH 03/14] helio-sequencer: update to 3.12. Fixing lint errors --- srcpkgs/helio-sequencer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/helio-sequencer/template b/srcpkgs/helio-sequencer/template index b75e65baf0c903..0e1bacb4c4c225 100644 --- a/srcpkgs/helio-sequencer/template +++ b/srcpkgs/helio-sequencer/template @@ -1,8 +1,8 @@ # Template file for 'helio-sequencer' pkgname=helio-sequencer version=3.12 -_gitrev="61f7db380f083b424418d65f4e26addc1370ddea" revision=1 +_gitrev="61f7db380f083b424418d65f4e26addc1370ddea" archs="i686 x86_64" hostmakedepends="git pkg-config" makedepends="freetype-devel libX11-devel libXinerama-devel libXrandr-devel libXcursor-devel libXcomposite-devel MesaLib-devel libfreeglut-devel libcurl-devel alsa-lib-devel jack-devel libsigc++-devel" From 377e713b08aa93c8916b2225c4984a2994615e25 Mon Sep 17 00:00:00 2001 From: IFoundSilentHouse Date: Tue, 19 Mar 2024 02:37:07 +0600 Subject: [PATCH 04/14] helio-sequencer: update to 3.12. Fixing lint errors --- srcpkgs/helio-sequencer/template | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/srcpkgs/helio-sequencer/template b/srcpkgs/helio-sequencer/template index 0e1bacb4c4c225..e187abca1fe06b 100644 --- a/srcpkgs/helio-sequencer/template +++ b/srcpkgs/helio-sequencer/template @@ -14,38 +14,38 @@ homepage="https://helio.fm/" changelog="https://github.com/helio-fm/helio-sequencer/blob/develop/CHANGELOG.md" do_fetch() { - # commit 61f7db3 is a commit of stable version 3.12 - # helio-sequencer has thirdparty repos in its' github - # so we have to use this do_fetch() hack - git clone --recursive https://github.com/helio-fm/helio-sequencer.git $wrksrc - cd $wrksrc - git reset --hard ${_gitrev} + # commit 61f7db3 is a commit of stable version 3.12 + # helio-sequencer has thirdparty repos in its' github + # so we have to use this do_fetch() hack + git clone --recursive https://github.com/helio-fm/helio-sequencer.git $wrksrc + cd $wrksrc + git reset --hard ${_gitrev} } do_build() { - case "$XBPS_TARGET_MACHINE" in - i686) export CONFIG=Release32 ;; - x86_64) export CONFIG=Release64 ;; - esac - cd $wrksrc/Projects/LinuxMakefile/ - make all strip - cd $wrksrc/Docs + case "$XBPS_TARGET_MACHINE" in + i686) export CONFIG=Release32 ;; + x86_64) export CONFIG=Release64 ;; + esac + cd $wrksrc/Projects/LinuxMakefile/ + make all strip + cd $wrksrc/Docs } do_install() { - cd $wrksrc - vbin Projects/LinuxMakefile/build/helio + cd $wrksrc + vbin Projects/LinuxMakefile/build/helio } post_install() { - cd $wrksrc - vinstall Projects/Deployment/Linux/Debian/x64/usr/share/applications/Helio.desktop 644 usr/share/applications - cd $wrksrc/Projects/Deployment/Linux/Debian/x64/usr/share/icons/hicolor/ - vmkdir usr/share/icons/hicolor/ - for _i in 16 32 48 128 256; do - vinstall ${_i}x${_i}/apps/helio-workstation.png 644 usr/share/icons/hicolor/${_i}x${_i}/apps helio-workstation.png - done - cd $wrksrc - vlicense LICENSE + cd $wrksrc + vinstall Projects/Deployment/Linux/Debian/x64/usr/share/applications/Helio.desktop 644 usr/share/applications + cd $wrksrc/Projects/Deployment/Linux/Debian/x64/usr/share/icons/hicolor/ + vmkdir usr/share/icons/hicolor/ + for _i in 16 32 48 128 256; do + vinstall ${_i}x${_i}/apps/helio-workstation.png 644 usr/share/icons/hicolor/${_i}x${_i}/apps helio-workstation.png + done + cd $wrksrc + vlicense LICENSE } From b11664a7f59d138b363e51ed7833380e3fc38517 Mon Sep 17 00:00:00 2001 From: IFoundSilentHouse Date: Tue, 19 Mar 2024 02:40:17 +0600 Subject: [PATCH 05/14] helio-sequencer: update to 3.12. Fixing lint errors --- srcpkgs/helio-sequencer/template | 2 -- 1 file changed, 2 deletions(-) diff --git a/srcpkgs/helio-sequencer/template b/srcpkgs/helio-sequencer/template index e187abca1fe06b..f32a8d88c12e09 100644 --- a/srcpkgs/helio-sequencer/template +++ b/srcpkgs/helio-sequencer/template @@ -46,6 +46,4 @@ post_install() { vinstall ${_i}x${_i}/apps/helio-workstation.png 644 usr/share/icons/hicolor/${_i}x${_i}/apps helio-workstation.png done cd $wrksrc - vlicense LICENSE } - From c968b09b1994abc594e5847bfc592fcf7f1681a0 Mon Sep 17 00:00:00 2001 From: IFoundSilentHouse Date: Tue, 19 Mar 2024 02:49:43 +0600 Subject: [PATCH 06/14] helio-sequencer: update to 3.12. Sweeping up --- srcpkgs/helio-sequencer/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/helio-sequencer/template b/srcpkgs/helio-sequencer/template index f32a8d88c12e09..d8eb29b2d42e77 100644 --- a/srcpkgs/helio-sequencer/template +++ b/srcpkgs/helio-sequencer/template @@ -29,7 +29,6 @@ do_build() { esac cd $wrksrc/Projects/LinuxMakefile/ make all strip - cd $wrksrc/Docs } do_install() { From 731095841186776de3f80882148d4f188ff00f34 Mon Sep 17 00:00:00 2001 From: IFoundSilentHouse Date: Wed, 20 Mar 2024 03:38:25 +0600 Subject: [PATCH 07/14] helio-sequencer: update to 3.12. Full template rework --- srcpkgs/helio-sequencer/template | 67 +++++++++++++++++++------------- 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/srcpkgs/helio-sequencer/template b/srcpkgs/helio-sequencer/template index d8eb29b2d42e77..d4b50cec1dd25a 100644 --- a/srcpkgs/helio-sequencer/template +++ b/srcpkgs/helio-sequencer/template @@ -2,47 +2,58 @@ pkgname=helio-sequencer version=3.12 revision=1 -_gitrev="61f7db380f083b424418d65f4e26addc1370ddea" -archs="i686 x86_64" -hostmakedepends="git pkg-config" -makedepends="freetype-devel libX11-devel libXinerama-devel libXrandr-devel libXcursor-devel libXcomposite-devel MesaLib-devel libfreeglut-devel libcurl-devel alsa-lib-devel jack-devel libsigc++-devel" -depends="curl freetype libXinerama libglvnd alsa-lib" +build_style=gnu-makefile +make_build_args="-C Projects/LinuxMakefile" +make_build_target="all strip" +hostmakedepends="pkg-config" +makedepends="freetype-devel libX11-devel libXinerama-devel libXrandr-devel +libXcursor-devel libXcomposite-devel MesaLib-devel libfreeglut-devel +libcurl-devel alsa-lib-devel jack-devel libsigc++-devel" short_desc="One music sequencer for all major platforms, desktop and mobile" maintainer="IFoundSilentHouse " license="GPL-3.0-or-later" homepage="https://helio.fm/" -changelog="https://github.com/helio-fm/helio-sequencer/blob/develop/CHANGELOG.md" +changelog="https://github.com/helio-fm/helio-sequencer/blob/develop/CHANGELOG.md +" +_hopscotch_map_vers=2.3.1 +_juce_commit=159e86a56f03b485ba276fbd01241504d87d5141 +distfiles="https://github.com/helio-fm/helio-sequencer/archive/refs/tags/${version}.tar.gz +https://github.com/Tessil/hopscotch-map/archive/refs/tags/v${_hopscotch_map_vers}.tar.gz + https://github.com/helio-fm/JUCE/archive/${_juce_commit}.tar.gz +" +checksum="6c5654e7ce3b0e3f7c7ffb99654b2bad6585b5122d37c8769c961e45332f560a + 53dab49005cd5dc859f2546d0d3eef058ec7fb3b74fc3b19f4965a9a151e9b20 + d11bc2c70b51ac3aff6b14d5df4f3eaefde1db3a62a8cc32dd2dd5feebb08bf4" -do_fetch() { - # commit 61f7db3 is a commit of stable version 3.12 - # helio-sequencer has thirdparty repos in its' github - # so we have to use this do_fetch() hack - git clone --recursive https://github.com/helio-fm/helio-sequencer.git $wrksrc - cd $wrksrc - git reset --hard ${_gitrev} -} +skip_extraction=" + v${_hopscotch_map_vers}.tar.gz + ${_juce_commit}.tar.gz +" + +if [[ "$XBPS_TARGET_WORDSIZE" -eq 32 ]]; then + make_build_args+=" CONFIG=Release32" +else + make_build_args+=" CONFIG=Release64" +fi -do_build() { - case "$XBPS_TARGET_MACHINE" in - i686) export CONFIG=Release32 ;; - x86_64) export CONFIG=Release64 ;; - esac - cd $wrksrc/Projects/LinuxMakefile/ - make all strip +post_extract() { + vsrcextract -C $wrksrc/ThirdParty/HopscotchMap \ + "v${_hopscotch_map_vers}.tar.gz" + vsrcextract -C $wrksrc/ThirdParty/JUCE "${_juce_commit}.tar.gz" } do_install() { - cd $wrksrc vbin Projects/LinuxMakefile/build/helio } post_install() { - cd $wrksrc - vinstall Projects/Deployment/Linux/Debian/x64/usr/share/applications/Helio.desktop 644 usr/share/applications - cd $wrksrc/Projects/Deployment/Linux/Debian/x64/usr/share/icons/hicolor/ - vmkdir usr/share/icons/hicolor/ + local _i + local _dpdir=Projects/Deployment/Linux/Debian/x64/usr/share/applications + local +_icodir=Projects/Deployment/Linux/Debian/x64/usr/share/icons/hicolor + vinstall ${_dpdir}/Helio.desktop 644 usr/share/applications for _i in 16 32 48 128 256; do - vinstall ${_i}x${_i}/apps/helio-workstation.png 644 usr/share/icons/hicolor/${_i}x${_i}/apps helio-workstation.png + vinstall ${_icodir}/${_i}x${_i}/apps/helio-workstation.png 644 +usr/share/icons/hicolor/${_i}x${_i}/apps helio-workstation.png done - cd $wrksrc } From 8d1cdfc0d0440fb4e36561a339c43f08153dcd47 Mon Sep 17 00:00:00 2001 From: IFoundSilentHouse Date: Wed, 20 Mar 2024 03:53:14 +0600 Subject: [PATCH 08/14] helio-sequencer: update to 3.12. minor fixes --- srcpkgs/helio-sequencer/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/helio-sequencer/template b/srcpkgs/helio-sequencer/template index d4b50cec1dd25a..3ec7f3cfd5b34e 100644 --- a/srcpkgs/helio-sequencer/template +++ b/srcpkgs/helio-sequencer/template @@ -6,8 +6,8 @@ build_style=gnu-makefile make_build_args="-C Projects/LinuxMakefile" make_build_target="all strip" hostmakedepends="pkg-config" -makedepends="freetype-devel libX11-devel libXinerama-devel libXrandr-devel -libXcursor-devel libXcomposite-devel MesaLib-devel libfreeglut-devel +makedepends="freetype-devel libX11-devel libXinerama-devel libXrandr-devel +libXcursor-devel libXcomposite-devel MesaLib-devel libfreeglut-devel libcurl-devel alsa-lib-devel jack-devel libsigc++-devel" short_desc="One music sequencer for all major platforms, desktop and mobile" maintainer="IFoundSilentHouse " @@ -30,7 +30,7 @@ skip_extraction=" ${_juce_commit}.tar.gz " -if [[ "$XBPS_TARGET_WORDSIZE" -eq 32 ]]; then +if [[ "$XBPS_TARGET_WORDSIZE" -eq 32 ]]; then make_build_args+=" CONFIG=Release32" else make_build_args+=" CONFIG=Release64" @@ -47,13 +47,13 @@ do_install() { } post_install() { - local _i + local _i local _dpdir=Projects/Deployment/Linux/Debian/x64/usr/share/applications - local + local _icodir=Projects/Deployment/Linux/Debian/x64/usr/share/icons/hicolor vinstall ${_dpdir}/Helio.desktop 644 usr/share/applications for _i in 16 32 48 128 256; do - vinstall ${_icodir}/${_i}x${_i}/apps/helio-workstation.png 644 -usr/share/icons/hicolor/${_i}x${_i}/apps helio-workstation.png + vinstall ${_icodir}/${_i}x${_i}/apps/helio-workstation.png 644 +usr/share/icons/hicolor/${_i}x${_i}/apps done } From 97a7470ac98fe704279fdc86b25096f077c9aaa0 Mon Sep 17 00:00:00 2001 From: IFoundSilentHouse Date: Wed, 20 Mar 2024 04:00:52 +0600 Subject: [PATCH 09/14] helio-sequencer: update to 3.12. minor fixes --- srcpkgs/helio-sequencer/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/helio-sequencer/template b/srcpkgs/helio-sequencer/template index 3ec7f3cfd5b34e..cdbed7c9ecf9cb 100644 --- a/srcpkgs/helio-sequencer/template +++ b/srcpkgs/helio-sequencer/template @@ -53,7 +53,6 @@ post_install() { _icodir=Projects/Deployment/Linux/Debian/x64/usr/share/icons/hicolor vinstall ${_dpdir}/Helio.desktop 644 usr/share/applications for _i in 16 32 48 128 256; do - vinstall ${_icodir}/${_i}x${_i}/apps/helio-workstation.png 644 -usr/share/icons/hicolor/${_i}x${_i}/apps + vinstall ${_icodir}/${_i}x${_i}/apps/helio-workstation.png 644 usr/share/icons/hicolor/${_i}x${_i}/apps done } From e8ce105442ed8ceee42ab262f1dd6b388c6b299d Mon Sep 17 00:00:00 2001 From: IFoundSilentHouse Date: Wed, 20 Mar 2024 06:13:25 +0600 Subject: [PATCH 10/14] helio-sequencer: update to 3.12. Patch testing --- .../patches/000-makefile-cross-fix.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 srcpkgs/helio-sequencer/patches/000-makefile-cross-fix.patch diff --git a/srcpkgs/helio-sequencer/patches/000-makefile-cross-fix.patch b/srcpkgs/helio-sequencer/patches/000-makefile-cross-fix.patch new file mode 100644 index 00000000000000..d91ed7d5ec2a64 --- /dev/null +++ b/srcpkgs/helio-sequencer/patches/000-makefile-cross-fix.patch @@ -0,0 +1,25 @@ +diff -ruN a/Projects/LinuxMakefile/Makefile b/Projects/LinuxMakefile/Makefile +--- a/Projects/LinuxMakefile/Makefile 2024-03-20 04:09:05.759889257 +0600 ++++ b/Projects/LinuxMakefile/Makefile 2024-03-20 04:10:43.848854400 +0600 +@@ -73,10 +73,6 @@ + JUCE_OBJDIR := build/intermediate/Release32 + JUCE_OUTDIR := build + +- ifeq ($(TARGET_ARCH),) +- TARGET_ARCH := -m32 +- endif +- + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_B650AE49=1" "-DJUCE_APP_VERSION=3.12" "-DJUCE_APP_VERSION_HEX=0x30c00" $(shell pkg-config --cflags alsa freetype2 libcurl) -pthread -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../ThirdParty/ASIO/common -I../../Source/ -I../../Source/Core -I../../Source/Core/Audio -I../../Source/Core/Audio/BuiltIn -I../../Source/Core/Audio/BuiltIn/SoundFont -I../../Source/Core/Audio/Instruments -I../../Source/Core/Audio/Transport -I../../Source/Core/Configuration -I../../Source/Core/Configuration/Resources -I../../Source/Core/Configuration/Resources/Models -I../../Source/Core/CommandPalette -I../../Source/Core/Midi -I../../Source/Core/Midi/Patterns -I../../Source/Core/Midi/Sequences -I../../Source/Core/Midi/Sequences/Events -I../../Source/Core/Network -I../../Source/Core/Network/Models -I../../Source/Core/Network/Requests -I../../Source/Core/Network/Services -I../../Source/Core/Serialization -I../../Source/Core/Tree -I../../Source/Core/Undo -I../../Source/Core/Undo/Actions -I../../Source/Core/VCS -I../../Source/Core/VCS/DiffLogic -I../../Source/Core/Workspace -I../../Source/UI/ -I../../Source/UI/Common -I../../Source/UI/Dialogs -I../../Source/UI/Headline -I../../Source/UI/Input -I../../Source/UI/Menus -I../../Source/UI/Menus/Base -I../../Source/UI/Menus/SelectionMenus -I../../Source/UI/Pages/Instruments -I../../Source/UI/Pages/Instruments/Editor -I../../Source/UI/Pages/Project -I../../Source/UI/Pages/Settings -I../../Source/UI/Pages/VCS -I../../Source/UI/Pages/Dashboard -I../../Source/UI/Popups -I../../Source/UI/Sequencer -I../../Source/UI/Sequencer/EditorPanels -I../../Source/UI/Sequencer/EditorPanels/AutomationEditor -I../../Source/UI/Sequencer/EditorPanels/VelocityEditor -I../../Source/UI/Sequencer/Header -I../../Source/UI/Sequencer/Helpers -I../../Source/UI/Sequencer/MiniMaps -I../../Source/UI/Sequencer/MiniMaps/AnnotationsMap -I../../Source/UI/Sequencer/MiniMaps/KeySignaturesMap -I../../Source/UI/Sequencer/MiniMaps/PianoMap -I../../Source/UI/Sequencer/MiniMaps/TimeSignaturesMap -I../../Source/UI/Sequencer/PatternRoll -I../../Source/UI/Sequencer/PianoRoll -I../../Source/UI/Sequencer/Sidebars -I../../Source/UI/Themes $(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 := helio +@@ -94,10 +90,6 @@ + JUCE_OBJDIR := build/intermediate/Release64 + JUCE_OUTDIR := build + +- ifeq ($(TARGET_ARCH),) +- TARGET_ARCH := -m64 +- endif +- + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_B650AE49=1" "-DJUCE_APP_VERSION=3.12" "-DJUCE_APP_VERSION_HEX=0x30c00" $(shell pkg-config --cflags alsa freetype2 libcurl) -pthread -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../ThirdParty/ASIO/common -I../../Source/ -I../../Source/Core -I../../Source/Core/Audio -I../../Source/Core/Audio/BuiltIn -I../../Source/Core/Audio/BuiltIn/SoundFont -I../../Source/Core/Audio/Instruments -I../../Source/Core/Audio/Transport -I../../Source/Core/Configuration -I../../Source/Core/Configuration/Resources -I../../Source/Core/Configuration/Resources/Models -I../../Source/Core/CommandPalette -I../../Source/Core/Midi -I../../Source/Core/Midi/Patterns -I../../Source/Core/Midi/Sequences -I../../Source/Core/Midi/Sequences/Events -I../../Source/Core/Network -I../../Source/Core/Network/Models -I../../Source/Core/Network/Requests -I../../Source/Core/Network/Services -I../../Source/Core/Serialization -I../../Source/Core/Tree -I../../Source/Core/Undo -I../../Source/Core/Undo/Actions -I../../Source/Core/VCS -I../../Source/Core/VCS/DiffLogic -I../../Source/Core/Workspace -I../../Source/UI/ -I../../Source/UI/Common -I../../Source/UI/Dialogs -I../../Source/UI/Headline -I../../Source/UI/Input -I../../Source/UI/Menus -I../../Source/UI/Menus/Base -I../../Source/UI/Menus/SelectionMenus -I../../Source/UI/Pages/Instruments -I../../Source/UI/Pages/Instruments/Editor -I../../Source/UI/Pages/Project -I../../Source/UI/Pages/Settings -I../../Source/UI/Pages/VCS -I../../Source/UI/Pages/Dashboard -I../../Source/UI/Popups -I../../Source/UI/Sequencer -I../../Source/UI/Sequencer/EditorPanels -I../../Source/UI/Sequencer/EditorPanels/AutomationEditor -I../../Source/UI/Sequencer/EditorPanels/VelocityEditor -I../../Source/UI/Sequencer/Header -I../../Source/UI/Sequencer/Helpers -I../../Source/UI/Sequencer/MiniMaps -I../../Source/UI/Sequencer/MiniMaps/AnnotationsMap -I../../Source/UI/Sequencer/MiniMaps/KeySignaturesMap -I../../Source/UI/Sequencer/MiniMaps/PianoMap -I../../Source/UI/Sequencer/MiniMaps/TimeSignaturesMap -I../../Source/UI/Sequencer/PatternRoll -I../../Source/UI/Sequencer/PianoRoll -I../../Source/UI/Sequencer/Sidebars -I../../Source/UI/Themes $(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 := helio From 871d625e504e73ad815a93da024b2c6a268d3bde Mon Sep 17 00:00:00 2001 From: IFoundSilentHouse Date: Wed, 20 Mar 2024 06:20:14 +0600 Subject: [PATCH 11/14] Revert "helio-sequencer: update to 3.12." This reverts commit 97a7470ac98fe704279fdc86b25096f077c9aaa0. --- srcpkgs/helio-sequencer/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/helio-sequencer/template b/srcpkgs/helio-sequencer/template index cdbed7c9ecf9cb..3ec7f3cfd5b34e 100644 --- a/srcpkgs/helio-sequencer/template +++ b/srcpkgs/helio-sequencer/template @@ -53,6 +53,7 @@ post_install() { _icodir=Projects/Deployment/Linux/Debian/x64/usr/share/icons/hicolor vinstall ${_dpdir}/Helio.desktop 644 usr/share/applications for _i in 16 32 48 128 256; do - vinstall ${_icodir}/${_i}x${_i}/apps/helio-workstation.png 644 usr/share/icons/hicolor/${_i}x${_i}/apps + vinstall ${_icodir}/${_i}x${_i}/apps/helio-workstation.png 644 +usr/share/icons/hicolor/${_i}x${_i}/apps done } From 396972428038b7e571dd71cb802eb8edac6023f0 Mon Sep 17 00:00:00 2001 From: IFoundSilentHouse Date: Wed, 20 Mar 2024 06:23:55 +0600 Subject: [PATCH 12/14] helio-sequencer: update to 3.12. Patch testing --- .../patches/000-makefile-cross-fix.patch | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 srcpkgs/helio-sequencer/patches/000-makefile-cross-fix.patch diff --git a/srcpkgs/helio-sequencer/patches/000-makefile-cross-fix.patch b/srcpkgs/helio-sequencer/patches/000-makefile-cross-fix.patch deleted file mode 100644 index d91ed7d5ec2a64..00000000000000 --- a/srcpkgs/helio-sequencer/patches/000-makefile-cross-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruN a/Projects/LinuxMakefile/Makefile b/Projects/LinuxMakefile/Makefile ---- a/Projects/LinuxMakefile/Makefile 2024-03-20 04:09:05.759889257 +0600 -+++ b/Projects/LinuxMakefile/Makefile 2024-03-20 04:10:43.848854400 +0600 -@@ -73,10 +73,6 @@ - JUCE_OBJDIR := build/intermediate/Release32 - JUCE_OUTDIR := build - -- ifeq ($(TARGET_ARCH),) -- TARGET_ARCH := -m32 -- endif -- - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_B650AE49=1" "-DJUCE_APP_VERSION=3.12" "-DJUCE_APP_VERSION_HEX=0x30c00" $(shell pkg-config --cflags alsa freetype2 libcurl) -pthread -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../ThirdParty/ASIO/common -I../../Source/ -I../../Source/Core -I../../Source/Core/Audio -I../../Source/Core/Audio/BuiltIn -I../../Source/Core/Audio/BuiltIn/SoundFont -I../../Source/Core/Audio/Instruments -I../../Source/Core/Audio/Transport -I../../Source/Core/Configuration -I../../Source/Core/Configuration/Resources -I../../Source/Core/Configuration/Resources/Models -I../../Source/Core/CommandPalette -I../../Source/Core/Midi -I../../Source/Core/Midi/Patterns -I../../Source/Core/Midi/Sequences -I../../Source/Core/Midi/Sequences/Events -I../../Source/Core/Network -I../../Source/Core/Network/Models -I../../Source/Core/Network/Requests -I../../Source/Core/Network/Services -I../../Source/Core/Serialization -I../../Source/Core/Tree -I../../Source/Core/Undo -I../../Source/Core/Undo/Actions -I../../Source/Core/VCS -I../../Source/Core/VCS/DiffLogic -I../../Source/Core/Workspace -I../../Source/UI/ -I../../Source/UI/Common -I../../Source/UI/Dialogs -I../../Source/UI/Headline -I../../Source/UI/Input -I../../Source/UI/Menus -I../../Source/UI/Menus/Base -I../../Source/UI/Menus/SelectionMenus -I../../Source/UI/Pages/Instruments -I../../Source/UI/Pages/Instruments/Editor -I../../Source/UI/Pages/Project -I../../Source/UI/Pages/Settings -I../../Source/UI/Pages/VCS -I../../Source/UI/Pages/Dashboard -I../../Source/UI/Popups -I../../Source/UI/Sequencer -I../../Source/UI/Sequencer/EditorPanels -I../../Source/UI/Sequencer/EditorPanels/AutomationEditor -I../../Source/UI/Sequencer/EditorPanels/VelocityEditor -I../../Source/UI/Sequencer/Header -I../../Source/UI/Sequencer/Helpers -I../../Source/UI/Sequencer/MiniMaps -I../../Source/UI/Sequencer/MiniMaps/AnnotationsMap -I../../Source/UI/Sequencer/MiniMaps/KeySignaturesMap -I../../Source/UI/Sequencer/MiniMaps/PianoMap -I../../Source/UI/Sequencer/MiniMaps/TimeSignaturesMap -I../../Source/UI/Sequencer/PatternRoll -I../../Source/UI/Sequencer/PianoRoll -I../../Source/UI/Sequencer/Sidebars -I../../Source/UI/Themes $(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 := helio -@@ -94,10 +90,6 @@ - JUCE_OBJDIR := build/intermediate/Release64 - JUCE_OUTDIR := build - -- ifeq ($(TARGET_ARCH),) -- TARGET_ARCH := -m64 -- endif -- - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_B650AE49=1" "-DJUCE_APP_VERSION=3.12" "-DJUCE_APP_VERSION_HEX=0x30c00" $(shell pkg-config --cflags alsa freetype2 libcurl) -pthread -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../ThirdParty/ASIO/common -I../../Source/ -I../../Source/Core -I../../Source/Core/Audio -I../../Source/Core/Audio/BuiltIn -I../../Source/Core/Audio/BuiltIn/SoundFont -I../../Source/Core/Audio/Instruments -I../../Source/Core/Audio/Transport -I../../Source/Core/Configuration -I../../Source/Core/Configuration/Resources -I../../Source/Core/Configuration/Resources/Models -I../../Source/Core/CommandPalette -I../../Source/Core/Midi -I../../Source/Core/Midi/Patterns -I../../Source/Core/Midi/Sequences -I../../Source/Core/Midi/Sequences/Events -I../../Source/Core/Network -I../../Source/Core/Network/Models -I../../Source/Core/Network/Requests -I../../Source/Core/Network/Services -I../../Source/Core/Serialization -I../../Source/Core/Tree -I../../Source/Core/Undo -I../../Source/Core/Undo/Actions -I../../Source/Core/VCS -I../../Source/Core/VCS/DiffLogic -I../../Source/Core/Workspace -I../../Source/UI/ -I../../Source/UI/Common -I../../Source/UI/Dialogs -I../../Source/UI/Headline -I../../Source/UI/Input -I../../Source/UI/Menus -I../../Source/UI/Menus/Base -I../../Source/UI/Menus/SelectionMenus -I../../Source/UI/Pages/Instruments -I../../Source/UI/Pages/Instruments/Editor -I../../Source/UI/Pages/Project -I../../Source/UI/Pages/Settings -I../../Source/UI/Pages/VCS -I../../Source/UI/Pages/Dashboard -I../../Source/UI/Popups -I../../Source/UI/Sequencer -I../../Source/UI/Sequencer/EditorPanels -I../../Source/UI/Sequencer/EditorPanels/AutomationEditor -I../../Source/UI/Sequencer/EditorPanels/VelocityEditor -I../../Source/UI/Sequencer/Header -I../../Source/UI/Sequencer/Helpers -I../../Source/UI/Sequencer/MiniMaps -I../../Source/UI/Sequencer/MiniMaps/AnnotationsMap -I../../Source/UI/Sequencer/MiniMaps/KeySignaturesMap -I../../Source/UI/Sequencer/MiniMaps/PianoMap -I../../Source/UI/Sequencer/MiniMaps/TimeSignaturesMap -I../../Source/UI/Sequencer/PatternRoll -I../../Source/UI/Sequencer/PianoRoll -I../../Source/UI/Sequencer/Sidebars -I../../Source/UI/Themes $(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 := helio From 14c12dc995e1af5188502b1a1f410614eb45707e Mon Sep 17 00:00:00 2001 From: IFoundSilentHouse Date: Wed, 20 Mar 2024 11:16:47 +0600 Subject: [PATCH 13/14] helio-sequencer: update to 3.12. new patch testing --- .../patches/000-makefile_cross_fix.patch | 24 +++++++++++++++++++ srcpkgs/helio-sequencer/template | 5 ++-- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/helio-sequencer/patches/000-makefile_cross_fix.patch diff --git a/srcpkgs/helio-sequencer/patches/000-makefile_cross_fix.patch b/srcpkgs/helio-sequencer/patches/000-makefile_cross_fix.patch new file mode 100644 index 00000000000000..eefc846d6f131c --- /dev/null +++ b/srcpkgs/helio-sequencer/patches/000-makefile_cross_fix.patch @@ -0,0 +1,24 @@ +--- a/Projects/LinuxMakefile/Makefile 2023-12-12 16:15:50.000000000 +0600 ++++ b/Projects/LinuxMakefile/Makefile 2024-03-20 11:01:33.501082485 +0600 +@@ -73,10 +73,6 @@ + JUCE_OBJDIR := build/intermediate/Release32 + JUCE_OUTDIR := build + +- ifeq ($(TARGET_ARCH),) +- TARGET_ARCH := -m32 +- endif +- + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_B650AE49=1" "-DJUCE_APP_VERSION=3.12" "-DJUCE_APP_VERSION_HEX=0x30c00" $(shell pkg-config --cflags alsa freetype2 libcurl) -pthread -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../ThirdParty/ASIO/common -I../../Source/ -I../../Source/Core -I../../Source/Core/Audio -I../../Source/Core/Audio/BuiltIn -I../../Source/Core/Audio/BuiltIn/SoundFont -I../../Source/Core/Audio/Instruments -I../../Source/Core/Audio/Transport -I../../Source/Core/Configuration -I../../Source/Core/Configuration/Resources -I../../Source/Core/Configuration/Resources/Models -I../../Source/Core/CommandPalette -I../../Source/Core/Midi -I../../Source/Core/Midi/Patterns -I../../Source/Core/Midi/Sequences -I../../Source/Core/Midi/Sequences/Events -I../../Source/Core/Network -I../../Source/Core/Network/Models -I../../Source/Core/Network/Requests -I../../Source/Core/Network/Services -I../../Source/Core/Serialization -I../../Source/Core/Tree -I../../Source/Core/Undo -I../../Source/Core/Undo/Actions -I../../Source/Core/VCS -I../../Source/Core/VCS/DiffLogic -I../../Source/Core/Workspace -I../../Source/UI/ -I../../Source/UI/Common -I../../Source/UI/Common/Origami -I../../Source/UI/Dialogs -I../../Source/UI/Headline -I../../Source/UI/Input -I../../Source/UI/Menus -I../../Source/UI/Menus/Base -I../../Source/UI/Menus/SelectionMenus -I../../Source/UI/Pages/Instruments -I../../Source/UI/Pages/Instruments/Editor -I../../Source/UI/Pages/Project -I../../Source/UI/Pages/Settings -I../../Source/UI/Pages/VCS -I../../Source/UI/Pages/Dashboard -I../../Source/UI/Pages/Dashboard/Menu -I../../Source/UI/Popups -I../../Source/UI/Sequencer -I../../Source/UI/Sequencer/EditorPanels -I../../Source/UI/Sequencer/EditorPanels/AutomationEditor -I../../Source/UI/Sequencer/EditorPanels/VelocityEditor -I../../Source/UI/Sequencer/Header -I../../Source/UI/Sequencer/Helpers -I../../Source/UI/Sequencer/MiniMaps -I../../Source/UI/Sequencer/MiniMaps/AnnotationsMap -I../../Source/UI/Sequencer/MiniMaps/KeySignaturesMap -I../../Source/UI/Sequencer/MiniMaps/PianoMap -I../../Source/UI/Sequencer/MiniMaps/TimeSignaturesMap -I../../Source/UI/Sequencer/PatternRoll -I../../Source/UI/Sequencer/PianoRoll -I../../Source/UI/Sequencer/Sidebars -I../../Source/UI/Themes $(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 := helio +@@ -94,10 +90,6 @@ + JUCE_OBJDIR := build/intermediate/Release64 + JUCE_OUTDIR := build + +- ifeq ($(TARGET_ARCH),) +- TARGET_ARCH := -m64 +- endif +- + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_B650AE49=1" "-DJUCE_APP_VERSION=3.12" "-DJUCE_APP_VERSION_HEX=0x30c00" $(shell pkg-config --cflags alsa freetype2 libcurl) -pthread -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../Projucer/JuceLibraryCode -I../../ThirdParty/JUCE/modules -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../ThirdParty/JUCE/modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../ThirdParty/ASIO/common -I../../Source/ -I../../Source/Core -I../../Source/Core/Audio -I../../Source/Core/Audio/BuiltIn -I../../Source/Core/Audio/BuiltIn/SoundFont -I../../Source/Core/Audio/Instruments -I../../Source/Core/Audio/Transport -I../../Source/Core/Configuration -I../../Source/Core/Configuration/Resources -I../../Source/Core/Configuration/Resources/Models -I../../Source/Core/CommandPalette -I../../Source/Core/Midi -I../../Source/Core/Midi/Patterns -I../../Source/Core/Midi/Sequences -I../../Source/Core/Midi/Sequences/Events -I../../Source/Core/Network -I../../Source/Core/Network/Models -I../../Source/Core/Network/Requests -I../../Source/Core/Network/Services -I../../Source/Core/Serialization -I../../Source/Core/Tree -I../../Source/Core/Undo -I../../Source/Core/Undo/Actions -I../../Source/Core/VCS -I../../Source/Core/VCS/DiffLogic -I../../Source/Core/Workspace -I../../Source/UI/ -I../../Source/UI/Common -I../../Source/UI/Common/Origami -I../../Source/UI/Dialogs -I../../Source/UI/Headline -I../../Source/UI/Input -I../../Source/UI/Menus -I../../Source/UI/Menus/Base -I../../Source/UI/Menus/SelectionMenus -I../../Source/UI/Pages/Instruments -I../../Source/UI/Pages/Instruments/Editor -I../../Source/UI/Pages/Project -I../../Source/UI/Pages/Settings -I../../Source/UI/Pages/VCS -I../../Source/UI/Pages/Dashboard -I../../Source/UI/Pages/Dashboard/Menu -I../../Source/UI/Popups -I../../Source/UI/Sequencer -I../../Source/UI/Sequencer/EditorPanels -I../../Source/UI/Sequencer/EditorPanels/AutomationEditor -I../../Source/UI/Sequencer/EditorPanels/VelocityEditor -I../../Source/UI/Sequencer/Header -I../../Source/UI/Sequencer/Helpers -I../../Source/UI/Sequencer/MiniMaps -I../../Source/UI/Sequencer/MiniMaps/AnnotationsMap -I../../Source/UI/Sequencer/MiniMaps/KeySignaturesMap -I../../Source/UI/Sequencer/MiniMaps/PianoMap -I../../Source/UI/Sequencer/MiniMaps/TimeSignaturesMap -I../../Source/UI/Sequencer/PatternRoll -I../../Source/UI/Sequencer/PianoRoll -I../../Source/UI/Sequencer/Sidebars -I../../Source/UI/Themes $(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 := helio diff --git a/srcpkgs/helio-sequencer/template b/srcpkgs/helio-sequencer/template index 3ec7f3cfd5b34e..5539ff2fc3e7e0 100644 --- a/srcpkgs/helio-sequencer/template +++ b/srcpkgs/helio-sequencer/template @@ -30,7 +30,7 @@ skip_extraction=" ${_juce_commit}.tar.gz " -if [[ "$XBPS_TARGET_WORDSIZE" -eq 32 ]]; then +if [[ "$XBPS_TARGET_WORDSIZE" -eq 32 ]]; then make_build_args+=" CONFIG=Release32" else make_build_args+=" CONFIG=Release64" @@ -53,7 +53,6 @@ post_install() { _icodir=Projects/Deployment/Linux/Debian/x64/usr/share/icons/hicolor vinstall ${_dpdir}/Helio.desktop 644 usr/share/applications for _i in 16 32 48 128 256; do - vinstall ${_icodir}/${_i}x${_i}/apps/helio-workstation.png 644 -usr/share/icons/hicolor/${_i}x${_i}/apps + vinstall ${_icodir}/${_i}x${_i}/apps/helio-workstation.png 644 usr/share/icons/hicolor/${_i}x${_i}/apps helio-workstation.png done } From 2a22ed6334908cc4d1e5f52aec5d596b15867838 Mon Sep 17 00:00:00 2001 From: IFoundSilentHouse Date: Wed, 20 Mar 2024 11:31:44 +0600 Subject: [PATCH 14/14] helio-sequencer: update to 3.12. new patch testing --- srcpkgs/helio-sequencer/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/helio-sequencer/template b/srcpkgs/helio-sequencer/template index 5539ff2fc3e7e0..cca62213fa89f9 100644 --- a/srcpkgs/helio-sequencer/template +++ b/srcpkgs/helio-sequencer/template @@ -2,6 +2,7 @@ pkgname=helio-sequencer version=3.12 revision=1 +archs="~*-musl" build_style=gnu-makefile make_build_args="-C Projects/LinuxMakefile" make_build_target="all strip" @@ -30,7 +31,7 @@ skip_extraction=" ${_juce_commit}.tar.gz " -if [[ "$XBPS_TARGET_WORDSIZE" -eq 32 ]]; then +if [[ "$XBPS_TARGET_WORDSIZE" -eq 32 ]]; then make_build_args+=" CONFIG=Release32" else make_build_args+=" CONFIG=Release64"