From fe3240d342189764bfacd98c3b700479cd9a73a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 29 Apr 2017 15:21:37 +0200 Subject: [PATCH] qjackctl: update 0.4.2 -> 0.4.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...uild-tools-by-configure-options-auto.patch | 27 +++++++--------- ...ac-do-not-der-absolute-default-paths.patch | 31 ------------------- .../{qjackctl_0.4.2.bb => qjackctl_0.4.5.bb} | 10 +++--- 3 files changed, 16 insertions(+), 52 deletions(-) delete mode 100644 recipes-misc/recipes-multimedia/qjackctl/files/0002-configure.ac-do-not-der-absolute-default-paths.patch rename recipes-misc/recipes-multimedia/qjackctl/{qjackctl_0.4.2.bb => qjackctl_0.4.5.bb} (76%) diff --git a/recipes-misc/recipes-multimedia/qjackctl/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch b/recipes-misc/recipes-multimedia/qjackctl/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch index 434de356..e1d93430 100644 --- a/recipes-misc/recipes-multimedia/qjackctl/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch +++ b/recipes-misc/recipes-multimedia/qjackctl/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch @@ -11,21 +11,20 @@ Upstream-Status: Inappropriate [cross specific] Signed-off-by: Andreas Müller --- - configure.ac | 66 +++++++++++++++--------------------------------------------- - 1 file changed, 16 insertions(+), 50 deletions(-) + configure.ac | 63 +++++++++++++++--------------------------------------------- + 1 file changed, 16 insertions(+), 47 deletions(-) diff --git a/configure.ac b/configure.ac -index b02c1eb..6812734 100644 +index c081a96..3d19fd0 100644 --- a/configure.ac +++ b/configure.ac -@@ -212,16 +212,10 @@ done +@@ -253,15 +253,10 @@ done # A common error message: ac_errmsg="not found in current PATH. Maybe QT development environment isn't available." -if test "x$ac_qt4" = "xyes"; then - AC_PATH_PROG(ac_qmake, qmake-qt4, [no], $ac_path) --fi --if test "x$ac_qt5" = "xyes"; then +-else - AC_PATH_PROG(ac_qmake, qmake-qt5, [no], $ac_path) -fi -if test "x$ac_qmake" = "xno"; then @@ -39,8 +38,8 @@ index b02c1eb..6812734 100644 if test "x$ac_qmake" = "xno"; then AC_MSG_ERROR([qmake $ac_errmsg]) fi -@@ -240,13 +234,6 @@ if test -d $ac_qt_install_bins; then - ac_path="$ac_qt_install_bins:$ac_path" +@@ -291,13 +286,6 @@ if test -d $ac_qt_install_path; then + ac_path="$ac_qt_install_path:$ac_path" fi -# Check it again, now with updated PATH, just in case... @@ -52,12 +51,12 @@ index b02c1eb..6812734 100644 - AC_SUBST(ac_qmake) - ac_qt_install_headers=`$ac_qmake -query QT_INSTALL_HEADERS` -@@ -262,58 +249,37 @@ if test -d $ac_qt_install_libs; then + AC_CACHE_CHECK([for Qt install headers], [ac_cv_qt_install_headers], [ +@@ -319,56 +307,37 @@ if test -d $ac_qt_install_libs; then ac_libs="-L$ac_qt_install_libs $ac_libs" fi --# Check for proper Qt4/5 version. +-# Finally, check for proper Qt4/5 version. -if test "x$ac_qt4" = "xyes"; then - AC_CACHE_CHECK([for Qt library version >= 4.4], - ac_cv_qtversion, [ @@ -70,9 +69,7 @@ index b02c1eb..6812734 100644 - exit 1 - ]) - ]) --fi -- --if test "x$ac_qt5" = "xyes"; then +-else - AC_CACHE_CHECK([for Qt library version >= 5.1], - ac_cv_qtversion, [ - AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [ @@ -125,5 +122,5 @@ index b02c1eb..6812734 100644 AC_MSG_ERROR([lrelease $ac_errmsg]) fi -- -2.5.5 +2.9.3 diff --git a/recipes-misc/recipes-multimedia/qjackctl/files/0002-configure.ac-do-not-der-absolute-default-paths.patch b/recipes-misc/recipes-multimedia/qjackctl/files/0002-configure.ac-do-not-der-absolute-default-paths.patch deleted file mode 100644 index e750dc6f..00000000 --- a/recipes-misc/recipes-multimedia/qjackctl/files/0002-configure.ac-do-not-der-absolute-default-paths.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cad9d387c113c0ffeff8005a7131b6a545ab86bd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sun, 21 Aug 2016 21:25:07 +0200 -Subject: [PATCH] configure.ac: do not der absolute default paths -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [cross specific] - -Signed-off-by: Andreas Müller ---- - configure.ac | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6812734..0928946 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -114,8 +114,6 @@ AC_ARG_ENABLE(stacktrace, - [ac_stacktrace="$enableval"]) - - --# Standard installation base dirs. --ac_with_paths="/usr /usr/local" - - # Set for alternate Qt4/5 installation dir. - AC_ARG_WITH(qt4, --- -2.5.5 - diff --git a/recipes-misc/recipes-multimedia/qjackctl/qjackctl_0.4.2.bb b/recipes-misc/recipes-multimedia/qjackctl/qjackctl_0.4.5.bb similarity index 76% rename from recipes-misc/recipes-multimedia/qjackctl/qjackctl_0.4.2.bb rename to recipes-misc/recipes-multimedia/qjackctl/qjackctl_0.4.5.bb index aa16b0a5..203d21c2 100644 --- a/recipes-misc/recipes-multimedia/qjackctl/qjackctl_0.4.2.bb +++ b/recipes-misc/recipes-multimedia/qjackctl/qjackctl_0.4.5.bb @@ -12,17 +12,15 @@ DEPENDS += " \ portaudio-v19 \ " -inherit autotools qmake5_base gtk-icon-cache - -B = "${S}" +# autotools-brokensep must be after qmake5_base! +inherit qmake5_base autotools-brokensep gtk-icon-cache SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ file://0001-find-native-qt-build-tools-by-configure-options-auto.patch \ - file://0002-configure.ac-do-not-der-absolute-default-paths.patch \ " -SRC_URI[md5sum] = "272cacd4878521e4ba43fd23b19da8a5" -SRC_URI[sha256sum] = "cf1c4aff22f8410feba9122e447b1e28c8fa2c71b12cfc0551755d351f9eaf5e" +SRC_URI[md5sum] = "2f8697891942403d7782e173704110c9" +SRC_URI[sha256sum] = "c50da569ec8466ac6cc72c65e2d8212eb9c40149daed0a10fb7795ff9ddc4ab7" EXTRA_OECONF = " \ --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \