Merge branch 'master' into refac/memory

.appveyor.yml

@@ -19,5 +19,9 @@ build_script:
   - cmake -DUSE_COMPILE_CACHE=ON -DCACHE_TOOL=%APPVEYOR_BUILD_FOLDER%/clcache.4.1.0/clcache-4.1.0/clcache.exe -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH=c:/Qt/5.12/msvc2017%QT_SUFFIX%;c:/tools/vcpkg/installed/%PLATFORM%-windows -DCMAKE_GENERATOR_PLATFORM="%CMAKE_PLATFORM%" ..
   - cmake --build . -- /maxcpucount:4
   - cmake --build . --target tests
+  - cmake --build . --target package
+artifacts:
+  - path: 'build\lmms-*.exe'
+    name: Installer
 cache:
   - c:/tools/vcpkg/installed

.circleci/config.yml

@@ -12,6 +12,18 @@ shared:
       key: ccache-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ .Branch }}-{{ .BuildNum }}
       paths:
         - ~/.ccache
+  restore_homebrew_cache: &restore_homebrew_cache
+    restore_cache:
+      keys:
+        - homebrew-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ .Branch }}
+        - homebrew-{{ arch }}-{{ .Environment.CIRCLE_JOB }}
+        - homebrew-{{ arch }}
+  save_homebrew_cache: &save_homebrew_cache
+    save_cache:
+      key: homebrew-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ .Branch }}-{{ .BuildNum }}
+      paths:
+        - ~/Library/Caches/Homebrew
+        - /usr/local/Homebrew
 
   ccache_stats: &ccache_stats
     run:
@@ -30,6 +42,14 @@ shared:
         mkdir -p /tmp/artifacts
         # Workaround for failing submodule fetching
         git config --global --unset url."ssh://git@github.com".insteadOf || true
+        if [[ -n "${CIRCLE_PR_NUMBER}" ]]
+        then
+            echo "Fetching out merged pull request"
+            git fetch -u origin refs/pull/${CIRCLE_PR_NUMBER}/merge:pr/merge
+            git checkout pr/merge
+        else
+            echo "Not a pull request"
+        fi
 
   # Commmon environment variables
   common_environment: &common_environment
@@ -59,6 +79,15 @@ jobs:
       - run:
           name: Build tests
           command: cd build && make tests
+      - run:
+          name: Build installer
+          command: |
+            cd build
+            make package
+            cp ./lmms-*.exe /tmp/artifacts/
+      - store_artifacts:
+          path: /tmp/artifacts/
+          destination: /
       - *ccache_stats
       - *save_cache
   mingw64:
@@ -79,11 +108,20 @@ jobs:
       - run:
           name: Build tests
           command: cd build && make tests
+      - run:
+          name: Build installer
+          command: |
+            cd build
+            make package
+            cp ./lmms-*.exe /tmp/artifacts/
+      - store_artifacts:
+          path: /tmp/artifacts/
+          destination: /
       - *ccache_stats
       - *save_cache
   linux.gcc:
     docker:
-      - image: lmmsci/linux.gcc:18.04
+      - image: lmmsci/linux.gcc:16.04
     environment:
       <<: *common_environment
     steps:
@@ -92,7 +130,10 @@ jobs:
       - *restore_cache
       - run:
           name: Configure
-          command: mkdir build && cd build && cmake .. $CMAKE_OPTS -DCMAKE_INSTALL_PREFIX=./install
+          command: |
+            source /opt/qt5*/bin/qt5*-env.sh || true
+            mkdir build && cd build
+            cmake .. $CMAKE_OPTS -DCMAKE_INSTALL_PREFIX=./install
       - run:
           name: Build
           command: cd build && make
@@ -125,10 +166,56 @@ jobs:
       - run:
           name: Shellcheck
           command: shellcheck $(find "./cmake/" -type f -name '*.sh' -o -name "*.sh.in")
+  macos:
+    environment:
+      <<: *common_environment
+    macos:
+      xcode: "9.3.1"
+    steps:
+      - checkout
+      - *init
+      - *restore_homebrew_cache
+      - *restore_cache
+      - run:
+          name: Install Homebrew dependencies
+          command: |
+            # unlink Homebrew's python 2 to prevent an node-gyp error
+            brew unlink python@2 || true
+            brew update && brew install ccache fftw cmake pkg-config libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio fltk qt5 carla
+      - run:
+          name: Install nodejs dependencies
+          command: npm install -g appdmg
+      - run:
+          name: Building
+          command: |
+            mkdir build && cd build
+            cmake .. -DCMAKE_INSTALL_PREFIX="../target" -DCMAKE_PREFIX_PATH="$(brew --prefix qt5)" $CMAKE_OPTS -DUSE_WERROR=OFF
+            make
+      - run:
+          name: Build tests
+          command: cd build && make tests
+      - run:
+          name: Run tests
+          command: build/tests/tests
+      - run:
+          name: Build DMG
+          command: |
+            cd build
+            make install
+            make dmg
+            cp ./lmms-*.dmg /tmp/artifacts/
+      - store_artifacts:
+          path: /tmp/artifacts/
+          destination: /
+      - *save_cache
+      - *save_homebrew_cache
+
+
 workflows:
   version: 2
   build-and-test:
     jobs:
+      - macos
       - mingw32
       - mingw64
       - linux.gcc

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+# Please search the issue tracker for existing bug reports before submitting your own. Delete this line to confirm no similar report has been posted yet.
+
+### Bug Summary
+
+#### Steps to reproduce
+
+#### Expected behavior
+
+#### Actual behavior
+
+#### Screenshot
+
+#### Affected LMMS versions
+
+<!--
+LMMS's version is visible on the splash screen and under Help > About.
+If your version isn't from lmms.io/download, please note which branch it was built from.
+Finally, if possible, please test if the bug occurs on both stable and master.
+-->
+
+#### Logs
+<details>
+  <summary>Click to expand</summary>
+<pre>
+<!-- paste logs here -->
+</pre>
+</details>

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,4 @@
+contact_links:
+- name: Get help on Discord
+  url: https://lmms.io/chat/
+  about: Need help? Have a question? Reach out to other LMMS users on our Discord server!

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,18 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+# Please search the issue tracker for existing feature requests before submitting your own. Delete this line to confirm no similar request has been posted yet.
+
+### Enhancement Summary
+
+#### Justification
+
+#### Mockup
+
+<!-- If your request encompasses changes to the user interface, provide a mockup of your proposal here -->

.gitmodules

@@ -37,3 +37,9 @@
 [submodule "doc/wiki"]
 	path = doc/wiki
 	url = https://github.com/lmms/lmms.wiki.git
+[submodule "src/3rdparty/ringbuffer"]
+	path = src/3rdparty/ringbuffer
+	url = https://github.com/JohannesLorenz/ringbuffer.git
+[submodule "plugins/carlabase/carla"]
+	path = plugins/carlabase/carla
+	url = https://github.com/falktx/carla

.mailmap

@@ -29,3 +29,5 @@ grejppi <grejppi@gmail.com>
 Johannes Lorenz <j.git@lorenz-ho.me> <johannes89@mailueberfall.de>
 Johannes Lorenz <j.git@lorenz-ho.me> <1042576+JohannesLorenz@users.noreply.github.com>
 Noah Brecht <noahb2713@gmail.com>
+Olivier Humbert <trebmuh@tuxfamily.org> <trebmuh@users.noreply.github.com>
+Hussam al-Homsi <sawuare@gmail.com> Hussam Eddin Alhomsi <hussameddin.alhomsi@gmail.com>

.travis.yml

@@ -1,6 +1,6 @@
 language: cpp
 compiler: gcc
-dist: trusty
+dist: xenial
 sudo: required
 cache:
     directories:
@@ -11,8 +11,6 @@ matrix:
     include:
         - env: TYPE=style
         - os: linux
-        - env: TARGET_OS=win32
-        - env: TARGET_OS=win64
         - env: TARGET_OS=debian-sid TARGET_DEPLOY=True
           git:
               depth: false
@@ -24,7 +22,7 @@ matrix:
           git:
               depth: false
         - os: osx
-          osx_image: xcode8.3
+          osx_image: xcode9.4
 before_install:
     # appdmg doesn't work with old Node.js
     - if [ "$TRAVIS_OS_NAME" = osx ]; then nvm install 10; fi

.travis/linux..before_install.sh

@@ -2,10 +2,7 @@
 
 set -e
 
-sudo add-apt-repository ppa:beineri/opt-qt592-trusty -y
-sudo add-apt-repository ppa:andrewrk/libgroove -y
-sudo sed -e "s/trusty/precise/" -i \
-	/etc/apt/sources.list.d/andrewrk-libgroove-trusty.list
+sudo add-apt-repository ppa:beineri/opt-qt592-xenial -y
 
 sudo dpkg --add-architecture i386
 sudo apt-get update -qq || true

.travis/linux..install.sh

@@ -4,7 +4,7 @@ set -e
 
 PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libmp3lame-dev
 	libasound2-dev libjack-jackd2-dev libsdl-dev libsamplerate0-dev libstk0-dev stk
-	libfluidsynth-dev portaudio19-dev g++-multilib libfltk1.3-dev
+	libfluidsynth-dev portaudio19-dev g++-multilib libfltk1.3-dev fluid
 	libgig-dev libsoundio-dev qt59base qt59translations qt59tools"
 
 # swh build dependencies
