From 6c06a17ca3cc7c91b9f4996fd53ddef2554e7acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 29 Mar 2020 21:12:18 +0200 Subject: [PATCH] qtractor: upgrade 0.9.12 -> 0.9.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-musicians/rncbc/qtractor.bb | 4 ++-- ...-nor-try-run-for-float-sse-detection.patch | 17 +++++++------ ...-nor-try-run-for-suil-libs-detection.patch | 24 +++++++++---------- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/recipes-musicians/rncbc/qtractor.bb b/recipes-musicians/rncbc/qtractor.bb index 19bdcbb..88e0bad 100644 --- a/recipes-musicians/rncbc/qtractor.bb +++ b/recipes-musicians/rncbc/qtractor.bb @@ -28,8 +28,8 @@ SRC_URI = " \ \ file://Qtractor.conf \ " -SRCREV = "c2a4d134d8a30ceaa177d098b2d932c19078b558" -PV = "0.9.12+git${SRCPV}" +SRCREV = "d769b11c410a52d48c77beb55908aa7f0a15a8f6" +PV = "0.9.13+git${SRCPV}" S = "${WORKDIR}/git" EXTRA_OECONF = " \ diff --git a/recipes-musicians/rncbc/qtractor/0001-do-nor-try-run-for-float-sse-detection.patch b/recipes-musicians/rncbc/qtractor/0001-do-nor-try-run-for-float-sse-detection.patch index 9a7f5bf..b54edb9 100644 --- a/recipes-musicians/rncbc/qtractor/0001-do-nor-try-run-for-float-sse-detection.patch +++ b/recipes-musicians/rncbc/qtractor/0001-do-nor-try-run-for-float-sse-detection.patch @@ -8,30 +8,29 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- - configure.ac | 19 +++---------------- - 1 file changed, 3 insertions(+), 16 deletions(-) + configure.ac | 18 +++--------------- + 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac -index 99b3e5a..35416ff 100644 +index e33d2cb2..a582410f 100644 --- a/configure.ac +++ b/configure.ac -@@ -564,14 +564,7 @@ fi +@@ -606,13 +606,7 @@ fi AC_SUBST(ac_lrelease) -# Check for IEEE 32bit float optimizations. +-AC_CHECK_SIZEOF(float) -AC_CACHE_CHECK([for IEEE 32bit float optimizations], - ac_cv_float32, [ -- AC_TRY_RUN([ -- int main() { return (sizeof(float) == 4 ? 0 : 1); } -- ], ac_cv_float32="yes", ac_cv_float32="no") +- AS_IF([test "$ac_cv_sizeof_float" = 4], [ac_cv_float32="yes"], [ac_cv_float32="no"]) -]) -ac_float32=$ac_cv_float32 +ac_float32=yes if test "x$ac_float32" = "xyes"; then AC_DEFINE(CONFIG_FLOAT32, 1, [Define if IEEE 32bit float optimizations are enabled.]) fi -@@ -585,19 +578,13 @@ if test "x$ac_sse" = "xyes"; then +@@ -626,19 +620,13 @@ if test "x$ac_sse" = "xyes"; then CPPFLAGS="$ac_sse_cflags $CPPFLAGS" AC_CACHE_CHECK([for SSE optimization], ac_cv_sse, [ @@ -54,5 +53,5 @@ index 99b3e5a..35416ff 100644 ], ac_cv_sse="yes", ac_cv_sse="no") ]) -- -2.5.5 +2.21.1 diff --git a/recipes-musicians/rncbc/qtractor/0002-do-nor-try-run-for-suil-libs-detection.patch b/recipes-musicians/rncbc/qtractor/0002-do-nor-try-run-for-suil-libs-detection.patch index 7f7ecd0..4cbac30 100644 --- a/recipes-musicians/rncbc/qtractor/0002-do-nor-try-run-for-suil-libs-detection.patch +++ b/recipes-musicians/rncbc/qtractor/0002-do-nor-try-run-for-suil-libs-detection.patch @@ -9,15 +9,15 @@ Signed-off-by: Andreas Müller 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac -index b3de5acd..09d2ef06 100644 +index a582410f..0dbfc4f5 100644 --- a/configure.ac +++ b/configure.ac -@@ -1229,17 +1229,7 @@ if test "x$ac_lv2_ui_show" = "xyes"; then +@@ -1339,17 +1339,7 @@ if test "x$ac_lv2_ui_show" = "xyes"; then fi - if test "x$ac_suil" = "xyes"; then + if test "x$ac_libsuil" = "xyes"; then - AC_CACHE_CHECK([for LV2 UI GTK2 support (libsuil_gtk2_in_qt5)], -- ac_cv_suil_gtk2_in_qt5, [ +- ac_cv_libsuil_gtk2_in_qt5, [ - AC_TRY_RUN([ - #include - #include "lv2/lv2plug.in/ns/extensions/ui/ui.h" @@ -25,18 +25,18 @@ index b3de5acd..09d2ef06 100644 - #define LV2_UI__Qt5UI LV2_UI_PREFIX "Qt5UI" - #endif - int main() { return !suil_ui_supported(LV2_UI__Qt5UI, LV2_UI__GtkUI); } -- ], ac_cv_suil_gtk2_in_qt5="yes", ac_cv_suil_gtk2_in_qt5="no") +- ], ac_cv_libsuil_gtk2_in_qt5="yes", ac_cv_libsuil_gtk2_in_qt5="no") - ]) + ac_cv_suil_gtk2_in_qt5="yes" - if test "x$ac_cv_suil_gtk2_in_qt5" = "xyes"; then + if test "x$ac_cv_libsuil_gtk2_in_qt5" = "xyes"; then AC_DEFINE(CONFIG_LIBSUIL_GTK2_IN_QT5, 1, [Define if libsuil_gtk2_in_qt5 is available.]) # ac_lv2_ui_gtk2="no" -@@ -1257,17 +1247,7 @@ else +@@ -1367,17 +1357,7 @@ else fi - if test "x$ac_suil" = "xyes"; then + if test "x$ac_libsuil" = "xyes"; then - AC_CACHE_CHECK([for LV2 UI X11 support (libsuil_x11_in_qt5)], -- ac_cv_suil_x11_in_qt5, [ +- ac_cv_libsuil_x11_in_qt5, [ - AC_TRY_RUN([ - #include - #include "lv2/lv2plug.in/ns/extensions/ui/ui.h" @@ -44,12 +44,12 @@ index b3de5acd..09d2ef06 100644 - #define LV2_UI__Qt5UI LV2_UI_PREFIX "Qt5UI" - #endif - int main() { return !suil_ui_supported(LV2_UI__Qt5UI, LV2_UI__X11UI); } -- ], ac_cv_suil_x11_in_qt5="yes", ac_cv_suil_x11_in_qt5="no") +- ], ac_cv_libsuil_x11_in_qt5="yes", ac_cv_libsuil_x11_in_qt5="no") - ]) + ac_cv_suil_x11_in_qt5="yes" - if test "x$ac_cv_suil_x11_in_qt5" = "xyes"; then + if test "x$ac_cv_libsuil_x11_in_qt5" = "xyes"; then AC_DEFINE(CONFIG_LIBSUIL_X11_IN_QT5, 1, [Define if libsuil_x11_in_qt5 is available.]) # ac_lv2_ui_x11="no" -- -2.20.1 +2.21.1