Merge branch 'LMMS:master' into css-tweaks

.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
   linux:
     name: linux
     runs-on: ubuntu-latest
-    container: lmmsci/linux.gcc:18.04
+    container: ghcr.io/lmms/linux.gcc:20.04
     env:
       CMAKE_OPTS: >-
         -DUSE_WERROR=ON
@@ -18,12 +18,8 @@ jobs:
       CCACHE_NOCOMPRESS: 1
       MAKEFLAGS: -j2
     steps:
-      - name: Update and configure Git
-        run: |
-          add-apt-repository ppa:git-core/ppa
-          apt-get update
-          apt-get --yes install git
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+      - name: Configure git
+        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Check out
         uses: actions/checkout@v3
         with:
@@ -62,7 +58,7 @@ jobs:
         run: |
           ccache --cleanup
           echo "[ccache config]"
-          ccache --print-config
+          ccache --show-config
           echo "[ccache stats]"
           ccache --show-stats
         env:
@@ -218,7 +214,6 @@ jobs:
     name: msvc-${{ matrix.arch }}
     runs-on: windows-2019
     env:
-      qt-version: '5.15.2'
       CCACHE_MAXSIZE: 0
       CCACHE_NOCOMPRESS: 1
     steps:
@@ -246,22 +241,21 @@ jobs:
           path: ~\AppData\Local\ccache
       - name: Install tools
         run: choco install ccache
-      - name: Install 64-bit Qt
-        if: matrix.arch == 'x64'
-        uses: jurplel/install-qt-action@b3ea5275e37b734d027040e2c7fe7a10ea2ef946
-        with:
-          version: ${{ env.qt-version }}
-          arch: win64_msvc2019_64
-          archives: qtbase qtsvg qttools
-          cache: true
-      - name: Install 32-bit Qt
+      - name: Install Qt
         uses: jurplel/install-qt-action@b3ea5275e37b734d027040e2c7fe7a10ea2ef946
         with:
-          version: ${{ env.qt-version }}
-          arch: win32_msvc2019
+          version: '5.15.2'
+          arch: |-
+            ${{
+              fromJSON('
+                {
+                  "x86": "win32_msvc2019",
+                  "x64": "win64_msvc2019_64"
+                }
+              ')[matrix.arch]
+            }}
           archives: qtbase qtsvg qttools
           cache: true
-          set-env: ${{ matrix.arch == 'x86' }}
       - name: Set up build environment
         uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89
         with:

CMakeLists.txt

@@ -94,8 +94,8 @@ OPTION(WANT_STK		"Include Stk (Synthesis Toolkit) support" ON)
 OPTION(WANT_SWH		"Include Steve Harris's LADSPA plugins" ON)
 OPTION(WANT_TAP		"Include Tom's Audio Processing LADSPA plugins" ON)
 OPTION(WANT_VST		"Include VST support" ON)
-OPTION(WANT_VST_32	"Include 32-bit VST support" ON)
-OPTION(WANT_VST_64	"Include 64-bit VST support" ON)
+OPTION(WANT_VST_32	"Include 32-bit Windows VST support" ON)
+OPTION(WANT_VST_64	"Include 64-bit Windows VST support" ON)
 OPTION(WANT_WINMM	"Include WinMM MIDI support" OFF)
 OPTION(WANT_DEBUG_FPE	"Debug floating point exceptions" OFF)
 option(WANT_DEBUG_ASAN	"Enable AddressSanitizer" OFF)
@@ -131,6 +131,9 @@ IF(LMMS_BUILD_WIN32)
 	SET(WANT_WINMM ON)
 	SET(BUNDLE_QT_TRANSLATIONS ON)
 	SET(LMMS_HAVE_WINMM TRUE)
+	if(NOT LMMS_BUILD_WIN64)
+		set(WANT_VST_64 OFF)
+	endif()
 	SET(STATUS_ALSA "<not supported on this platform>")
 	SET(STATUS_OSS "<not supported on this platform>")
 	SET(STATUS_PULSEAUDIO "<not supported on this platform>")
@@ -142,16 +145,6 @@ ELSE(LMMS_BUILD_WIN32)
 	SET(STATUS_WINMM "<not supported on this platform>")
 ENDIF(LMMS_BUILD_WIN32)
 
-
-# TODO: Fix linking issues with msys debug builds
-IF(LMMS_BUILD_MSYS AND CMAKE_BUILD_TYPE STREQUAL "Debug")
-	SET(WANT_GIG OFF)
-	SET(WANT_STK OFF)
-	SET(WANT_SWH OFF)
-	SET(STATUS_GIG "not built as requested")
-	SET(STATUS_STK "not built as requested")
-ENDIF()
-
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 CHECK_INCLUDE_FILES(pthread.h LMMS_HAVE_PTHREAD_H)
@@ -176,7 +169,7 @@ check_library_exists(rt shm_open "" LMMS_HAVE_LIBRT)
 
 LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}")
 