@@ -18,9 +18,3 @@ PACKAGES="$PACKAGES $SWH_PACKAGES $VST_PACKAGES libjack-jackd2-0"
 
 # shellcheck disable=SC2086
 sudo apt-get install -y $PACKAGES
-
-# kxstudio repo offers Carla; avoid package conflicts (wine, etc) by running last
-sudo add-apt-repository -y ppa:kxstudio-debian/libs
-sudo add-apt-repository -y ppa:kxstudio-debian/apps
-sudo apt-get update
-sudo apt-get install -y carla

.travis/osx..before_install.sh

@@ -3,3 +3,5 @@
 set -e
 
 brew update
+# Python 2 may cause conflicts on dependency installation
+brew unlink python@2 || true

.travis/osx..install.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-PACKAGES="cmake pkg-config libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio node fltk qt5 carla"
+PACKAGES="cmake pkg-config libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio node fltk qt carla"
 
 if "${TRAVIS}"; then
    PACKAGES="$PACKAGES ccache"

.travis/script.sh

@@ -22,7 +22,7 @@ else
 	"$TRAVIS_BUILD_DIR/.travis/$TRAVIS_OS_NAME.$TARGET_OS.script.sh"
 
 	# Package and upload non-tagged builds
-	if [ ! -z "$TRAVIS_TAG" ]; then
+	if [ -n "$TRAVIS_TAG" ]; then
 		# Skip, handled by travis deploy instead
 		exit 0
 	elif [[ $TARGET_OS == win* ]]; then
@@ -42,5 +42,7 @@ else
 	fi
 
 	echo "Uploading $PACKAGE to transfer.sh..."
-	curl --upload-file "$PACKAGE" "https://transfer.sh/$PACKAGE" || true
+	# Limit the connection time to 3 minutes and total upload time to 5 minutes
+	# Otherwise the build may hang
+	curl --connect-timeout 180 --max-time 300 --upload-file "$PACKAGE" "https://transfer.sh/$PACKAGE" || true
 fi

CMakeLists.txt

@@ -3,6 +3,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.3)
 PROJECT(lmms)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
+SET(LMMS_BINARY_DIR ${CMAKE_BINARY_DIR})
+SET(LMMS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 
 IF(COMMAND CMAKE_POLICY)
 	CMAKE_POLICY(SET CMP0005 NEW)
@@ -13,8 +15,10 @@ IF(COMMAND CMAKE_POLICY)
 		CMAKE_POLICY(SET CMP0050 OLD)
 	ENDIF()
 	CMAKE_POLICY(SET CMP0020 NEW)
+	CMAKE_POLICY(SET CMP0057 NEW)
 ENDIF(COMMAND CMAKE_POLICY)
 
+INCLUDE(PluginList)
 INCLUDE(CheckSubmodules)
 INCLUDE(AddFileDependencies)
 INCLUDE(CheckIncludeFiles)
@@ -32,7 +36,7 @@ SET(PROJECT_DESCRIPTION "${PROJECT_NAME_UCASE} - Free music production software"
 SET(PROJECT_COPYRIGHT   "2008-${PROJECT_YEAR} ${PROJECT_AUTHOR}")
 SET(VERSION_MAJOR       "1")
 SET(VERSION_MINOR       "2")
-SET(VERSION_RELEASE     "0")
+SET(VERSION_RELEASE     "1")
 SET(VERSION_STAGE       "")
 SET(VERSION_BUILD       "0")
 SET(VERSION             "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}")
@@ -140,8 +144,7 @@ CHECK_INCLUDE_FILES(locale.h LMMS_HAVE_LOCALE_H)
 
 LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}")
 
-
-FIND_PACKAGE(Qt5 COMPONENTS Core Gui Widgets Xml REQUIRED)
+FIND_PACKAGE(Qt5 5.6.0 COMPONENTS Core Gui Widgets Xml REQUIRED)
 FIND_PACKAGE(Qt5 COMPONENTS LinguistTools QUIET)
 
 INCLUDE_DIRECTORIES(
@@ -228,7 +231,8 @@ IF(WANT_CARLA)
 		SET(LMMS_HAVE_CARLA TRUE)
 		SET(STATUS_CARLA "OK")
 	ELSE(CARLA_FOUND)
-		SET(STATUS_CARLA "not found, please install the latest carla")
+		SET(LMMS_HAVE_WEAKCARLA TRUE)
+		SET(STATUS_CARLA "OK (weak linking enabled)")
 	ENDIF(CARLA_FOUND)
 ENDIF(WANT_CARLA)
 
@@ -437,9 +441,9 @@ If(WANT_GIG)
 ENDIF(WANT_GIG)
 
 # check for pthreads
-IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD)
+IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD OR LMMS_BUILD_FREEBSD)
 	FIND_PACKAGE(Threads)
-ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD)
+ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD OR LMMS_BUILD_FREEBSD)
 
 # check for sndio (roaraudio won't work yet)
 IF(WANT_SNDIO)
