Bump version to 1.2.0-rc8

Population of the PortAudio setup widget has been delayed until it is shown, as it was causing crashes on some systems.

.circleci/config.yml

@@ -0,0 +1,11 @@
+# Dummy CircleCI Config File
+version: 2
+jobs:
+  build:
+    machine: true
+    branches:
+      ignore: stable-1.2
+    steps:
+      - run:
+          name: Dummy
+          command: echo "Dummy command to prevent error"

.gitattributes

@@ -1,2 +1,3 @@
 .gitattributes export-ignore
 .gitignore export-ignore
+data/locale/* linguist-documentation

.github/no-response.yml

@@ -0,0 +1,2 @@
+# Label requiring a response
+responseRequiredLabel: "response required"

.gitignore

@@ -1,6 +1,7 @@
 /build
 /target
 .*.sw?
+.DS_Store
 *~
 /CMakeLists.txt.user
 /plugins/zynaddsubfx/zynaddsubfx/ExternalPrograms/Controller/Makefile

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "src/3rdparty/qt5-x11embed"]
+	path = src/3rdparty/qt5-x11embed
+	url = https://github.com/Lukas-W/qt5-x11embed.git
+[submodule "src/3rdparty/rpmalloc/rpmalloc"]
+	path = src/3rdparty/rpmalloc/rpmalloc
+	url = https://github.com/rampantpixels/rpmalloc.git

.mailmap

@@ -1,5 +1,5 @@
 Alexandre Almeida <wilsalx@gmail.com> <meta.lx@hotmail.com>
-Tobias Doerffel <tobias.doerffel@gmail.com>
+Tobias Junghans <tobias.doerffel@gmail.com>
 Dave French <dave.french3@googlemail.com>
 Paul Giblock <drfaygo@gmail.com> <pgib@users.sf.net>
 Paul Giblock <drfaygo@gmail.com> <p@pgiblock.net>
@@ -25,3 +25,7 @@ midi-pascal <midi-pascal@videotron.ca> <pascal@TDE.(none)>
 Thomas Clark <the.thomas.j.clark@gmail.com>
 Thomas Clark <the.thomas.j.clark@gmail.com> <tjclark@wpi.edu>
 anonymous <support@lmms.io> Locale updater <>
+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>

.travis.yml

@@ -1,29 +1,60 @@
 language: cpp
 compiler: gcc
+dist: trusty
+sudo: required
+cache:
+    directories:
+        - apt_mingw_cache
+        - $HOME/.ccache
+        - $HOME/pbuilder-bases
 matrix:
     include:
         - env: TARGET_OS=win32
         - env: TARGET_OS=win64
-        - env: QT5=True
         - os: osx
+          osx_image: xcode8.2
+        - env: QT5=
+        - env: QT5=True
+        - env: QT5=True TARGET_OS=win32 TARGET_DEPLOY=True
+        - env: QT5=True TARGET_OS=win64 TARGET_DEPLOY=True
+        - os: osx
+          osx_image: xcode8.2
+          env: QT5=True
+        - env: TARGET_OS=debian-sid TARGET_DEPLOY=True
+        - env: TARGET_OS=debian-sid TARGET_ARCH=i386
+        - compiler: clang
+          env: TARGET_OS=debian-sid
 before_install:
-   - sh ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.before_install.sh
+   - . ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.before_install.sh
 install:
-    - sh ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.install.sh
+    - . ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.install.sh
 before_script:
-    - mkdir build && cd build
+    - export CMAKE_FLAGS="-DWANT_QT5=$QT5 -DUSE_WERROR=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo"
+    - if [ -z "$TRAVIS_TAG" ]; then export CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_CCACHE=ON"; fi
 script:
-    - sh ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.script.sh
-    - make -j4
-    - if [[ $TARGET_OS != win* ]]; then make tests && ./tests/tests; fi;
-before_deploy: make package
+    - . ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.script.sh
+after_script:
+    - ccache -s
+before_deploy:
+    - if [ "$TARGET_OS" != debian-sid ]; then make package; fi
 deploy:
     provider: releases
     api_key:
         secure: d4a+x4Gugpss7JK2DcHjyBZDmEFFh4iVfKDfITSD50T6Mc6At4LMgojvEu+6qT6IyOY2vm3UVT6fhyeuWDTRDwW9tfFlaHVA0h8aTRD+eAXOA7pQ8rEMwQO3+WCKuKTfEqUkpL4wxhww8dpkv54tqeIs0S4TBqz9tk8UhzU7XbE=
-    file: lmms-${TRAVIS_TAG:1}-$TARGET_OS.exe
+    file_glob: true
+    file:
+        - lmms-${TRAVIS_TAG:1}-$TARGET_OS.exe
+        - /var/cache/pbuilder/result/lmms_*.tar.xz
+    skip_cleanup: true
     on:
         tags: true
         all_branches: true
-        condition: "$TARGET_OS != linux"
+        condition: '"$TARGET_DEPLOY" = True'
     repo: LMMS/lmms
+notifications:
+    webhooks:
+       urls:
+           - https://webhooks.gitter.im/e/1ac7fc698195981a9227
+       on_success: change  # options: [always|never|change] default: always
+       on_failure: always  # options: [always|never|change] default: always
+       on_start: never     # options: [always|never|change] default: always 

.travis/ccache.sha256

@@ -0,0 +1 @@
+0de866bc0ee26de392e037104b174474989a830e2249280a136144baa44557aa ccache_3.2.4-1_amd64.deb

.travis/debian_pkgs.sha256

@@ -0,0 +1,2 @@
+314ef4af137903dfb13e8c3ef1e6ea56cfdb23808d52ec4f5f50e288c73610c5  pbuilder_0.229.1_all.deb
+fa82aa8ed3055c6f6330104deedf080b26778295e589426d4c4dd0f2c2a5defa  debootstrap_1.0.95_all.deb

.travis/linux..before_install.sh

@@ -1,7 +1,9 @@
-sudo add-apt-repository ppa:kalakris/cmake -y;
-sudo add-apt-repository ppa:andrewrk/libgroove -y;
-if [ $QT5 ]
-	then
-	sudo add-apt-repository ppa:ubuntu-sdk-team/ppa -y
-fi
-sudo apt-get update -qq
+#!/usr/bin/env bash
+
+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 dpkg --add-architecture i386
+sudo apt-get update -qq || true

.travis/linux..install.sh

@@ -1,13 +1,25 @@
-PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev  libogg-dev
-	libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev
-	libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev
+#!/usr/bin/env bash
+
+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
 	libgig-dev libsoundio-dev"
 
-if [ $QT5 ]
-then
-	PACKAGES="$PACKAGES qtbase5-dev qttools5-dev-tools qttools5-dev"
+VST_PACKAGES="wine-dev libqt5x11extras5-dev qtbase5-private-dev libxcb-util0-dev libxcb-keysyms1-dev"
+
+# Help with unmet dependencies
+PACKAGES="$PACKAGES $VST_PACKAGES libjack-jackd2-0"
+
+if [ $QT5 ]; then
+	PACKAGES="$PACKAGES qt59base qt59translations qt59tools"
 else
 	PACKAGES="$PACKAGES libqt4-dev"
 fi
 
 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-git

.travis/linux..script.sh

@@ -1 +1,14 @@
-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_WERROR=ON -DWANT_QT5=$QT5 ..
+#!/usr/bin/env bash
+mkdir build
+cd build
+
+if [ $QT5 ]; then
+	unset QTDIR QT_PLUGIN_PATH LD_LIBRARY_PATH
+	source /opt/qt59/bin/qt59-env.sh
+fi
+
+cmake -DUSE_WERROR=ON $CMAKE_FLAGS ..
+
+make -j4
+make tests
+./tests/tests

.travis/linux.debian-sid.before_install.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+sudo apt-get update -qq

.travis/linux.debian-sid.install.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+sudo apt-get install -y \
+	debian-archive-keyring \
+	dpkg \
+	pbuilder
+
+# work around a pbuilder bug which breaks ccache
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666525
+cd /tmp
+wget http://archive.ubuntu.com/ubuntu/pool/main/p/pbuilder/pbuilder_0.229.1_all.deb
+wget http://archive.ubuntu.com/ubuntu/pool/main/d/debootstrap/debootstrap_1.0.95_all.deb
+sha256sum -c "$TRAVIS_BUILD_DIR/.travis/debian_pkgs.sha256"
+sudo dpkg -i pbuilder_0.229.1_all.deb debootstrap_1.0.95_all.deb
+cd "$OLDPWD"

.travis/linux.debian-sid.script.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+set -e
+
+: ${TARGET_ARCH:=amd64}
+
+BASETGZ="$HOME/pbuilder-bases/debian-sid-$TARGET_ARCH.tgz"
+MIRROR=http://cdn-fastly.deb.debian.org/debian
+KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
+
+if [ -z "$TRAVIS_TAG" ]
+then
+	sudo \
+	sh -c "echo CCACHEDIR=$HOME/.ccache >> /etc/pbuilderrc"
+fi
+
+if [ "$CC" = clang ]
+then
+	sudo sh -c "echo EXTRAPACKAGES=clang >> /etc/pbuilderrc"
+fi
+
+if [ ! -e "$BASETGZ.stamp" ]
+then
+	mkdir -p "$HOME/pbuilder-bases"
+	sudo pbuilder --create --basetgz "$BASETGZ" --mirror $MIRROR \
+		--distribution sid --architecture $TARGET_ARCH \
+		--debootstrapopts --variant=buildd \
+		--debootstrapopts --keyring=$KEYRING \
+		--debootstrapopts --include=perl
+	touch "$BASETGZ.stamp"
+else
+	sudo pbuilder --update --basetgz "$BASETGZ"
+fi
+
+DIR="$PWD"
+cd ..
+dpkg-source -b "$DIR"
+env -i CC="$CC" CXX="$CXX" sudo pbuilder --build --debbuildopts "--jobs=auto" \
+	--basetgz "$BASETGZ" ./*.dsc

.travis/linux.win.download.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -e
+
+CACHE_DIR=$TRAVIS_BUILD_DIR/apt_mingw_cache/$1
+mkdir -p $CACHE_DIR
+
+pushd $CACHE_DIR
+
+apt-get --print-uris --yes install $MINGW_PACKAGES | grep ^\' | cut -d\' -f2 > downloads.list
+wget -N --input-file downloads.list
+
+sudo cp ./*.deb /var/cache/apt/archives/
+
+popd

.travis/linux.win32.before_install.sh

@@ -1,2 +1,4 @@
-sudo add-apt-repository ppa:tobydox/mingw-x-precise -y
+#!/usr/bin/env bash
+
+sudo add-apt-repository ppa:tobydox/mingw-x-trusty -y
 sudo apt-get update -qq

.travis/linux.win32.install.sh

@@ -1,7 +1,31 @@
-sudo apt-get install -y nsis cloog-isl libmpc2 mingw32
+#!/usr/bin/env bash
+set -e
 
-sudo apt-get install -y mingw32-x-qt mingw32-x-sdl mingw32-x-libvorbis 			\
-	mingw32-x-fluidsynth mingw32-x-stk mingw32-x-glib2 mingw32-x-portaudio		\
-	mingw32-x-libsndfile mingw32-x-fftw mingw32-x-flac mingw32-x-fltk			\
-	mingw32-x-libsamplerate mingw32-x-pkgconfig mingw32-x-binutils				\
-	mingw32-x-gcc mingw32-x-runtime mingw32-x-libgig mingw32-x-libsoundio
+if [ $QT5 ]; then
+	MINGW_PACKAGES="mingw32-x-qt5base"
+else
+	MINGW_PACKAGES="mingw32-x-qt"
+fi
+
+MINGW_PACKAGES="mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x-stk
+	mingw32-x-glib2 mingw32-x-portaudio mingw32-x-libsndfile mingw32-x-fftw
+	mingw32-x-flac mingw32-x-fltk mingw32-x-libsamplerate
+	mingw32-x-pkgconfig mingw32-x-binutils mingw32-x-gcc mingw32-x-runtime
+	mingw32-x-libgig mingw32-x-libsoundio mingw32-x-lame $MINGW_PACKAGES"
+
+export MINGW_PACKAGES
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+. $DIR/linux.win.download.sh win32
+
+PACKAGES="nsis cloog-isl libmpc3 qt4-linguist-tools mingw32 $MINGW_PACKAGES"
+
+sudo apt-get install -y $PACKAGES
+
+# ccache 3.2 is needed because mingw32-x-gcc is version 4.9, which causes cmake
+# to use @file command line passing, which in turn ccache 3.1.9 doesn't support
+pushd /tmp
+wget http://archive.ubuntu.com/ubuntu/pool/main/c/ccache/ccache_3.2.4-1_amd64.deb
+sha256sum -c $TRAVIS_BUILD_DIR/.travis/ccache.sha256
+sudo dpkg -i ccache_3.2.4-1_amd64.deb
+popd

.travis/linux.win32.script.sh

@@ -1,2 +1,8 @@
-export CMAKE_OPTS="-DUSE_WERROR=ON"
-../cmake/build_mingw32.sh || ../cmake/build_mingw32.sh
+#!/usr/bin/env bash
+mkdir build
+cd build
+
+export CMAKE_OPTS="$CMAKE_FLAGS -DUSE_WERROR=ON"
+../cmake/build_mingw32.sh
+
+make -j4

.travis/linux.win64.before_install.sh

@@ -1 +1,3 @@
-sh .travis/linux.win32.before_install.sh
+#!/usr/bin/env bash
+
+. .travis/linux.win32.before_install.sh

.travis/linux.win64.install.sh

@@ -1,7 +1,26 @@
-sh .travis/linux.win32.install.sh
+#!/usr/bin/env bash
+set -e
 
-sudo apt-get install -y mingw64-x-qt mingw64-x-sdl mingw64-x-libvorbis			\
-	mingw64-x-fluidsynth mingw64-x-stk mingw64-x-glib2 mingw64-x-portaudio		\
-	mingw64-x-libsndfile mingw64-x-fftw mingw64-x-flac mingw64-x-fltk			\
-	mingw64-x-libsamplerate mingw64-x-pkgconfig mingw64-x-binutils mingw64-x-gcc\
-	mingw64-x-runtime mingw64-x-libgig mingw64-x-libsoundio
+# First, install 32-bit deps
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+. $DIR/linux.win32.install.sh
+
+
+if [ $QT5 ]; then
+	MINGW_PACKAGES="mingw64-x-qt5base"
+else
+	MINGW_PACKAGES="mingw64-x-qt"
+fi
+
+MINGW_PACKAGES="mingw64-x-sdl mingw64-x-libvorbis mingw64-x-fluidsynth mingw64-x-stk
+	mingw64-x-glib2 mingw64-x-portaudio mingw64-x-libsndfile
+	mingw64-x-fftw mingw64-x-flac mingw64-x-fltk mingw64-x-libsamplerate
+	mingw64-x-pkgconfig mingw64-x-binutils mingw64-x-gcc mingw64-x-runtime
+	mingw64-x-libgig mingw64-x-libsoundio mingw64-x-lame $MINGW_PACKAGES"
+
+export MINGW_PACKAGES
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+. $DIR/linux.win.download.sh win64
+
+sudo apt-get install -y $MINGW_PACKAGES

.travis/linux.win64.script.sh

@@ -1,2 +1,8 @@
-export CMAKE_OPTS="-DUSE_WERROR=ON"
-../cmake/build_mingw64.sh || ../cmake/build_mingw64.sh
+#!/usr/bin/env bash
+mkdir build
+cd build
+
+export CMAKE_OPTS="$CMAKE_FLAGS -DUSE_WERROR=ON"
+../cmake/build_mingw64.sh
+
+make -j4

.travis/osx..before_install.sh

@@ -1 +1,3 @@
+#!/usr/bin/env bash
+
 brew update

.travis/osx..install.sh

@@ -1 +1,17 @@
-brew install qt libsndfile fftw libvorbis libogg jack sdl libsamplerate stk fluid-synth portaudio fltk
+#!/usr/bin/env bash
+
+PACKAGES="cmake pkgconfig fftw libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio node fltk carla"
+
+if [ $QT5 ]; then
+	PACKAGES="$PACKAGES qt5"
+fi
+
+brew install $PACKAGES ccache
+
+if [ -z "$QT5" ]; then
+	brew tap cartr/qt4
+	brew tap-pin cartr/qt4
+	brew install qt@4
+fi
+
+sudo npm install -g appdmg

.travis/osx..script.sh

@@ -1 +1,14 @@
-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. -DUSE_WERROR=OFF
+#!/usr/bin/env bash
+mkdir build
+cd build
+
+if [ $QT5 ]; then
+        # Workaround; No FindQt5.cmake module exists
+        export CMAKE_PREFIX_PATH="$(brew --prefix qt5)"
+fi
+
+cmake $CMAKE_FLAGS -DUSE_WERROR=OFF ..
+
+make -j4
+make tests
+./tests/tests

.tx/config

@@ -0,0 +1,11 @@
+[main]
+host = https://www.transifex.com
+minimum_perc = 51
+#Need to finish at least 51% before merging back
+
+[lmms.lmms]
+file_filter = data/locale/<lang>.ts
+source_file = data/locale/en.ts
+source_lang = en
+type = QT
+

CMakeLists.txt

@@ -9,6 +9,8 @@ IF(COMMAND CMAKE_POLICY)
 	CMAKE_POLICY(SET CMP0003 NEW)
 	IF (CMAKE_MAJOR_VERSION GREATER 2)
 		CMAKE_POLICY(SET CMP0026 OLD)
+		CMAKE_POLICY(SET CMP0045 NEW)
+		CMAKE_POLICY(SET CMP0050 OLD)
 	ENDIF()
 ENDIF(COMMAND CMAKE_POLICY)
 
@@ -18,26 +20,25 @@ INCLUDE(FindPkgConfig)
 
 STRING(TOUPPER          "${CMAKE_PROJECT_NAME}" PROJECT_NAME_UCASE)
 
-# Timestamp available since cmake 2.8.11
-IF(CMAKE_VERSION VERSION_LESS "2.8.11")
-	EXECUTE_PROCESS(COMMAND date +%Y OUTPUT_VARIABLE PROJECT_YEAR OUTPUT_STRIP_TRAILING_WHITESPACE)
-ELSE()
-	STRING(TIMESTAMP        PROJECT_YEAR "%Y")
-ENDIF()
+SET(PROJECT_YEAR 2019)
 
 SET(PROJECT_AUTHOR      "LMMS Developers")
-SET(PROJECT_URL         "http://lmms.io")
+SET(PROJECT_URL         "https://lmms.io")
 SET(PROJECT_EMAIL       "lmms-devel@lists.sourceforge.net")
 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       "1")
-SET(VERSION_PATCH       "90")
-#SET(VERSION_SUFFIX     "")
-SET(VERSION             "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-IF(VERSION_SUFFIX)
-	SET(VERSION     "${VERSION}-${VERSION_SUFFIX}")
-ENDIF(VERSION_SUFFIX)
+SET(VERSION_MINOR       "2")
+SET(VERSION_RELEASE     "0")
+SET(VERSION_STAGE       "rc8")
+SET(VERSION_BUILD       "0")
+SET(VERSION             "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}")
+IF(VERSION_STAGE)
+	SET(VERSION     "${VERSION}-${VERSION_STAGE}")
+ENDIF()
+IF(VERSION_BUILD)
+	SET(VERSION     "${VERSION}.${VERSION_BUILD}")
+ENDIF()
 
 # Override version information for non-base builds
 INCLUDE(VersionInfo)
@@ -50,9 +51,12 @@ OPTION(WANT_CAPS	"Include C* Audio Plugin Suite (LADSPA plugins)" ON)
 OPTION(WANT_CARLA	"Include Carla plugin" ON)
 OPTION(WANT_CMT		"Include Computer Music Toolkit LADSPA plugins" ON)
 OPTION(WANT_JACK	"Include JACK (Jack Audio Connection Kit) support" ON)
+OPTION(WANT_WEAKJACK	"Loosely link JACK libraries" ON)
+OPTION(WANT_MP3LAME	"Include MP3/Lame support" ON)
 OPTION(WANT_OGGVORBIS	"Include OGG/Vorbis support" ON)
 OPTION(WANT_PULSEAUDIO	"Include PulseAudio support" ON)
 OPTION(WANT_PORTAUDIO	"Include PortAudio support" ON)
+OPTION(WANT_SNDIO	"Include sndio support" ON)
 OPTION(WANT_SOUNDIO	"Include libsoundio support" ON)
 OPTION(WANT_SDL		"Include SDL (Simple DirectMedia Layer) support" ON)
 OPTION(WANT_SF2		"Include SoundFont2 player plugin" ON)
@@ -67,7 +71,8 @@ OPTION(WANT_QT5		"Build with Qt5" OFF)
 
 
 IF(LMMS_BUILD_APPLE)
-	SET(WANT_SF2 OFF)
+	# Fix linking on 10.14+. See issue #4762 on github
+	LINK_DIRECTORIES(/usr/local/lib)
 	SET(WANT_ALSA OFF)
 	SET(WANT_PULSEAUDIO OFF)
 	SET(WANT_VST OFF)
@@ -83,12 +88,14 @@ IF(LMMS_BUILD_WIN32)
 	SET(WANT_ALSA OFF)
 	SET(WANT_JACK OFF)
 	SET(WANT_PULSEAUDIO OFF)
-	SET(WANT_SYSTEM_SR OFF)
+	SET(WANT_SNDIO OFF)
+	SET(WANT_SOUNDIO OFF)
 	SET(WANT_WINMM ON)
 	SET(LMMS_HAVE_WINMM TRUE)
 	SET(STATUS_ALSA "<not supported on this platform>")
 	SET(STATUS_JACK "<not supported on this platform>")
 	SET(STATUS_PULSEAUDIO "<not supported on this platform>")
+	SET(STATUS_SOUNDIO "<disabled in this release>")
 	SET(STATUS_WINMM "OK")
 	SET(STATUS_APPLEMIDI "<not supported on this platform>")
 ELSE(LMMS_BUILD_WIN32)
@@ -132,7 +139,7 @@ IF(WANT_QT5)
 
 	FIND_PACKAGE(Qt5Core REQUIRED)
 	FIND_PACKAGE(Qt5Gui REQUIRED)
-	FIND_PACKAGE(Qt5LinguistTools REQUIRED)
+	FIND_PACKAGE(Qt5LinguistTools)
 	FIND_PACKAGE(Qt5Widgets REQUIRED)
 	FIND_PACKAGE(Qt5Xml REQUIRED)
 
@@ -150,6 +157,14 @@ IF(WANT_QT5)
 		Qt5::Xml
 	)
 
+	IF(LMMS_BUILD_LINUX)
+		FIND_PACKAGE(Qt5X11Extras REQUIRED)
+		LIST(APPEND QT_LIBRARIES Qt5::X11Extras)
+	ENDIF()
+
+	# Resolve Qt5::qmake to full path for use in packaging scripts
+	GET_TARGET_PROPERTY(QT_QMAKE_EXECUTABLE "${Qt5Core_QMAKE_EXECUTABLE}" IMPORTED_LOCATION)
+
 	FIND_PACKAGE(Qt5Test)
 	SET(QT_QTTEST_LIBRARY Qt5::Test)
 ELSE()
@@ -216,7 +231,11 @@ ENDIF(WANT_TAP)
 
 # check for CARLA
 IF(WANT_CARLA)
-	PKG_CHECK_MODULES(CARLA carla-standalone>=1.9.5)
+	PKG_CHECK_MODULES(CARLA carla-native-plugin)
+	# look for carla under old name
+	IF(NOT CARLA_FOUND)
+		PKG_CHECK_MODULES(CARLA carla-standalone>=1.9.5)
+	ENDIF()
 	IF(CARLA_FOUND)
 		SET(LMMS_HAVE_CARLA TRUE)
 		SET(STATUS_CARLA "OK")
@@ -305,6 +324,21 @@ IF(NOT LMMS_HAVE_PULSEAUDIO)
 ENDIF(NOT LMMS_HAVE_PULSEAUDIO)
 
 
+# check for MP3/Lame-libraries
+IF(WANT_MP3LAME)
+	FIND_PACKAGE(Lame)
+	IF(LAME_FOUND)
+		SET(LMMS_HAVE_MP3LAME TRUE)
+		SET(STATUS_MP3LAME "OK")
+	ELSE(LAME_FOUND)
+		SET(STATUS_MP3LAME "not found, please install libmp3lame-dev (or similar)")
+		SET(LAME_LIBRARIES "")
+		SET(LAME_INCLUDE_DIRS "")
+	ENDIF(LAME_FOUND)
+ELSE(WANT_MP3LAME)
+	SET(STATUS_MP3LAME "Disabled for build")
+ENDIF(WANT_MP3LAME)
+
 # check for OGG/Vorbis-libraries
 IF(WANT_OGGVORBIS)
 	FIND_PACKAGE(OggVorbis)
@@ -347,8 +381,16 @@ ENDIF(NOT LMMS_HAVE_ALSA)
 IF(WANT_JACK)
 	PKG_CHECK_MODULES(JACK jack>=0.77)
 	IF(JACK_FOUND)
+		IF(WANT_WEAKJACK)
+			SET(LMMS_HAVE_WEAKJACK TRUE)
+			SET(STATUS_JACK "OK (weak linking enabled)")
+			SET(JACK_INCLUDE_DIRS "")
+			# use dlsym instead
+			SET(JACK_LIBRARIES ${CMAKE_DL_LIBS})
+		ELSE()
+			SET(STATUS_JACK "OK")
+		ENDIF()
 		SET(LMMS_HAVE_JACK TRUE)
-		SET(STATUS_JACK "OK")
 	ELSE(JACK_FOUND)
 		SET(STATUS_JACK "not found, please install libjack0.100.0-dev (or similar) "
 			"if you require JACK support")
@@ -360,6 +402,10 @@ ENDIF(WANT_JACK)
 PKG_CHECK_MODULES(FFTW3F REQUIRED fftw3f>=3.0.0)
 
 
+# check for FLTK
+FIND_PACKAGE(FLTK)
+
+
 # check for Fluidsynth
 IF(WANT_SF2)
 	PKG_CHECK_MODULES(FLUIDSYNTH fluidsynth>=1.0.7)
@@ -384,14 +430,31 @@ If(WANT_GIG)
 ENDIF(WANT_GIG)
 
 # check for pthreads
-IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE)
+IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD)
 	FIND_PACKAGE(Threads)
-ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE)
+ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD)
+
+IF(WANT_SNDIO)
+	FIND_PACKAGE(Sndio)
+	IF(SNDIO_FOUND)
+		SET(LMMS_HAVE_SNDIO TRUE)
+        	SET(STATUS_SNDIO "OK")
+    	ELSE()
+        	SET(STATUS_SNDIO "<not found or not supported on this platform>")
+	ENDIF(SNDIO_FOUND)
+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)
@@ -437,10 +500,15 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DLMMS_DEBUG")
 FILE(REMOVE include/lmmsconfig.h)
 
 FILE(GLOB LMMS_INCLUDES "${CMAKE_SOURCE_DIR}/include/*.h")
+LIST(SORT LMMS_INCLUDES)
 
-# Get list of all committers from git history, ordered by number of commits
+# Get list of all committers from git history, ordered by number of commits.
+# The CONTRIBUTORS file is used by AboutDialog. This information can be provided
+# with -DCONTRIBUTORS=/path/to/CONTRIBUTORS instead. For instance, to generate
+# this file for version 1.1.3, the command is:
+# 	git shortlog -sne v1.1.3 | cut -c8-
 FIND_PACKAGE(Git)
-IF(GIT_FOUND)
+IF(GIT_FOUND AND NOT CONTRIBUTORS)
 	SET(CONTRIBUTORS "${CMAKE_BINARY_DIR}/CONTRIBUTORS")
 	EXECUTE_PROCESS(
 		COMMAND "${GIT_EXECUTABLE}" shortlog -sne
@@ -448,7 +516,7 @@ IF(GIT_FOUND)
 		OUTPUT_FILE "${CONTRIBUTORS}"
 		WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
 		TIMEOUT 1)
-ENDIF(GIT_FOUND)
+ENDIF()
 
 # embedded resources stuff
 IF(WIN32 OR WIN64)
@@ -470,6 +538,19 @@ ELSE(WIN32)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DPIC")
 ENDIF(WIN32)
 
+# use ccache
+OPTION(USE_CCACHE "Use ccache for compilation" OFF)
+IF(USE_CCACHE)
+    FIND_PROGRAM(CCACHE ccache)
+    IF (CCACHE)
+        MESSAGE(STATUS "Using ccache found in PATH")
+        SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE})
+        SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE})
+    ELSE()
+        MESSAGE(WARNING "USE_CCACHE enabled, but no ccache found")
+    ENDIF()
+ENDIF()
+
 # make sub-directories
 ADD_SUBDIRECTORY(cmake)
 ADD_SUBDIRECTORY(src)
@@ -482,9 +563,10 @@ ADD_SUBDIRECTORY(doc)
 ADD_SUBDIRECTORY(cmake/postinstall)
 
 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\""
+				COMMAND gzip -c ${CMAKE_SOURCE_DIR}/doc/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz
 				DEPENDS "${CMAKE_SOURCE_DIR}/doc/lmms.1"
-				COMMENT "Generating lmms.1.gz")
+				COMMENT "Generating lmms.1.gz"
+				VERBATIM)
 
 
 ADD_CUSTOM_TARGET(manpage ALL
@@ -507,6 +589,7 @@ IF(LMMS_BUILD_WIN32)
 		FILE(GLOB ZASF_BINARIES
 			"${CMAKE_SOURCE_DIR}/extras/plugins/zynaddsubfx/zynaddsubfx.dll"
 			"${CMAKE_SOURCE_DIR}/extras/plugins/zynaddsubfx/remote_zynaddsubfx.exe")
+		LIST(SORT ZASF_BINARIES)
 		INSTALL(FILES "${ZASF_BINARIES}" DESTINATION "${PLUGIN_DIR}")
 	ENDIF(EXISTS "${CMAKE_SOURCE_DIR}/extras")
 ENDIF(LMMS_BUILD_WIN32)
@@ -548,6 +631,7 @@ MESSAGE(
 "* ALSA                        : ${STATUS_ALSA}\n"
 "* JACK                        : ${STATUS_JACK}\n"
 "* OSS                         : ${STATUS_OSS}\n"
+"* Sndio                       : ${STATUS_SNDIO}\n"
 "* PortAudio                   : ${STATUS_PORTAUDIO}\n"
 "* libsoundio                  : ${STATUS_SOUNDIO}\n"
 "* PulseAudio                  : ${STATUS_PULSEAUDIO}\n"
@@ -559,6 +643,8 @@ MESSAGE(
 "-------------------------\n"
 "* ALSA                        : ${STATUS_ALSA}\n"
 "* OSS                         : ${STATUS_OSS}\n"
+"* Sndio                       : ${STATUS_SNDIO}\n"
+"* JACK                        : ${STATUS_JACK}\n"
 "* WinMM                       : ${STATUS_WINMM}\n"
 "* AppleMidi                   : ${STATUS_APPLEMIDI}\n"
 )
@@ -568,6 +654,7 @@ MESSAGE(
 "-----------------------------------------\n"
 "* WAVE                        : OK\n"
 "* OGG/VORBIS                  : ${STATUS_OGGVORBIS}\n"
+"* MP3/Lame                    : ${STATUS_MP3LAME}\n"
 )
 
 MESSAGE(
@@ -596,4 +683,3 @@ MESSAGE(
 "\n\n")
 
 INCLUDE(InstallRequiredSystemLibraries)
-

README.md

@@ -1,5 +1,10 @@
-#![LMMS Logo](http://lmms.sourceforge.net/Lmms_logo.png) LMMS
-[![Build Status](https://travis-ci.org/LMMS/lmms.png)](https://travis-ci.org/LMMS/lmms)
+# ![LMMS Logo](http://lmms.sourceforge.net/Lmms_logo.png) LMMS
+
+[![Build status](https://img.shields.io/travis/LMMS/lmms.svg?maxAge=3600)](https://travis-ci.org/LMMS/lmms)
+[![Latest stable release](https://img.shields.io/github/release/LMMS/lmms.svg?maxAge=3600)](https://lmms.io/download)
+[![Overall downloads on Github](https://img.shields.io/github/downloads/LMMS/lmms/total.svg?maxAge=3600)](https://github.com/LMMS/lmms/releases)
+[![Join the chat at Discord](https://img.shields.io/badge/chat-on%20discord-7289DA.svg)](https://discord.gg/3sc5su7)
+[![Localise on transifex](https://img.shields.io/badge/localise-on_transifex-green.svg)](https://www.transifex.com/lmms/lmms/)
 
 What is LMMS?
 --------------
@@ -10,12 +15,12 @@ the creation of melodies and beats, the synthesis and mixing of sounds, and
 arranging of samples. You can have fun with your MIDI-keyboard and much more;
 all in a user-friendly and modern interface.
 
-[Homepage](http://lmms.io)<br>
+[Homepage](https://lmms.io)<br>
 [Downloads/Releases](https://github.com/LMMS/lmms/releases)<br>
 [Developer Wiki](https://github.com/LMMS/lmms/wiki)<br>
-[Artist & User Wiki/Documentation](http://lmms.io/documentation)<br>
-[Sound Demos](http://lmms.io/showcase/)<br>
-[LMMS Sharing Platform](http://lmms.io/lsp/) Share your songs!
+[Artist & User Wiki/Documentation](https://lmms.io/documentation)<br>
+[Sound Demos](https://lmms.io/showcase/)<br>
+[LMMS Sharing Platform](https://lmms.io/lsp/) Share your songs!
 
 Features
 ---------
@@ -23,16 +28,16 @@ Features
 * Song-Editor for composing songs
 * A Beat+Bassline-Editor for creating beats and basslines
 * An easy-to-use Piano-Roll for editing patterns and melodies
-* An FX mixer with 64 FX channels and arbitrary number of effects allow unlimited mixing possibilities
+* An FX mixer with unlimited FX channels and arbitrary number of effects
 * Many powerful instrument and effect-plugins out of the box
 * Full user-defined track-based automation and computer-controlled automation sources
 * Compatible with many standards such as SoundFont2, VST(i), LADSPA, GUS Patches, and full MIDI support
-* Import of MIDI and FLP (FL Studio®/Fruityloops® Project) files
+* MIDI file importing and exporting
 
 Building
 ---------
 
-See [Compiling LMMS](https://github.com/LMMS/lmms/wiki/Compiling-lmms) on our
+See [Compiling LMMS](https://github.com/LMMS/lmms/wiki/Compiling) on our
 wiki for information on how to build LMMS.
 
 

buildtools/update_locales

@@ -0,0 +1,71 @@
+#!/bin/bash
+aberr(){ printf "[\e[31mERROR\e[0m]: \e[1m%s\e[0m\n" "$*" >&2; }
+abinfo(){ printf "[\e[96mINFO\e[0m]: \e[1m%s\e[0m\n" "$*" >&2; }
+
+function upload_to_tx() {
+  if ! which tx > /dev/null; then
+    aberr "You don't have Transifex client installed. \n Run \`pip install transifex-client\` to install it."
+    exit 1
+  fi
+  abinfo "Uploading to transifex..."
+  if ! tx push -s; then
+    aberr "Problems occurred when uploading strings to Transifex."
+    printf "\t Either there are syntax errors in source file or you don't have permission to update the source file."
+    exit 1
+  fi
+  exit 0
+}
+
+function validate() {
+  ERR_LANG=""
+  ERR_BUF=""
+  for i in data/locale/*.ts; do
+    if ! ERR_BUF=$(lconvert-qt5 -i "${i}" -o "/tmp/test.qm" -of qm 2>&1); then
+      ERR_LANG+="\e[96m$(basename "${i}")\e[0m: \e[93m${ERR_BUF}\e[0m "
+      printf "\e[31mx\e[0m"
+      continue
+    fi
+    printf "\e[32m.\e[0m"
+  done
+  echo ""
+  if [[ "x${ERR_LANG}" != "x" ]]; then
+    aberr "The following files failed the validation: "
+    echo -e "${ERR_LANG}"
+  fi
+}
+
+abinfo "Checking for your environment..."
+if ! which lupdate-qt5 > /dev/null; then
+  aberr "You don't seem to have Qt i18n tools installed."
+  printf "\tUsually this comes with your Qt installation, or you need to\n"
+  printf "\tinstall extra packages like \`qt5-tools\` or similar.\n"
+  exit 1;
+fi
+
+abinfo "Scanning directories..."
+
+if test -d src/3rdparty/qt5-x11embed/3rdparty/ECM/; then
+  # prevent from collecting strings in ECM
+  rm -rf src/3rdparty/qt5-x11embed/3rdparty/ECM/
+fi
+
+if ! lupdate-qt5 -I include/ src/ plugins/ -ts data/locale/en.ts; then
+  aberr "There are some problems when collecting the strings."
+  exit 1
+fi
+
+abinfo "Validating translations..."
+validate
+
+abinfo "Translations successfully updated."
+printf "Do you want to upload translations to Transifex? [y/N]: "
+read -n 1 -r TX
+echo ""
+
+if [[ "$TX" == "y" || "$TX" == "Y" ]]; then
+  upload_to_tx
+fi
+
+abinfo "No upload as required."
+
+exit 0

cmake/CMakeLists.txt

@@ -4,13 +4,16 @@ SET(CPACK_PACKAGE_DESCRIPTION_FILE              "${CMAKE_SOURCE_DIR}/README.md")
 SET(CPACK_RESOURCE_FILE_LICENSE                 "${CMAKE_SOURCE_DIR}/LICENSE.txt")
 SET(CPACK_PACKAGE_VERSION_MAJOR                 "${VERSION_MAJOR}")
 SET(CPACK_PACKAGE_VERSION_MINOR                 "${VERSION_MINOR}")
-SET(CPACK_PACKAGE_VERSION_PATCH                 "${VERSION_PATCH}")
+SET(CPACK_PACKAGE_VERSION_PATCH                 "${VERSION_RELEASE}")
+IF(VERSION_STAGE)
+	SET(CPACK_PACKAGE_VERSION_PATCH         "${CPACK_PACKAGE_VERSION_PATCH}-${VERSION_STAGE}")
+ENDIF()
+IF(VERSION_BUILD)
+	SET(CPACK_PACKAGE_VERSION_PATCH         "${CPACK_PACKAGE_VERSION_PATCH}.${VERSION_BUILD}")
+ENDIF()
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY             "${PROJECT_NAME_UCASE}")
 SET(CPACK_SOURCE_GENERATOR                      "TBZ2")
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME              "${CMAKE_PROJECT_NAME}-${VERSION}")
-IF(VERSION_SUFFIX)
-	SET(CPACK_PACKAGE_VERSION_PATCH         "${VERSION_PATCH}-${VERSION_SUFFIX}")
-ENDIF()
 IF(NOT DEFINED WIN32)
 	SET(CPACK_STRIP_FILES                   "bin/${CMAKE_PROJECT_NAME};${PLUGIN_DIR}/*.so")
 	SET(CPACK_PACKAGE_EXECUTABLES           "${CMAKE_PROJECT_NAME}" "${PROJECT_NAME_UCASE} binary")

cmake/apple/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(MACOSX_BUNDLE_ICON_FILE             "lmms.icns")
+SET(MACOSX_BUNDLE_ICON_FILE             "icon.icns")
 SET(MACOSX_BUNDLE_GUI_IDENTIFIER        "${PROJECT_NAME_UCASE}")
 SET(MACOSX_BUNDLE_LONG_VERSION_STRING   "${VERSION}")
 SET(MACOSX_BUNDLE_BUNDLE_NAME           "${PROJECT_NAME_UCASE}")
@@ -10,7 +10,7 @@ SET(MACOSX_BUNDLE_MIMETYPE_ICON         "project.icns")
 SET(MACOSX_BUNDLE_MIMETYPE_ID           "io.lmms")
 SET(MACOSX_BUNDLE_PROJECT_URL           "${PROJECT_URL}")
 
-CONFIGURE_FILE("lmms.plist.in"          "${CMAKE_INSTALL_PREFIX}/Info.plist")
+CONFIGURE_FILE("lmms.plist.in"          "${CMAKE_BINARY_DIR}/Info.plist")
 CONFIGURE_FILE("install_apple.sh.in"    "${CMAKE_BINARY_DIR}/install_apple.sh" @ONLY)
 CONFIGURE_FILE("package_apple.json.in"  "${CMAKE_BINARY_DIR}/package_apple.json" @ONLY)
 

cmake/apple/install_apple.sh.in

@@ -1,81 +1,83 @@
 #!/bin/bash
-#title         :install_apple.sh
-#description   :Creates Apple ".app" bundle for LMMS
-#author        :Tres Finocchiaro
-#date          :20140504
-#version       :1.1
-#usage         :bash create_applet_installer.sh
-#notes         :See also https://github.com/LMMS
-#notes         :Troubleshooting try: export DYLD_PRINT_LIBRARIES=1; export VERBOSE=1;
-#requires      :deploymacqt
-#=========================================================================================
+# Creates Apple ".app" bundle for @PROJECT_NAME_UCASE@
+# Note:
+#   Examine linkings using `otool -L somelib.so`
+#   Debug the loading of dynamic libraries using `export DYLD_PRINT_LIBRARIES=1`
+
 # STK rawwaves directory
 STK_RAWWAVE=$HOME/stk-*/rawwaves
