qsynth: update to 0.4.3

rework: use autotools instead of cmake (similar to all the *v1 packs [1])

[1] http://www.rncbc.org/drupal/

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>

recipes-misc/recipes-multimedia/fluidsynth/qsynth/0001-find-native-qt-build-tools-by-configure-options-auto.patch

@@ -0,0 +1,129 @@
+From f9970bc20b4ceb864c98a3d5550c27500db60520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sat, 26 Nov 2016 00:46:10 +0100
+Subject: [PATCH] find native qt build tools by configure options - auto
+ detection does not work
+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 <schnitzeltony@googlemail.com>
+---
+ configure.ac | 66 +++++++++++++++---------------------------------------------
+ 1 file changed, 16 insertions(+), 50 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 05c7eb3..753908c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -258,18 +258,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)
+-else
+-   AC_PATH_PROG(ac_qmake, qmake-qt5, [no], $ac_path)
+-fi
+-if test "x$ac_qmake" = "xno"; then
+-   AC_PATH_PROG(ac_cv_qmake, qmake, [no], $ac_path)
+-   ac_qmake=$ac_cv_qmake
+-fi
+-if test "x$ac_qmake" = "xno"; then
+-   AC_MSG_ERROR([qmake $ac_errmsg])
+-fi
++AC_ARG_WITH(qmake,
++  AC_HELP_STRING([--with-qmake=PATH], [use alternate qmake path]),
++  [ac_qmake="$withval"], [ac_qmake="no"])
++
+ 
+ # Check for proper Qt major version.
+ AC_CACHE_CHECK([for Qt major version], [ac_cv_qt_version_major], [
+@@ -296,13 +288,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...
+-AC_PATH_PROG(ac_cv_qmake, qmake, [no], $ac_path)
+-ac_qmake=$ac_cv_qmake
+-if test "x$ac_qmake" = "xno"; then
+-   AC_MSG_ERROR([qmake $ac_errmsg])
+-fi
+-
+ AC_SUBST(ac_qmake)
+ 
+ AC_CACHE_CHECK([for Qt install headers], [ac_cv_qt_install_headers], [
+@@ -324,56 +309,37 @@ if test -d $ac_qt_install_libs; then
+    ac_libs="-L$ac_qt_install_libs $ac_libs"
+ fi
+ 
+-# 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, [
+-      AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [
+-         #if QT_VERSION < 0x040400 || QT_VERSION >= 0x050000
+-         #error Qt library 4.4 or greater required.
+-         #endif
+-      ], ac_cv_qtversion="yes", [
+-         echo "no; Qt 4.4 or greater is required"
+-         exit 1
+-      ])
+-   ])
+-else
+-   AC_CACHE_CHECK([for Qt library version >= 5.1],
+-      ac_cv_qtversion, [
+-      AC_TRY_COMPILE([#include "QtCore/qglobal.h"], [
+-         #if QT_VERSION < 0x050100 || QT_VERSION >= 0x060000
+-         #error Qt library 5.1 or greater required.
+-         #endif
+-      ], ac_cv_qtversion="yes", [
+-         echo "no; Qt 5.1 or greater is required"
+-         exit 1
+-      ])
+-   ])
+-fi
+-
+ # Check for Qt moc utility.
+-AC_PATH_PROG(ac_moc, moc, [no], $ac_path)
++AC_ARG_WITH(moc,
++  AC_HELP_STRING([--with-moc=PATH], [use alternate moc path]),
++  [ac_moc="$withval"], [ac_moc="no"])
+ if test "x$ac_moc" = "xno"; then
+    AC_MSG_ERROR([moc $ac_errmsg])
+ fi
+ AC_SUBST(ac_moc)
+ 
+ # Check for Qt uic utility.
+-AC_PATH_PROG(ac_uic, uic, [no], $ac_path)
++AC_ARG_WITH(uic,
++  AC_HELP_STRING([--with-uic=PATH], [use alternate uic path]),
++  [ac_uic="$withval"], [ac_uic="no"])
+ if test "x$ac_uic" = "xno"; then
+    AC_MSG_ERROR([uic $ac_errmsg])
+ fi
+ AC_SUBST(ac_uic)
+ 
+ # Check for Qt lupdate utility.
+-AC_PATH_PROG(ac_lupdate, lupdate, [no], $ac_path)
++AC_ARG_WITH(lupdate,
++  AC_HELP_STRING([--with-lupdate=PATH], [use alternate lupdate path]),
++  [ac_lupdate="$withval"], [ac_lupdate="no"])
+ if test "x$ac_lupdate" = "xno"; then
+    AC_MSG_ERROR([lupdate $ac_errmsg])
+ fi
+ AC_SUBST(ac_lupdate)
+ 
+ # Check for Qt lrelease utility.
+-AC_PATH_PROG(ac_lrelease, lrelease, [no], $ac_path)
++AC_ARG_WITH(lrelease,
++  AC_HELP_STRING([--with-lrelease=PATH], [use alternate lrelease path]),
++  [ac_lrelease="$withval"], [ac_lrelease="no"])
+ if test "x$ac_release" = "xno"; then
+    AC_MSG_ERROR([lrelease $ac_errmsg])
+ fi
+-- 
+2.5.5
+

recipes-misc/recipes-multimedia/fluidsynth/qsynth_0.4.1.bb

@@ -1,15 +0,0 @@
-SUMMARY = "Qt GUI Interface for FluidSynth"
-HOMEPAGE = "http://qsynth.sourceforge.net/qsynth-index.html"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-
-DEPENDS += " \
-    fluidsynth \
-"
-
-inherit cmake_qt5
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "1fc967c1aa0b468e9be1916e6fe836a4"
-SRC_URI[sha256sum] = "50f4e36e0c5a7e092429e1cafbd8989346127b8b0c0868566addcacc5735970c"
-

recipes-misc/recipes-multimedia/fluidsynth/qsynth_0.4.3.bb

@@ -0,0 +1,31 @@
+SUMMARY = "Qt GUI Interface for FluidSynth"
+HOMEPAGE = "https://qsynth.sourceforge.io/"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+DEPENDS += " \
+    qtbase \
+    qtx11extras \
+    fluidsynth \
+"
+
+inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache distro_features_check
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI = " \
+    ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
+    file://0001-find-native-qt-build-tools-by-configure-options-auto.patch \
+"
+SRC_URI[md5sum] = "997cd7f7cd83cd6d61f9d7aba5d6c88a"
+SRC_URI[sha256sum] = "de27097a6e5e68799e0ab72641682b3c8f3d7bc404d2ba38e2ca66e952aab0c8"
+
+EXTRA_OECONF = " \
+    --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \
+    --with-moc=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc \
+    --with-uic=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic \
+    --with-lupdate=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate \
+    --with-lrelease=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease \
+"
+
+FILES_${PN} += "${datadir}/appdata"