@@ -498,7 +502,7 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
 
 	# Due to a regression in gcc-4.8.X, we need to disable array-bounds check
 	IF (CMAKE_COMPILER_IS_GNUCXX AND ((CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL "4.8.0") OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.8.0") OR LMMS_BUILD_WIN32))
-		SET(WERROR_FLAGS "${WERROR_FLAGS} -Wno-array-bounds")
+		SET(WERROR_FLAGS "${WERROR_FLAGS} -Wno-array-bounds -Wno-attributes")
 	ENDIF()
 ELSEIF(MSVC)
 	# Remove any existing /W flags
@@ -569,8 +573,8 @@ ADD_SUBDIRECTORY(tests)
 ADD_SUBDIRECTORY(data)
 ADD_SUBDIRECTORY(doc)
 
-# post-install tasks
-ADD_SUBDIRECTORY(cmake/postinstall)
+# install tasks
+ADD_SUBDIRECTORY(cmake/install)
 
 ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz"
 				COMMAND gzip -c ${CMAKE_SOURCE_DIR}/doc/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz
@@ -710,4 +714,9 @@ MESSAGE(
 "\n\n")
 
 SET(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION "${BIN_DIR}")
+if(MSVC)
+	# We can't set this on the install time according to the configuration
+	SET(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE)
+	SET(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
+endif()
 INCLUDE(InstallRequiredSystemLibraries)

cmake/install/CMakeLists.txt

@@ -0,0 +1,42 @@
+SET(PLUGIN_FILES "")
+IF(LMMS_BUILD_WIN32)
+	INSTALL(FILES $<TARGET_FILE:Qt5::QWindowsIntegrationPlugin> DESTINATION platforms)
+ENDIF()
+
+IF(LMMS_BUILD_WIN32 OR LMMS_INSTALL_DEPENDENCIES)
+	include(InstallTargetDependencies)
+
+	# Collect directories to search for DLLs
+	GET_FILENAME_COMPONENT(QTBIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH)
+	set(LIB_DIRS "${QTBIN_DIR}")
+
+	GET_PROPERTY(PLUGINS_BUILT GLOBAL PROPERTY PLUGINS_BUILT)
+
+	IF(LMMS_BUILD_WIN32)
+		SET(LMMS_DEP_DESTINATION ${BIN_DIR})
+		SET(PLUGIN_DEP_DESTINATION ${BIN_DIR})
+	ELSE()
+		SET(LMMS_DEP_DESTINATION ${LIB_DIR})
+		SET(PLUGIN_DEP_DESTINATION ${LIB_DIR})
+	ENDIF()
+
+	INSTALL_TARGET_DEPENDENCIES(
+			NAME "main_binary"
+			TARGETS lmms
+			DESTINATION "${LMMS_DEP_DESTINATION}"
+			LIB_DIRS  ${LIB_DIRS}
+	)
+
+	INSTALL_TARGET_DEPENDENCIES(
+			NAME "plugins"
+			TARGETS ${PLUGINS_BUILT}
+			DESTINATION ${PLUGIN_DEP_DESTINATION}
+			LIB_DIRS ${LIB_DIRS} "${PLUGIN_DIR}" "${PLUGIN_DIR}/optional"
+			SEARCH_PATH "${PLUGIN_DIR}" "${PLUGIN_DIR}/optional"
+	)
+ENDIF()
+
+IF(LMMS_BUILD_APPLE)
+	INSTALL(CODE "EXECUTE_PROCESS(COMMAND chmod u+x ${CMAKE_BINARY_DIR}/install_apple.sh)")
+	INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_BINARY_DIR}/install_apple.sh)")
+ENDIF()

cmake/install/excludelist-win

@@ -0,0 +1,23 @@
+# List of DLLs considered to be system libraries.
+# This is needed when cross-compiling for Windows.
+ADVAPI32.dll
+COMCTL32.dll
+comdlg32.dll
+dwmapi.dll
+GDI32.dll
+IMM32.dll
+KERNEL32.dll
+MPR.DLL
+msvcrt.dll
+ole32.dll
+OLEAUT32.dll
+OPENGL32.DLL
+SHELL32.dll
+USER32.dll
+UxTheme.dll
+VERSION.dll
+WINMM.DLL
+WS2_32.dll
+RPCRT4.dll
+dsound.dll
+SETUPAPI.dll

cmake/linux/launch_lmms.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+export PATH="$PATH:/sbin"
+if command -v carla > /dev/null 2>&1; then
+   CARLAPATH="$(command -v carla)"
+   CARLAPREFIX="${CARLAPATH%/bin*}"
+   echo "Carla appears to be installed on this system at $CARLAPREFIX/lib[64]/carla so we'll use it."
+   export LD_LIBRARY_PATH=$CARLAPREFIX/lib/carla:$CARLAPREFIX/lib64/carla:$LD_LIBRARY_PATH
+else
+   echo "Carla does not appear to be installed.  That's OK, please ignore any related library errors."
+fi
+export LD_LIBRARY_PATH=$DIR/usr/lib/:$DIR/usr/lib/lmms:$LD_LIBRARY_PATH
+# Prevent segfault on VirualBox
+if lsmod |grep vboxguest > /dev/null 2>&1; then
+   echo "VirtualBox detected.  Forcing libgl software rendering."
+   export LIBGL_ALWAYS_SOFTWARE=1;
+fi
+if ldconfig -p | grep libjack.so.0 > /dev/null 2>&1; then
+   echo "Jack appears to be installed on this system, so we'll use it."
+else
+   echo "Jack does not appear to be installed.  That's OK, we'll use a dummy version instead."
+   export LD_LIBRARY_PATH=$DIR/usr/lib/lmms/optional:$LD_LIBRARY_PATH
+fi
+QT_X11_NO_NATIVE_MENUBAR=1 "$DIR"/usr/bin/lmms.real "$@"

cmake/linux/lmms.desktop

@@ -3,11 +3,11 @@ Name=LMMS
 GenericName=Music production suite
 GenericName[ca]=Programari de producció musical
 GenericName[de]=Software zur Musik-Produktion
-GenericName[fr]=Ensemble pour la production musicale
+GenericName[fr]=Suite de production musicale
 GenericName[pl]=Narzędzia do produkcji muzyki
 Comment=Music sequencer and synthesizer
 Comment[ca]=Producció fàcil de música per a tothom!
-Comment[fr]=Production facile de musique pour tout le monde !
+Comment[fr]=Séquenceur et synthétiseur de musique
 Comment[pl]=Prosta produkcja muzyki dla każdego!
 Icon=lmms
 Exec=lmms %f

cmake/linux/package_linux.sh.in

@@ -99,33 +99,8 @@ cp -R /usr/share/stk/rawwaves/ "${APPDIR}usr/share/stk/"
 
 # Create a wrapper script which calls the lmms executable
 mv "${APPDIR}usr/bin/lmms" "${APPDIR}usr/bin/lmms.real"
-# shellcheck disable=SC1083
-cat >"${APPDIR}usr/bin/lmms" <<EOL
-#!/usr/bin/env bash
-DIR="\$( cd "\$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
-export PATH="$PATH:/sbin"
-if which carla > /dev/null 2>&1; then
-   CARLAPATH="\$(which carla)"
-   CARLAPREFIX="\${CARLAPATH%/bin*}"
-   echo "Carla appears to be installed on this system at \$CARLAPREFIX/lib[64]/carla so we'll use it."
-   export LD_LIBRARY_PATH=\$CARLAPREFIX/lib/carla:\$CARLAPREFIX/lib64/carla:\$LD_LIBRARY_PATH
-else
-   echo "Carla does not appear to be installed.  That's OK, please ignore any related library errors."
-fi
-export LD_LIBRARY_PATH=\$DIR/usr/lib/:\$DIR/usr/lib/lmms:\$LD_LIBRARY_PATH
-# Prevent segfault on VirualBox
-if lsmod |grep vboxguest > /dev/null 2>&1; then
-   echo "VirtualBox detected.  Forcing libgl software rendering."
-   export LIBGL_ALWAYS_SOFTWARE=1;
-fi
-if ldconfig -p | grep libjack.so.0 > /dev/null 2>&1; then
-   echo "Jack appears to be installed on this system, so we'll use it."
-else
-   echo "Jack does not appear to be installed.  That's OK, we'll use a dummy version instead."
-   export LD_LIBRARY_PATH=\$DIR/usr/lib/lmms/optional:\$LD_LIBRARY_PATH
-fi
-QT_X11_NO_NATIVE_MENUBAR=1 \$DIR/usr/bin/lmms.real "\$@"
-EOL
+
+cp "@CMAKE_CURRENT_SOURCE_DIR@/launch_lmms.sh" "${APPDIR}usr/bin/lmms"
 
 chmod +x "${APPDIR}usr/bin/lmms"
 
@@ -133,15 +108,7 @@ chmod +x "${APPDIR}usr/bin/lmms"
 unset LD_LIBRARY_PATH
 
 # Ensure linuxdeployqt can find shared objects
-export LD_LIBRARY_PATH="${APPDIR}usr/lib/lmms/":$LD_LIBRARY_PATH
-
-# Handle wine linking
-if [ -d "@WINE_32_LIBRARY_DIR@" ]; then
-   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@WINE_32_LIBRARY_DIRS@
-fi
-if [ -d "@WINE_64_LIBRARY_DIR@" ]; then
-   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@WINE_64_LIBRARY_DIRS@
-fi
+export LD_LIBRARY_PATH="${APPDIR}"usr/lib/lmms/:"${APPDIR}"usr/lib/lmms/optional:"$LD_LIBRARY_PATH"
 
 # Move executables so linuxdeployqt can find them
 ZYNLIB="${APPDIR}usr/lib/lmms/RemoteZynAddSubFx"
@@ -153,8 +120,18 @@ VSTBIN32="${APPDIR}usr/bin/RemoteVstPlugin32.exe.so"
 VSTBIN64="${APPDIR}usr/bin/RemoteVstPlugin64.exe.so"
 
 mv "$ZYNLIB" "$ZYNBIN"
-mv "$VSTLIB32" "$VSTBIN32"
-mv "$VSTLIB64" "$VSTBIN64"
+mv "$VSTLIB32" "$VSTBIN32" || true
+mv "$VSTLIB64" "$VSTBIN64" || true
+
+# Handle wine linking
+if [ -d "@WINE_32_LIBRARY_DIR@" ] && \
+		ldd "$VSTBIN32" | grep "libwine\.so" | grep "not found"; then
+   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"@WINE_32_LIBRARY_DIRS@"
+fi
+if [ -d "@WINE_64_LIBRARY_DIR@" ] && \
+		ldd "$VSTBIN64" | grep "libwine\.so" | grep "not found"; then
+   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"@WINE_64_LIBRARY_DIRS@"
+fi
 
 # Patch the desktop file
 sed -i 's/.*Exec=.*/Exec=lmms.real/' "$DESKTOPFILE"
@@ -175,22 +152,22 @@ executables="${executables} -executable=${APPDIR}usr/lib/lmms/ladspa/pitch_scale
 # Bundle both qt and non-qt dependencies into appimage format
 echo -e "\nBundling and relinking system dependencies..."
 echo -e ">>>>> linuxdeployqt" > "$LOGFILE"
-# FIXME: -unsupported-allow-new-glibc may result in an AppImage which is unusable on old systems.
 
 # shellcheck disable=SC2086
-"$LINUXDEPLOYQT" "$DESKTOPFILE" $executables -unsupported-allow-new-glibc -bundle-non-qt-libs -verbose=$VERBOSITY $STRIP >> "$LOGFILE" 2>&1
+"$LINUXDEPLOYQT" "$DESKTOPFILE" $executables -bundle-non-qt-libs -verbose=$VERBOSITY $STRIP >> "$LOGFILE" 2>&1
 success "Bundled and relinked dependencies"
 
 # Link to original location so lmms can find them
 ln -sr  "$ZYNBIN" "$ZYNLIB"
-ln -sr  "$VSTBIN32" "$VSTLIB32"
-ln -sr  "$VSTBIN64" "$VSTLIB64"
+ln -sr  "$VSTBIN32" "$VSTLIB32" || true
+ln -sr  "$VSTBIN64" "$VSTLIB64" || true
 
 # Remove wine library conflict
 rm -f "${APPDIR}/usr/lib/libwine.so.1"
 
 # Use system-provided carla
 rm -f "${APPDIR}usr/lib/"libcarla*.so
+rm -f "${APPDIR}usr/lib/lmms/optional/"libcarla*.so
 
 # Remove bundled jack in LD_LIBRARY_PATH if exists
 if [ -e "${APPDIR}/usr/lib/libjack.so.0" ]; then

cmake/modules/BuildPlugin.cmake

@@ -62,14 +62,19 @@ FUNCTION(BUILD_PLUGIN PLUGIN_NAME)
 
 	TARGET_LINK_LIBRARIES(${PLUGIN_NAME} Qt5::Widgets Qt5::Xml lmms)
 
-	INSTALL(TARGETS ${PLUGIN_NAME} DESTINATION "${PLUGIN_DESTINATION}")
+	INSTALL(TARGETS ${PLUGIN_NAME}
+		LIBRARY DESTINATION "${PLUGIN_DESTINATION}"
+		RUNTIME DESTINATION "${PLUGIN_DESTINATION}"
+	)
 
 	IF(LMMS_BUILD_APPLE AND "${PLUGIN_LINK}" STREQUAL "SHARED")
 		SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
 	ENDIF()
 	IF(LMMS_BUILD_WIN32 AND STRIP)
+		IF(STRIP)
+			ADD_CUSTOM_COMMAND(TARGET ${PLUGIN_NAME} POST_BUILD COMMAND ${STRIP} "$<TARGET_FILE:${PLUGIN_NAME}>")
+		ENDIF()
 		SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES PREFIX "")
