From 787e5051bbb802f9699b2c35c80181c351560261 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Wed, 9 Jun 2021 14:12:46 +0000 Subject: [PATCH] community/lmms to 1.2.2-4 --- community/lmms/PKGBUILD | 10 ++++++++-- community/lmms/lmms-1.2.2-wine.patch | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 community/lmms/lmms-1.2.2-wine.patch diff --git a/community/lmms/PKGBUILD b/community/lmms/PKGBUILD index b296cbc62..b754a88db 100644 --- a/community/lmms/PKGBUILD +++ b/community/lmms/PKGBUILD @@ -12,7 +12,7 @@ pkgname=lmms pkgver=1.2.2 -pkgrel=3 +pkgrel=4 pkgdesc='The Linux MultiMedia Studio' arch=('x86_64') url="https://lmms.io" @@ -27,16 +27,22 @@ makedepends=('alsa-lib' 'bash-completion' 'cmake' 'doxygen' optdepends=('pulseaudio: pulseaudio support' 'wine: VST plugin support') source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}_${pkgver}.tar.xz" + "${pkgname}-1.2.2-wine.patch" 'https://github.com/rampantpixels/rpmalloc/commit/1c580b394e1a20e63d63c72cad421f7be4422089.patch') sha512sums=('df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028' + '6dc97f6961a7eda8826ca28e2c3fb5cb69f73423d8809b2fba993120c7ebc3ff1f0dee91b2b7e304341bae89b72348ff86434c2637cfe58af8c6e6e28f43c692' '95b8df46fbb1194d30ba9dd34e7b0325590c63a1a2f34730fa62c00fea1a75e728733ee3c287ed2b31150e66aa18e170fe4725a0e7cad2518039a19b12dc389c') b2sums=('8b561068194e9a4af8260675e784c25a92b6b2f731c29b677cbc16581306bbadcf27ea529adbcd735ff4adffedf3dd98ec7b2d89428a63ea600d022ecdae58e4' + '4b42d098c91871bcee9fbdc9486d1273be535f8c4ce837c0f7132cb2ed69739a60551e5c3f0c90059e83ae5d98d5887c5d00d597c785776eff854c42ede8a645' '350a8aa6610e30b5bd2b56a854bc7e8f872064c510cca84a641a8fb666e1a2620a95604c43ea6979ab651cad83524180bdbeae7e70219b109e6740f4f48e54e6') prepare() { mv -v "${pkgname}" "${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" + # prevent cmake from doing regular expressions breaking the build + patch -Np1 -i ../"${pkgname}-1.2.2-wine.patch" # upstream rpmalloc fix for ARM - patch -p1 -d ${pkgname}-${pkgver}/src/3rdparty/rpmalloc/rpmalloc -i "${srcdir}/1c580b394e1a20e63d63c72cad421f7be4422089.patch" + patch -p1 -d src/3rdparty/rpmalloc/rpmalloc -i "${srcdir}/1c580b394e1a20e63d63c72cad421f7be4422089.patch" } build() { diff --git a/community/lmms/lmms-1.2.2-wine.patch b/community/lmms/lmms-1.2.2-wine.patch new file mode 100644 index 000000000..56f86313d --- /dev/null +++ b/community/lmms/lmms-1.2.2-wine.patch @@ -0,0 +1,24 @@ +diff -ruN a/cmake/modules/FindWine.cmake b/cmake/modules/FindWine.cmake +--- a/cmake/modules/FindWine.cmake 2018-11-03 02:43:42.000000000 +0100 ++++ b/cmake/modules/FindWine.cmake 2021-06-03 22:37:41.258182544 +0200 +@@ -31,7 +31,7 @@ + # WineHQ (/opt/wine-stable, /opt/wine-devel, /opt/wine-staging) + STRING(REPLACE "/lib64/wine/" "/lib/wine/" FLAG "${FLAG}") + +- STRING(REGEX REPLACE "/wine/libwinecrt0.a.*" "" WINE_LIBRARY_FIX "${FLAG}") ++ STRING(REGEX REPLACE "libwinecrt0.a.*" "" WINE_LIBRARY_FIX "${FLAG}") + SET(WINE_LIBRARY_FIX "${WINE_LIBRARY_FIX}/") + ENDIF() + ENDFOREACH() +diff -ruN a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt +--- a/plugins/vst_base/CMakeLists.txt 2018-11-03 02:43:42.000000000 +0100 ++++ b/plugins/vst_base/CMakeLists.txt 2021-06-03 22:37:45.881530269 +0200 +@@ -38,7 +38,7 @@ + IF(LMMS_HOST_X86_64) + SET(EXTRA_FLAGS -m32) + IF(WINE_LIBRARY_FIX) +- SET(EXTRA_FLAGS ${EXTRA_FLAGS} -nodefaultlibs ${WINE_LIBRARY_FIX}wine/libwinecrt0.a -L${WINE_LIBRARY_FIX}wine/ -luser32 -lkernel32 -lgdi32) ++ SET(EXTRA_FLAGS ${EXTRA_FLAGS} -nodefaultlibs ${WINE_LIBRARY_FIX}libwinecrt0.a -L${WINE_LIBRARY_FIX} -luser32 -lkernel32 -lgdi32) + ENDIF() + ENDIF(LMMS_HOST_X86_64) +