Adapted and merged to upstream master 18_3

.mailmap

@@ -25,3 +25,4 @@ midi-pascal <[email protected]> <pascal@TDE.(none)>
 Thomas Clark <[email protected]>
 Thomas Clark <[email protected]> <[email protected]>
 anonymous <[email protected]> Locale updater <>
+grejppi <[email protected]>

CMakeLists.txt

@@ -18,15 +18,11 @@ 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()
+# Updated by maintenance tasks
+SET(PROJECT_YEAR 2015)
 
 SET(PROJECT_AUTHOR      "LMMS Developers")
-SET(PROJECT_URL         "http://lmms.io")
+SET(PROJECT_URL         "https://lmms.io")
 SET(PROJECT_EMAIL       "[email protected]")
 SET(PROJECT_DESCRIPTION "${PROJECT_NAME_UCASE} - Free music production software")
 SET(PROJECT_COPYRIGHT   "2008-${PROJECT_YEAR} ${PROJECT_AUTHOR}")
@@ -461,22 +457,6 @@ 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.
-# 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 AND NOT CONTRIBUTORS)
-	SET(CONTRIBUTORS "${CMAKE_BINARY_DIR}/CONTRIBUTORS")
-	EXECUTE_PROCESS(
-		COMMAND "${GIT_EXECUTABLE}" shortlog -sne
-		COMMAND cut -c8-
-		OUTPUT_FILE "${CONTRIBUTORS}"
-		WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-		TIMEOUT 1)
-ENDIF()
-
 # embedded resources stuff
 IF(WIN32 OR WIN64)
 	# compile buildtools native
@@ -509,9 +489,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

README.md

@@ -3,7 +3,7 @@
 [![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%20on-discord-7289DA.svg)](https://discord.gg/5kSc32Z)
+[![Join the chat at Discord](https://img.shields.io/badge/chat-on%20discord-7289DA.svg)](https://discord.gg/5kSc32Z)
 [![Localise on transifex](https://img.shields.io/badge/localise-on_transifex-green.svg)](https://www.transifex.com/lmms/lmms/)
 
 What is LMMS?
@@ -15,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
 ---------

cmake/build_mingw32.sh

@@ -8,7 +8,7 @@ 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"
 

cmake/build_mingw64.sh

@@ -8,7 +8,7 @@ else
 	CMAKE_OPTS="$CMAKE_OPTS -DLMMS_BUILD_MSYS=1"
 fi
 
-export PATH=$PATH:$MINGW/bin
+export PATH=$MINGW/bin:$PATH
 
 if [ "$1" = "-qt5" ]; then
         QT5=True

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/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."