-		ADD_CUSTOM_COMMAND(TARGET ${PLUGIN_NAME} POST_BUILD COMMAND ${STRIP} "$<TARGET_FILE:${PLUGIN_NAME}>")
 	ENDIF()
 
 	SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${RCC_OUT} ${plugin_MOC_out}")
@@ -84,4 +89,7 @@ FUNCTION(BUILD_PLUGIN PLUGIN_NAME)
 	TARGET_INCLUDE_DIRECTORIES(${PLUGIN_NAME}
 		PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 	)
+
+	SET_PROPERTY(GLOBAL APPEND PROPERTY PLUGINS_BUILT ${PLUGIN_NAME})
+	GET_PROPERTY(PLUGINS_BUILT GLOBAL PROPERTY PLUGINS_BUILT)
 ENDFUNCTION(BUILD_PLUGIN)

cmake/modules/CheckSubmodules.cmake

@@ -7,12 +7,12 @@
 #       INCLUDE(CheckSubmodules)
 #
 # Options:
-#       SET(SKIP_SUBMODULES "foo;bar")
+#       SET(PLUGIN_LIST "zynaddsubfx;...") # skips submodules for plugins not explicitely listed
 #
 # Or via command line:       
-#       cmake -DSKIP_SUBMODULES=foo;bar
+#       cmake -PLUGIN_LIST=foo;bar
 #
-# Copyright (c) 2017, Tres Finocchiaro, <tres.finocchiaro@gmail.com>
+# Copyright (c) 2019, Tres Finocchiaro, <tres.finocchiaro@gmail.com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
@@ -20,13 +20,15 @@
 # Files which confirm a successful clone
 SET(VALID_CRUMBS "CMakeLists.txt;Makefile;Makefile.in;Makefile.am;configure.ac;configure.py;autogen.sh;.gitignore;LICENSE;Home.md")
 
+OPTION(NO_SHALLOW_CLONE "Disable shallow cloning of submodules" OFF)
+
 # Try and use the specified shallow clone on submodules, if supported
 SET(DEPTH_VALUE 100)
 
 # Number of times git commands will retry before failing
 SET(MAX_ATTEMPTS 2)
 