+
+if [ ! -d "$STK_RAWWAVE" ]; then
+   STK_RAWWAVE=$(brew --prefix stk)/share/stk/rawwaves
+fi
  
 # Place to create ".app" bundle
 APP="@CMAKE_BINARY_DIR@/@PROJECT_NAME_UCASE@.app"
- 
-# MacPorts installs libreadline with wrong permissions
-LIBREADLINE="libreadline.6.2.dylib"
- 
-#=========================================================================================
 
 MSG_COLOR='\x1B[1;36m'
 COLOR_RESET='\x1B[0m'
 echo -e "$MSG_COLOR\n\nCreating App Bundle \"$APP\"...$COLOR_RESET"
- 
-# MacPorts only - check for u+w permissions on libreadline
-if [ -f "@APPLE_PREFIX@/lib/$LIBREADLINE" ]; then
-  CHECKREADLINE=$(stat -f "%p" @APPLE_PREFIX@/lib/$LIBREADLINE)
-  CHECKREADLINE=${CHECKREADLINE:3:1}
-  if [ "${CHECKREADLINE}" != "7" ]; then
-    echo -e "\n\n\t\t\t\t***********\n\t\t\t\t* WARNING *\n\t\t\t\t***********"
-    echo -e "File $LIBREADLINE is not marked as user writable."
-    echo -e "This will break macdeployqt's linking process after it is copied."
-    echo -e "A sudo password is required to elevate and fix using chmod u+w."
-    echo -e "\nPLEASE ENTER SUDO PASSWORD:"
-    sudo chmod u+w "@APPLE_PREFIX@/lib/$LIBREADLINE"
-  fi
+
+# Locate macdeployqt, assume homebrew & Qt5
+which macdeployqt > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+  export PATH=$PATH:$(brew --prefix qt)/bin
 fi
  
 # Remove any old .app bundles
 rm -Rf "$APP"
