diff --git a/recipes-misc/recipes-multimedia/qmidictl/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch b/recipes-misc/recipes-multimedia/qmidictl/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch new file mode 100644 index 00000000..e1d93430 --- /dev/null +++ b/recipes-misc/recipes-multimedia/qmidictl/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch @@ -0,0 +1,126 @@ +From f79f0fa7a121f939f8b833b06400045ce8e3d8c1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 21 Aug 2016 21:12:11 +0200 +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 +--- + configure.ac | 63 +++++++++++++++--------------------------------------------- + 1 file changed, 16 insertions(+), 47 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c081a96..3d19fd0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -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) +-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 ++AC_ARG_WITH(qmake, ++ AC_HELP_STRING([--with-qmake=PATH], [use alternate qmake path]), ++ [ac_qmake="$withval"], [ac_qmake="no"]) ++ + if test "x$ac_qmake" = "xno"; then + AC_MSG_ERROR([qmake $ac_errmsg]) + fi +@@ -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... +-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], [ +@@ -319,56 +307,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.9.3 + diff --git a/recipes-misc/recipes-multimedia/qmidictl/qmidictl_0.5.0.bb b/recipes-misc/recipes-multimedia/qmidictl/qmidictl_0.5.0.bb new file mode 100644 index 00000000..e6c25689 --- /dev/null +++ b/recipes-misc/recipes-multimedia/qmidictl/qmidictl_0.5.0.bb @@ -0,0 +1,32 @@ +SUMMARY = "A MIDI Network Gateway via UDP/IP Multicast" +HOMEPAGE = "http://qmidinet.sourceforge.net" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS += " \ + qtbase-native \ + qttools-native \ + qtbase \ +" + +# autotools-brokensep must be after qmake5_base! +inherit qmake5_base autotools-brokensep gtk-icon-cache qt5-translation + +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] = "c4ccec449411b62ab1ae179df07ea031" +SRC_URI[sha256sum] = "c610c6401396f4a6e9f92ad701e0785d1a58805f158cd6c91446b9fba47454fd" + +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}/metainfo \ +"