summaryrefslogtreecommitdiff
path: root/x11/libinput/files/patch-tools_Makefile.am
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2018-12-30 22:50:15 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2018-12-30 22:50:15 +0000
commit57eddb3fa57f0798f57bfaeb6eff73ce64d2ec58 (patch)
tree17338a54563d99efc4804ffe13ec8507fdf764eb /x11/libinput/files/patch-tools_Makefile.am
parentRevert r488739, it resulted in bogus dependencies for PHP 5.6 (diff)
x11/libinput: Update to 1.11.3
Update x11/libinput to 1.11.3. Switch to use the meson build system. This adds a runtime dependency on python, since a bunch of libinput tools uses python. libinput tools, such as libinput-list-devices are now accessed through bin/libinput. Make wacom dependency an option (default to on). Make the gui tool installation an option, default it to off. Add upstream patches to detect epoll-shim, to work around issues with our input.h headers, and to work around our lack of the versionsort() libc function. Remove old no longer needed patches. PR: 222905 (based on) Submitted by: Greg V Obtained from: FreeBSD Graphics Team Development Repo https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/input https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/input-ports
Diffstat (limited to '')
-rw-r--r--x11/libinput/files/patch-tools_Makefile.am24
1 files changed, 0 insertions, 24 deletions
diff --git a/x11/libinput/files/patch-tools_Makefile.am b/x11/libinput/files/patch-tools_Makefile.am
deleted file mode 100644
index 65884b04fd3a..000000000000
--- a/x11/libinput/files/patch-tools_Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
---- tools/Makefile.am.orig 2017-02-11 05:10:33 UTC
-+++ tools/Makefile.am
-@@ -11,8 +11,8 @@ AM_CXXFLAGS = $(GCC_CXXFLAGS)
- libshared_la_SOURCES = \
- shared.c \
- shared.h
--libshared_la_CFLAGS = $(AM_CFLAGS) $(LIBEVDEV_CFLAGS)
--libshared_la_LIBADD = $(LIBEVDEV_LIBS)
-+libshared_la_CFLAGS = $(AM_CFLAGS) $(LIBEVDEV_CFLAGS) $(LIBUDEV_CFLAGS)
-+libshared_la_LIBADD = $(LIBEVDEV_LIBS) $(LIBUDEV_LIBS)
-
- event_debug_SOURCES = event-debug.c
- event_debug_LDADD = ../src/libinput.la libshared.la $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS)
-@@ -20,8 +20,9 @@ event_debug_LDFLAGS = -no-install
- event_debug_CFLAGS = $(AM_CFLAGS) $(LIBUDEV_CFLAGS) $(LIBEVDEV_CFLAGS)
-
- ptraccel_debug_SOURCES = ptraccel-debug.c
--ptraccel_debug_LDADD = ../src/libfilter.la ../src/libinput.la
-+ptraccel_debug_LDADD = ../src/libfilter.la ../src/libinput.la $(LIBUDEV_LIBS)
- ptraccel_debug_LDFLAGS = -no-install
-+ptraccel_debug_CFLAGS = $(LIBUDEV_CFLAGS)
-
- libinput_list_devices_SOURCES = libinput-list-devices.c
- libinput_list_devices_LDADD = ../src/libinput.la libshared.la $(LIBUDEV_LIBS)