+
+# Copy/overwrite Info.plist
+\cp  "@CMAKE_BINARY_DIR@/Info.plist" "@CMAKE_INSTALL_PREFIX@/"
  
-# Create new bundle, copy our built code to it
-mkdir -p "$APP"
-cd "@CMAKE_INSTALL_PREFIX@"
-mkdir "$APP/Contents"
-cp -R * "$APP/Contents"
- 
-# Manually copy STK rawwaves
+# Create .app bundle containing contents from CMAKE_INSTALL_PREFIX
+mkdir -p "$APP/Contents/MacOS"
+mkdir -p "$APP/Contents/Frameworks"
+mkdir -p "$APP/Contents/Resources"
 mkdir -p "$APP/Contents/share/stk/rawwaves"
-cp $STK_RAWWAVE/*.raw "$APP/Contents/share/stk/rawwaves"
+cd "@CMAKE_INSTALL_PREFIX@"
+cp -R * "$APP/Contents"
+cp "@CMAKE_SOURCE_DIR@/cmake/apple/"*.icns "$APP/Contents/Resources/"
+cp $STK_RAWWAVE/*.raw "$APP/Contents/share/stk/rawwaves" > /dev/null 2>&1
  
 # Make all libraries writable for macdeployqt
 cd "$APP"
 find . -type f -print0 | xargs -0 chmod u+w
+
+lmmsbin="MacOS/@CMAKE_PROJECT_NAME@"
+zynlib="lib/lmms/libzynaddsubfx.so"
+zynfmk="Frameworks/libZynAddSubFxCore.dylib"
+zynbin="MacOS/RemoteZynAddSubFx"
  
-# Move lmms binary to the proper location
-mkdir -p "$APP/Contents/MacOS"
-mv "$APP/Contents/bin/lmms" "$APP/Contents/MacOS/lmms"
-rm -rf "$APP/Contents/bin"
+# Move lmms binary
+mv "$APP/Contents/bin/@CMAKE_PROJECT_NAME@" "$APP/Contents/$lmmsbin"
  
-# Move libraries to proper locations
-mkdir -p "$APP/Contents/Frameworks"
-mv "$APP/Contents/lib/lmms/libZynAddSubFxCore.dylib" \
-   "$APP/Contents/Frameworks/libZynAddSubFxCore.dylib"
-   
-mv "$APP/Contents/lib/lmms/RemoteZynAddSubFx" \
-   "$APP/Contents/MacOS/RemoteZynAddSubFx"
- 
-# Fix more Zyn Linking issues
+# Fix zyn linking 
+mv "$APP/Contents/lib/lmms/RemoteZynAddSubFx" "$APP/Contents/$zynbin"
+mv "$APP/Contents/lib/lmms/libZynAddSubFxCore.dylib" "$APP/Contents/$zynfmk"
+
 install_name_tool -change @rpath/libZynAddSubFxCore.dylib \
-   @loader_path/../../Frameworks/libZynAddSubFxCore.dylib \
-   "$APP/Contents/lib/lmms/libzynaddsubfx.so"
- 
-install_name_tool -change @CMAKE_BINARY_DIR@/plugins/zynaddsubfx/libZynAddSubFxCore.dylib \
-   @loader_path/../../Frameworks/libZynAddSubFxCore.dylib \
-   "$APP/Contents/MacOS/RemoteZynAddSubFx"
+   @loader_path/../$zynfmk \
+  "$APP/Contents/$zynbin"
+
+install_name_tool -change @rpath/libZynAddSubFxCore.dylib \
+   @loader_path/../../$zynfmk \
+  "$APP/Contents/$zynlib"
+  
+# Replace @rpath with @loader_path for Carla
+# See also plugins/carlabase/CMakeLists.txt
+# This MUST be done BEFORE calling macdeployqt
+install_name_tool -change @rpath/libcarlabase.dylib \
+   @loader_path/libcarlabase.dylib \
+  "$APP/Contents/lib/lmms/libcarlapatchbay.so"
+
+install_name_tool -change @rpath/libcarlabase.dylib \
+  @loader_path/libcarlabase.dylib \
+  "$APP/Contents/lib/lmms/libcarlarack.so"
+
+# Link lmms binary
+_executables="${_executables} -executable=$APP/Contents/$zynbin"
+_executables="${_executables} -executable=$APP/Contents/$zynfmk"
  
 # Build a list of shared objects in target/lib/lmms
 for file in "$APP/Contents/lib/lmms/"*.so; do
@@ -88,16 +90,31 @@ for file in "$APP/Contents/lib/lmms/ladspa/"*.so; do
    _thisfile="$APP/Contents/lib/lmms/ladspa/${file##*/}"
    _executables="${_executables} -executable=$_thisfile"
 done
