diff options
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch')
6 files changed, 187 insertions, 0 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/frame/pessimizing-move.patch b/external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/frame/pessimizing-move.patch new file mode 100644 index 00000000..aa5a56ab --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/frame/pessimizing-move.patch @@ -0,0 +1,27 @@ +let compiler decide on copy elision +Fixes compiler errors with clang +| ../../frame-2.5.0/src/x11/device_x11.cpp:126:13: error: moving a temporary object prevents copy elision [-Werror,-Wpessimizing-move] +| std::move(UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis))); +| ^ +| ../../frame-2.5.0/src/x11/device_x11.cpp:126:13: note: remove std::move call here +| std::move(UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis))); +| ^~~~~~~~~~ ~ +| 1 error generated. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending + +Index: frame-2.5.0/src/x11/device_x11.cpp +=================================================================== +--- frame-2.5.0.orig/src/x11/device_x11.cpp ++++ frame-2.5.0/src/x11/device_x11.cpp +@@ -122,8 +122,7 @@ UFDeviceX11::UFDeviceX11(Display* displa + UFAxis_* axis = new UFAxis(type, valuator_info->min, valuator_info->max, + valuator_info->resolution); + +- axes_[type] = +- std::move(UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis))); ++ axes_[type] = UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis)); + + axis_map_[valuator_info->number] = type; + diff --git a/external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb b/external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb new file mode 100644 index 00000000..da1a2a36 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "Frame handles simultaneous touches" + +HOMEPAGE = "https://launchpad.net/frame" + +LICENSE = "GPLv3 & LGPLv3" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + file://COPYING.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ +" + +inherit autotools pkgconfig + +SRC_URI = "https://launchpad.net/${BPN}/trunk/v${PV}/+download/${BPN}-${PV}.tar.gz \ + file://pessimizing-move.patch" +SRC_URI[md5sum] = "02baa941091c5d198cd1623b3ad36e68" +SRC_URI[sha256sum] = "cfb9ab52cdccd926f1822a457264d0014c7eb9f4600a72626063dd073b26256f" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[x11] = "--enable-x11, --disable-x11, libxi xext virtual/xserver" + +PACKAGE_BEFORE_PN += "${PN}-test" +FILES_${PN}-test = "${bindir}/frame-test*" + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch b/external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch new file mode 100644 index 00000000..3b3acab2 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch @@ -0,0 +1,43 @@ +From 1e48821ba109b00e9c2931f12aa206c4ef54fd71 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 24 Apr 2017 12:34:55 -0700 +Subject: [PATCH] libgeis: Compare the first character of string to null + +gcc7 wants to be specific when it comes to comparing characters +and strings + +fixes + +| ../../../../../../../workspace/sources/geis/libgeis/geis_v1.c: In function '_v1_subscribe_device': +| ../../../../../../../workspace/sources/geis/libgeis/geis_v1.c:613:20: error: comparison between pointer and zero character constant [-Werror=pointer-compare] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libgeis/geis_v1.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libgeis/geis_v1.c b/libgeis/geis_v1.c +index 67045ee..07c0851 100644 +--- a/libgeis/geis_v1.c ++++ b/libgeis/geis_v1.c +@@ -610,7 +610,7 @@ _v1_subscribe_device(GeisInstance instance, + const char **gesture_list) + { + GeisStatus result = GEIS_UNKNOWN_ERROR; +- if (gesture_list == GEIS_ALL_GESTURES) ++ if (gesture_list[0][0] == GEIS_ALL_GESTURES) + { + geis_debug("subscribing device %d for all gestures", device_id); + } +@@ -757,7 +757,7 @@ geis_unsubscribe(GeisInstance instance, + GeisGestureType *gesture_list) + { + GeisStatus status = GEIS_STATUS_NOT_SUPPORTED; +- if (gesture_list == GEIS_ALL_GESTURES) ++ if (gesture_list[0] == GEIS_ALL_GESTURES) + { + status = geis_subscription_deactivate(instance->subscription); + } +-- +2.12.2 + diff --git a/external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch b/external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch new file mode 100644 index 00000000..389e1b3f --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch @@ -0,0 +1,14 @@ +--- geis-2.2.17/libgeis/geis_subscription.c.orig 2016-06-17 12:04:21.062938443 -0400 ++++ geis-2.2.17/libgeis/geis_subscription.c 2016-06-17 12:05:02.934939172 -0400 +@@ -237,9 +237,10 @@ + GeisSize i; + for (i = 0; i < bag->sub_store_size; ++i) + { +- if (bag->sub_store[i]) ++ if (bag->sub_store[i]) { + _subscription_unref(bag->sub_store[i]); + bag->sub_store[i] = NULL; ++ } + } + } + diff --git a/external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb b/external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb new file mode 100644 index 00000000..30d41a16 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb @@ -0,0 +1,55 @@ +SUMMARY = "An implementation of the GEIS interface" +DESCRIPTION = "An implementation of the GEIS (Gesture Engine Interface and Support) \ +interface\ +GEIS is a library for applications and toolkit programmers which \ +provides a consistent platform independent interface for any \ +system-wide input gesture recognition mechanism." + +HOMEPAGE = "https://launchpad.net/geis" + +LICENSE = "GPLv3 & LGPLv3" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.GPL;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ +" + +inherit autotools pkgconfig python3native lib_package distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +DEPENDS += "grail dbus-glib python3 virtual/libx11 libxext libxi libxcb dbus frame" + +SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.xz \ + file://fix-indentation-for-gcc6.patch \ + file://0001-libgeis-Compare-the-first-character-of-string-to-nul.patch \ + " +SRC_URI[md5sum] = "2ff9d76a3ea5794516bb02c9d1924faf" +SRC_URI[sha256sum] = "8a60f5683852094038904e690d23cc5a90a980fc52da67f0f28890baa25c70eb" + +EXTRA_OECONF = "--disable-integration-tests" + +FILES_${PN}-bin = "${bindir}" +RDEPENDS_${PN}-bin = " \ + python3-compression \ + python3-core \ + python3-crypt \ + python3-ctypes \ + python3-fcntl \ + python3-misc \ + python3-pickle \ + python3-shell \ + python3-stringold \ + python3-threading \ +" + +FILES_${PN} += " \ + ${datadir}/geisview \ + ${libdir}/${PYTHON_DIR}/site-packages/geis* \ + ${libdir}/${PYTHON_DIR}/site-packages/_*.so \ +" + +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" + +FILES_${PN}-dev += "${libdir}/${PYTHON_DIR}/site-packages/_*.la" + +FILES_${PN}-staticdev += "${libdir}/${PYTHON_DIR}/site-packages/_*.a" diff --git a/external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb b/external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb new file mode 100644 index 00000000..22fd0f48 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb @@ -0,0 +1,24 @@ +SUMMARY = "Gesture Recognition And Instantiation Library" + +HOMEPAGE = "https://launchpad.net/grail" + +LICENSE = "GPLv3 & LGPLv3" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + file://COPYING.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ +" + +inherit autotools pkgconfig + +DEPENDS = "frame" +CXXFLAGS_append_toolchain-clang = " -Wno-pessimizing-move" +SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.bz2" +SRC_URI[md5sum] = "0df1b3ec6167920f310e2effe6e2ad44" +SRC_URI[sha256sum] = "5eed1f650f042481daa3a2de5e7d43261fe343b2a1b1e240f3b7fc26572c9df3" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[x11] = "--with-x11, --without-x11, libxi" + +PACKAGE_BEFORE_PN += "${PN}-test" +FILES_${PN}-test = "${bindir}/grail-test*" +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" |