From 8e41d1f2d83fdd601b02245dce60085f371940d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 1 Mar 2018 13:51:17 +0100 Subject: [PATCH] Revert "mixxx: update to git HEAD" Looks like unfinished development This reverts commit ee4d6d56d6574aaa6ea3ff8f6a508b3fbbacbbe1. --- ...float-math-build-option-to-force-vamp-calcu.patch | 12 +++++++----- recipes-misc/recipes-multimedia/mixxx/mixxx_git.bb | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) 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/files/0004-add-vamp-float-math-build-option-to-force-vamp-calcu.patch index 92c4c0e7..7cc621b6 100644 --- 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/files/0004-add-vamp-float-math-build-option-to-force-vamp-calcu.patch @@ -74,12 +74,14 @@ diff --git a/SConstruct b/SConstruct index 301fd3d..7fc552a 100644 --- a/SConstruct +++ b/SConstruct -@@ -65,7 +65,8 @@ available_features = [features.Mad, +@@ -63,8 +63,9 @@ available_features = [features.Mad, + features.IPod, + features.FFMPEG, - # Experimental features - features.OpenGLES, -- features.QtKeychain -+ features.QtKeychain, +- # Experimental features +- features.OpenGLES ++ # Experimental features ++ features.OpenGLES, + features.VampFloat ] diff --git a/recipes-misc/recipes-multimedia/mixxx/mixxx_git.bb b/recipes-misc/recipes-multimedia/mixxx/mixxx_git.bb index cf43425d..f4d8bdc9 100644 --- a/recipes-misc/recipes-multimedia/mixxx/mixxx_git.bb +++ b/recipes-misc/recipes-multimedia/mixxx/mixxx_git.bb @@ -42,7 +42,7 @@ SRC_URI = " \ file://0004-add-vamp-float-math-build-option-to-force-vamp-calcu.patch \ file://0005-Fix-release-build-with-Qt-5.10.patch \ " -SRCREV = "24028f2e8a28210fe45d8b67f2bb44d580587261" +SRCREV = "b6d29e53d3ae74cd040a5d5ecbe742f9c385575a" S = "${WORKDIR}/git" PV = "2.0.0+git${SRCPV}"