- 
-# Additional binaries that require linking
-_executables="${_executables} -executable=$APP/Contents/MacOS/RemoteZynAddSubFx"
-_executables="${_executables} -executable=$APP/Contents/Frameworks/libZynAddSubFxCore.dylib"
 
-# Build our App Package using "macdeployqt"
+# Finalize .app
 macdeployqt "$APP" $_executables
- 
-# OS X Specific Artwork
-mkdir -p "$APP/Contents/Resources"
-cp "@CMAKE_SOURCE_DIR@/cmake/apple/"*.icns "$APP/Contents/Resources/"
- 
+
+# Carla is a standalone plugin.  Remove library, look for it side-by-side LMMS.app
+# This MUST be done AFTER calling macdeployqt
+#
+# For example:
+#    /Applications/LMMS.app
+#    /Applications/Carla.app
+carlalibs=$(echo "@CARLA_LIBRARIES@"|tr ";" "\n")
+
+# Loop over all libcarlas, fix linking
+for file in "$APP/Contents/lib/lmms/"libcarla*; do
+   _thisfile="$APP/Contents/lib/lmms/${file##*/}"
+   for lib in $carlalibs; do
+     _oldpath="../../Frameworks/lib${lib}.dylib"
+     _newpath="Carla.app/Contents/MacOS/lib${lib}.dylib"
+     install_name_tool -change @loader_path/$_oldpath \
+       @executable_path/../../../$_newpath \
+       "$_thisfile"
+     rm -f "$APP/Contents/Frameworks/lib${lib}.dylib"
+   done
+done
+
+# Cleanup
+rm -rf "$APP/Contents/bin"
 echo -e "\nFinished.\n\n"

cmake/apple/lmms.plist.in

@@ -143,5 +143,9 @@
                 </dict>
             </dict>
         </array>
+        <key>NSPrincipalClass</key>
+        <string>NSApplication</string>
+        <key>NSHighResolutionCapable</key>
+        <string>True</string>
   </dict>
 </plist>

cmake/apple/package_apple.json.in

