Merge branch 'master' into Livemetadata

.travis.yml

@@ -28,9 +28,9 @@ addons:
       - libopusfile-dev
       - libportmidi-dev
       - libprotobuf-dev
-      - libqt4-dev
-      - libqt4-opengl-dev
-      - libqt4-sql-sqlite
+      - libqt5opengl5-dev
+      - libqt5sql5-sqlite
+      - libqt5svg5-dev
       - librubberband-dev
       - libshout3-dev
       - libsndfile1-dev
@@ -42,9 +42,12 @@ addons:
       - libwavpack-dev
       - portaudio19-dev
       - protobuf-compiler
+      - qt5-default
+      - qtscript5-dev
       - scons
       - vamp-plugin-sdk
       - qtkeychain-dev
+      - liblilv-dev
 before_install:
   # Virtual X, needed for analyzer waveform tests
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0         ; fi
@@ -53,23 +56,24 @@ before_install:
   # Homebrew uses Python 3 now, and portmidi depends on Python 2 which triggers this bug:
   # https://github.com/Homebrew/homebrew-core/issues/26358
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install scons portaudio libsndfile libogg libvorbis portmidi taglib libshout protobuf flac ffmpeg qt chromaprint rubberband fftw libmodplug libid3tag libmad mp4v2 faad2 wavpack opusfile; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install scons portaudio libsndfile libogg libvorbis portmidi taglib libshout protobuf flac ffmpeg qt chromaprint rubberband fftw libmodplug libid3tag libmad mp4v2 faad2 wavpack opusfile lilv; fi
 
 install:
   ####
   # Common
 
   # Build flags common to OS X and Linux.
   # Parallel builds are important for avoiding OSX build timeouts.
-  - export COMMON="-j4 test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1"
+  # We turn off verbose output to avoid going over the 4MB output limit.
+  - export COMMON="-j4 qt5=1 test=1 mad=1 faad=1 ffmpeg=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0"
 
   #####
   # Ubuntu Trusty Build
 
   ####
   # OS X Build
 
-  # Define QTDIR. Homebrew does not support Qt4 anymore, so /usr/local/Cellar/qt stores Qt5 installs.
+  # Define QTDIR.
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export QTDIR=$(find /usr/local/Cellar/qt -d 1 | tail -n 1) ; fi
 
   # Workaround for bug in libopus's opus.h including <opus_multistream.h>
@@ -78,11 +82,9 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CFLAGS="-isystem /usr/local/include/opus" ; fi
 
   # NOTE(rryan): 2016-11-15 we are experiencing Travis timeouts for the OSX
-  # build.  Turning off optimizations to see if that speeds up compile times. We
-  # also need to avoid going over 4MB of output so we turn off verbose mode.
-  # NOTE(rryan): 2016-12-31 Homebrew has dropped qt4 support. Build with qt5.
+  # build.  Turning off optimizations to see if that speeds up compile times.
   # TODO(rryan): localecompare doesn't work on Travis with qt5 for some reason.
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export EXTRA_FLAGS="optimize=none asan=0 verbose=0 qt5=1 localecompare=0" ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export EXTRA_FLAGS="optimize=none asan=0 localecompare=0" ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export EXTRA_FLAGS="localecompare=1" ; fi
 
   ####

README.md

@@ -96,7 +96,11 @@ license.
 [mailing list]: https://lists.sourceforge.net/lists/listinfo/mixxx-devel
 [irc channel]: http://mixxx.org/irc.php
 [SCons]: http://www.scons.org/
+<<<<<<< HEAD
 [launchpad 2.2.0]: https://launchpad.net/mixxx/+milestone/2.2.0
+=======
+[launchpad 2.1.1]: https://launchpad.net/mixxx/+milestone/2.1.1
+>>>>>>> upstream/2.1
 [wiki roadmap]: http://mixxx.org/wiki/doku.php/development_roadmap
 [easybugs]: https://bugs.launchpad.net/mixxx/+bugs?field.searchtext=&orderby=-importance&search=Search&field.status%3Alist=NEW&field.status%3Alist=CONFIRMED&field.status%3Alist=TRIAGED&field.status%3Alist=INPROGRESS&field.status%3Alist=INCOMPLETE_WITH_RESPONSE&field.status%3Alist=INCOMPLETE_WITHOUT_RESPONSE&assignee_option=any&field.assignee=&field.bug_reporter=&field.bug_commenter=&field.subscriber=&field.structural_subscriber=&field.tag=easy&field.tags_combinator=ANY&field.has_cve.used=&field.omit_dupes.used=&field.omit_dupes=on&field.affects_me.used=&field.has_patch.used=&field.has_branches.used=&field.has_branches=on&field.has_no_branches.used=&field.has_no_branches=on&field.has_blueprints.used=&field.has_blueprints=on&field.has_no_blueprints.used=&field.has_no_blueprints=on
 [creating skins]: http://mixxx.org/wiki/doku.php/creating_skins