-FIND_PACKAGE(Qt5 5.6.0 COMPONENTS Core Gui Widgets Xml REQUIRED)
+FIND_PACKAGE(Qt5 5.9.0 COMPONENTS Core Gui Widgets Xml REQUIRED)
 FIND_PACKAGE(Qt5 COMPONENTS LinguistTools QUIET)
 
 INCLUDE_DIRECTORIES(
@@ -587,26 +580,42 @@ IF(WANT_SNDIO)
 ENDIF(WANT_SNDIO)
 
 # check for WINE
-IF(WANT_VST)
-	FIND_PACKAGE(Wine)
-	IF(WINE_FOUND)
-		SET(LMMS_SUPPORT_VST TRUE)
-		IF(WINE_LIBRARY_FIX)
-			SET(STATUS_VST "OK, with workaround linking ${WINE_LIBRARY_FIX}")
-		ELSE()
-			SET(STATUS_VST "OK")
-		ENDIF()
-	ELSEIF(WANT_VST_NOWINE)
-		SET(LMMS_SUPPORT_VST TRUE)
-		SET(STATUS_VST "OK")
-	ELSE(WINE_FOUND)
-		SET(STATUS_VST "not found, please install (lib)wine-dev (or similar) - 64 bit systems additionally need gcc-multilib and g++-multilib")
-	ENDIF(WINE_FOUND)
-ENDIF(WANT_VST)
-IF(LMMS_BUILD_WIN32)
-	SET(LMMS_SUPPORT_VST TRUE)
-	SET(STATUS_VST "OK")
-ENDIF(LMMS_BUILD_WIN32)
+if(WANT_VST)
+	if((WANT_VST_32 OR WANT_VST_64) AND NOT LMMS_BUILD_WIN32)
+		find_package(Wine)
+		include(CheckWineGcc)
+	endif()
+	macro(check_vst bits)
+		if(NOT WANT_VST_${bits})
+			set(STATUS_VST_${bits} "Not built, as requested")
+		elseif(LMMS_BUILD_WIN32)
+			set(STATUS_VST_${bits} "OK")
+			set(LMMS_HAVE_VST_${bits} TRUE)
+		elseif(NOT WINE_FOUND)
+			set(STATUS_VST_${bits} "not found, please install (lib)wine-dev (or similar) - 64 bit systems additionally need gcc-multilib and g++-multilib")
+		else()
+			CheckWineGcc("${bits}" "${WINEGCC}" WINEGCC_WORKING)
+			if(WINEGCC_WORKING)
+				set(LMMS_HAVE_VST_${bits} TRUE)
+				if(WINE_LIBRARY_FIX)
+					set(STATUS_VST_${bits} "OK, with workaround linking ${WINE_LIBRARY_FIX}")
+				else()
+					set(STATUS_VST_${bits} "OK")
+				endif()
+			else()
+				set(STATUS_VST_${bits} "winegcc fails to compile ${bits}-bit binaries, please make sure you have ${bits}-bit GCC libraries")
+			endif()
+		endif()
+	endmacro()
+	check_vst(32)
+	check_vst(64)
+	if(LMMS_HAVE_VST_32 OR LMMS_HAVE_VST_64 OR LMMS_BUILD_LINUX)
+		set(LMMS_HAVE_VST TRUE)
+		set(STATUS_VST "OK")
+	else()
+		set(STATUS_VST "No hosts selected and available")
+	endif()
+endif()
 
 IF(WANT_DEBUG_FPE)
 	IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE)
