hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Remove custom winebuild task (#8077)

Browse Source 
Remove custom winebuild task; leverage wine 10.14+ directly instead

---------

Co-authored-by: Dalton Messmer <messmer.dalton@gmail.com>
This commit is contained in:
Tres Finocchiaro
2025-10-21 11:19:52 -04:00
committed by GitHub
parent 8c12e47b11
commit 38ceac80dd
6 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/VstBase/CMakeLists.txt
View File

@@ -47,25 +47,6 @@ foreach(var ${export_variables})
_export_var_to_external(${var})
endforeach()
# If we're building wine-powered RemoteVstPlugins for Linux,
# use a custom winebuild to fix ASLR-related VST crashes.
# See upstream bug report: https://bugs.winehq.org/show_bug.cgi?id=58480
if(LMMS_BUILD_LINUX AND (LMMS_HAVE_VST_32 OR LMMS_HAVE_VST_64))
ExternalProject_Add(wine
GIT_REPOSITORY https://github.com/tresf/wine
GIT_TAG 1f8bb63e75baa5c9f901c8f50b4ea9dd69e0baa0
GIT_SHALLOW ON
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/wine"
SOURCE_SUBDIR tools/winebuild
BUILD_ALWAYS ON
BUILD_IN_SOURCE ON
INSTALL_COMMAND ""
)
ExternalProject_Get_Property(wine SOURCE_DIR)
set(CUSTOM_WINEBUILD_EXECUTABLE "${SOURCE_DIR}/tools/winebuild/winebuild")
message(STATUS "Using custom winebuild: ${CUSTOM_WINEBUILD_EXECUTABLE}")
endif()
# build 32 bit version of RemoteVstPlugin
if(LMMS_HAVE_VST_32)
INCLUDE("${CMAKE_CURRENT_LIST_DIR}/RemoteVstPlugin32.cmake")

4
plugins/VstBase/RemoteVstPlugin32.cmake
View File

@@ -34,9 +34,7 @@ ELSEIF(LMMS_BUILD_LINUX)
CMAKE_ARGS
"${EXTERNALPROJECT_CMAKE_ARGS}"
"-DCMAKE_CXX_COMPILER=${WINEGCC}"
# Pass /DYNAMICBASE:NO to custom winebuild per #7987
"-DCMAKE_CXX_FLAGS=-m32 --winebuild \"${CUSTOM_WINEBUILD_EXECUTABLE}\" -Wb,--disable-dynamicbase"
DEPENDS wine
"-DCMAKE_CXX_FLAGS=-m32"
)
INSTALL(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/../32/RemoteVstPlugin32" "${CMAKE_CURRENT_BINARY_DIR}/../32/RemoteVstPlugin32.exe.so" DESTINATION "${PLUGIN_DIR}/32")

4
plugins/VstBase/RemoteVstPlugin64.cmake
View File

@@ -9,9 +9,7 @@ ELSEIF(LMMS_BUILD_LINUX)
CMAKE_ARGS
"${EXTERNALPROJECT_CMAKE_ARGS}"
"-DCMAKE_CXX_COMPILER=${WINEGCC}"
# Pass /DYNAMICBASE:NO to custom winebuild per #7987
"-DCMAKE_CXX_FLAGS=${CXX_FLAGS} --winebuild \"${CUSTOM_WINEBUILD_EXECUTABLE}\" -Wb,--disable-dynamicbase"
DEPENDS wine
"-DCMAKE_CXX_FLAGS=${CXX_FLAGS}"
)
INSTALL(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/../RemoteVstPlugin64" "${CMAKE_CURRENT_BINARY_DIR}/../RemoteVstPlugin64.exe.so" DESTINATION "${PLUGIN_DIR}")
ENDIF()