SConstruct

@@ -55,6 +55,7 @@ available_features = [features.Mad,
                       features.ColorDiagnostics,
                       features.Sanitizers,
                       features.LocaleCompare,
+                      features.Lilv,
                       features.Battery,
 
                       # "Features" of dubious quality

appveyor.yml

@@ -22,7 +22,7 @@ configuration:
 #  - release
 #  - debug
 environment:
-  ENVIRONMENTS_URL: https://downloads.mixxx.org/builds/buildserver/2.1.x-windows/
+  ENVIRONMENTS_URL: https://downloads.mixxx.org/builds/buildserver/2.2.x-windows/
   ENVIRONMENTS_PATH: C:\mixxx-buildserver
   matrix:
     - platform: x64

build/appveyor/build_mixxx.bat

@@ -89,7 +89,7 @@ set WINLIB_DIR=%3
 SET BIN_DIR=%WINLIB_DIR%\bin
 SET LIB_DIR=%WINLIB_DIR%\lib
 SET INCLUDE_DIR=%WINLIB_DIR%\include
-set QT_VERSION=4.8.7
+set QT_VERSION=5.10.1
 SET QTDIR=%WINLIB_DIR%\Qt-%QT_VERSION%
 
 if NOT EXIST "%BIN_DIR%\scons.py" (
@@ -140,7 +140,7 @@ set CXXFLAGS=/MP /FS /EHsc /Zc:threadSafeInit-
 set CFLAGS=/MP /FS /EHsc /Zc:threadSafeInit-
 
 set PATH=%BIN_DIR%;%PATH%
-scons.py mixxx makerelease toolchain=msvs winlib=%WINLIB_DIR% build=%BUILD_TYPE% staticlibs=1 staticqt=1 debug_assertions_fatal=1 verbose=0 machine=%MACHINE_TYPE% qtdir=%QTDIR% hss1394=1 mediafoundation=1 opus=1 localecompare=1 optimize=fastbuild virtualize=0 test=1 qt_sqlite_plugin=0 mssdk_dir="%MSSDK_DIR%" build_number_in_title_bar=0 bundle_pdbs=1
+scons.py mixxx makerelease toolchain=msvs winlib=%WINLIB_DIR% build=%BUILD_TYPE% staticlibs=1 staticqt=1 debug_assertions_fatal=1 verbose=0 machine=%MACHINE_TYPE% qtdir=%QTDIR% hss1394=1 mediafoundation=1 opus=1 localecompare=1 optimize=fastbuild virtualize=0 test=1 qt_sqlite_plugin=0 mssdk_dir="%MSSDK_DIR%" build_number_in_title_bar=0 bundle_pdbs=0
 
 IF ERRORLEVEL 1 (
 echo ==============================

build/debian/changelog

@@ -1,3 +1,9 @@
+mixxx (2.1.1-0ubuntu1) artful; urgency=medium
+
+  * New upstream release.
+
+ -- RJ Ryan <rryan@mixxx.org>  Thu, 17 May 2018 20:42:25 +0200
+
 mixxx (2.1.0-0ubuntu1) artful; urgency=medium
 
   * New upstream release.

build/debian/control

@@ -6,7 +6,21 @@ Build-Depends: debhelper (>= 9),
                pkg-config,
                docbook-to-man,
                libglu1-mesa-dev,
-               libqt4-opengl-dev | libqt4-dev (>= 4.6.0),
+# qt5-default depends on qtbase5-dev, which includes headers for
+# QtConcurrent
+# QtCore
+# QtGui
+# QtNetwork
+# QtPlatformHeaders
+# QtPrintSupport
+# QtSql
+# QtWidgets
+# QtXml
+               qt5-default (>= 5.2.0),
+# We additionally need headers for QtOpenGL, QtScript, and QtSvg.
+               qtscript5-dev,
+               libqt5opengl5-dev,
+               libqt5svg5-dev,
                scons,
                libjack-dev,
                portaudio19-dev,
@@ -31,7 +45,8 @@ Build-Depends: debhelper (>= 9),
                libsqlite3-dev,
                libsoundtouch-dev,
                libhidapi-dev,
-               libupower-glib-dev
+               libupower-glib-dev,
+               liblilv-dev
 Standards-Version: 3.9.8
 Homepage: http://www.mixxx.org/
 
@@ -40,11 +55,11 @@ Section: sound
 Architecture: linux-any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libqt4-opengl,
-         libqt4-svg,
-         libqt4-xmlpatterns,
-         libqt4-sql,
-         libqt4-sql-sqlite
+         libqt5opengl5,
+         libqt5svg5,
+         libqt5xml5,
+         libqt5sql5,
+         libqt5sql5-sqlite
 Recommends: libmp3lame0
 Suggests: pdf-viewer
 Replaces: mixxx-data