Skip to content

Commit

Permalink
updpatch: cardinal 23.02-2
Browse files Browse the repository at this point in the history
- riscv support patch has been merged upstream and released.
- GCC 13 issue has been reported as https://bugs.archlinux.org/task/79062
  • Loading branch information
felixonmars committed Jul 11, 2023
1 parent b1a306d commit 8c4277d
Showing 1 changed file with 20 additions and 26 deletions.
46 changes: 20 additions & 26 deletions cardinal/riscv64.patch
Original file line number Diff line number Diff line change
@@ -1,42 +1,36 @@
diff --git PKGBUILD PKGBUILD
index ddee02d..1b4f8c3 100644
--- PKGBUILD
+++ PKGBUILD
@@ -19,9 +19,17 @@ source=(
@@ -39,11 +39,14 @@ checkdepends=(
source=(
https://github.com/DISTRHO/$pkgbase/releases/download/$pkgver/$pkgbase-$pkgver.tar.xz
$pkgbase-$pkgver.svg::https://raw.githubusercontent.com/DISTRHO/Cardinal/eb95b5990cf734c10f2caab1a246eac893f0266d/plugins/Cardinal/orig/distrho.svg
+ $pkgname-gcc13.patch::https://github.com/surge-synthesizer/surge/commit/d2fba1c6ff02cbdfa9db2ce06508745c247629b5.patch
)
sha512sums=('fe50de9bc033698f052a8691fee46869b87f25bb013cdf17f0e4680cbfd550ac4c9b553ed49b67ebc13bf1ff07333dc6df0e17c793f4fc9173f3d1168f5c1869'
sha512sums=('60d6dcb2f3c90e41739c645f75408dc1603c5c999819577be26dbc7d05e2fbbce8dbf3d8d20d7d9e3075459f0fadb6f32c17d98c2186cf0ebed767f016410aec'
- '31a7d1e548285af0ead1bc844fbb1d35b50f6284159047cb401a829d4068992fa328770e42c377c08d013f6787e55ac12b94eba4d5af4b90373b157971fc8835')
+ '31a7d1e548285af0ead1bc844fbb1d35b50f6284159047cb401a829d4068992fa328770e42c377c08d013f6787e55ac12b94eba4d5af4b90373b157971fc8835'
+ 'e02b5ea7153151c0d4749b3e93785dbe71134d0e9e4805f5fa4d6abd8178972aa297e1f968d5a8b802222ee1388311b5f96215afca4405932285aa62dd911318'
+ 'ce36e0779e4f112b52b487fc844b162e7653daa654d2b27e55284fbfb06955b39cc510f0cee7c5274abad36891208b92afcfbb0a92404d6918685afc4543f8c7')
b2sums=('c9a3deab7e90c73e194cc3e9b391061eec3c7fd29dfaeb3e24226af37af16dc4893080eb20953c3139f54f4a75191b09c4438b4812b1f8533e5923394fcbc2b3'
+ 'f38872eee7264fff2f598a4aa100877d979c80c1c7796c4533fee7075aeffed2dc6758240413d07fcea32438749f5c676fc0083c3fa08be7da3abb1de3914433')
b2sums=('c28b1aff34c3e1b5fff01cf74c2df38e4ed58e7c56ccb5e106ef8582675e2914e4973bca874053371521150a838007d4eaa0e8ea58899337c22a2f5b22dfd5cd'
- 'd82fefe15234c1ed3a4d487c6082a2e3ac73b60f11041314e99c5a5de5b3ea141efbd5afd18851510bd4f801fd71f7cd89d54d86258d1ba750bbfd762aa37a8d')
+ 'd82fefe15234c1ed3a4d487c6082a2e3ac73b60f11041314e99c5a5de5b3ea141efbd5afd18851510bd4f801fd71f7cd89d54d86258d1ba750bbfd762aa37a8d'
+ 'da5278d1d56604e3a6db9e3eb2e6a674dd41d268f93f015a1a295d1ef2028ffa94968eec7b462a6562ec6a2cf833a321240fa42834de72aeaa1bc87d1d3b836b'
+ '51900c7c42a64c0d3a8dd8e6e11fa688350c58904e745fbbeb0ce3e0e6106235af5b78c0f9fd544d34f91bf6ed8a90c029445fcac3d7732dd98af65635cf5675')
+
+makedepends+=(simde)
+source+=(use-simde.patch::https://github.com/xctan/Cardinal/compare/fad92579b9f9789d9d3be0cc55704fd0e1f30e19...xctan:Cardinal:riscv.patch
+ carla-riscv.patch::https://github.com/falkTX/Carla/pull/1649.patch)
+ 'de2e6b293025275b8141c4b0aff37c3d4c170f67229f8abcd58e8bf2ed261ba8e74e29a310b8227042334f1855e0d4d13b9777b8d823be628fce5508b718a561')

_pick() {
local p="$1" f d; shift
@@ -41,11 +49,17 @@ prepare() {
_common_depends=(
cardinal-data
@@ -86,6 +89,8 @@ prepare() {
--pkgdesc "$pkgdesc JACK standalone" \
--icon $pkgbase \
--genericname "Virtual modular synthesizer"
+ pushd $pkgname-$pkgver
+ patch -Np1 -i ../use-simde.patch
+ pushd carla
+ patch -Np1 -i ../../carla-riscv.patch
+ popd
+ popd
+ cd $pkgbase-$pkgver/plugins/surgext/surge
+ patch -p1 -i "$srcdir/$pkgname-gcc13.patch"
}

build() {
- export CFLAGS+=" -B/usr/lib/mold -Wno-format-security"
- export CXXFLAGS+=" -B/usr/lib/mold -Wno-format-security"
+ export CFLAGS+=" -B/usr/lib/mold -Wno-format-security -Wl,-L/lib -Wl,-L/usr/lib"
+ export CXXFLAGS+=" -B/usr/lib/mold -Wno-format-security -Wl,-L/lib -Wl,-L/usr/lib"
make PREFIX=/usr SYSDEPS=true WITH_LTO=true -C $pkgname-$pkgver
}
@@ -180,3 +185,5 @@ package_cardinal-vst3() {

mv -v $pkgbase-vst3/* "$pkgdir"
}
+
+makedepends+=(simde)

0 comments on commit 8c4277d

Please sign in to comment.