@@ -1,6 +1,5 @@
 {
  "title": "@MACOSX_BUNDLE_BUNDLE_NAME@ @MACOSX_BUNDLE_LONG_VERSION_STRING@",
- "icon": "@CMAKE_SOURCE_DIR@/cmake/apple/lmms.icns",
  "background": "@CMAKE_SOURCE_DIR@/cmake/apple/dmg_branding.png",
  "icon-size": 72,
  "contents": [

cmake/build_mingw32.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Accomodate both linux windows mingw locations
 MINGW=/mingw32
@@ -8,13 +8,17 @@ else
 	CMAKE_OPTS="$CMAKE_OPTS -DLMMS_BUILD_MSYS=1"
 fi
 
-export PATH=$PATH:$MINGW/bin
+export PATH=$MINGW/bin:$PATH
 export CFLAGS="-march=pentium3 -mtune=generic -mpreferred-stack-boundary=5 -mfpmath=sse"
 export CXXFLAGS="$CFLAGS"
 
-if [ "$1" = "-qt5" ] ; then
-	CMAKE_OPTS="-DWANT_QT5=ON -DCMAKE_PREFIX_PATH=$MINGW $CMAKE_OPTS"
+if [ "$1" = "-qt5" ]; then
+	QT5=True
 fi
 
-cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/modules/Win32Toolchain.cmake -DCMAKE_MODULE_PATH=`pwd`/../cmake/modules/ $CMAKE_OPTS
+if [ $QT5 ]; then
+	CMAKE_OPTS="-DWANT_QT5=$QT5 -DCMAKE_PREFIX_PATH=$MINGW $CMAKE_OPTS"
+fi
 
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cmake $DIR/.. -DCMAKE_TOOLCHAIN_FILE=$DIR/../cmake/modules/Win32Toolchain.cmake -DCMAKE_MODULE_PATH=$DIR/../cmake/modules/ $CMAKE_OPTS

cmake/build_mingw64.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Accomodate both linux windows mingw locations
 MINGW=/mingw64
@@ -8,11 +8,15 @@ else
 	CMAKE_OPTS="$CMAKE_OPTS -DLMMS_BUILD_MSYS=1"
 fi
 
-export PATH=$PATH:$MINGW/bin
+export PATH=$MINGW/bin:$PATH
 
-if [ "$1" = "-qt5" ] ; then
-	CMAKE_OPTS="-DWANT_QT5=ON -DCMAKE_PREFIX_PATH=$MINGW $CMAKE_OPTS"
+if [ "$1" = "-qt5" ]; then
+        QT5=True
 fi
 
-cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/modules/Win64Toolchain.cmake -DCMAKE_MODULE_PATH=`pwd`/../cmake/modules/ $CMAKE_OPTS
+if [ $QT5 ]; then
+        CMAKE_OPTS="-DWANT_QT5=$QT5 -DCMAKE_PREFIX_PATH=$MINGW $CMAKE_OPTS"
+fi
 
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cmake $DIR/.. -DCMAKE_TOOLCHAIN_FILE=$DIR/../cmake/modules/Win64Toolchain.cmake -DCMAKE_MODULE_PATH=$DIR/../cmake/modules/ $CMAKE_OPTS

cmake/linux/CMakeLists.txt

@@ -1,4 +1,18 @@
-INSTALL(FILES lmms.png                  DESTINATION "${DATA_DIR}/pixmaps")
-INSTALL(FILES lmms                      DESTINATION "${DATA_DIR}/menu")
+INSTALL(DIRECTORY icons/                DESTINATION "${DATA_DIR}/icons/hicolor")
 INSTALL(FILES lmms.desktop              DESTINATION "${DATA_DIR}/applications")
 INSTALL(FILES lmms.xml                  DESTINATION "${DATA_DIR}/mime/packages")
+
+# AppImage creation target
+SET(APPIMAGE_FILE "${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}-linux-${CMAKE_SYSTEM_PROCESSOR}.AppImage")
+
+CONFIGURE_FILE("package_linux.sh.in"    "${CMAKE_BINARY_DIR}/package_linux.sh" @ONLY)
+
+FILE(REMOVE "${APPIMAGE_FILE}")
+ADD_CUSTOM_TARGET(removeappimage
+	COMMAND rm -f "${APPIMAGE_FILE}"
+	COMMENT "Removing old AppImage")
+ADD_CUSTOM_TARGET(appimage 
+	COMMAND chmod +x "${CMAKE_BINARY_DIR}/package_linux.sh"
+	COMMAND "${CMAKE_BINARY_DIR}/package_linux.sh"
+	COMMENT "Generating AppImage")
+ADD_DEPENDENCIES(appimage removeappimage)

cmake/linux/icons/scalable/apps/lmms.svg

@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   id="svg4034"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   inkscape:export-filename="64x64@2.png"
+   inkscape:export-xdpi="192"
+   inkscape:export-ydpi="192"
+   sodipodi:docname="lmms.svg">
+  <defs
+     id="defs4036">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4173"
+       x="-0.011714286"
+       width="1.0234286"
+       y="-0.0123"
+       height="1.0246">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.205"
+         id="feGaussianBlur4175" />
+    </filter>
+    <linearGradient
+       gradientTransform="translate(0,32)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient4244-6"
+       id="linearGradient866"
+       x1="35"
+       y1="-14"
+       x2="35"
+       y2="27"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4244-6"
+       inkscape:collect="always">
+      <stop
+         id="stop4428"
+         offset="0"
+         style="stop-color:#27ab5f;stop-opacity:1" />
+      <stop
+         id="stop4430"
+         offset="1"
+         style="stop-color:#249a56;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4142135"
+     inkscape:cx="210.86487"
+     inkscape:cy="3.375495"
+     inkscape:current-layer="svg4034"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="253"
+     inkscape:window-y="1072"
+     inkscape:window-maximized="1"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4042" />
+    <sodipodi:guide
+       position="37,4"
+       orientation="0,1"
+       id="guide4951"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="38,60"
+       orientation="0,1"
+       id="guide4955"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="-19,32"
+       orientation="0,1"
+       id="guide4957"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4039">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     rx="4"
+     y="4"
+     x="4"
+     height="56"
+     width="56"
+     id="rect5093"
+     style="display:inline;opacity:0.98999999;fill:#34d07b;fill-opacity:1;stroke:none;stroke-opacity:1" />
+  <rect
+     rx="3"
+     y="5"
+     x="5"
+     height="54"
+     width="54"
+     id="rect5095"
+     style="display:inline;opacity:1;fill:url(#linearGradient866);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     sodipodi:nodetypes="ccccccccccccccccc"
+     inkscape:connector-curvature="0"
+     id="path5085-3-6"
+     d="M 32,13 11,25 v 24 l 7,4 7,-4 v -8 l -7,-4 v -8 l 14,-8 14,8 v 8 l -7,4 v 8 l 7,4 7,-4 V 25 Z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97797471;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4173);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     sodipodi:nodetypes="ccccccccccccccccc"
+     inkscape:connector-curvature="0"
+     id="path5085-3"
+     d="M 32,11 11,23 v 24 l 7,4 7,-4 v -8 l -7,-4 v -8 l 14,-8 14,8 v 8 l -7,4 v 8 l 7,4 7,-4 V 23 Z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97797471;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5497);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+</svg>

cmake/linux/icons/scalable/mimetypes/application-x-lmms-project.svg

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   id="svg4034"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   inkscape:export-filename="/home/umcaruje/d/Dropbox/lmms icons/project-256x256.png"
+   inkscape:export-xdpi="360"
+   inkscape:export-ydpi="360"
+   sodipodi:docname="application-x-lmms-project.svg"
+   enable-background="new">
+  <defs
+     id="defs4036">
+    <linearGradient
+       id="linearGradient4244-6"
+       inkscape:collect="always">
+      <stop
+         id="stop4428"
+         offset="0"
+         style="stop-color:#27ab5f;stop-opacity:1" />
+      <stop
+         id="stop4430"
+         offset="1"
+         style="stop-color:#249a56;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4400"
+       x="-0.024"
+       width="1.048"
+       y="-0.024"
+       height="1.048">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.14999999"
+         id="feGaussianBlur4402" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4244-6"
+       id="linearGradient4432"
+       gradientUnits="userSpaceOnUse"
+       x1="9.8838835"
+       y1="-9.8994951"
+       x2="10.275496"
+       y2="27.930717" />
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4442"
+       x="-0.0116"
+       width="1.0232"
+       y="-0.012428571"
+       height="1.0248571">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.145"
+         id="feGaussianBlur4444" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="4.2102935"
+     inkscape:cy="18.651114"
+     inkscape:current-layer="g4263"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="740"
+     inkscape:window-x="339"
+     inkscape:window-y="1080"
+     inkscape:window-maximized="1"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4042" />
+    <sodipodi:guide
+       position="37,4"
+       orientation="0,1"
+       id="guide4951" />
+    <sodipodi:guide
+       position="38,60"
+       orientation="0,1"
+       id="guide4955" />
+    <sodipodi:guide
+       position="-19,32"
+       orientation="0,1"
+       id="guide4957" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4039">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="g4263"
+     inkscape:label="mimetype"
+     style="display:inline">
+    <g
+       id="g4189">
+      <path
+         sodipodi:nodetypes="ssssssccccs"
+         inkscape:connector-curvature="0"
+         id="path4273"
+         d="m 10,-30 c -1.108,0 -2,0.892 -2,2 l 0,56 c 0,1.108 0.892,2 2,2 l 44,0 c 1.108,0 2,-0.892 2,-2 l 0,-43 c 0,-1 -1,-2 -1,-2 L 43,-29 c 0,0 -1,-1 -2,-1 z"
+         style="display:inline;opacity:1;fill:#34d07b;fill-opacity:1;stroke:none;stroke-opacity:1"
+         transform="translate(0,32)" />
+      <path
+         sodipodi:nodetypes="sssssscccs"
+         inkscape:connector-curvature="0"
+         id="path4275"
+         d="m 10,-29 c -0.554,0 -1,0.446 -1,1 l 0,56 c 0,0.554 0.446,1 1,1 l 44,0 c 0.554,0 1,-0.446 1,-1 l 0,-43 -13,-1 -1,-13 z"
+         style="display:inline;opacity:1;fill:url(#linearGradient4432);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="translate(0,32)" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path4339-5"
+         d="m 40,-29 0,11.999999 c 0,2 1,3 3,3 l 11.999999,0 0,-1 L 41,-29 Z"
+         style="display:inline;opacity:0.12999998;fill:#222222;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4400)"
+         transform="translate(0,32)" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path4339"
+         d="m 41,-29 0,12 c 0,1.03125 0.9375,2 2,2 l 12,0 0,-1 -13,-13 z"
+         style="display:inline;fill:#34d07b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         transform="translate(0,32)" />
+      <path
+         sodipodi:nodetypes="ccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path4436"
+         d="m 32,22 -15,8 0,17.5 5,2.5 4.999999,-2.5 0,-6 L 22,39 l 0,-6 10,-5.5 10,5.5 0,6 -4.999999,2.5 0,6 L 42,50 47,47.5 47,30 Z"
+         style="display:inline;color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;overflow:visible;visibility:visible;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97797471;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4442);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97797471;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5497);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 32,20 -15,8 0,17.5 5,2.5 4.999999,-2.5 0,-6 L 22,37 l 0,-6 10,-5.5 10,5.5 0,6 -4.999999,2.5 0,6 L 42,48 47,45.5 47,28 Z"
+         id="path4265"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccccccccccc" />
+    </g>
+  </g>
+</svg>

cmake/linux/lmms

@@ -1,4 +1,4 @@
 ?package(lmms):needs="X11" section="Apps/Sound" \
   title="LMMS" hints="Audio" command="/usr/bin/lmms" \
   longtitle="LMMS" \
-  icon="/usr/share/pixmaps/lmms.png"
+  icon="/usr/share/icons/hicolor/scalable/apps/lmms.svg"

cmake/linux/lmms.desktop

@@ -1,12 +1,14 @@
 [Desktop Entry]
 Name=LMMS
-GenericName=music production suite
+GenericName=Music production suite
 GenericName[ca]=Programari de producció musical
 GenericName[de]=Software zur Musik-Produktion
-Comment=easy music production for everyone!
+GenericName[fr]=Ensemble pour la production musicale
+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 !
 Icon=lmms
-Exec=env QT_X11_NO_NATIVE_MENUBAR=1 lmms %f
+Exec=lmms %f
 Terminal=false
 Type=Application
 Categories=Qt;AudioVideo;Audio;Midi;

cmake/linux/lmms.spec.in

@@ -26,7 +26,7 @@ Release:	%{release}
 Summary:	powerful sequencer-, synthesizer- and sample-studio for Linux
 Summary(de):	Leistungsfaehiges Sequenzer-, Synthesizer- und Sample-Studio fuer Linux
 License:	GPL
-URL:		http://lmms.io/
+URL:		https://lmms.io/
 Group:		Applications/Multimedia
 Provides:	lmms = %{version}-%{release}
 BuildRequires:	gcc gcc-c++ libstdc++-devel autoconf automake libtool make
@@ -197,4 +197,4 @@ desktop-file-install \
 -%changelog
 -* Please see release notes (viewable online):
 -- https://github.com/LMMS/lmms/releases/tag/v${LMMS_VERSION}
--
+-

cmake/linux/lmms.xml

@@ -4,11 +4,7 @@
     <sub-class-of type="application/xml"/>
     <comment>LMMS project</comment>
     <comment xml:lang="ca">Projecte LMMS</comment>
-    <glob pattern="*.mmp"/>
     <glob pattern="*.mmpz"/>
-    <magic priority="80">
-      <match type="string" value="&lt;!DOCTYPE multimedia-project" offset="0:256"/>
-      <match type="string" value="&lt;multimedia-project" offset="0:64"/>
-    </magic>
+    <glob pattern="*.mmp"/>
   </mime-type>
 </mime-info>

cmake/linux/package_linux.sh.in

@@ -0,0 +1,200 @@
+#!/usr/bin/env bash
+# Creates Linux ".AppImage" for @PROJECT_NAME_UCASE@
+#
+# Depends:  linuxdeployqt
+#
+# Notes:    Will attempt to fetch linuxdeployqt automatically (x86_64 only)
+#           See Also: https://github.com/probonopd/linuxdeployqt/blob/master/BUILDING.md
+
+set -e
+
+LINUXDEPLOYQT="@CMAKE_BINARY_DIR@/linuxdeployqt"
+VERBOSITY=2 # 3=debug
+LOGFILE="@CMAKE_BINARY_DIR@/appimage.log"
+APPDIR="@CMAKE_BINARY_DIR@/@PROJECT_NAME_UCASE@.AppDir/"
+DESKTOPFILE="${APPDIR}usr/share/applications/lmms.desktop"
+STRIP=""
+
+# Don't strip for Debug|RelWithDebInfo builds
+if [[ "@CMAKE_BUILD_TYPE@" == *"Deb"* ]]; then
+	STRIP="-no-strip"
+fi
+
+# Console colors
+RED="\\x1B[1;31m"
+GREEN="\\x1B[1;32m"
+YELLOW="\\x1B[1;33m"
+PLAIN="\\x1B[0m"
+
+function error {
+	echo -e "   ${PLAIN}[${RED}error${PLAIN}] ${1}"
+	return 1
+}
+
+function success {
+	echo -e "   ${PLAIN}[${GREEN}success${PLAIN}] ${1}"
+}
+
+function skipped {
+	echo -e "   ${PLAIN}[${YELLOW}skipped${PLAIN}] ${1}"
+}
+
+# Blindly assume system arch is appimage arch
+ARCH=$(arch)
+export ARCH
+
+# Check for problematic install locations
+INSTALL=$(echo "@CMAKE_INSTALL_PREFIX@" | sed 's/\/*$//g')
+if [ "$INSTALL" == "/usr/local" ] || [ "$INSTALL" == "/usr" ] ; then
+	error "Incompatible CMAKE_INSTALL_PREFIX for creating AppImage: @CMAKE_INSTALL_PREFIX@"
+fi
+
+echo -e "\nWriting verbose output to \"${LOGFILE}\""
+
+# Ensure linuxdeployqt uses the same qmake version as cmake
+export PATH="$(pwd -P)/squashfs-root/usr/bin:$(dirname "@QT_QMAKE_EXECUTABLE@")":$PATH
+
+# Fetch portable linuxdeployqt if cache is older than $DAYSOLD
+APPIMAGETOOL="squashfs-root/usr/bin/appimagetool"
+echo -e "\nDownloading linuxdeployqt to ${LINUXDEPLOYQT}..."
+mkdir -p "$HOME/bin"
+DAYSOLD=2
+if env -i which linuxdeployqt > /dev/null 2>&1; then
+	skipped "System already provides this utility"
+elif ! find "$LINUXDEPLOYQT" -mtime -$DAYSOLD 2>/dev/null|grep -q "." > /dev/null 2>&1; then
+	url="https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-$(uname -p).AppImage"
+	echo "   [.......] Couldn't find linuxdeployqt newer than $DAYSOLD days old"
+	echo "   [.......] Downloading ($(uname -p)): ${url}"
+	wget "$url" -O "$LINUXDEPLOYQT" -q || (rm "$LINUXDEPLOYQT" && false)
+	chmod +x "$LINUXDEPLOYQT"
+	touch "$LINUXDEPLOYQT"
+	success "Downloaded $LINUXDEPLOYQT"
+	"$LINUXDEPLOYQT" --appimage-extract > /dev/null 2>&1
+	success "Extracted $APPIMAGETOOL"
+else
+	skipped "$LINUXDEPLOYQT is less than $DAYSOLD days old"
+fi
+
+# Make skeleton AppDir
+echo -e "\nCreating ${APPDIR}..."
+rm -rf "${APPDIR}"
+mkdir -p "${APPDIR}usr"
+success "Created ${APPDIR}"
+
+# Clone install to AppDir
+echo -e "\nCopying @CMAKE_INSTALL_PREFIX@ to ${APPDIR}..."
+cp -R "@CMAKE_INSTALL_PREFIX@/." "${APPDIR}usr"
+rm -rf "${APPDIR}usr/include"
+success "${APPDIR}"
+
+# Copy rawwaves directory for stk/mallets
+mkdir -p "${APPDIR}usr/share/stk/"
+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 )"
+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
+
+chmod +x "${APPDIR}usr/bin/lmms"
+
+# Per https://github.com/probonopd/linuxdeployqt/issues/129 
+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_LIBRARY_FIX@" ]; then
+   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@WINE_LIBRARY_FIX@:@WINE_LIBRARY_FIX@wine/
+fi
+
+# Move executables so linuxdeployqt can find them
+ZYNLIB="${APPDIR}usr/lib/lmms/RemoteZynAddSubFx"
+VSTLIB="${APPDIR}usr/lib/lmms/RemoteVstPlugin.exe.so"
+
+ZYNBIN="${APPDIR}usr/bin/RemoteZynAddSubFx"
+VSTBIN="${APPDIR}usr/bin/RemoteVstPlugin.exe.so"
+
+mv "$ZYNLIB" "$ZYNBIN"
+mv "$VSTLIB" "$VSTBIN"
+
+# Patch the desktop file
+sed -i 's/.*Exec=.*/Exec=lmms.real/' "$DESKTOPFILE"
+
+# Fix linking for soft-linked plugins
+for file in "${APPDIR}usr/lib/lmms/"*.so; do
+   thisfile="${APPDIR}usr/lib/lmms/${file##*/}"
+   executables="${executables} -executable=$thisfile"
+done
+executables="${executables} -executable=${ZYNBIN}"
+executables="${executables} -executable=${VSTBIN}"
+executables="${executables} -executable=${APPDIR}usr/lib/lmms/ladspa/imp_1199.so"
+executables="${executables} -executable=${APPDIR}usr/lib/lmms/ladspa/imbeq_1197.so"
+executables="${executables} -executable=${APPDIR}usr/lib/lmms/ladspa/pitch_scale_1193.so"
+executables="${executables} -executable=${APPDIR}usr/lib/lmms/ladspa/pitch_scale_1194.so"
+
+# Bundle both qt and non-qt dependencies into appimage format
+echo -e "\nBundling and relinking system dependencies..."
+echo -e ">>>>> linuxdeployqt" > "$LOGFILE"
+# shellcheck disable=SC2086
+"$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  "$VSTBIN" "$VSTLIB"
+
+# Remove wine library conflict
+rm -f "${APPDIR}/usr/lib/libwine.so.1"
+
+# Use system-provided carla
+rm -f "${APPDIR}usr/lib/"libcarla*.so
+
+# Remove bundled jack in LD_LIBRARY_PATH if exists
+if [ -e "${APPDIR}/usr/lib/libjack.so.0" ]; then
+   rm "${APPDIR}/usr/lib/libjack.so.0"
+fi
+
+# Bundle jack out of LD_LIBRARY_PATH
+JACK_LIB=$(ldd "${APPDIR}/usr/bin/lmms" | sed -n 's/\tlibjack\.so\.0 => \(.\+\) (0x[0-9a-f]\+)/\1/p')
+if [ -e "$JACK_LIB" ]; then
+   mkdir -p "${APPDIR}usr/lib/lmms/optional/"
+   cp "$JACK_LIB" "${APPDIR}usr/lib/lmms/optional/"
+fi
+
+# Point the AppRun to the shim launcher
+rm -f "${APPDIR}/AppRun"
+ln -sr "${APPDIR}/usr/bin/lmms" "${APPDIR}/AppRun"
+
+# Create AppImage
+echo -e "\nFinishing the AppImage..."
+echo -e "\n\n>>>>> appimagetool" >> "$LOGFILE"
+"$APPIMAGETOOL" "${APPDIR}" "@APPIMAGE_FILE@" >> "$LOGFILE" 2>&1
+success "Created @APPIMAGE_FILE@"
+
+echo -e "\nFinished"

cmake/modules/BashCompletion.cmake

@@ -0,0 +1,93 @@
+# A wrapper around pkg-config-provided and cmake-provided bash completion that
+# will have dynamic behavior at INSTALL() time to allow both root-level
+# INSTALL() as well as user-level INSTALL().
+#
+# See also https://github.com/scop/bash-completion
+#
+# Copyright (c) 2018, 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.
+#
+# Usage:
+#    INCLUDE(BashCompletion)
+#    BASHCOMP_INSTALL(foo)
+#    ... where "foo" is a shell script adjacent to the CMakeLists.txt
+#
+# How it determines BASHCOMP_PKG_PATH, in order:
+#    1. Uses BASHCOMP_PKG_PATH if already set (e.g. -DBASHCOMP_PKG_PATH=...)
+#       a. If not, uses pkg-config's PKG_CHECK_MODULES to determine path
+#       b. Fallback to cmake's FIND_PACKAGE(bash-completion) path
+#       c. Fallback to hard-coded /usr/share/bash-completion/completions
+#    2. Final fallback to ${CMAKE_INSTALL_PREFIX}/share/bash-completion/completions if
+#       detected path is unwritable.
+
+# - Windows does not support bash completion
+# - macOS support should eventually be added for Homebrew (TODO)
+IF(WIN32)
+	MESSAGE(STATUS "Bash competion is not supported on this platform.")
+ELSEIF(APPLE)
+	MESSAGE(STATUS "Bash completion is not yet implemented for this platform.")
+ELSE()
+	INCLUDE(FindUnixCommands)
+	# Honor manual override if provided
+	IF(NOT BASHCOMP_PKG_PATH)
+		# First, use pkg-config, which is the most reliable
+		FIND_PACKAGE(PkgConfig QUIET)
+		IF(PKGCONFIG_FOUND)
+			PKG_CHECK_MODULES(BASH_COMPLETION bash-completion)
+			PKG_GET_VARIABLE(BASHCOMP_PKG_PATH bash-completion completionsdir)
+		ELSE()
+			# Second, use cmake (preferred but less common)
+			FIND_PACKAGE(bash-completion QUIET)
+			IF(BASH_COMPLETION_FOUND)
+				SET(BASHCOMP_PKG_PATH "${BASH_COMPLETION_COMPLETIONSDIR}")
+			ENDIF()
+		ENDIF()
+
+		# Third, use a hard-coded fallback value
+		IF("${BASHCOMP_PKG_PATH}" STREQUAL "")
+			SET(BASHCOMP_PKG_PATH "/usr/share/bash-completion/completions")
+		ENDIF()
+	ENDIF()
+
+	# Always provide a fallback for non-root INSTALL()
+	SET(BASHCOMP_USER_PATH "${CMAKE_INSTALL_PREFIX}/share/bash-completion/completions")
+
+	# Cmake doesn't allow easy use of conditional logic at INSTALL() time
+	# this is a problem because ${BASHCOMP_PKG_PATH} may not be writable and we
+	# need sane fallback behavior for bundled INSTALL() (e.g. .AppImage, etc).
+	#
+	# The reason this can't be detected by cmake is that it's fairly common to
+	# run "cmake" as a one user (i.e. non-root) and "make install" as another user
+	# (i.e. root).
+	#
+	# - Creates a script called "install_${SCRIPT_NAME}_completion.sh" into the
+	#   working binary directory and invokes this script at install.
+	# - Script handles INSTALL()-time conditional logic for sane ballback behavior
+	#   when ${BASHCOMP_PKG_PATH} is unwritable (i.e. non-root); Something cmake
+	#   can't handle on its own at INSTALL() time)
+	MACRO(BASHCOMP_INSTALL SCRIPT_NAME)
+		# A shell script for wrapping conditionl logic
+		SET(BASHCOMP_SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install_${SCRIPT_NAME}_completion.sh")
+
+		FILE(WRITE ${BASHCOMP_SCRIPT} "\
+#!${BASH}\n\
+set -e\n\
+if [ -w \"${BASHCOMP_PKG_PATH}\" ]; then\n\
+  BASHCOMP_PKG_PATH=\"${BASHCOMP_PKG_PATH}\"\n\
+else \n\
+  BASHCOMP_PKG_PATH=\"\$DESTDIR${BASHCOMP_USER_PATH}\"\n\
+fi\n\
+echo -e \"\\nInstalling bash completion...\\n\"\n\
+mkdir -p \"\$BASHCOMP_PKG_PATH\"\n\
+cp \"${CMAKE_CURRENT_SOURCE_DIR}/${SCRIPT_NAME}\" \"\$BASHCOMP_PKG_PATH\"\n\
+chmod a+r \"\$BASHCOMP_PKG_PATH/${SCRIPT_NAME}\"\n\
+echo -e \"Bash completion for ${SCRIPT_NAME} has been installed to \$BASHCOMP_PKG_PATH/${SCRIPT_NAME}\"\n\
+")
+		INSTALL(CODE "EXECUTE_PROCESS(COMMAND chmod u+x \"install_${SCRIPT_NAME}_completion.sh\" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )")
+		INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"./install_${SCRIPT_NAME}_completion.sh\" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )")
+
+		MESSAGE(STATUS "Bash completion script for ${SCRIPT_NAME} will be installed to ${BASHCOMP_PKG_PATH} or fallback to ${BASHCOMP_USER_PATH} if unwritable.")
+	ENDMACRO()
+ENDIF()
+

cmake/modules/BuildPlugin.cmake

@@ -1,22 +1,34 @@
 # 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> )
+# 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>)
 
 MACRO(BUILD_PLUGIN PLUGIN_NAME)
-	CMAKE_PARSE_ARGUMENTS(PLUGIN "" "" "MOCFILES;EMBEDDED_RESOURCES;UICFILES" ${ARGN})
+	CMAKE_PARSE_ARGUMENTS(PLUGIN "" "" "MOCFILES;EMBEDDED_RESOURCES;UICFILES;LINK" ${ARGN})
 	SET(PLUGIN_SOURCES ${PLUGIN_UNPARSED_ARGUMENTS})
 
-	INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/src/gui)
+	INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/src/gui")
 
 	ADD_DEFINITIONS(-DPLUGIN_NAME=${PLUGIN_NAME})
 
 	LIST(LENGTH PLUGIN_EMBEDDED_RESOURCES ER_LEN)
 	IF(ER_LEN)
