[arch-commits] Commit in lmms/trunk (PKGBUILD lmms-1.2.2-wine.patch)

[David Runge]

    Date: Thursday, June 3, 2021 @ 20:47:02
  Author: dvzrv
Revision: 955743

upgpkg: lmms 1.2.2-4: Rebuild against libgig 4.3.0.

Add patch fot fix build issues due to very klunky regular expressions targetting wine libraries.

Added:
  lmms/trunk/lmms-1.2.2-wine.patch
Modified:
  lmms/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   16 ++++++++++++----
 lmms-1.2.2-wine.patch |   24 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-03 20:42:10 UTC (rev 955742)
+++ PKGBUILD	2021-06-03 20:47:02 UTC (rev 955743)
@@ -6,7 +6,7 @@
 
 pkgname=lmms
 pkgver=1.2.2
-pkgrel=3
+pkgrel=4
 pkgdesc='The Linux MultiMedia Studio'
 arch=('x86_64')
 url="https://lmms.io"
@@ -20,12 +20,20 @@
 'qt5-tools' 'stk' 'wine')
 optdepends=('pulseaudio: pulseaudio support'
             'wine: VST plugin support')
-source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}_${pkgver}.tar.xz")
-sha512sums=('df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028')
-b2sums=('8b561068194e9a4af8260675e784c25a92b6b2f731c29b677cbc16581306bbadcf27ea529adbcd735ff4adffedf3dd98ec7b2d89428a63ea600d022ecdae58e4')
+options=(!lto)
+source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}_${pkgver}.tar.xz"
+        "${pkgname}-1.2.2-wine.patch"
+)
+sha512sums=('df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028'
+            '6dc97f6961a7eda8826ca28e2c3fb5cb69f73423d8809b2fba993120c7ebc3ff1f0dee91b2b7e304341bae89b72348ff86434c2637cfe58af8c6e6e28f43c692')
+b2sums=('8b561068194e9a4af8260675e784c25a92b6b2f731c29b677cbc16581306bbadcf27ea529adbcd735ff4adffedf3dd98ec7b2d89428a63ea600d022ecdae58e4'
+        '4b42d098c91871bcee9fbdc9486d1273be535f8c4ce837c0f7132cb2ed69739a60551e5c3f0c90059e83ae5d98d5887c5d00d597c785776eff854c42ede8a645')
 
 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"
 }
 
 build() {

Added: lmms-1.2.2-wine.patch
===================================================================
--- lmms-1.2.2-wine.patch	                        (rev 0)
+++ lmms-1.2.2-wine.patch	2021-06-03 20:47:02 UTC (rev 955743)
@@ -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)
+