From 246f1dc8bc12f997ff53268ace14eed80a8e53c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 30 Oct 2018 20:26:29 +0100
Subject: [PATCH] mixxx: upgrade to 2.1.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../0001-do-not-check-for-known-machine-types.patch           | 0
 .../{files => mixxx}/0002-force-using-system-soundtouch.patch | 2 +-
 .../0003-align-path-of-qt-build-tools-to-our-needs.patch      | 0
 ...add-vamp-float-math-build-option-to-force-vamp-calcu.patch | 0
 recipes-misc/recipes-multimedia/mixxx/mixxx_git.bb            | 4 ++--
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename recipes-misc/recipes-multimedia/mixxx/{files => mixxx}/0001-do-not-check-for-known-machine-types.patch (100%)
 rename recipes-misc/recipes-multimedia/mixxx/{files => mixxx}/0002-force-using-system-soundtouch.patch (96%)
 rename recipes-misc/recipes-multimedia/mixxx/{files => mixxx}/0003-align-path-of-qt-build-tools-to-our-needs.patch (100%)
 rename recipes-misc/recipes-multimedia/mixxx/{files => mixxx}/0004-add-vamp-float-math-build-option-to-force-vamp-calcu.patch (100%)

diff --git a/recipes-misc/recipes-multimedia/mixxx/files/0001-do-not-check-for-known-machine-types.patch b/recipes-misc/recipes-multimedia/mixxx/mixxx/0001-do-not-check-for-known-machine-types.patch
similarity index 100%
rename from recipes-misc/recipes-multimedia/mixxx/files/0001-do-not-check-for-known-machine-types.patch
rename to recipes-misc/recipes-multimedia/mixxx/mixxx/0001-do-not-check-for-known-machine-types.patch
diff --git a/recipes-misc/recipes-multimedia/mixxx/files/0002-force-using-system-soundtouch.patch b/recipes-misc/recipes-multimedia/mixxx/mixxx/0002-force-using-system-soundtouch.patch
similarity index 96%
rename from recipes-misc/recipes-multimedia/mixxx/files/0002-force-using-system-soundtouch.patch
rename to recipes-misc/recipes-multimedia/mixxx/mixxx/0002-force-using-system-soundtouch.patch
index 6ea9e3f9..aa77e51d 100644
--- a/recipes-misc/recipes-multimedia/mixxx/files/0002-force-using-system-soundtouch.patch
+++ b/recipes-misc/recipes-multimedia/mixxx/mixxx/0002-force-using-system-soundtouch.patch
@@ -25,7 +25,7 @@ index a053970..3edb64e 100644
  
          if build.platform_is_linux:
 -            # Try using system lib
--            if conf.CheckForPKG('soundtouch', '1.8.0'):
+-            if conf.CheckForPKG('soundtouch', '2.0.0'):
 -                # System Lib found
 -                build.env.ParseConfig('pkg-config soundtouch --silence-errors \
 -                                      --cflags --libs')
diff --git a/recipes-misc/recipes-multimedia/mixxx/files/0003-align-path-of-qt-build-tools-to-our-needs.patch b/recipes-misc/recipes-multimedia/mixxx/mixxx/0003-align-path-of-qt-build-tools-to-our-needs.patch
similarity index 100%
rename from recipes-misc/recipes-multimedia/mixxx/files/0003-align-path-of-qt-build-tools-to-our-needs.patch
rename to recipes-misc/recipes-multimedia/mixxx/mixxx/0003-align-path-of-qt-build-tools-to-our-needs.patch
diff --git a/recipes-misc/recipes-multimedia/mixxx/files/0004-add-vamp-float-math-build-option-to-force-vamp-calcu.patch b/recipes-misc/recipes-multimedia/mixxx/mixxx/0004-add-vamp-float-math-build-option-to-force-vamp-calcu.patch
similarity index 100%
rename from recipes-misc/recipes-multimedia/mixxx/files/0004-add-vamp-float-math-build-option-to-force-vamp-calcu.patch
rename to recipes-misc/recipes-multimedia/mixxx/mixxx/0004-add-vamp-float-math-build-option-to-force-vamp-calcu.patch
diff --git a/recipes-misc/recipes-multimedia/mixxx/mixxx_git.bb b/recipes-misc/recipes-multimedia/mixxx/mixxx_git.bb
index f7642a2c..4920c42d 100644
--- a/recipes-misc/recipes-multimedia/mixxx/mixxx_git.bb
+++ b/recipes-misc/recipes-multimedia/mixxx/mixxx_git.bb
@@ -41,9 +41,9 @@ SRC_URI = " \
     file://0003-align-path-of-qt-build-tools-to-our-needs.patch \
     file://0004-add-vamp-float-math-build-option-to-force-vamp-calcu.patch \
 "
-SRCREV = "55b4f3e0a67d27f94d55c0c5152e53fc138dea7c"
+SRCREV = "fab54081a9d1faed4e6f601ecdf2f4feb5c050c1"
 S = "${WORKDIR}/git"
-PV = "2.1.0+git${SRCPV}"
+PV = "2.1.4+git${SRCPV}"
 
 EXTRA_OESCONS_MATH ??= " \
     vampfloatmath=1 \