@@ -852,8 +861,9 @@ MESSAGE(
 "* SoundFont2 player           : ${STATUS_FLUIDSYNTH}\n"
 "* Sid instrument              : ${STATUS_SID}\n"
 "* Stk Mallets                 : ${STATUS_STK}\n"
-"* VST-instrument hoster       : ${STATUS_VST}\n"
-"* VST-effect hoster           : ${STATUS_VST}\n"
+"* VST plugin host             : ${STATUS_VST}\n"
+"  * 32-bit Windows host       : ${STATUS_VST_32}\n"
+"  * 64-bit Windows host       : ${STATUS_VST_64}\n"
 "* CALF LADSPA plugins         : ${STATUS_CALF}\n"
 "* CAPS LADSPA plugins         : ${STATUS_CAPS}\n"
 "* CMT LADSPA plugins          : ${STATUS_CMT}\n"

cmake/modules/BuildPlugin.cmake

@@ -1,12 +1,12 @@
 # BuildPlugin.cmake - Copyright (c) 2008 Tobias Doerffel
 #
 # description: build LMMS-plugin
-# usage: BUILD_PLUGIN(<PLUGIN_NAME> <PLUGIN_SOURCES> MOCFILES <HEADERS_FOR_MOC> EMBEDDED_RESOURCES <LIST_OF_FILES_TO_EMBED> UICFILES <UI_FILES_TO_COMPILE> LINK <SHARED|MODULE>)
+# usage: BUILD_PLUGIN(<PLUGIN_NAME> <PLUGIN_SOURCES> MOCFILES <HEADERS_FOR_MOC> EMBEDDED_RESOURCES <LIST_OF_FILES_TO_EMBED> LINK <SHARED|MODULE>)
 
 INCLUDE(GenQrc)
 
 MACRO(BUILD_PLUGIN PLUGIN_NAME)
-	CMAKE_PARSE_ARGUMENTS(PLUGIN "" "LINK;EXPORT_BASE_NAME" "MOCFILES;EMBEDDED_RESOURCES;UICFILES" ${ARGN})
+	CMAKE_PARSE_ARGUMENTS(PLUGIN "" "LINK;EXPORT_BASE_NAME" "MOCFILES;EMBEDDED_RESOURCES" ${ARGN})
 	SET(PLUGIN_SOURCES ${PLUGIN_UNPARSED_ARGUMENTS})
 
 	INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}/include")
@@ -31,10 +31,9 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
 	ENDIF(ER_LEN)
 
 	QT5_WRAP_CPP(plugin_MOC_out ${PLUGIN_MOCFILES})
-	QT5_WRAP_UI(plugin_UIC_out ${PLUGIN_UICFILES})
 
 	FOREACH(f ${PLUGIN_SOURCES})
-		ADD_FILE_DEPENDENCIES(${f} ${RCC_OUT} ${plugin_UIC_out})
+		ADD_FILE_DEPENDENCIES(${f} ${RCC_OUT})
 	ENDFOREACH(f)
 
 	IF(LMMS_BUILD_APPLE)
@@ -45,10 +44,6 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
 		LINK_DIRECTORIES("${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}")
 		LINK_LIBRARIES(${QT_LIBRARIES})
 	ENDIF(LMMS_BUILD_WIN32)
-	IF(LMMS_BUILD_MSYS AND CMAKE_BUILD_TYPE STREQUAL "Debug")
-		# Override Qt debug libraries with release versions
-		SET(QT_LIBRARIES "${QT_OVERRIDE_LIBRARIES}")
-	ENDIF()
 
 	IF (NOT PLUGIN_LINK)
 		SET(PLUGIN_LINK "MODULE")

cmake/modules/DetectMachine.cmake

@@ -12,11 +12,6 @@ ELSE()
 	SET(LMMS_BUILD_LINUX 1)
 ENDIF(WIN32)
 
-# LMMS_BUILD_MSYS also set in build_winXX.sh
-IF(LMMS_BUILD_WIN32 AND CMAKE_COMPILER_IS_GNUCXX AND DEFINED ENV{MSYSCON})
-	SET(LMMS_BUILD_MSYS TRUE)
-ENDIF()
-
 MESSAGE("PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
 SET(LMMS_HOST_X86 FALSE)
 SET(LMMS_HOST_X86_64 FALSE)