Merge branch 'master' into groove

.appveyor.yml

@@ -8,15 +8,19 @@ environment:
   matrix:
     - compiler: msvc
 install:
-  - vcpkg install --triplet %PLATFORM%-windows --recurse fftw3 libsamplerate libsndfile sdl2
+  - cd C:\Tools\vcpkg
+  - git pull --quiet
+  - .\bootstrap-vcpkg.bat
+  - cd %APPVEYOR_BUILD_FOLDER%
+  - vcpkg install --triplet %PLATFORM%-windows --recurse fftw3 libsamplerate libsndfile lilv lv2 sdl2
   - nuget install clcache -Version 4.1.0
 build_script:
   - cd %APPVEYOR_BUILD_FOLDER%
   - mkdir build
   - cd build
   - ps: $env:CMAKE_PLATFORM="$(if ($env:PLATFORM -eq 'x64') { 'x64' } else { '' })"
   - ps: $env:QT_SUFFIX="$(if ($env:PLATFORM -eq 'x64') { '_64' } else { '' })"
-  - cmake -DUSE_COMPILE_CACHE=ON -DCACHE_TOOL=%APPVEYOR_BUILD_FOLDER%/clcache.4.1.0/clcache-4.1.0/clcache.exe -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH=c:/Qt/5.12/msvc2017%QT_SUFFIX%;c:/tools/vcpkg/installed/%PLATFORM%-windows -DCMAKE_GENERATOR_PLATFORM="%CMAKE_PLATFORM%" ..
+  - cmake -DUSE_COMPILE_CACHE=ON -DCACHE_TOOL=%APPVEYOR_BUILD_FOLDER%/clcache.4.1.0/clcache-4.1.0/clcache.exe -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH=c:/Qt/5.12/msvc2017%QT_SUFFIX% -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_GENERATOR_PLATFORM="%CMAKE_PLATFORM%" ..
   - cmake --build . -- /maxcpucount:4
   - cmake --build . --target tests
   - cmake --build . --target package

.circleci/config.yml

@@ -121,7 +121,7 @@ jobs:
       - *save_cache
   linux.gcc:
     docker:
-      - image: lmmsci/linux.gcc:16.04
+      - image: lmmsci/linux.gcc:18.04
     environment:
       <<: *common_environment
     steps:
@@ -170,15 +170,21 @@ jobs:
     environment:
       <<: *common_environment
     macos:
-      xcode: "9.3.1"
+      xcode: "10.3.0"
     steps:
       - checkout
       - *init
       - *restore_homebrew_cache
       - *restore_cache
       - run:
           name: Install Homebrew dependencies
-          command: brew update && brew install ccache fftw cmake pkg-config libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio fltk qt5 carla
+          command: |
+            # uninstall Homebrew's python 2 to prevent errors on brew install
+            brew uninstall python@2 || true
+            # Working around for https://github.com/Homebrew/brew/pull/9383
+            (git -C "/usr/local/Homebrew/Library/Taps/homebrew/homebrew-core" fetch && git merge FETCH_HEAD --ff-only) || true
+            (git -C "/usr/local/Homebrew" fetch && git merge FETCH_HEAD --ff-only) || true
+            brew install ccache fftw cmake pkg-config libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio lilv lv2 stk fluid-synth portaudio fltk qt5 carla
       - run:
           name: Install nodejs dependencies
           command: npm install -g appdmg

.gitattributes