-MESSAGE("\nValidating submodules...")
+MESSAGE("\nChecking submodules...")
 IF(NOT EXISTS "${CMAKE_SOURCE_DIR}/.gitmodules")
 	MESSAGE("Skipping the check because .gitmodules not detected."
 		"Please make sure you have all submodules in the source tree!"
@@ -41,74 +43,106 @@ SET(LANG_BACKUP "$ENV{LANG}")
 SET(ENV{LC_ALL} "C")
 SET(ENV{LANG} "en_US")
 
-# Assume alpha-numeric paths
-STRING(REGEX MATCHALL "path = [-0-9A-Za-z/_]+" SUBMODULE_LIST ${SUBMODULE_DATA})
-STRING(REGEX MATCHALL "url = [.:%-0-9A-Za-z/_]+" SUBMODULE_URL_LIST ${SUBMODULE_DATA})
+# Submodule list pairs, unparsed (WARNING: Assumes alpha-numeric paths)
+STRING(REGEX MATCHALL "path = [-0-9A-Za-z/_]+" SUBMODULE_LIST_RAW ${SUBMODULE_DATA})
+STRING(REGEX MATCHALL "url = [.:%-0-9A-Za-z/_]+" SUBMODULE_URL_RAW ${SUBMODULE_DATA})
 
-FOREACH(_part ${SUBMODULE_LIST})
-	STRING(REPLACE "path = " "" SUBMODULE_PATH ${_part})
+# Submodule list pairs, parsed
+SET(SUBMODULE_LIST "")
+SET(SUBMODULE_URL "")
 
-	LIST(FIND SUBMODULE_LIST ${_part} SUBMODULE_INDEX)
-	LIST(GET SUBMODULE_URL_LIST ${SUBMODULE_INDEX} _url)
-	STRING(REPLACE "url = " "" SUBMODULE_URL ${_url})
+FOREACH(_path ${SUBMODULE_LIST_RAW})
+	# Parse SUBMODULE_PATH
+	STRING(REPLACE "path = " "" SUBMODULE_PATH "${_path}")
+
+	# Grab index for matching SUBMODULE_URL
+	LIST(FIND SUBMODULE_LIST_RAW "${_path}" SUBMODULE_INDEX)
+	LIST(GET SUBMODULE_URL_RAW ${SUBMODULE_INDEX} _url)
+
+	# Parse SUBMODULE_URL
+	STRING(REPLACE "url = " "" SUBMODULE_URL "${_url}")
 
-	# Remove submodules from validation as specified in -DSKIP_SUBMODULES=foo;bar
 	SET(SKIP false)
+
+	# Loop over skipped plugins, add to SKIP_SUBMODULES (e.g. -DPLUGIN_LIST=foo;bar)
+	IF(${SUBMODULE_PATH} MATCHES "^plugins/")
+		SET(REMOVE_PLUGIN true)
+		FOREACH(_plugin ${PLUGIN_LIST})
+			IF(_plugin STREQUAL "")
+				CONTINUE()
+			ENDIF()
+			IF(${SUBMODULE_PATH} MATCHES "${_plugin}")
+				SET(REMOVE_PLUGIN false)
+			ENDIF()
+		ENDFOREACH()
+
+		IF(REMOVE_PLUGIN)
+			LIST(APPEND SKIP_SUBMODULES "${SUBMODULE_PATH}")
+		ENDIF()
+	ENDIF()
+
+	# Finally, loop and mark "SKIP" on match
 	IF(SKIP_SUBMODULES)
 		FOREACH(_skip ${SKIP_SUBMODULES})
-			IF(${SUBMODULE_PATH} MATCHES ${_skip})
-				MESSAGE("-- Skipping ${SUBMODULE_PATH} matches \"${_skip}\"")
+			IF("${SUBMODULE_PATH}" MATCHES "${_skip}")
+				MESSAGE("-- Skipping ${SUBMODULE_PATH} matches \"${_skip}\" (absent in PLUGIN_LIST)")
 				SET(SKIP true)
+				BREAK()
 			ENDIF()
 		ENDFOREACH()
 	ENDIF()
-	IF(NOT SKIP)
-		LIST(INSERT SUBMODULE_LIST ${SUBMODULE_INDEX} ${SUBMODULE_PATH})
-		LIST(INSERT SUBMODULE_URL_LIST ${SUBMODULE_INDEX} ${SUBMODULE_URL})
-	ENDIF()
-	LIST(REMOVE_ITEM SUBMODULE_LIST ${_part})
-	LIST(REMOVE_ITEM SUBMODULE_URL_LIST ${_url})
-ENDFOREACH()
 
+	IF(NOT SKIP)
+		LIST(APPEND SUBMODULE_LIST "${SUBMODULE_PATH}")
+		LIST(APPEND SUBMODULE_URL "${SUBMODULE_URL}")
+	ENDIF()
+ENDFOREACH()
 
 # Once called, status is stored in GIT_RESULT respectively.
 # Note: Git likes to write to stderr.  Don't assume stderr is error; Check GIT_RESULT instead.
-MACRO(GIT_SUBMODULE SUBMODULE_PATH FORCE_DEINIT FORCE_REMOTE)
+MACRO(GIT_SUBMODULE SUBMODULE_PATH FORCE_DEINIT FORCE_REMOTE NO_DEPTH)
 	FIND_PACKAGE(Git REQUIRED)
 	# Handle missing commits
 	SET(FORCE_REMOTE_FLAG "${FORCE_REMOTE}")
+	SET(NO_DEPTH_FLAG "${NO_DEPTH}")
 	IF(FORCE_REMOTE_FLAG)
 		MESSAGE("--   Adding remote submodulefix to ${SUBMODULE_PATH}")
 		EXECUTE_PROCESS(
-			COMMAND ${GIT_EXECUTABLE} remote rm submodulefix
-			COMMAND ${GIT_EXECUTABLE} remote add submodulefix ${FORCE_REMOTE}
-			COMMAND ${GIT_EXECUTABLE} fetch submodulefix
-			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/${SUBMODULE_PATH}
+			COMMAND "${GIT_EXECUTABLE}" remote rm submodulefix
+			COMMAND "${GIT_EXECUTABLE}" remote add submodulefix ${FORCE_REMOTE}
+			COMMAND "${GIT_EXECUTABLE}" fetch submodulefix
+			WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/${SUBMODULE_PATH}"
 			OUTPUT_QUIET ERROR_QUIET
 		)
 		# Recurse
-		GIT_SUBMODULE(${SUBMODULE_PATH} false false)
+		GIT_SUBMODULE(${SUBMODULE_PATH} false false ${NO_DEPTH_FLAG})
 	ELSEIF(${FORCE_DEINIT})
 		MESSAGE("--   Resetting ${SUBMODULE_PATH}")
 		EXECUTE_PROCESS(
-			COMMAND ${GIT_EXECUTABLE} submodule deinit -f ${CMAKE_SOURCE_DIR}/${SUBMODULE_PATH}
-			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+			COMMAND "${GIT_EXECUTABLE}" submodule deinit -f "${CMAKE_SOURCE_DIR}/${SUBMODULE_PATH}"
+			WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
 			OUTPUT_QUIET
 		)
-		# Recurse
-		GIT_SUBMODULE(${SUBMODULE_PATH} false false)
+		MESSAGE("--   Deleting ${CMAKE_SOURCE_DIR}/.git/${SUBMODULE_PATH}")
+		FILE(REMOVE_RECURSE "${CMAKE_SOURCE_DIR}/.git/modules/${SUBMODULE_PATH}")
+		# Recurse without depth
+		GIT_SUBMODULE(${SUBMODULE_PATH} false false true)
 	ELSE()
 		# Try to use the depth switch
-		SET(DEPTH_CMD "")
+		IF(NO_SHALLOW_CLONE OR GIT_VERSION_STRING VERSION_LESS "1.8.4" OR NO_DEPTH_FLAG)
+			# Shallow submodules were introduced in 1.8.4
 			MESSAGE("--   Fetching ${SUBMODULE_PATH}")
-		IF(DEPTH_VALUE)
-			SET(DEPTH_CMD "--depth" )
+			SET(DEPTH_CMD "")
+			SET(DEPTH_VAL "")
+		ELSE()
 			MESSAGE("--   Fetching ${SUBMODULE_PATH} @ --depth ${DEPTH_VALUE}")
+			SET(DEPTH_CMD "--depth")
+			SET(DEPTH_VAL "${DEPTH_VALUE}")
 		ENDIF()
 		
 		EXECUTE_PROCESS(
-			COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive ${DEPTH_CMD} ${DEPTH_VALUE} ${CMAKE_SOURCE_DIR}/${SUBMODULE_PATH}
-			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+			COMMAND "${GIT_EXECUTABLE}" submodule update --init --recursive ${DEPTH_CMD} ${DEPTH_VAL} "${CMAKE_SOURCE_DIR}/${SUBMODULE_PATH}"
+			WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
 			RESULT_VARIABLE GIT_RESULT
 			OUTPUT_VARIABLE GIT_STDOUT
 			ERROR_VARIABLE GIT_STDERR
@@ -124,7 +158,7 @@ SET(RETRY_PHRASES "Failed to recurse;cannot create directory;already exists;${MI
 
 # Attempt to do lazy clone
 FOREACH(_submodule ${SUBMODULE_LIST})
-	STRING(REPLACE "/" ";" PATH_PARTS ${_submodule})
+	STRING(REPLACE "/" ";" PATH_PARTS "${_submodule}")
 	LIST(REVERSE PATH_PARTS)
 	LIST(GET PATH_PARTS 0 SUBMODULE_NAME)
 
@@ -138,14 +172,12 @@ FOREACH(_submodule ${SUBMODULE_LIST})
 		ENDIF()
 	ENDFOREACH()
 	IF(NOT CRUMB_FOUND)
-		GIT_SUBMODULE(${_submodule} false false)
+		GIT_SUBMODULE("${_submodule}" false false false)
 
 		SET(COUNTED 0)
-		SET(COUNTING "")
 		# Handle edge-cases where submodule didn't clone properly or re-uses a non-empty directory
 		WHILE(NOT GIT_RESULT EQUAL 0 AND COUNTED LESS MAX_ATTEMPTS)
-			LIST(APPEND COUNTING "x")
-			LIST(LENGTH COUNTING COUNTED)
+			MATH(EXPR COUNTED "${COUNTED}+1")
 			SET(MISSING_COMMIT false)
 			FOREACH(_phrase ${MISSING_COMMIT_PHRASES})
 				IF("${GIT_MESSAGE}" MATCHES "${_phrase}")
@@ -154,25 +186,16 @@ FOREACH(_submodule ${SUBMODULE_LIST})
 				ENDIF()
 			ENDFOREACH()
 			FOREACH(_phrase ${RETRY_PHRASES})
-				IF(${MISSING_COMMIT})
+				IF(${MISSING_COMMIT} AND COUNTED LESS 2)
 					LIST(FIND SUBMODULE_LIST ${_submodule} SUBMODULE_INDEX)
 					LIST(GET SUBMODULE_URL_LIST ${SUBMODULE_INDEX} SUBMODULE_URL)
 					MESSAGE("--   Retrying ${_submodule} using 'remote add submodulefix' (attempt ${COUNTED} of ${MAX_ATTEMPTS})...")
 					
-					GIT_SUBMODULE(${_submodule} false "${SUBMODULE_URL}")
+					GIT_SUBMODULE("${_submodule}" false "${SUBMODULE_URL}" false)
 					BREAK()
 				ELSEIF("${GIT_MESSAGE}" MATCHES "${_phrase}")
 					MESSAGE("--   Retrying ${_submodule} using 'deinit' (attempt ${COUNTED} of ${MAX_ATTEMPTS})...")
-
-					# Shallow submodules were introduced in 1.8.4
-					# Shallow commits can fail to clone from non-default branches, only try once
-					IF(GIT_VERSION_STRING VERSION_GREATER "1.8.3" AND COUNTED LESS 2)
-						# Try a shallow submodule clone
-					ELSE()
-						UNSET(DEPTH_VALUE)
-					ENDIF()
-					
-					GIT_SUBMODULE(${_submodule} true false)
+					GIT_SUBMODULE("${_submodule}" true false false)
 					BREAK()
 				ENDIF()
 			ENDFOREACH()

cmake/modules/CreateTempFile.cmake

@@ -0,0 +1,21 @@
+function(CreateTempFilePath)
+    set(options CONFIG_SUFFIX)
+    set(oneValueArgs OUTPUT_VAR TAG)
+    set(multiValueArgs CONTENT)
+    cmake_parse_arguments(TEMP "${options}" "${oneValueArgs}"
+            "${multiValueArgs}" ${ARGN} )
+
+    # Use hash to create a unique identifier
+    # for this file.
+    string(SHA1 hashed_content "${TEMP_CONTENT}")
+
+    set(file_name "${CMAKE_BINARY_DIR}/${TEMP_TAG}_${hashed_content}")
+    set(${TEMP_OUTPUT_VAR} "${file_name}" PARENT_SCOPE)
+    if(CONFIG_SUFFIX)
+        set(file_name "${file_name}_$<CONFIG>")
+    endif()
+
+    file(GENERATE OUTPUT "${file_name}"
+            CONTENT "${TEMP_CONTENT}")
+
+endfunction()

cmake/modules/DefineInstallVar.cmake

@@ -0,0 +1,31 @@
+# This functions forwards a variable to
+# the install stage.
+# Parameters:
+#   CONTENT: Variable content.
+#   NAME: Variable name.
+# Options:
+#   GENERATOR_EXPRESSION: Support generator expression for CONTENT.
+function(DEFINE_INSTALL_VAR)
+    set(options GENERATOR_EXPRESSION)
+    set(oneValueArgs NAME )
+    set(multiValueArgs CONTENT)
+    cmake_parse_arguments(VAR "${options}" "${oneValueArgs}"
+            "${multiValueArgs}" ${ARGN} )
+
+    # install(CODE) does not support generator expression in ver<3.14
+    if(VAR_GENERATOR_EXPRESSION AND ${CMAKE_VERSION} VERSION_LESS "3.14.0")
+        include(CreateTempFile)
+        if(CMAKE_CONFIGURATION_TYPES) # in case of multi-config generators like MSVC generators
+            CreateTempFilePath(OUTPUT_VAR file_path TAG "${VAR_NAME}" CONTENT "${VAR_CONTENT}" CONFIG_SUFFIX)
+            install(CODE "file(READ \"${file_path}_\${CMAKE_INSTALL_CONFIG_NAME}\" \"${VAR_NAME}\")")
+        else()
+            CreateTempFilePath(OUTPUT_VAR file_path TAG "${VAR_NAME}" CONTENT "${VAR_CONTENT}")
+            install(CODE "file(READ \"${file_path}\" \"${VAR_NAME}\")")
+        endif()
+    else()
+        if(VAR_GENERATOR_EXPRESSION)
+            cmake_policy(SET CMP0087 NEW)
+        endif()
+        install(CODE "set(\"${VAR_NAME}\" \"${VAR_CONTENT}\")")
+    endif()
+endfunction()

cmake/modules/DetectMachine.cmake

@@ -6,6 +6,8 @@ ELSEIF(APPLE)
 	SET(LMMS_BUILD_APPLE 1)
 ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
 	SET(LMMS_BUILD_OPENBSD 1)
+ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+	SET(LMMS_BUILD_FREEBSD 1)
 ELSEIF(HAIKU)
 	SET(LMMS_BUILD_HAIKU 1)
 ELSE()
@@ -32,6 +34,25 @@ IF(WIN32)
 	ELSE(WIN64)
 		SET(IS_X86 TRUE)
 	ENDIF(WIN64)
+
+	if(MSVC)
+		SET(MSVC_VER ${CMAKE_CXX_COMPILER_VERSION})
+
+		IF(MSVC_VER VERSION_GREATER 19.20 OR MSVC_VER VERSION_EQUAL 19.20)
+			SET(LMMS_MSVC_GENERATOR "Visual Studio 16 2019")
+			SET(LMMS_MSVC_YEAR 2019) # Qt only provides binaries for MSVC 2017, but 2019 is binary compatible
+		ELSEIF(MSVC_VER VERSION_GREATER 19.10 OR MSVC_VER VERSION_EQUAL 19.10)
+			SET(LMMS_MSVC_GENERATOR "Visual Studio 15 2017")
+			SET(LMMS_MSVC_YEAR 2017)
+		ELSEIF(MSVC_VER VERSION_GREATER 19.0 OR MSVC_VER VERSION_EQUAL 19.0)
+			SET(LMMS_MSVC_GENERATOR "Visual Studio 14 2015")
+			SET(LMMS_MSVC_YEAR 2015)
+		ELSE()
+			MESSAGE(SEND_WARNING "Can't detect MSVC version: ${MSVC_VER}")
+		ENDIF()
+
+		unset(MSVC_VER)
+	endif()
 ELSE(WIN32)
 	EXEC_PROGRAM( ${CMAKE_C_COMPILER} ARGS "-dumpmachine ${CMAKE_C_FLAGS}" OUTPUT_VARIABLE Machine )
 	MESSAGE("Machine: ${Machine}")

cmake/modules/FindSDL2.cmake

@@ -82,7 +82,7 @@ SET(SDL2_SEARCH_PATHS
 FIND_PATH(SDL2_INCLUDE_DIR SDL.h
 	HINTS
 	$ENV{SDL2DIR}
-	PATH_SUFFIXES include/SDL2 include
+	PATH_SUFFIXES SDL2 include/SDL2 include
 	PATHS ${SDL2_SEARCH_PATHS}
 )
 

cmake/modules/FindWine.cmake

@@ -11,11 +11,19 @@ MACRO(_findwine_find_flags output expression result)
 	STRING(REPLACE " " ";" WINEBUILD_FLAGS "${output}")
 	FOREACH(FLAG ${WINEBUILD_FLAGS})
 		IF("${FLAG}" MATCHES "${expression}")
-			SET(${result} "${FLAG}")
+			LIST(APPEND ${result} "${FLAG}")
 		ENDIF()
 	ENDFOREACH()
 ENDMACRO()
 
+MACRO(_regex_replace_foreach EXPRESSION REPLACEMENT RESULT INPUT)
+	SET(${RESULT} "")
+	FOREACH(ITEM ${INPUT})
+		STRING(REGEX REPLACE "${EXPRESSION}" "${REPLACEMENT}" ITEM "${ITEM}")
+		LIST(APPEND ${RESULT} "${ITEM}")
+	ENDFOREACH()
+ENDMACRO()
+
 LIST(APPEND CMAKE_PREFIX_PATH /opt/wine-stable /opt/wine-devel /opt/wine-staging /usr/lib/wine/)
 
 FIND_PROGRAM(WINE_CXX
@@ -31,10 +39,10 @@ IF(WINE_CXX)
 	_findwine_find_flags("${WINEBUILD_OUTPUT_32}" "^-isystem" WINEGCC_INCLUDE_DIR)
 	_findwine_find_flags("${WINEBUILD_OUTPUT_32}" "libwinecrt0\\.a.*" WINECRT_32)
 	_findwine_find_flags("${WINEBUILD_OUTPUT_64}" "libwinecrt0\\.a.*" WINECRT_64)
-	STRING(REGEX REPLACE "^-isystem" "" WINE_INCLUDE_HINT "${WINEGCC_INCLUDE_DIR}")
-	STRING(REGEX REPLACE "/wine/windows$" "" WINE_INCLUDE_HINT "${WINE_INCLUDE_HINT}")
-	STRING(REGEX REPLACE "libwinecrt0\\.a.*" "" WINE_32_LIBRARY_DIR "${WINECRT_32}")
-	STRING(REGEX REPLACE "libwinecrt0\\.a.*" "" WINE_64_LIBRARY_DIR "${WINECRT_64}")
+	_regex_replace_foreach("^-isystem" "" WINE_INCLUDE_HINT "${WINEGCC_INCLUDE_DIR}")
+	_regex_replace_foreach("/wine/windows$" "" WINE_INCLUDE_HINT "${WINE_INCLUDE_HINT}")
+	STRING(REGEX REPLACE "wine/libwinecrt0\\.a.*" "" WINE_32_LIBRARY_DIR "${WINECRT_32}")
+	STRING(REGEX REPLACE "wine/libwinecrt0\\.a.*" "" WINE_64_LIBRARY_DIR "${WINECRT_64}")
 
 	IF(BUGGED_WINEGCC)
 		MESSAGE(WARNING "Your winegcc is unusable due to https://bugs.winehq.org/show_bug.cgi?id=46293,\n
@@ -76,7 +84,7 @@ IF(WINE_CXX)
 ENDIF()
 
 FIND_PATH(WINE_INCLUDE_DIR wine/exception.h
-	HINTS "${WINE_INCLUDE_HINT}"
+	HINTS ${WINE_INCLUDE_HINT}
 )
 
 SET(_ARCHITECTURE ${CMAKE_LIBRARY_ARCHITECTURE})

cmake/modules/InstallDependencies.cmake

@@ -0,0 +1,184 @@
+include(GetPrerequisites)
+include(CMakeParseArguments)
+
+CMAKE_POLICY(SET CMP0011 NEW)
+CMAKE_POLICY(SET CMP0057 NEW)
+
+function(make_absolute var)
+	get_filename_component(abs "${${var}}" ABSOLUTE BASE_DIR "${CMAKE_INSTALL_PREFIX}")
+	set(${var} ${abs} PARENT_SCOPE)
+endfunction()
+
+# Reads lines of a file into a list, skipping '#' comment lines
+function(READ_LIST_FILE FILE VAR)
+	file(STRINGS "${FILE}" list)
+
+	set(result "")
+	foreach(item ${list})
+		string(STRIP "${item}" item)
+		if(item STREQUAL "" OR item MATCHES "^\#")
+			continue()
+		endif()
+		list(APPEND result "${item}")
+	endforeach()
+
+	set(${VAR} ${result} PARENT_SCOPE)
+endfunction()
+
+function(make_all_absolute list_var)
+	set(result "")
+	foreach(file ${${list_var}})
+		make_absolute(file)
+		list(APPEND result ${file})
+	endforeach()
+	set(${list_var} ${result} PARENT_SCOPE)
+endfunction()
+
+if(CMAKE_BINARY_DIR)
+	set(tmp_lib_dir "${CMAKE_BINARY_DIR}/bundled-libraries")
+elseif(CMAKE_HOST_UNIX)
+	set(tmp_lib_dir "/tmp/bundled-libraries")
+elseif(DEFINED ENV{TEMP})
+	set(tmp_lib_dir "$ENV{TMP}/bundled-libraries")
+else()
+	message(FATAL_ERROR "Can't find a temp dir for libraries")
+endif()
+
+# Like file(INSTALL), but resolves symlinks
+function(install_file_resolved file destination)
+
+	get_filename_component(file_name "${file}" NAME)
+	if(IS_SYMLINK "${file}")
+		get_filename_component(real_path "${file}" REALPATH)
+		get_filename_component(real_name "${real_path}" NAME)
+		file(COPY "${real_path}" DESTINATION "${tmp_lib_dir}")
+		file(RENAME "${tmp_lib_dir}/${real_name}" "${tmp_lib_dir}/${file_name}")
+		set(file_path "${tmp_lib_dir}/${file_name}")
+	else()
+		set(file_path "${file}")
+	endif()
+
+	file(INSTALL "${file_path}" DESTINATION "${destination}")
+endfunction()
+
+function(install_resolved)
+	cmake_parse_arguments("" "" "DESTINATION" "FILES" ${ARGN})
+	foreach(file ${_FILES})
+		install_file_resolved("${file}" "${_DESTINATION}")
+	endforeach()
+endfunction()
+
+if(CMAKE_CROSSCOMPILING)
+	# If we're cross-compiling, GetPrerequisites may not be able to find system libraries such as kernel32.dll because
+	# they're supplied by the toolchain. To suppress thousands of lines of warnings being printed to the console, we
+	# override gp_resolved_file_type to return "system" for any library in ${IGNORE_LIBS} without trying to resolve the
+	# file first.
+	# GetPrerequisites supports using an override function called gp_resolved_file_type_override, but it's not suited
+	# for our purpose because it's only called by gp_resolved_file_type *after* trying to resolve the file.
+	function(gp_resolved_file_type original_file file exepath dirs type_var)
+		set(file_find "${file}")
+		if(_IGNORE_CASE)
+			# On case-insensitive systems, convert to upper characters to respect it
+			string(TOUPPER "${file_find}" file_find)
+		endif()
+		SET(IGNORE_LIBS ${_IGNORE_LIBS} CACHE INTERNAL "Ignored library names" FORCE)
+		if(IGNORE_LIBS AND ${file_find} IN_LIST IGNORE_LIBS)
+			set(${type_var} system PARENT_SCOPE)
+		else()
+			#_gp_resolved_file_type(${ARGV})
+			_gp_resolved_file_type("${original_file}" "${file}" "${exepath}" "${dirs}" "${type_var}" ${ARGN})
+		endif()
+	endfunction()
+endif()
+
+function(INSTALL_DEPENDENCIES)
+	cmake_parse_arguments("" "INCLUDE_SYSTEM;IGNORE_CASE" "GP_TOOL;DESTINATION;IGNORE_LIBS_FILE" "FILES;LIB_DIRS;SEARCH_PATHS;IGNORE_LIBS" ${ARGN})
+
+	# Make paths absolute
+	make_absolute(_DESTINATION)
+	make_all_absolute(_FILES)
+	make_all_absolute(_LIB_DIRS)
+	make_all_absolute(_SEARCH_PATHS)
+
+	if(_INCLUDE_SYSTEM)
+		set(EXCLUDE_SYSTEM 0)
+	else()
+		set(EXCLUDE_SYSTEM 1)
+	endif()
+
+	if(_IGNORE_LIBS_FILE)
+		READ_LIST_FILE("${_IGNORE_LIBS_FILE}" _IGNORE_LIBS)
+		if(_IGNORE_CASE)
+			# On case-insensitive systems, convert to upper characters to respect it
+			string(TOUPPER "${_IGNORE_LIBS}" _IGNORE_LIBS)
+		endif()
+		SET(IGNORE_LIBS ${_IGNORE_LIBS} CACHE INTERNAL "Ignored library names" FORCE)
+	endif()
+
+	if(_GP_TOOL)
+		set(gp_tool "${_GP_TOOL}")
+	endif()
+
+	set(prereqs "")
+	foreach(file ${_FILES})
+		get_filename_component(file_name "${file}" NAME)
+		message("-- Finding prerequisites of ${file_name}")
+		find_prerequisites("${file}" _prereqs
+			${EXCLUDE_SYSTEM} # exclude system files
+			1 # recurse
+			""
+			"${_LIB_DIRS}"
+			"${_SEARCH_PATHS}"
+			"${_IGNORE_LIBS}"
+		)
+
+		list(APPEND prereqs ${_prereqs})
+	endforeach()
+
+	list(REMOVE_DUPLICATES prereqs)
+
+	foreach(prereq ${prereqs})
+		get_filename_component(prereq_name "${prereq}" NAME)
+
+		foreach(rpath ${_SEARCH_PATHS})
+			if(EXISTS "${rpath}/${prereq_name}")
+				list(REMOVE_ITEM prereqs "${prereq}")
+				break()
+			endif()
+		endforeach()
+	endforeach()
+
+	#file(INSTALL ${prereqs} DESTINATION ${_DESTINATION})
+	install_resolved(FILES ${prereqs} DESTINATION "${_DESTINATION}")
+endfunction()
+
+# Like get_prerequisites, but returns full paths
+function(FIND_PREREQUISITES target RESULT_VAR exclude_system recurse
+	exepath dirs rpaths)
+	set(RESULTS)
+
+	get_prerequisites("${target}" _prereqs ${exclude_system} ${recurse}
+                  "" "${dirs}" "${rpaths}")
+
+	foreach(prereq ${_prereqs})
+		get_filename_component(prereq_name "${prereq}" NAME)
+		if(_IGNORE_CASE)
+			# Windows is case insensitive.
+			# Use upper characters to respect it.
+			string(TOUPPER "${prereq_name}" prereq_name)
+		endif()
+		if("${prereq_name}" IN_LIST IGNORE_LIBS)
+			continue()
+		endif()
+
+		gp_resolve_item("${LIB_DLL}" "${prereq}" "" "${dirs}" RESOLVED_PREREQ "${rpaths}")
+
+		if(RESOLVED_PREREQ AND IS_ABSOLUTE ${RESOLVED_PREREQ} AND EXISTS ${RESOLVED_PREREQ})
+			list(APPEND RESULTS ${RESOLVED_PREREQ})
+		else()
+			message(FATAL_ERROR "Can't resolve dependency ${prereq}.")
+		endif()
+	endforeach()
+
+	set(${RESULT_VAR} ${RESULTS} PARENT_SCOPE)
+endfunction()

cmake/modules/InstallTargetDependencies.cmake

@@ -0,0 +1,89 @@
+include(DefineInstallVar)
+
+SET(DEFAULT_SEARCH_DIRECTORIES "${BIN_DIR}" "${LIB_DIR}" "${CMAKE_FIND_ROOT_PATH}" "${CMAKE_PREFIX_PATH}")
+SET(DEFAULT_SEARCH_SUFFIXES "bin" "lib" "../bin")
+
+# Like INSTALL_DEPENDENCIES but can be called from regular cmake code
+# (instead of install(CODE)), takes targets instead of files,
+# takes care of configuring search paths, and other platform-specific tweaks.
+# Arguments:
+#	TARGETS:			list of cmake targets to install.
+#	NAME:				unique string for this install.
+#	DESTINATION:		directory path to install the binaries to.
+#	LIB_DIRS:			list of paths for looking up dependencies.
+#	LIB_DIRS_SUFFIXES:	list of possible suffixes for LIB_DIRS entries.
+#	NO_DEFAULT_PATHS:	supply this value to avoid adding DEFAULT_SEARCH_DIRECTORIES
+#						to LIB_DIRS and DEFAULT_SEARCH_SUFFIXES to LIB_DIRS_SUFFIXES.
+FUNCTION(INSTALL_TARGET_DEPENDENCIES)
+	set(options NO_DEFAULT_PATHS)
+	set(oneValueArgs NAME)
+	set(multiValueArgs TARGETS DESTINATION LIB_DIRS_SUFFIXES LIB_DIRS)
+	cmake_parse_arguments(DEPS "${options}" "${oneValueArgs}"
+			"${multiValueArgs}" ${ARGN} )
+
+	if(NOT DEPS_LIB_DIRS)
+		set(DEPS_LIB_DIRS "")
+	endif()
+
+	# Set default values.
+	if(NOT DEPS_NO_DEFAULT_PATHS)
+		list(APPEND DEPS_LIB_DIRS ${DEFAULT_SEARCH_DIRECTORIES})
+		set(DEPS_LIB_DIRS_SUFFIXES "${DEPS_LIB_DIRS_SUFFIXES}" ${DEFAULT_SEARCH_SUFFIXES})
+	endif()
+
+	FOREACH(TARGET ${DEPS_TARGETS})
+		IF(NOT TARGET ${TARGET})
+			message(FATAL_ERROR "Not a target: ${TARGET}")
+		ENDIF()
+
+		# Collect target output files.
+		LIST(APPEND DEPLOY_TARGETS "$<TARGET_FILE:${TARGET}>")
+
+		# Collect target link directories
+		get_target_property(target_libs ${TARGET} LINK_LIBRARIES)
+
+		foreach(lib ${target_libs})
+			if(TARGET ${lib} OR NOT IS_ABSOLUTE ${lib})
+				continue()
+			endif()
+
+			get_filename_component(lib_dir ${lib} PATH)
+			list(APPEND DEPS_LIB_DIRS ${lib_dir})
+		endforeach()
+	ENDFOREACH()
+
+	LIST(APPEND DEPS_LIB_DIRS ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES})
+
+	FOREACH(LIB_PATH ${DEPS_LIB_DIRS})
+		FOREACH(suffix ${DEPS_LIB_DIRS_SUFFIXES})
+			list(APPEND DEPS_LIB_DIRS "${LIB_PATH}/${suffix}")
+		ENDFOREACH()
+	ENDFOREACH()
+
+	DEFINE_INSTALL_VAR(NAME "DEPLOY_FILES" CONTENT "${DEPLOY_TARGETS}" GENERATOR_EXPRESSION)
+
+	LIST(REMOVE_DUPLICATES DEPS_LIB_DIRS)
+
+	IF(LMMS_BUILD_LINUX)
+		FILE(DOWNLOAD "https://raw.githubusercontent.com/AppImage/AppImages/master/excludelist"
+				"${CMAKE_BINARY_DIR}/excludelist")
+		SET(additional_args INCLUDE_SYSTEM IGNORE_LIBS_FILE ${CMAKE_BINARY_DIR}/excludelist)
+	ELSEIF(LMMS_BUILD_WIN32)
+		SET(additional_args IGNORE_CASE IGNORE_LIBS_FILE "${LMMS_SOURCE_DIR}/cmake/install/excludelist-win")
+		IF(CMAKE_CROSSCOMPILING)
+			SET(additional_args "${additional_args}" GP_TOOL objdump)
+		ENDIF()
+	ENDIF()
+
+	INSTALL(CODE "
+		INCLUDE(\"${LMMS_SOURCE_DIR}/cmake/modules/InstallDependencies.cmake\")
+
+		INSTALL_DEPENDENCIES(
+			FILES \"\${DEPLOY_FILES}\"
+			DESTINATION \"${DEPS_DESTINATION}\"
+			LIB_DIRS \"${DEPS_LIB_DIRS}\"
+			SEARCH_PATHS \"${DEPS_SEARCH_PATHS}\"
+			${additional_args}
+		)
+	")
+ENDFUNCTION()

cmake/modules/PluginList.cmake

@@ -0,0 +1,105 @@
+# Provides a fast mechanism for filtering the plugins used at build-time
+SET(PLUGIN_LIST "" CACHE STRING "List of plug-ins to build")
+STRING(REPLACE " " ";" PLUGIN_LIST "${PLUGIN_LIST}")
+OPTION(LMMS_MINIMAL "Build a minimal list of plug-ins" OFF)
+OPTION(LIST_PLUGINS "Lists the available plugins for building" OFF)
+
+SET(MINIMAL_LIST
+	audio_file_processor
+	kicker
+	triple_oscillator
+)
+
+IF(LMMS_MINIMAL)
+	IF("${PLUGIN_LIST}" STREQUAL "")
+		STRING(REPLACE ";" " " MINIMAL_LIST_STRING "${MINIMAL_LIST}")
+		MESSAGE(
+"-- Using minimal plug-ins: ${MINIMAL_LIST_STRING}\n"
+"   Note: You can specify specific plug-ins using -DPLUGIN_LIST=\"foo bar\""
+		)
+	ENDIF()
+	SET(PLUGIN_LIST ${MINIMAL_LIST} ${PLUGIN_LIST})
+ENDIF()
+
+SET(LMMS_PLUGIN_LIST
+	${MINIMAL_LIST}
+	Amplifier
+	BassBooster
+	bit_invader
+	Bitcrush
+	carlabase
+	carlapatchbay
+	carlarack
+	CrossoverEQ
+	Delay
+	DualFilter
+	dynamics_processor
+	Eq
+	Flanger
+	HydrogenImport
+	ladspa_browser
+	LadspaEffect
+	lb302
+	MidiImport
+	MidiExport
+	MultitapEcho
+	monstro
+	nes
+	OpulenZ
+	organic
+	FreeBoy
+	patman
+	peak_controller_effect
+	GigPlayer
+	ReverbSC
+	sf2_player
+	sfxr
+	sid
+	SpectrumAnalyzer
+	stereo_enhancer
+	stereo_matrix
+	stk
+	vst_base
+	vestige
+	VstEffect
+	watsyn
+	waveshaper
+	Vectorscope
+	vibed
+	Xpressive
+	zynaddsubfx
+)
+
+IF("${PLUGIN_LIST}" STREQUAL "")
+	SET(PLUGIN_LIST ${LMMS_PLUGIN_LIST})
+ENDIF()
+
+MACRO(LIST_ALL_PLUGINS)
+	MESSAGE("\n\nAll possible -DPLUGIN_LIST values")
+	MESSAGE("\n   KEYWORD:")
+	MESSAGE("      -DLMMS_MINIMAL=True")
+	FOREACH(item IN LISTS MINIMAL_LIST)
+		MESSAGE("         ${item}")
+	ENDFOREACH()
+	MESSAGE("\n   NAME:")
+	FOREACH(item IN LISTS LMMS_PLUGIN_LIST)
+		MESSAGE("      ${item}")
+	ENDFOREACH()
+	MESSAGE("\nNote:  This value also impacts the fetching of git submodules.\n")
+	MESSAGE(FATAL_ERROR "Information was requested, aborting build!")
+ENDMACRO()
+
+IF(LIST_PLUGINS)
+	UNSET(LIST_PLUGINS CACHE)
+	LIST_ALL_PLUGINS()
+ENDIF()
+
+IF(MSVC)
+	SET(MSVC_INCOMPATIBLE_PLUGINS
+		LadspaEffect
+		zynaddsubfx
+	)
+	message(WARNING "Compiling with MSVC. The following plugins are not available: ${MSVC_INCOMPATIBLE_PLUGINS}")
+	LIST(REMOVE_ITEM PLUGIN_LIST ${MSVC_INCOMPATIBLE_PLUGINS})
+ENDIF()
+

cmake/modules/winegcc_wrapper.in

@@ -58,6 +58,9 @@ if [ "$win64" = true ] && [ "$no_link" != true ]; then
 	extra_args="$extra_args @WINE_64_FLAGS@"
 fi
 
+# Work around https://bugs.winehq.org/show_bug.cgi?id=47710
+extra_args="$extra_args -D__WIDL_objidl_generated_name_0000000C="
+
 # Run winegcc
 export WINEBUILD=@WINE_BUILD@
 @WINE_CXX@ $extra_args $args

cmake/msys/extract_debs.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+set -e
+
 ppa_dir=./ppa/
 
 pushd $ppa_dir

cmake/msys/msys_helper.sh

@@ -68,7 +68,7 @@ stkver="4.5.1"
 mingw_root="/$(echo "$MSYSTEM"|tr '[:upper:]' '[:lower:]')"
 
 info "Downloading and building fltk $fltkver"
-if ! which fluid; then
+if ! command -v fluid; then
 	wget http://fltk.org/pub/fltk/$fltkver/fltk-$fltkver-source.tar.gz -O "$HOME/fltk-source.tar.gz"
 	tar zxf "$HOME/fltk-source.tar.gz" -C "$HOME/"
 	pushd "$HOME/fltk-$fltkver"

cmake/nsis/CMakeLists.txt

@@ -1,3 +1,8 @@
+SET(WIN_PLATFORM mingw)
+if(LMMS_MSVC_YEAR)
+	SET(WIN_PLATFORM "msvc${LMMS_MSVC_YEAR}")
+endif()
+
 SET(CPACK_PACKAGE_ICON                  "${CMAKE_SOURCE_DIR}/cmake/nsis/nsis_branding.bmp")
 IF(MSVC)
 	STRING(REPLACE "/" "\\\\" CPACK_PACKAGE_ICON ${CPACK_PACKAGE_ICON})
@@ -15,7 +20,7 @@ SET(CPACK_NSIS_DEFINES                  "
   !include FileAssociation.nsh
   !include LogicLib.nsh
   !include WinVer.nsh")
-SET(CPACK_PACKAGE_FILE_NAME             "${CMAKE_PROJECT_NAME}-${VERSION}-win32")
+SET(CPACK_PACKAGE_FILE_NAME             "${CMAKE_PROJECT_NAME}-${VERSION}-${WIN_PLATFORM}-win32")
 SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS   "
   \\\${registerExtension} \\\"$INSTDIR\\\\${CMAKE_PROJECT_NAME}.exe\\\" \\\".mmp\\\" \\\"${PROJECT_NAME_UCASE} Project\\\"
   \\\${registerExtension} \\\"$INSTDIR\\\\${CMAKE_PROJECT_NAME}.exe\\\" \\\".mmpz\\\" \\\"${PROJECT_NAME_UCASE} Project (compressed)\\\"
@@ -31,7 +36,7 @@ SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
   " PARENT_SCOPE)
 
 IF(WIN64)
-	SET(CPACK_PACKAGE_FILE_NAME      "${CMAKE_PROJECT_NAME}-${VERSION}-win64")
+	SET(CPACK_PACKAGE_FILE_NAME      "${CMAKE_PROJECT_NAME}-${VERSION}-${WIN_PLATFORM}-win64")
 	SET(CPACK_INSTALL_FIX "$PROGRAMFILES64\\\\${CPACK_PACKAGE_INSTALL_DIRECTORY}\\\\")
 	SET(CPACK_NSIS_DEFINES "
 		${CPACK_NSIS_DEFINES} 

cmake/postinstall/CMakeLists.txt

@@ -1,4 +0,0 @@
-IF(LMMS_BUILD_APPLE)
-	INSTALL(CODE "EXECUTE_PROCESS(COMMAND chmod u+x ${CMAKE_BINARY_DIR}/install_apple.sh)")
-	INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_BINARY_DIR}/install_apple.sh)")
-ENDIF()

data/locale/pl.ts

@@ -3108,7 +3108,7 @@ Możesz usunąć i przenieść kanały FX w menu kontekstowym, które jest dost
     </message>
     <message>
         <source>VELOCITY</source>
-        <translation>GŁOŚNOŚĆ UDERZENIA</translation>
+        <translation>PRĘDKOŚĆ</translation>
     </message>
     <message>
         <source>ENABLE MIDI OUTPUT</source>
@@ -10321,4 +10321,4 @@ Kontrolka LED w prawym dolnym rogu edytora kształtu fali pokazuje, czy wybrana
         <translation>Wzmocnienie wyścia</translation>
     </message>
 </context>
-</TS>
+</TS>

data/locale/ru.ts

@@ -1664,7 +1664,7 @@ Oe Ai &lt;oeai/at/symbiants/dot/com&gt;</translation>
     <message>
         <location filename="../../src/gui/widgets/EffectView.cpp" line="66"/>
         <source>W/D</source>
-        <translation>НАСЫЩ</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../../src/gui/widgets/EffectView.cpp" line="69"/>
@@ -1679,7 +1679,7 @@ Oe Ai &lt;oeai/at/symbiants/dot/com&gt;</translation>
     <message>
         <location filename="../../src/gui/widgets/EffectView.cpp" line="76"/>
         <source>DECAY</source>
-        <translation>ЗАТУХАНИЕ</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../../src/gui/widgets/EffectView.cpp" line="79"/>

data/locale/sv.ts

@@ -1658,7 +1658,7 @@ If you're interested in translating LMMS in another language or want to imp
     <message>
         <location filename="../../src/gui/widgets/EffectView.cpp" line="66"/>
         <source>W/D</source>
-        <translation>B/T</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../../src/gui/widgets/EffectView.cpp" line="69"/>
@@ -1673,7 +1673,7 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     <message>
         <location filename="../../src/gui/widgets/EffectView.cpp" line="76"/>
         <source>DECAY</source>
-        <translation>FÖRFALL</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../../src/gui/widgets/EffectView.cpp" line="79"/>

data/locale/uk.ts

@@ -1678,7 +1678,7 @@ If you're interested in translating LMMS in another language or want to imp
     <message>
         <location filename="../../src/gui/widgets/EffectView.cpp" line="76"/>
         <source>DECAY</source>
-        <translation>ЗГАСАННЯ</translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../../src/gui/widgets/EffectView.cpp" line="79"/>

data/presets/ZynAddSubFX/Companion/0074-Smooth Expanded.xiz

@@ -19,7 +19,7 @@
 <string name="author">Will Godfrey
 GPL V 2 or later</string>
 <string name="comments">Now has a slow long tail.
-Only really noticable on lower notes.</string>
+Only really noticeable on lower notes.</string>
 <par name="type" value="12" />
 </INFO>
 <INSTRUMENT_KIT>