diff --git a/srcpkgs/Carla/patches/aarch64.patch b/srcpkgs/Carla/patches/aarch64.patch deleted file mode 100644 index 480b454c842..00000000000 --- a/srcpkgs/Carla/patches/aarch64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- source/modules/water/memory/ByteOrder.h 2018-01-22 21:05:35.000000000 +0000 -+++ - 2018-06-18 09:58:25.563913205 +0000 -@@ -153,7 +153,7 @@ - { - #ifdef CARLA_OS_MAC - return OSSwapInt32 (n); -- #elif defined(CARLA_OS_WIN) || ! (defined (__arm__) || defined (__arm64__)) -+ #elif defined(CARLA_OS_WIN) || ! (defined (__arm__) || ! defined (__arm64__)) - asm("bswap %%eax" : "=a"(n) : "a"(n)); - return n; - #else diff --git a/srcpkgs/Carla/patches/musl.patch b/srcpkgs/Carla/patches/musl.patch deleted file mode 100644 index 5166cb20da7..00000000000 --- a/srcpkgs/Carla/patches/musl.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- source/modules/hylia/link/asio/impl/error_code.ipp 2018-01-22 21:05:35.000000000 +0000 -+++ - 2018-06-18 09:13:32.145486974 +0000 -@@ -101,7 +101,7 @@ - #elif defined(__MACH__) && defined(__APPLE__) \ - || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) \ - || defined(_AIX) || defined(__hpux) || defined(__osf__) \ -- || defined(__ANDROID__) -+ || defined(__ANDROID__) || !defined(__GLIBC__) - char buf[256] = ""; - using namespace std; - strerror_r(value, buf, sizeof(buf)); - diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template index f6a71c2478b..52af9f93020 100644 --- a/srcpkgs/Carla/template +++ b/srcpkgs/Carla/template @@ -1,7 +1,7 @@ # Template file for 'Carla' pkgname=Carla -version=1.9.8 -revision=3 +version=1.9.13 +revision=1 build_style=gnu-makefile make_build_args="DEFAULT_QT=5" make_install_args="DEFAULT_QT=5" @@ -10,15 +10,15 @@ pycompile_dirs="usr/share/carla" hostmakedepends="pkg-config python3" makedepends="python3-PyQt5-devel-tools python3-PyQt5 libmagic file-devel liblo-devel alsa-lib-devel pulseaudio-devel libX11-devel gtk+3-devel - gtk+-devel qt5-devel fluidsynth-devel fftw-devel mxml-devel zlib-devel + gtk+-devel qt5-devel fluidsynth-devel fftw-devel zlib-devel python3-rdflib" depends="python3 python3-PyQt5 python3-PyQt5-svg" short_desc="Audio plugin host" maintainer="nutcase84 " license="GPL-2.0-or-later" homepage="http://kxstudio.linuxaudio.org/Applications:Carla" -distfiles="https://github.com/falkTX/Carla/archive/${version}.tar.gz" -checksum=966647c508bf92eafb03d0aaf687acb399c687782461154fad40d64745786e67 +distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz" +checksum=cc6639dd23b22279f8ab1ae9b51e71d5480b86112c475110daa68cf68fb8cf63 case $XBPS_TARGET_MACHINE in x86_64* | i686*);; @@ -31,6 +31,9 @@ if [ "$CROSS_BUILD" ]; then fi pre_build() { + sed -e '1,1i#include ' \ + -i source/modules/water/text/CharacterFunctions.h + if [ "$CROSS_BUILD" ]; then sed -i -e 's#\./carla-lv2-export#/usr/bin/carla-lv2-export#g' \ source/plugin/Makefile @@ -40,8 +43,6 @@ pre_build() { } post_install() { - vmkdir "$py3_sitelib" - mv ${DESTDIR}/usr/lib/python3/dist-packages/*.py "${DESTDIR}"/"$py3_sitelib" vbin bin/carla-lv2-export }