@@ -1,3 +1,5 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 data/locale/* linguist-documentation
+* text=auto eol=lf
+*.{bin,bmp,flac,icns,ico,mmpz,ogg,png,xiz,xmz,wav} binary

.github/ISSUE_TEMPLATE/bug_report.md

@@ -19,7 +19,13 @@ assignees: ''
 
 #### Screenshot
 
-#### LMMS version used
+#### Affected LMMS versions
+
+<!--
+LMMS's version is visible on the splash screen and under Help > About.
+If your version isn't from lmms.io/download, please note which branch it was built from.
+Finally, if possible, please test if the bug occurs on both stable and master.
+-->
 
 #### Logs
 <details>

.gitmodules

@@ -3,7 +3,7 @@
 	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
+	url = https://github.com/mjansson/rpmalloc.git
 [submodule "plugins/zynaddsubfx/zynaddsubfx"]
 	path = plugins/zynaddsubfx/zynaddsubfx
 	url = https://github.com/lmms/zynaddsubfx.git
@@ -34,3 +34,18 @@
 [submodule "doc/wiki"]
 	path = doc/wiki
 	url = https://github.com/lmms/lmms.wiki.git
+[submodule "src/3rdparty/ringbuffer"]
+	path = src/3rdparty/ringbuffer
+	url = https://github.com/JohannesLorenz/ringbuffer.git
+[submodule "plugins/carlabase/carla"]
+	path = plugins/carlabase/carla
+	url = https://github.com/falktx/carla
+[submodule "plugins/sid/resid"]
+	path = plugins/Sid/resid
+	url = https://github.com/simonowen/resid
+[submodule "src/3rdparty/jack2"]
+	path = src/3rdparty/jack2
+	url = https://github.com/jackaudio/jack2
+[submodule "plugins/LadspaEffect/cmt/cmt"]
+	path = plugins/LadspaEffect/cmt/cmt
+	url = https://github.com/lmms/cmt

.mailmap

@@ -1,4 +1,4 @@
-Alexandre Almeida <[email protected]> <[email protected]>
+Alexandre Almeida <[email protected]>
 Tobias Junghans <[email protected]>
 Dave French <[email protected]>
 Paul Giblock <[email protected]> <[email protected]>

.travis.yml

@@ -1,6 +1,6 @@
 language: cpp
 compiler: gcc
-dist: trusty
+dist: xenial
 sudo: required
 cache:
     directories:
@@ -22,7 +22,7 @@ matrix:
           git:
               depth: false
         - os: osx
-          osx_image: xcode9.4
+          osx_image: xcode10.3
 before_install:
     # appdmg doesn't work with old Node.js
     - if [ "$TRAVIS_OS_NAME" = osx ]; then nvm install 10; fi
@@ -31,17 +31,3 @@ script: ${TRAVIS_BUILD_DIR}/.travis/script.sh
 after_script: ${TRAVIS_BUILD_DIR}/.travis/after_script.sh
 before_deploy:
     - if [ "$TARGET_OS" != debian-sid ]; then make package; fi
-deploy:
-    provider: releases
-    api_key:
-        secure: d4a+x4Gugpss7JK2DcHjyBZDmEFFh4iVfKDfITSD50T6Mc6At4LMgojvEu+6qT6IyOY2vm3UVT6fhyeuWDTRDwW9tfFlaHVA0h8aTRD+eAXOA7pQ8rEMwQO3+WCKuKTfEqUkpL4wxhww8dpkv54tqeIs0S4TBqz9tk8UhzU7XbE=
-    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_DEPLOY" = True'
-    repo: LMMS/lmms

.travis/linux..before_install.sh

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

.travis/linux..install.sh

@@ -4,7 +4,7 @@ set -e
 
 PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libmp3lame-dev
 	libasound2-dev libjack-jackd2-dev libsdl-dev libsamplerate0-dev libstk0-dev stk
-	libfluidsynth-dev portaudio19-dev g++-multilib libfltk1.3-dev
+	libfluidsynth-dev portaudio19-dev g++-multilib libfltk1.3-dev fluid
 	libgig-dev libsoundio-dev qt59base qt59translations qt59tools"
 
 # swh build dependencies
@@ -13,14 +13,11 @@ SWH_PACKAGES="perl libxml2-utils libxml-perl liblist-moreutils-perl"
 # VST dependencies
 VST_PACKAGES="wine-dev qt59x11extras qtbase5-private-dev libxcb-util0-dev libxcb-keysyms1-dev"
 
+# LV2 dependencies; libsuil-dev is not required
+LV2_PACKAGES="lv2-dev liblilv-dev"
+
 # Help with unmet dependencies
-PACKAGES="$PACKAGES $SWH_PACKAGES $VST_PACKAGES libjack-jackd2-0"
+PACKAGES="$PACKAGES $SWH_PACKAGES $VST_PACKAGES $LV2_PACKAGES libjack-jackd2-0"
 
 # shellcheck disable=SC2086
 sudo apt-get install -y $PACKAGES
-
-# kxstudio repo offers Carla; avoid package conflicts (wine, etc) by running last
-sudo add-apt-repository -y ppa:kxstudio-debian/libs
-sudo add-apt-repository -y ppa:kxstudio-debian/apps
-sudo apt-get update
-sudo apt-get install -y carla

.travis/osx..before_install.sh

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

.travis/osx..install.sh

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

.travis/script.sh

@@ -13,7 +13,7 @@ if [ "$TYPE" = 'style' ]; then
 
 else
 
-	export CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+	export CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUNDLE_QT_TRANSLATIONS=ON"
 
 	if [ -z "$TRAVIS_TAG" ]; then
 		export CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_CCACHE=ON"
@@ -22,7 +22,7 @@ else
 	"$TRAVIS_BUILD_DIR/.travis/$TRAVIS_OS_NAME.$TARGET_OS.script.sh"
 
 	# Package and upload non-tagged builds
-	if [ ! -z "$TRAVIS_TAG" ]; then
+	if [ -n "$TRAVIS_TAG" ]; then
 		# Skip, handled by travis deploy instead
 		exit 0
 	elif [[ $TARGET_OS == win* ]]; then