From fdd98e47bb04bba5689e99b41a802efdbb53365e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 12 Mar 2019 23:07:59 +0100
Subject: [PATCH] qmidinet: upgrade 0.5.2 -> 0.5.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...uild-tools-by-configure-options-auto.patch | 92 +++++++++++++++++++
 .../{qmidinet_0.5.2.bb => qmidinet_0.5.3.bb}  |  4 +-
 2 files changed, 94 insertions(+), 2 deletions(-)
 create mode 100644 recipes-musicians/rncbc/qmidinet/0001-find-native-qt-build-tools-by-configure-options-auto.patch
 rename recipes-musicians/rncbc/{qmidinet_0.5.2.bb => qmidinet_0.5.3.bb} (87%)

diff --git a/recipes-musicians/rncbc/qmidinet/0001-find-native-qt-build-tools-by-configure-options-auto.patch b/recipes-musicians/rncbc/qmidinet/0001-find-native-qt-build-tools-by-configure-options-auto.patch
new file mode 100644
index 00000000..35664117
--- /dev/null
+++ b/recipes-musicians/rncbc/qmidinet/0001-find-native-qt-build-tools-by-configure-options-auto.patch
@@ -0,0 +1,92 @@
+From 42fa0e7e4ce43def9c34af83bfff22950f00b711 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Tue, 12 Mar 2019 23:03:13 +0100
+Subject: [PATCH] find native qt build tools by configure options - auto
+ detection does not work
+
+Upstream-Status: Inappropriate [cross specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ configure.ac | 40 +++++++++++++++-------------------------
+ 1 file changed, 15 insertions(+), 25 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f7d88bd..b5e0b5d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -176,27 +176,9 @@ done
+ # A common error message:
+ ac_errmsg="not found in current PATH. Maybe QT development environment isn't available."
+ 
+-# Check for proper qmake path/version alternatives.
+-AC_PATH_TOOL(ac_qmake, qmake, [no], $ac_path)
+-if test "x$ac_qmake" = "xno"; then
+-   AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
+-   ac_qmake=$ac_cv_qmake
+-fi
+-
+-# Check for proper Qt major version.
+-AC_CACHE_CHECK([for Qt major version], [ac_cv_qt_version_major], [
+-   ac_cv_qt_version_major=$($ac_qmake -query QT_VERSION | cut -d'.' -f1)
+-   ac_cv_qt_version_major=$(($ac_cv_qt_version_major + 0))
+-])
+-ac_qt_version_major=$ac_cv_qt_version_major
+-if test $ac_qt_version_major -ne 5; then
+-	AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path)
+-	ac_qmake=$ac_cv_qmake
+-fi
+-
+-if test "x$ac_qmake" = "xno"; then
+-   AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)])
+-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 install path.
+ AC_CACHE_CHECK([for Qt install path], [ac_cv_qt_install_path], [
+@@ -249,28 +231,36 @@ AC_CACHE_CHECK([for Qt library version >= 5.1],
+ ])
+ 
+ # Check for Qt moc utility.
+-AC_PATH_TOOL(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_TOOL(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_TOOL(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_TOOL(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.20.1
+
diff --git a/recipes-musicians/rncbc/qmidinet_0.5.2.bb b/recipes-musicians/rncbc/qmidinet_0.5.3.bb
similarity index 87%
rename from recipes-musicians/rncbc/qmidinet_0.5.2.bb
rename to recipes-musicians/rncbc/qmidinet_0.5.3.bb
index 47413fa8..380fb801 100644
--- a/recipes-musicians/rncbc/qmidinet_0.5.2.bb
+++ b/recipes-musicians/rncbc/qmidinet_0.5.3.bb
@@ -17,8 +17,8 @@ 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] = "834c55af1da1eb9f787ca390d619f1a7"
-SRC_URI[sha256sum] = "dab64b3760d8250c864f5c45317fdf5c72336c57585c1d92c865b05d7d1e5c78"
+SRC_URI[md5sum] = "16c8ead283aec2002422036ef7dfd374"
+SRC_URI[sha256sum] = "205817e7e89ea8ab229813fcaaa7769a6a4fbb77d98b20cfff1755abc28f2652"
 
 EXTRA_OECONF = " \
     --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \