Bump buildroot to 2019.02
This commit is contained in:
@@ -0,0 +1,49 @@
|
||||
From 57383dc900e76e65ce5e5dc95f776e086100344d Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Sat, 12 Jan 2019 10:22:38 +0100
|
||||
Subject: [PATCH] meson.build: enable CPP include check only in case CPP
|
||||
compiler is available
|
||||
|
||||
Drop hard meson C++/CPP dependency, only needed for the build-time
|
||||
header inclusion test, build the test only in case C++/CPP compiler
|
||||
is available.
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
meson.build | 16 +++++++++-------
|
||||
1 file changed, 9 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index a9c7c185..8183822e 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -1,4 +1,4 @@
|
||||
-project('libinput', 'c', 'cpp',
|
||||
+project('libinput', 'c',
|
||||
version : '1.12.5',
|
||||
license : 'MIT/Expat',
|
||||
default_options : [ 'c_std=gnu99', 'warning_level=2' ],
|
||||
@@ -641,12 +641,14 @@ executable('test-build-linker',
|
||||
include_directories : [includes_src, includes_include],
|
||||
dependencies : [ dep_libinput, dep_libinput_util ],
|
||||
install : false)
|
||||
-# test including from C++
|
||||
-executable('test-build-cxx',
|
||||
- 'test/build-cxx.cc',
|
||||
- dependencies : [dep_udev],
|
||||
- include_directories : [includes_src, includes_include],
|
||||
- install : false)
|
||||
+# test including from C++ (in case CPP compiler is available)
|
||||
+if add_languages('cpp', required: false)
|
||||
+ executable('test-build-cxx',
|
||||
+ 'test/build-cxx.cc',
|
||||
+ dependencies : [dep_udev],
|
||||
+ include_directories : [includes_src, includes_include],
|
||||
+ install : false)
|
||||
+endif
|
||||
|
||||
# This is the test suite runner, we allow disabling that one because of
|
||||
# dependencies
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
# From https://lists.freedesktop.org/archives/wayland-devel/2017-September/034949.html
|
||||
md5 e94e9aa765da9533c23b80b440638de9 libinput-1.8.2.tar.xz
|
||||
sha1 1c55462eb598b91c9c360f31170a408fb8d38d22 libinput-1.8.2.tar.xz
|
||||
sha256 013518ee0adb2287e6e1f08412efba2137320738cadb5399b783738f04cbab38 libinput-1.8.2.tar.xz
|
||||
sha512 555a7680cc8aaf62c5370a865f3aff0a933d42d94a3d8861c072666b02c9e1be45ea39de9a749a9575cdfb613b6150e412e18559d94d4919f21ca4680a3c76a7 libinput-1.8.2.tar.xz
|
||||
# From https://lists.freedesktop.org/archives/wayland-devel/2019-January/039804.html
|
||||
md5 40dcc044443c9314537f605b6f30bf17 libinput-1.12.5.tar.xz
|
||||
sha1 7c0b75e8cf2f1747fb8ae69300acabd46f7a7f0d libinput-1.12.5.tar.xz
|
||||
sha256 7d4b6831010ef3bf69df4b41170047fa4325edef8ff5d2d28e78281af0687123 libinput-1.12.5.tar.xz
|
||||
sha512 9365b91b3ac2c4ff0f9927913242afac7677979682dd7b541001b13d09d7982acd854f6d348101cfa4b0854c6a92b4c683f62593a97870e32ae3d607eaeae3ff libinput-1.12.5.tar.xz
|
||||
|
||||
# License files
|
||||
sha256 70d5b1dfe5a9c50a1f2ea91b1c2b1c85d876c5c92339585edbb85cf69e945e14 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBINPUT_VERSION = 1.8.2
|
||||
LIBINPUT_VERSION = 1.12.5
|
||||
LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz
|
||||
LIBINPUT_SITE = http://www.freedesktop.org/software/libinput
|
||||
LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev
|
||||
@@ -12,13 +12,13 @@ LIBINPUT_INSTALL_STAGING = YES
|
||||
LIBINPUT_LICENSE = MIT
|
||||
LIBINPUT_LICENSE_FILES = COPYING
|
||||
# Tests need fork, so just disable them everywhere.
|
||||
LIBINPUT_CONF_OPTS = --disable-tests --disable-libwacom
|
||||
LIBINPUT_CONF_OPTS = -Dtests=false -Dlibwacom=false -Ddocumentation=false
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBGTK3),y)
|
||||
LIBINPUT_CONF_OPTS += --enable-debug-gui
|
||||
LIBINPUT_CONF_OPTS += -Ddebug-gui=true
|
||||
LIBINPUT_DEPENDENCIES += libgtk3
|
||||
else
|
||||
LIBINPUT_CONF_OPTS += --disable-debug-gui
|
||||
LIBINPUT_CONF_OPTS += -Ddebug-gui=false
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(meson-package))
|
||||
|
||||
Reference in New Issue
Block a user