-		SET(ER_H ${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h)
+		# Expand and sort arguments to avoid locale dependent sorting in
+		# shell
+		SET(NEW_ARGS)
+		FOREACH(ARG ${PLUGIN_EMBEDDED_RESOURCES})
+			FILE(GLOB EXPANDED "${ARG}")
+			LIST(SORT EXPANDED)
+			FOREACH(ITEM ${EXPANDED})
+				LIST(APPEND NEW_ARGS "${ITEM}")
+			ENDFOREACH()
+		ENDFOREACH()
+		SET(PLUGIN_EMBEDDED_RESOURCES ${NEW_ARGS})
+
+		SET(ER_H "${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h")
 		ADD_CUSTOM_COMMAND(OUTPUT ${ER_H}
 			COMMAND ${BIN2RES}
-			ARGS ${PLUGIN_EMBEDDED_RESOURCES} > ${ER_H}
+			ARGS ${PLUGIN_EMBEDDED_RESOURCES} > "${ER_H}"
 			DEPENDS bin2res)
 	ENDIF(ER_LEN)
 
@@ -33,11 +45,11 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
 	ENDFOREACH(f)
 
 	IF(LMMS_BUILD_APPLE)
-		LINK_DIRECTORIES(${CMAKE_BINARY_DIR})
+		LINK_DIRECTORIES("${CMAKE_BINARY_DIR}")
 		LINK_LIBRARIES(${QT_LIBRARIES})
 	ENDIF(LMMS_BUILD_APPLE)
 	IF(LMMS_BUILD_WIN32)
-		LINK_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+		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")
@@ -45,7 +57,12 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
 		SET(QT_LIBRARIES "${QT_OVERRIDE_LIBRARIES}")
 	ENDIF()
 
-	ADD_LIBRARY(${PLUGIN_NAME} MODULE ${PLUGIN_SOURCES} ${plugin_MOC_out})
+	IF ("${PLUGIN_LINK}" STREQUAL "SHARED")
+	  ADD_LIBRARY(${PLUGIN_NAME} SHARED ${PLUGIN_SOURCES} ${plugin_MOC_out})
+	ELSE ()
+	  ADD_LIBRARY(${PLUGIN_NAME} MODULE ${PLUGIN_SOURCES} ${plugin_MOC_out})
+	ENDIF ()
+	
 	IF(QT5)
 		TARGET_LINK_LIBRARIES(${PLUGIN_NAME} Qt5::Widgets Qt5::Xml)
 	ENDIF()
@@ -56,12 +73,16 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
 	INSTALL(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION "${PLUGIN_DIR}")
 
 	IF(LMMS_BUILD_APPLE)
-		SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES LINK_FLAGS "-bundle_loader ${CMAKE_BINARY_DIR}/lmms")
+		IF ("${PLUGIN_LINK}" STREQUAL "SHARED")
+			SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+		ELSE()
+			SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES LINK_FLAGS "-bundle_loader \"${CMAKE_BINARY_DIR}/lmms\"")
+		ENDIF()
 		ADD_DEPENDENCIES(${PLUGIN_NAME} lmms)
 	ENDIF(LMMS_BUILD_APPLE)
 	IF(LMMS_BUILD_WIN32)
 		SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES PREFIX "")
-		ADD_CUSTOM_COMMAND(TARGET ${PLUGIN_NAME} POST_BUILD COMMAND ${STRIP} $<TARGET_FILE:${PLUGIN_NAME}>)
+		ADD_CUSTOM_COMMAND(TARGET ${PLUGIN_NAME} POST_BUILD COMMAND ${STRIP} "$<TARGET_FILE:${PLUGIN_NAME}>")
 	ENDIF(LMMS_BUILD_WIN32)
 
 	SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${ER_H} ${plugin_MOC_out}")

cmake/modules/COPYING-CMAKE-SCRIPTS

@@ -0,0 +1,22 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake/modules/DetectMachine.cmake

@@ -2,16 +2,14 @@ IF(WIN32)
 	SET(LMMS_BUILD_WIN32 1)
 ELSEIF(APPLE)
 	SET(LMMS_BUILD_APPLE 1)
+ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+	SET(LMMS_BUILD_OPENBSD 1)
 ELSEIF(HAIKU)
 	SET(LMMS_BUILD_HAIKU 1)
 ELSE()
 	SET(LMMS_BUILD_LINUX 1)
 ENDIF(WIN32)
 
-IF(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
-	SET(LMMS_BUILD_CLANG 1)
-ENDIF()
-
 # See build_mingwXX.sh for LMMS_BUILD_MSYS
 
 MESSAGE("PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
@@ -29,7 +27,7 @@ ELSE(WIN32)
 	EXEC_PROGRAM( ${CMAKE_C_COMPILER} ARGS "-dumpmachine ${CMAKE_C_FLAGS}" OUTPUT_VARIABLE Machine )
 	MESSAGE("Machine: ${Machine}")
 	STRING(REGEX MATCH "i.86" IS_X86 "${Machine}")
-	STRING(REGEX MATCH "86_64" IS_X86_64 "${Machine}")
+	STRING(REGEX MATCH "86_64|amd64" IS_X86_64 "${Machine}")
 ENDIF(WIN32)
 
 IF(IS_X86)

cmake/modules/FindLame.cmake

@@ -0,0 +1,16 @@
+# - Try to find LAME
+# Once done this will define
+#
+# LAME_FOUND - system has liblame
+# LAME_INCLUDE_DIRS - the liblame include directory
+# LAME_LIBRARIES - The liblame libraries
+
+find_path(LAME_INCLUDE_DIRS lame/lame.h)
+find_library(LAME_LIBRARIES mp3lame)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Lame DEFAULT_MSG LAME_INCLUDE_DIRS LAME_LIBRARIES)
+
+list(APPEND LAME_DEFINITIONS -DHAVE_LIBMP3LAME=1)
+
+mark_as_advanced(LAME_INCLUDE_DIRS LAME_LIBRARIES LAME_DEFINITIONS)

cmake/modules/FindSndio.cmake

@@ -0,0 +1,34 @@
+# sndio check, based on FindAlsa.cmake
+#
+
+# Copyright (c) 2006, David Faure, <faure@kde.org>
+# Copyright (c) 2007, Matthias Kretz <kretz@kde.org>
+# Copyright (c) 2009, Jacob Meuser <jakemsr@sdf.lonestar.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+include(CheckIncludeFiles)
+include(CheckIncludeFileCXX)
+include(CheckLibraryExists)
+
+# Already done by toplevel
+find_library(SNDIO_LIBRARY sndio)
+set(SNDIO_LIBRARY_DIR "")
+if(SNDIO_LIBRARY)
+   get_filename_component(SNDIO_LIBRARY_DIR ${SNDIO_LIBRARY} PATH)
+endif(SNDIO_LIBRARY)
+
+check_library_exists(sndio sio_open "${SNDIO_LIBRARY_DIR}" HAVE_SIO_OPEN)
+
+find_path(SNDIO_INCLUDE_DIR sndio.h)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SNDIO DEFAULT_MSG SNDIO_LIBRARY SNDIO_INCLUDE_DIR HAVE_SIO_OPEN)
+
+if(SNDIO_FOUND)
+    set(SNDIO_INCLUDE_DIRS "${SNDIO_INCLUDE_DIR}")
+    set(SNDIO_LIBRARIES "${SNDIO_LIBRARY}")
+endif(HAVE_SNDIO)
+
+mark_as_advanced(SNDIO_INCLUDE_DIR SNDIO_LIBRARY SNDIO_INCLUDE_DIRS SNDIO_LIBRARIES)

