Bump buildroot to version 2017-02

TG-3 #closed
This commit is contained in:
jbnadal
2017-03-28 18:29:16 +02:00
parent 93b7fd91d2
commit 42c92a6bcb
3010 changed files with 41289 additions and 46428 deletions

View File

@@ -0,0 +1,88 @@
From 231a35e99fee8aba23f18cce21dfb5fa8bef0c36 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 23 Oct 2016 23:07:33 +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 | 1 -
configure.ac | 9 ---------
include/Makefile.am | 4 +++-
xorg-synaptics.pc.in | 5 +++--
4 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 678124c..c48c5c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,6 @@
# During distcheck, system locations (as provided by pkg-config) may
# not be writable; provide instead relative locations.
DISTCHECK_CONFIGURE_FLAGS = \
- --with-sdkdir='$${includedir}/xorg' \
--with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
SUBDIRS = include src man tools conf
diff --git a/configure.ac b/configure.ac
index 970dd5f..574353b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,11 +55,6 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
# Obtain compiler/linker options for the Synaptics driver dependencies
PKG_CHECK_MODULES(XORG, [inputproto >= 2.1.99.3] [xorg-server >= 1.12] xproto inputproto $REQUIRED_MODULES)
-# X Server SDK location is required to install Synaptics header files
-# This location is also relayed in the xorg-synaptics.pc file
-sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
-AC_SUBST([sdkdir])
-
# -----------------------------------------------------------------------------
# Configuration options
# -----------------------------------------------------------------------------
@@ -154,10 +149,6 @@ if test "x$have_libxtst" = "xyes" ; then
fi
# -----------------------------------------------------------------------------
-# 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_CONFIG_FILES([Makefile
src/Makefile
man/Makefile
diff --git a/include/Makefile.am b/include/Makefile.am
index 8234020..565868b 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -18,4 +18,6 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-sdk_HEADERS = synaptics-properties.h
+# Location formerly known as 'sdkdir'
+xorgincludedir = $(includedir)/xorg
+xorginclude_HEADERS = synaptics-properties.h
diff --git a/xorg-synaptics.pc.in b/xorg-synaptics.pc.in
index 159cfbf..68e0fbe 100644
--- a/xorg-synaptics.pc.in
+++ b/xorg-synaptics.pc.in
@@ -1,6 +1,7 @@
-sdkdir=@sdkdir@
+prefix=@prefix@
+includedir=@includedir@
Name: synaptics
Description: X.Org synaptics input driver.
Version: @PACKAGE_VERSION@
-Cflags: -I${sdkdir}
+Cflags: -I${includedir}/xorg
--
2.7.4

View File

@@ -1,2 +1,2 @@
# From http://lists.x.org/archives/xorg-announce/2015-November/002652.html
sha256 d39f100c74f3673778b53f17bab7690161925e25dd998a15dd8cc69b52e83f01 xf86-input-synaptics-1.8.3.tar.bz2
# From https://lists.x.org/archives/xorg-announce/2016-November/002744.html
sha256 afba3289d7a40217a19d90db98ce181772f9ca6d77e1898727b0afcf02073b5a xf86-input-synaptics-1.9.0.tar.bz2

View File

@@ -4,11 +4,12 @@
#
################################################################################
XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.8.3
XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.9.0
XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xf86-input-synaptics-$(XDRIVER_XF86_INPUT_SYNAPTICS_VERSION).tar.bz2
XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_INPUT_SYNAPTICS_LICENSE = MIT
XDRIVER_XF86_INPUT_SYNAPTICS_LICENSE_FILES = COPYING
XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = libevdev xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto mtdev
XDRIVER_XF86_INPUT_SYNAPTICS_AUTORECONF = YES
$(eval $(autotools-package))