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

Merge branch 'stable-1.2'

Browse Source 
# Conflicts:
#	.travis/linux..before_install.sh
#	.travis/linux..install.sh
#	cmake/linux/lmms.desktop
#	plugins/vst_base/CMakeLists.txt
This commit is contained in:
Lukas W
2017-10-18 17:33:55 +02:00
parent 7f92b82738 20ea945cee
commit 1059c92d87
37 changed files with 2514 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis/linux..before_install.sh
View File

@@ -2,6 +2,7 @@
set -e
sudo add-apt-repository ppa:beineri/opt-qt58-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

4
.travis/linux..install.sh
View File

@@ -3,7 +3,7 @@
set -e
PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libmp3lame-dev
libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev
libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev stk
libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev
libgig-dev libsoundio-dev"
@@ -11,7 +11,7 @@ PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libmp3lame-dev
PACKAGES="$PACKAGES libjack0"
if [ "$QT5" ]; then
PACKAGES="$PACKAGES qtbase5-dev qttools5-dev-tools qttools5-dev"
PACKAGES="$PACKAGES qt58base qt58translations qt58tools"
else
PACKAGES="$PACKAGES libqt4-dev"
fi

4
.travis/linux..script.sh
View File

@@ -1,4 +1,8 @@
#!/usr/bin/env bash
if [ $QT5 ]; then
unset QTDIR QT_PLUGIN_PATH LD_LIBRARY_PATH
source /opt/qt58/bin/qt58-env.sh
fi
set -e