From 868a783a82e3e10574aea6b5bdfad07fb6aa0ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 30 Nov 2017 23:21:22 +0100 Subject: [PATCH] qmidiarp: initial add 0.6.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...ind-qtwidget-headers-it-finds-host-s.patch | 35 ++++++++++ ...uild-tools-by-configure-options-auto.patch | 66 +++++++++++++++++++ .../qmidiarp/qmidiarp_0.6.4.bb | 38 +++++++++++ 3 files changed, 139 insertions(+) create mode 100644 recipes-misc/recipes-multimedia/qmidiarp/files/0001-remove-code-to-find-qtwidget-headers-it-finds-host-s.patch create mode 100644 recipes-misc/recipes-multimedia/qmidiarp/files/0002-find-native-qt-build-tools-by-configure-options-auto.patch create mode 100644 recipes-misc/recipes-multimedia/qmidiarp/qmidiarp_0.6.4.bb diff --git a/recipes-misc/recipes-multimedia/qmidiarp/files/0001-remove-code-to-find-qtwidget-headers-it-finds-host-s.patch b/recipes-misc/recipes-multimedia/qmidiarp/files/0001-remove-code-to-find-qtwidget-headers-it-finds-host-s.patch new file mode 100644 index 00000000..6da46695 --- /dev/null +++ b/recipes-misc/recipes-multimedia/qmidiarp/files/0001-remove-code-to-find-qtwidget-headers-it-finds-host-s.patch @@ -0,0 +1,35 @@ +From 2c7b219c4c50db0753a1ac6734e691bdba6a0e79 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 30 Nov 2017 21:44:15 +0100 +Subject: [PATCH] remove code to find qtwidget headers - it finds host's files +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 | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ceada50..ca5f5c8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -127,12 +127,6 @@ if test "x$ac_buildapp" = "xyes" -o ["x$ac_lv2pluginuis" = "xyes" -a "x$ac_lv2w + QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir Qt5Gui` + QT_CXXFLAGS=`$PKG_CONFIG --cflags Qt5Core Qt5Gui Qt5Widgets` + QT_CXXFLAGS="$QT_CXXFLAGS -fPIC" +- EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt" +- AC_CHECK_FILE([$QT_INCLUDE_DIR/QtWidgets/QWidget], +- AC_MSG_NOTICE([No extra QT_INCLUDE_DIR needed]), +- AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QtWidgets/QWidget], +- QT_CPPFLAGS="$QT_CPPFLAGS -I$EXTRA_QT_INCLUDE_DIR", +- AC_MSG_WARN([QWidget not found]))) + + AC_SUBST(QT_CXXFLAGS) + AC_SUBST(Qt5_LIBS) +-- +2.9.5 + diff --git a/recipes-misc/recipes-multimedia/qmidiarp/files/0002-find-native-qt-build-tools-by-configure-options-auto.patch b/recipes-misc/recipes-multimedia/qmidiarp/files/0002-find-native-qt-build-tools-by-configure-options-auto.patch new file mode 100644 index 00000000..eb59ebd6 --- /dev/null +++ b/recipes-misc/recipes-multimedia/qmidiarp/files/0002-find-native-qt-build-tools-by-configure-options-auto.patch @@ -0,0 +1,66 @@ +From 6bf6f86f9948bdc0e409f4c16c3ee41338494e6b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 30 Nov 2017 22:25:34 +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 +--- + configure.ac | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ceada50..d982045 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -148,11 +148,14 @@ if test "x$ac_buildapp" = "xyes" -o ["x$ac_lv2pluginuis" = "xyes" -a "x$ac_lv2w + dnl endo of qt version test + + dnl check for moc +- AC_PATH_PROGS(MOC, moc-$ac_qtversion moc, no, [$PATH:$QTDIR/bin]) ++ AC_ARG_WITH(moc, ++ AC_HELP_STRING([--with-moc=PATH], [use alternate moc path]), ++ [MOC="$withval"], [MOC="no"]) + if test "x$MOC" = "xno" ; then + AC_MSG_ERROR( + [cannot find 'moc', please install the Qt development tools package.]) + fi ++ AC_SUBST(MOC) + + # Enable translations. + AC_ARG_ENABLE(translations, +@@ -164,18 +167,24 @@ if test "x$ac_buildapp" = "xyes" -o ["x$ac_lv2pluginuis" = "xyes" -a "x$ac_lv2w + + AM_COND_IF([ENABLE_TRANSLATIONS],[ + dnl check for lupdate +- AC_PATH_PROGS(LUPDATE, lupdate-$ac_qtversion lupdate, no, [$PATH:$QTDIR/bin]) ++ AC_ARG_WITH(lupdate, ++ AC_HELP_STRING([--with-lupdate=PATH], [use alternate lupdate path]), ++ [LUPDATE="$withval"], [LUPDATE="no"]) + if test "x$LUPDATE" = "xno" ; then + AC_MSG_ERROR( + [cannot find 'lupdate', please install the Qt development tools package.]) + fi ++ AC_SUBST(LUPDATE) + + dnl check for lrelease +- AC_PATH_PROGS(LRELEASE, lrelease-$ac_qtversion lrelease, no, [$PATH:$QTDIR/bin]) ++ AC_ARG_WITH(lrelease, ++ AC_HELP_STRING([--with-lrelease=PATH], [use alternate lrelease path]), ++ [LRELEASE="$withval"], [LRELEASE="no"]) + if test "x$LRELEASE" = "xno" ; then + AC_MSG_ERROR( + [cannot find 'lrelease', please install the Qt development tools package.]) + fi ++ AC_SUBST(LRELEASE) + ], [AC_MSG_NOTICE([translations are disabled])]) + + # Modify the entries in the LV2 ttl files according to Qt version +-- +2.9.5 + diff --git a/recipes-misc/recipes-multimedia/qmidiarp/qmidiarp_0.6.4.bb b/recipes-misc/recipes-multimedia/qmidiarp/qmidiarp_0.6.4.bb new file mode 100644 index 00000000..0c501b69 --- /dev/null +++ b/recipes-misc/recipes-multimedia/qmidiarp/qmidiarp_0.6.4.bb @@ -0,0 +1,38 @@ +SUMMARY = "A Linux MIDI Arpeggiator, Step Sequencer and LFO" +HOMEPAGE = "http://qmidiarp.sourceforge.net" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e" + +DEPENDS += " \ + qtbase-native \ + qtbase \ + jack \ + lv2 \ + liblo \ +" + +inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache qt5-translation + +SRC_URI = " \ + git://github.com/emuse/qmidiarp.git \ + file://0001-remove-code-to-find-qtwidget-headers-it-finds-host-s.patch \ + file://0002-find-native-qt-build-tools-by-configure-options-auto.patch \ +" + +SRCREV = "05a1462569c1fb771852ca51bb8e5c8192b13e9d" +S = "${WORKDIR}/git" +PV = "0.6.4+git${SRCPV}" + +EXTRA_OECONF = " \ + --enable-translations \ + --with-moc=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc \ + --with-lupdate=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate \ + --with-lrelease=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease \ +" + +FILES_${PN} += " \ + ${datadir}/appdata \ + ${datadir}/qmidiarp/examples \ + ${datadir}/icons \ + ${libdir}/lv2 \ +"