cmake/modules/FindWine.cmake

@@ -7,13 +7,35 @@
 #  WINE_DEFINITIONS - Compiler switches required for using wine
 #
 
-FIND_PATH(WINE_INCLUDE_DIR windows/windows.h PATH_SUFFIXES wine)
-FIND_LIBRARY(WINE_LIBRARY NAMES wine PATH_SUFFIXES wine)
+LIST(APPEND CMAKE_PREFIX_PATH /opt/wine-stable /opt/wine-devel /opt/wine-staging)
+
+FIND_PATH(WINE_INCLUDE_DIR windows/windows.h PATH_SUFFIXES wine wine/wine)
+FIND_LIBRARY(WINE_LIBRARY NAMES wine PATH_SUFFIXES wine i386-linux-gnu/wine)
 FIND_PROGRAM(WINE_CXX NAMES wineg++ winegcc winegcc64 winegcc32)
 
 set(WINE_INCLUDE_DIRS ${WINE_INCLUDE_DIR} )
 set(WINE_LIBRARIES ${WINE_LIBRARY} )
 
+# Handle wine linking problems
+EXEC_PROGRAM(${WINE_CXX} ARGS "-v -m32 /dev/zero" OUTPUT_VARIABLE WINEBUILD_OUTPUT)
+STRING(REPLACE " " ";" WINEBUILD_FLAGS "${WINEBUILD_OUTPUT}")
+
+FOREACH(FLAG ${WINEBUILD_FLAGS})
+	IF("${FLAG}" MATCHES "libwinecrt0.a.*")
+		# Debian systems
+		STRING(REPLACE "/lib/x86_64-" "/lib/i386-" FLAG "${FLAG}")
+		# Fedora systems
+		STRING(REPLACE "/lib/lib64" "/lib/i386" FLAG "${FLAG}")
+		# Gentoo systems
+		STRING(REPLACE "/lib/wine-" "/lib32/wine-" FLAG "${FLAG}")
+		# 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}")
+		SET(WINE_LIBRARY_FIX "${WINE_LIBRARY_FIX}/")
+	ENDIF()
+ENDFOREACH()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Wine DEFAULT_MSG WINE_LIBRARIES WINE_INCLUDE_DIRS)
 

cmake/modules/InstallHelpers.cmake

@@ -23,6 +23,7 @@ ENDMACRO(LIST_CONTAINS)
 MACRO(INSTALL_DATA_SUBDIRS _subdir _wildcards)
 	FOREACH(_wildcard ${_wildcards})
 		FILE(GLOB_RECURSE files ${_wildcard})
+		LIST(SORT files)
 		SET(SUBDIRS)
 
 		FOREACH(_item ${files})
@@ -36,6 +37,7 @@ MACRO(INSTALL_DATA_SUBDIRS _subdir _wildcards)
 
 		FOREACH(_item ${SUBDIRS})
 			FILE(GLOB files "${_item}/${_wildcard}")
+			LIST(SORT files)
 			FOREACH(_file ${files})
 				INSTALL(FILES "${_file}" DESTINATION "${LMMS_DATA_DIR}/${_subdir}/${_item}/")
 			ENDFOREACH(_file ${files})

cmake/modules/MinGWCrossCompile.cmake

@@ -50,8 +50,11 @@ ELSE()
 	# Mingw tools
 	SET(STRIP                       ${MINGW_TOOL_PREFIX}strip)
 	SET(WINDRES                     ${MINGW_TOOL_PREFIX}windres)
-	SET(PKG_CONFIG_EXECUTABLE       ${MINGW_TOOL_PREFIX}pkg-config)
-	SET(PKG_CONFIG_FOUND            TRUE)
+	SET(ENV{PKG_CONFIG}             ${MINGW_TOOL_PREFIX}pkg-config)
+	IF(CMAKE_VERSION LESS 3)
+		SET(PKG_CONFIG_EXECUTABLE       $ENV{PKG_CONFIG})
+		SET(PKG_CONFIG_FOUND            TRUE)
+	ENDIF()
 	
 	# Search for programs in the build host directories
 	SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
@@ -85,7 +88,7 @@ IF(NOT DEFINED ENV{MINGW_DEBUG_INFO})
 	MESSAGE("* CMAKE_CXX_COMPILER                   : ${CMAKE_CXX_COMPILER}")
 	MESSAGE("* CMAKE_RC_COMPILER                    : ${CMAKE_RC_COMPILER}")
 	MESSAGE("* WINDRES                              : ${WINDRES}")
-	MESSAGE("* PKG_CONFIG_EXECUTABLE                : ${PKG_CONFIG_EXECUTABLE}")
+	MESSAGE("* ENV{PKG_CONFIG}                      : $ENV{PKG_CONFIG}")
 	MESSAGE("* MINGW_TOOL_PREFIX32                  : ${MINGW_TOOL_PREFIX32}")
 	MESSAGE("* CMAKE_C_COMPILER32                   : ${CMAKE_C_COMPILER32}")
 	MESSAGE("* CMAKE_CXX_COMPILER32                 : ${CMAKE_CXX_COMPILER32}")

cmake/modules/VersionInfo.cmake

@@ -1,24 +1,29 @@
 FIND_PACKAGE(Git)
 IF(GIT_FOUND AND NOT FORCE_VERSION)
-	# Look for git tag information (e.g. Stable: "v1.0.0", Non-stable: "v1.0.0-123-a1b2c3d4")
+	# Look for git tag information (e.g. Tagged: "v1.0.0", Non-tagged: "v1.0.0-123-a1b2c3d")
 	EXECUTE_PROCESS(
 		COMMAND "${GIT_EXECUTABLE}" describe --tags --match v[0-9].[0-9].[0-9]*
 		OUTPUT_VARIABLE GIT_TAG
 		WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-		TIMEOUT 1
+		TIMEOUT 10
 		OUTPUT_STRIP_TRAILING_WHITESPACE)
 	STRING(REPLACE "-" ";" TAG_LIST "${GIT_TAG}")
 	LIST(LENGTH TAG_LIST TAG_LIST_LENGTH)
-	IF(TAG_LIST_LENGTH EQUAL 1)
-		# Stable build, FORCE_VERSION=x.x.x
+	IF(TAG_LIST_LENGTH GREATER 0)
 		LIST(GET TAG_LIST 0 FORCE_VERSION)
 		STRING(REPLACE "v" "" FORCE_VERSION "${FORCE_VERSION}")
+	ENDIF()
+	IF(TAG_LIST_LENGTH EQUAL 2)
+		LIST(GET TAG_LIST 1 VERSION_STAGE)
+		SET(FORCE_VERSION "${FORCE_VERSION}-${VERSION_STAGE}")
 	ELSEIF(TAG_LIST_LENGTH EQUAL 3)
-		# Non-stable build, FORCE_VERSION=x.x.x-hash
-		LIST(GET TAG_LIST 0 FORCE_VERSION)
-		LIST(GET TAG_LIST 2 COMMIT_HASH)
-		STRING(REPLACE "v" "" FORCE_VERSION "${FORCE_VERSION}")
-		SET(FORCE_VERSION "${FORCE_VERSION}-${COMMIT_HASH}")
+		LIST(GET TAG_LIST 1 EXTRA_COMMITS)
+		SET(FORCE_VERSION "${FORCE_VERSION}.${EXTRA_COMMITS}")
+	ELSEIF(TAG_LIST_LENGTH EQUAL 4)
+		LIST(GET TAG_LIST 1 VERSION_STAGE)
+		LIST(GET TAG_LIST 2 EXTRA_COMMITS)
+		SET(FORCE_VERSION
+			"${FORCE_VERSION}-${VERSION_STAGE}.${EXTRA_COMMITS}")
 	ENDIF()
 ENDIF()
 
@@ -26,15 +31,28 @@ IF(FORCE_VERSION STREQUAL "internal")
 	# Use release info from /CMakeLists.txt
 ELSEIF(FORCE_VERSION)
 	STRING(REPLACE "." ";" VERSION_LIST "${FORCE_VERSION}")
-	STRING(REPLACE "-" ";" VERSION_LIST "${VERSION_LIST}")
 	LIST(LENGTH VERSION_LIST VERSION_LENGTH)
 	LIST(GET VERSION_LIST 0 VERSION_MAJOR)
 	LIST(GET VERSION_LIST 1 VERSION_MINOR)
-	LIST(GET VERSION_LIST 2 VERSION_PATCH)
+	LIST(GET VERSION_LIST 2 VERSION_RELEASE)
+	SET(VERSION_STAGE "")
+	SET(VERSION_BUILD 0)
 	IF(VERSION_LENGTH GREATER 3)
-		LIST(GET VERSION_LIST 3 VERSION_SUFFIX)
+		LIST(GET VERSION_LIST 3 VERSION_BUILD)
 	ENDIF()
+
+	STRING(REPLACE "-" ";" VERSION_LIST "${VERSION_RELEASE}")
+	LIST(LENGTH VERSION_LIST VERSION_LENGTH)
+	IF(VERSION_LENGTH GREATER 1)
+		LIST(GET VERSION_LIST 0 VERSION_RELEASE)
+		LIST(GET VERSION_LIST 1 VERSION_STAGE)
+	ENDIF()
+
 	SET(VERSION             "${FORCE_VERSION}")
+ELSEIF(GIT_FOUND)
+	MESSAGE(
+"Could not get project version.  Using release info from /CMakeLists.txt"
+	)
 ELSE()
 	MESSAGE("Git not found.  Using release info from /CMakeLists.txt")
 ENDIF()
@@ -44,15 +62,16 @@ ENDIF()
 MESSAGE("\n"
 	"Configuring ${PROJECT_NAME_UCASE}\n"
 	"--------------------------\n"
-	"* Build version               : ${VERSION}\n"
+	"* Project version             : ${VERSION}\n"
 	"*   Major version             : ${VERSION_MAJOR}\n"
 	"*   Minor version             : ${VERSION_MINOR}\n"
-	"*   Patch version             : ${VERSION_PATCH}\n"
-	"*   Suffix version            : ${VERSION_SUFFIX}\n"
+	"*   Release version           : ${VERSION_RELEASE}\n"
+	"*   Stage version             : ${VERSION_STAGE}\n"
+	"*   Build version             : ${VERSION_BUILD}\n"
         "*\n\n"
 	"Optional Version Usage:\n"
 	"--------------------------\n"
 	"*   Override version:           -DFORCE_VERSION=x.x.x-x\n"
-	"*   Disable hash suffix:        -DFORCE_VERSION=internal\n"
+	"*   Ignore Git information:     -DFORCE_VERSION=internal\n"
 )
 

cmake/msys/fetch_ppa.sh

@@ -17,10 +17,20 @@ PPA_URL=$PPA_ROOT/dists/$PPA_DISTRO/main/binary-$PPA_ARCH/Packages
 ppa_dir=./ppa/
 
 temp_file=/tmp/ppa_listing_$$
+temp_temp_file=/tmp/ppa_listing_temp_$$
+
+skip_files="binutils openssl flac libgig libogg libvorbis x-bootstrap zlib"
+skip_files="$skip_files x-runtime gcc qt_4 qt5 x-stk pkgconfig" 
+skip_files="$skip_files glib2 libpng"
 
 echo "Connecting to $PPA_HOST to get list of packages..."
 wget -qO- $PPA_URL |grep "Filename:" > $temp_file
 
+for j in $skip_files ; do
+	grep -v $j $temp_file > $temp_temp_file
+	mv $temp_temp_file $temp_file
+done
+
 line_count=`wc -l $temp_file |awk '{print $1}'`
 
 echo "Found $line_count packages for download..."

cmake/msys/msys_helper.sh

@@ -61,6 +61,11 @@ else
 fi
 
 fltkver="1.3.3"
+oggver="1.3.2"
+vorbisver="1.3.5"
+flacver="1.3.2"
+gigver="4.0.0"
+stkver="4.5.1"
 
 info "Downloading and building fltk $fltkver"
 
@@ -75,24 +80,207 @@ if [ $? -ne 0 ]; then
 	pushd $HOME/fltk-$fltkver
 
 	info "  - Compiling fltk $fltkver..."
-	./configure
+	./configure --prefix=$mingw_root --enable-shared
 
 	make
 
 	info "  - Installing fltk..."
-	make install DESTDIR=$mingw_root
+	make install
 
 	if [ $? -ne 0 ]; then
         	err "ERROR: Could not build/install fltk -- Zyn needs this.  Exiting."
 	fi
 	
-	ln -s $mingw_root/usr/local/bin/fluid.exe $mingw_root/bin/fluid.exe 	
+#	ln -s $mingw_root/usr/local/bin/fluid.exe $mingw_root/bin/fluid.exe 	
+	popd
 else
 	warn "  - Skipping, fluid binary already exists" 
 fi
 
