update buildroot to 2017.02.11
This commit is contained in:
@@ -0,0 +1,78 @@
|
||||
From 1b2cf6e6c2640e08166af36eee775542a45325af Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Sun, 23 Oct 2016 22:36:40 +0200
|
||||
Subject: [PATCH] build: get rid of sdkdir
|
||||
|
||||
Use of sdkdir causes problems during cross-compilation, where the full
|
||||
path is then appended to the DESTDIR, leading to host paths being
|
||||
appended in the target:
|
||||
https://bugs.busybox.net/show_bug.cgi?id=8696
|
||||
|
||||
Other drivers (e.g. keyboard) got rid of sdkdir. Do the same.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
---
|
||||
Makefile.am | 2 --
|
||||
configure.ac | 8 --------
|
||||
include/Makefile.am | 4 +++-
|
||||
xorg-libinput.pc.in | 5 +++--
|
||||
4 files changed, 6 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index a447d61..7aa5523 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -19,8 +19,6 @@
|
||||
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
|
||||
-DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg'
|
||||
-
|
||||
SUBDIRS = src include man test
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9894817..fe198cb 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -63,14 +63,6 @@ AC_ARG_WITH(xorg-conf-dir,
|
||||
[xorgconfdir='${prefix}/share/X11/xorg.conf.d'])
|
||||
AC_SUBST(xorgconfdir)
|
||||
|
||||
-# X Server SDK location is required to install header files
|
||||
-sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
|
||||
-
|
||||
-# Workaround overriding sdkdir to be able to create a tarball when user has no
|
||||
-# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am
|
||||
-AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"])
|
||||
-AC_SUBST([sdkdir])
|
||||
-
|
||||
DRIVER_NAME=libinput
|
||||
AC_SUBST([DRIVER_NAME])
|
||||
|
||||
diff --git a/include/Makefile.am b/include/Makefile.am
|
||||
index 0d52b9b..271ffac 100644
|
||||
--- a/include/Makefile.am
|
||||
+++ b/include/Makefile.am
|
||||
@@ -1 +1,3 @@
|
||||
-sdk_HEADERS = libinput-properties.h
|
||||
+# Location formerly known as 'sdkdir'
|
||||
+xorgincludedir = $(includedir)/xorg
|
||||
+xorginclude_HEADERS = libinput-properties.h
|
||||
diff --git a/xorg-libinput.pc.in b/xorg-libinput.pc.in
|
||||
index ff98189..9c0f506 100644
|
||||
--- a/xorg-libinput.pc.in
|
||||
+++ b/xorg-libinput.pc.in
|
||||
@@ -1,6 +1,7 @@
|
||||
-sdkdir=@sdkdir@
|
||||
+prefix=@prefix@
|
||||
+includedir=@includedir@
|
||||
|
||||
Name: xorg-libinput
|
||||
Description: X.Org libinput input driver.
|
||||
Version: @PACKAGE_VERSION@
|
||||
-Cflags: -I${sdkdir}
|
||||
+Cflags: -I${includedir}/xorg
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
config BR2_PACKAGE_XDRIVER_XF86_INPUT_LIBINPUT
|
||||
bool "xf86-input-libinput"
|
||||
depends on BR2_ENABLE_LOCALE # libinput
|
||||
depends on BR2_PACKAGE_HAS_UDEV # libinput
|
||||
select BR2_PACKAGE_LIBINPUT
|
||||
select BR2_PACKAGE_XPROTO_INPUTPROTO
|
||||
select BR2_PACKAGE_XPROTO_XPROTO
|
||||
help
|
||||
This is an X driver based on libinput. It is a thin wrapper around
|
||||
libinput, so while it does provide all features that libinput supports
|
||||
it does little beyond.
|
||||
|
||||
comment "xf86-input-libinput needs udev /dev management and a toolchain w/ locale"
|
||||
depends on !BR2_PACKAGE_HAS_UDEV || !BR2_ENABLE_LOCALE
|
||||
@@ -0,0 +1,2 @@
|
||||
# From https://lists.x.org/archives/xorg-announce/2017-February/002776.html
|
||||
sha256 ddcb07350aed59b2996a92a1b4ff64d1c0b0c86a3f0ddca15b2b1c8c8bb13628 xf86-input-libinput-0.24.0.tar.bz2
|
||||
@@ -0,0 +1,15 @@
|
||||
################################################################################
|
||||
#
|
||||
# xdriver_xf86-input-libinput
|
||||
#
|
||||
################################################################################
|
||||
|
||||
XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.24.0
|
||||
XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.bz2
|
||||
XDRIVER_XF86_INPUT_LIBINPUT_SITE = http://xorg.freedesktop.org/releases/individual/driver
|
||||
XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT
|
||||
XDRIVER_XF86_INPUT_LIBINPUT_LICENSE_FILES = COPYING
|
||||
XDRIVER_XF86_INPUT_LIBINPUT_DEPENDENCIES = libinput xserver_xorg-server xproto_inputproto xproto_xproto
|
||||
XDRIVER_XF86_INPUT_LIBINPUT_AUTORECONF = YES
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user