-popd
+info "Downloading and building libogg $oggver"
+
+if [ ! -e $mingw_root/lib/libogg.dll.a ]; then 
+	wget http://downloads.xiph.org/releases/ogg/libogg-$oggver.tar.xz -O $HOME/libogg-source.tar.xz
+	if [ $? -ne 0 ]; then
+		err "ERROR: Could not download libogg.  Exiting."	
+	fi
+	tar xf $HOME/libogg-source.tar.xz -C $HOME/
+	pushd $HOME/libogg-$oggver
+
+	info "  - Compiling libogg $oggver..."
+	./configure --prefix=$mingw_root
+
+	make
+
+	info "  - Installing libogg..."
+	make install
+
+	# for some reason libgig needs this
+	./configure --prefix=/opt$mingw_root
+
+	make
+
+	info "  - Installing libogg..."
+	make install
+
+	if [ $? -ne 0 ]; then
+        	err "ERROR: Could not build/install fltk -- lmms needs this.  Exiting."
+	fi
+	
+	popd
+else
+	warn "  - Skipping, libogg binary already exists" 
+fi
+
+
+info "Downloading and building libvorbis $vorbisver"
+
+if [ ! -e $mingw_root/lib/libvorbis.dll.a ]; then 
+	wget http://downloads.xiph.org/releases/vorbis/libvorbis-$vorbisver.tar.xz -O $HOME/libvorbis-source.tar.xz
+	if [ $? -ne 0 ]; then
+		err "ERROR: Could not download libogg.  Exiting."	
+	fi
+	tar xf $HOME/libvorbis-source.tar.xz -C $HOME/
+	pushd $HOME/libvorbis-$vorbisver
+
+	info "  - Compiling libvorbis $vorbisver..."
+	./configure --prefix=$mingw_root
+
+	make
+
+	info "  - Installing libvorbis..."
+	make install
+
+	# for some reason libgig needs this
+	./configure --prefix=/opt$mingw_root
+
+	make
+
+	info "  - Installing libvorbis..."
+	make install
+
+	if [ $? -ne 0 ]; then
+        	err "ERROR: Could not build/install libvorbis -- lmms needs this.  Exiting."
+	fi
+	
+	popd
+else
+	warn "  - Skipping, libvorbis binary already exists" 
+fi
+
+info "Downloading and building flac $flacver"
+
+if [ ! -e $mingw_root/lib/libFLAC.dll.a ]; then 
+	wget http://downloads.xiph.org/releases/flac/flac-$flacver.tar.xz -O $HOME/flac-source.tar.xz
+	if [ $? -ne 0 ]; then
+		err "ERROR: Could not download flac.  Exiting."	
+	fi
+	tar xf $HOME/flac-source.tar.xz -C $HOME/
+	pushd $HOME/flac-$flacver
+
+	info "  - Compiling flac $flacver..."
+	./configure --prefix=$mingw_root
+
+	make
+
+	info "  - Installing flac..."
+	make install
+
+	# for some reason libgig needs this
+	./configure --prefix=/opt$mingw_root
+
+	make
+
+	info "  - Installing flac..."
+	make install
+
+	if [ $? -ne 0 ]; then
+        	err "ERROR: Could not build/install flac -- lmms needs this.  Exiting."
+	fi
+	
+	popd
+else
+	warn "  - Skipping, libvorbis flac already exists" 
+fi
+
+info "Downloading and building libgig $gigver"
+
+if [ ! -e $mingw_root/lib/libgig/libgig.dll.a ]; then 
+	wget http://download.linuxsampler.org/packages/libgig-$gigver.tar.bz2 -O $HOME/gig-source.tar.xz
+	if [ $? -ne 0 ]; then
+		err "ERROR: Could not download libgig.  Exiting."	
+	fi
+	tar xf $HOME/gig-source.tar.xz -C $HOME/
+	pushd $HOME/libgig-$gigver
+
+	info "  - Compiling libgig $gigver..."
+	./configure --prefix=$mingw_root
+
+	make
+
+	info "  - Installing libgig..."
+	make install
+
+	mv $mingw_root/lib/bin/libakai-0.dll $mingw_root/bin
+	mv $mingw_root/lib/bin/libgig-7.dll $mingw_root/bin
+
+	if [ $? -ne 0 ]; then
+        	err "ERROR: Could not build/install libgig -- gigplayer needs this.  Exiting."
+	fi
+	
+	popd
+else
+	warn "  - Skipping, libgig binary already exists" 
+fi
+
+info "Downloading and building stk $stkver"
+
+if [ ! -e $mingw_root/lib/libstk.dll ]; then 
+	wget http://ccrma.stanford.edu/software/stk/release/stk-$stkver.tar.gz -O $HOME/stk-source.tar.xz
+	if [ $? -ne 0 ]; then
+		err "ERROR: Could not download stk.  Exiting."
+	fi
+	tar xf $HOME/stk-source.tar.xz -C $HOME/
+	pushd $HOME/stk-$stkver
+
+	info "  - Compiling stk $stkver..."
+	./configure --prefix=$mingw_root
+
+	make
+
+	info "  - Installing stk..."
+	make install
+
+	if [ $? -ne 0 ]; then
+        	err "ERROR: Could not build/install stk -- mallotstk needs this.  Exiting."
+	fi
+
+	mv $mingw_root/lib/libstk.so $mingw_root/lib/libstk.dll
+	mv $mingw_root/lib/libstk-$stkver.so $mingw_root/lib/libstk-$stkver.dll
+
+	popd
+else
+	warn "  - Skipping, stk binary already exists" 
+fi
+
+# make a symlink to make cmake happy
+if [ $mingw_root = "/mingw64" ]; then
+	if [ ! -e /opt/mingw64/bin/x86_64-w64-mingw32-pkg-config ]; then 
+		ln -s /usr/bin/pkg-config /opt/mingw64/bin/x86_64-w64-mingw32-pkg-config
+	fi
+fi
+if [ $mingw_root = "/mingw32" ]; then
+
+	if [ ! -e /opt/mingw32/bin/i686-w64-mingw32-pkg-config ]; then 
+		ln -s /usr/bin/pkg-config /opt/mingw32/bin/i686-w64-mingw32-pkg-config
+	fi
+fi
 
 info "Cleaning up..."
 rm -rf $HOME/fltk-$fltkver
+rm -rf $HOME/libogg-$oggver
+rm -rf $HOME/libvorbis-$vorbisver
+rm -rf $HOME/flac-$flacver
+rm -rf $HOME/libgig-$gigver
+rm -rf $HOME/stk-$stkver
 info "Done."

cmake/nsis/CMakeLists.txt

@@ -1,5 +1,5 @@
 SET(CPACK_PACKAGE_ICON                  "${CMAKE_SOURCE_DIR}/cmake/nsis/nsis_branding.bmp")
-SET(CPACK_NSIS_MUI_ICON                 "${CMAKE_SOURCE_DIR}/cmake/nsis/lmms.ico")
+SET(CPACK_NSIS_MUI_ICON                 "${CMAKE_SOURCE_DIR}/cmake/nsis/icon.ico")
 SET(CPACK_NSIS_INSTALLED_ICON_NAME      "${CMAKE_PROJECT_NAME}.exe" PARENT_SCOPE)
 SET(CPACK_NSIS_DISPLAY_NAME             "${PROJECT_NAME_UCASE} ${VERSION}" PARENT_SCOPE)
 SET(CPACK_NSIS_HELP_LINK                "${PROJECT_URL}" PARENT_SCOPE)
@@ -7,11 +7,17 @@ SET(CPACK_NSIS_URL_INFO_ABOUT           "${PROJECT_URL}" PARENT_SCOPE)
 SET(CPACK_NSIS_CONTACT                  "${PROJECT_EMAIL}" PARENT_SCOPE)
 SET(CPACK_PACKAGE_EXECUTABLES           "${CMAKE_PROJECT_NAME}.exe;${PROJECT_NAME_UCASE}" PARENT_SCOPE)
 SET(CPACK_NSIS_MENU_LINKS               "${CMAKE_PROJECT_NAME}.exe;${PROJECT_NAME_UCASE}" PARENT_SCOPE)
-SET(CPACK_NSIS_DEFINES                  "!include ${CMAKE_SOURCE_DIR}/cmake/nsis/FileAssociation.nsh")
+SET(CPACK_NSIS_DEFINES                  "
+  !include ${CMAKE_SOURCE_DIR}/cmake/nsis/FileAssociation.nsh
+  !include LogicLib.nsh
+  !include WinVer.nsh")
 SET(CPACK_PACKAGE_FILE_NAME             "${CMAKE_PROJECT_NAME}-${VERSION}-win32")
-SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
+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)\\\"
+  \\\${IfNot} \\\${AtMostWin7}
+    WriteRegDWORD HKLM \\\"Software\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\SideBySide\\\" \\\"PreferExternalManifest\\\" \\\"1\\\"
+  \\\${EndIf}
   " PARENT_SCOPE)
 SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
   \\\${unregisterExtension} \\\".mmp\\\" \\\"${PROJECT_NAME_UCASE} Project\\\"
@@ -58,6 +64,12 @@ SET(CPACK_NSIS_MUI_ICON                 "${CPACK_NSIS_MUI_ICON}" PARENT_SCOPE)
 CONFIGURE_FILE("lmms.rc.in"             "${CMAKE_BINARY_DIR}/lmms.rc")
 CONFIGURE_FILE("zynaddsubfx.rc.in"      "${CMAKE_BINARY_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc")
 
-FILE(GLOB RAWWAVES "${CMAKE_INSTALL_PREFIX}/share/stk/rawwaves/*.raw")
-INSTALL(FILES ${RAWWAVES} DESTINATION "${DATA_DIR}/stk/rawwaves")
+IF(LMMS_HAVE_STK)
+	FILE(GLOB RAWWAVES "${MINGW_PREFIX}/share/stk/rawwaves/*.raw")
+	LIST(SORT RAWWAVES)
+	INSTALL(FILES ${RAWWAVES} DESTINATION "${DATA_DIR}/stk/rawwaves")
+ENDIF()
 
+INSTALL(FILES "lmms.exe.manifest" DESTINATION .)
+INSTALL(FILES "lmms.VisualElementsManifest.xml" DESTINATION .)
+INSTALL(DIRECTORY "assets" DESTINATION .)

cmake/nsis/FileAssociation.nsh

@@ -129,6 +129,7 @@ NoBackup:
     WriteRegStr HKCR "$R0" "" "$R0"
     WriteRegStr HKCR "$R0\shell" "" "open"
 Skip:
+  WriteRegStr HKCR "$R0\DefaultIcon" "" "$R2,1"
   WriteRegStr HKCR "$R0\shell\open\command" "" '"$R2" "%1"'
   WriteRegStr HKCR "$R0\shell\edit" "" "Edit $R0"
   WriteRegStr HKCR "$R0\shell\edit\command" "" '"$R2" "%1"'

cmake/nsis/lmms.VisualElementsManifest.xml

@@ -0,0 +1,9 @@
+<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+  <VisualElements
+      ShowNameOnSquare150x150Logo='on'
+      Square150x150Logo='assets\Logo.png'
+      Square70x70Logo='assets\SmallLogo.png'
+      Square44x44Logo='assets\SmallLogo.png'
+      ForegroundText='light'
+      BackgroundColor='#249A57'/>
+</Application>

cmake/nsis/lmms.exe.manifest

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+<asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+        <ms_windowsSettings:dpiAware xmlns:ms_windowsSettings="http://schemas.microsoft.com/SMI/2005/WindowsSettings">false</ms_windowsSettings:dpiAware>
+    </asmv3:windowsSettings>
+</asmv3:application>
+</assembly>

cmake/nsis/lmms.rc.in

@@ -1,8 +1,8 @@
-lmmsicon ICON cmake/nsis/lmms.ico
+lmmsicon ICON cmake/nsis/icon.ico
+lmmsprojecticon ICON cmake/nsis/project.ico
 #include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION   @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@,0
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
   FILEOS        VOS_NT_WINDOWS32
   FILETYPE      VFT_APP

data/backgrounds/CMakeLists.txt

@@ -1,2 +1,3 @@
 FILE(GLOB PNG_FILES *.png)
+LIST(SORT PNG_FILES)
 INSTALL(FILES ${PNG_FILES} DESTINATION "${LMMS_DATA_DIR}/backgrounds")

data/locale/CMakeLists.txt

@@ -1,7 +1,56 @@
-FILE(GLOB QM_FILES *.qm)
+if (QT5)
+	set (QT_LUPDATE_EXECUTABLE "${Qt5_LUPDATE_EXECUTABLE}")
+	set (QT_LRELEASE_EXECUTABLE "${Qt5_LRELEASE_EXECUTABLE}")
+endif ()
+
+IF(QT_LUPDATE_EXECUTABLE STREQUAL "")
+	EXECUTE_PROCESS(COMMAND "lupdate" "--help" RESULT_VARIABLE LUPDATE_FALLBACK OUTPUT_QUIET)	
+	IF(LUPDATE_FALLBACK EQUAL 0)
+        	SET(QT_LUPDATE_EXECUTABLE lupdate)
+        	SET(QT_LRELEASE_EXECUTABLE lrelease)
+	ELSE()
+		MESSAGE(FATAL_ERROR "Cannot generate locales")
+	ENDIF()
+ENDIF()
+
+
+#
+# rules for building localizations
+#
+SET(ts_targets "")
+SET(qm_targets "")
+SET(QM_FILES "")
+
+FILE(GLOB lmms_LOCALES ${CMAKE_CURRENT_SOURCE_DIR}/*.ts)
+LIST(SORT lmms_LOCALES)
+FOREACH(_ts_file ${lmms_LOCALES})
+	GET_FILENAME_COMPONENT(_ts_target "${_ts_file}" NAME)
+	STRING(REPLACE ".ts" ".qm" _qm_file "${_ts_file}")
+	STRING(REPLACE ".ts" ".qm" _qm_target "${_ts_target}")
+	ADD_CUSTOM_TARGET(${_ts_target}
+		COMMAND "${QT_LUPDATE_EXECUTABLE}" -locations none -no-obsolete -I ${CMAKE_SOURCE_DIR}/include/ ${LMMS_SRCS} ${LMMS_INCLUDES} ${LMMS_UIS} `find "\"${CMAKE_SOURCE_DIR}/plugins/\"" -type f -name '*.cpp' -or -name '*.h'` -ts "\"${_ts_file}\""
+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+	ADD_CUSTOM_TARGET(${_qm_target}
+		COMMAND "${QT_LRELEASE_EXECUTABLE}" "${_ts_file}" -qm "${_qm_file}"
+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+	LIST(APPEND ts_targets "${_ts_target}")
+	LIST(APPEND qm_targets "${_qm_target}")
+	LIST(APPEND QM_FILES "${_qm_file}")
+ENDFOREACH(_ts_file ${lmms_LOCALES})
+
+ADD_CUSTOM_TARGET(update-locales)
+FOREACH(_item ${ts_targets})
+	ADD_DEPENDENCIES(update-locales "${_item}")
+ENDFOREACH(_item ${ts_targets})
+
+ADD_CUSTOM_TARGET(finalize-locales ALL)
+FOREACH(_item ${qm_targets})
+	ADD_DEPENDENCIES(finalize-locales "${_item}")
+ENDFOREACH(_item ${qm_targets})
+
 IF(LMMS_BUILD_WIN32)
 	FILE(GLOB QT_QM_FILES "${QT_TRANSLATIONS_DIR}/qt*[^h].qm")
+	LIST(SORT QT_QM_FILES)
 ENDIF(LMMS_BUILD_WIN32)
 
 INSTALL(FILES ${QM_FILES} ${QT_QM_FILES} DESTINATION "${LMMS_DATA_DIR}/locale")
-