Attachment 187852 Details for Bug 222905 – libinput-1.9.1.patch

[patch] libinput-1.9.1.patch

libinput.patch (text/plain), 9.04 KB, created by Val Packett on 2017-11-08 12:37:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2017-11-08 12:37:52 UTC

Size: 9.04 KB

patch

obsolete

>diff --git c/x11/libinput/Makefile i/x11/libinput/Makefile
>index 7588893f6a72..068f135d7329 100644
>--- c/x11/libinput/Makefile
>+++ i/x11/libinput/Makefile
>@@ -1,13 +1,16 @@
> # $FreeBSD$
> 
> PORTNAME=	libinput
>-PORTVERSION=	1.8.0
>+PORTVERSION=	1.9.1
> CATEGORIES=	x11
> MASTER_SITES=	http://freedesktop.org/software/${PORTNAME}/
> 
> MAINTAINER=	x11@FreeBSD.org
> COMMENT=	Generic input library
> 
>+LICENSE=	MIT
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
> BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat
> LIB_DEPENDS=	libevdev.so:devel/libevdev \
> 		libepoll-shim.so:devel/libepoll-shim \
>@@ -15,13 +18,17 @@ LIB_DEPENDS=	libevdev.so:devel/libevdev \
> 		libudev.so:devel/libudev-devd \
> 		libmtdev.so:devel/libmtdev
> 
>-USES=		autoreconf gmake libtool pathfix pkgconfig localbase tar:xz
>+USES=		meson pkgconfig tar:xz
> USE_LDCONFIG=	yes
>-GNU_CONFIGURE=	yes
> 
>-CONFIGURE_ARGS+=	--disable-documentation
>-CPPFLAGS+=	-I${LOCALBASE}/include/libepoll-shim
>-INSTALL_TARGET=	install-strip
>+MESON_ARGS+=	-Ddocumentation=false -Dtests=false
>+
>+OPTIONS_SUB=	yes
>+OPTIONS_DEFINE=	DEBUGGUI
>+
>+DEBUGGUI_DESC=		GUI tool for input testing/debugging
>+DEBUGGUI_USE=		GNOME=gtk30,cairo,glib20
>+DEBUGGUI_MESON_OFF=	-Ddebug-gui=false
> 
> post-patch:
> 	${REINPLACE_CMD} -e 's|program_invocation_short_name|getprogname()|' \
>diff --git c/x11/libinput/distinfo i/x11/libinput/distinfo
>index 93de60121b8e..397e91fa7403 100644
>--- c/x11/libinput/distinfo
>+++ i/x11/libinput/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1507646518
>-SHA256 (libinput-1.8.0.tar.xz) = f8c9dbc31bf549008486258ebfa328d3dbc749c0029c6168e46949c24cf19076
>-SIZE (libinput-1.8.0.tar.xz) = 939708
>+TIMESTAMP = 1510140359
>+SHA256 (libinput-1.9.1.tar.xz) = f0780de4211b3d09f86c17f619f936261a213ca532f8c9ec8f8e7e43422a65f8
>+SIZE (libinput-1.9.1.tar.xz) = 456772
>diff --git c/x11/libinput/files/patch-Makefile.am i/x11/libinput/files/patch-Makefile.am
>deleted file mode 100644
>index b8a4db09214e..000000000000
>--- c/x11/libinput/files/patch-Makefile.am
>+++ /dev/null
>@@ -1,8 +0,0 @@
>---- Makefile.am.orig	2017-02-11 05:10:33 UTC
>-+++ Makefile.am
>-@@ -1,4 +1,4 @@
>--SUBDIRS = src doc test tools udev
>-+SUBDIRS = src doc tools udev
>- 
>- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
>- 
>diff --git c/x11/libinput/files/patch-include_linux_input.h i/x11/libinput/files/patch-include_linux_input.h
>index c53abdf8dc32..84dcf77a4223 100644
>--- c/x11/libinput/files/patch-include_linux_input.h
>+++ i/x11/libinput/files/patch-include_linux_input.h
>@@ -1,6 +1,6 @@
>---- include/linux/input.h.orig	2016-12-05 05:15:21 UTC
>+--- include/linux/input.h.orig	2017-10-30 05:16:22 UTC
> +++ include/linux/input.h
>-@@ -11,7 +11,17 @@
>+@@ -11,7 +11,18 @@
>  #include <sys/time.h>
>  #include <sys/ioctl.h>
>  #include <sys/types.h>
>@@ -8,6 +8,7 @@
> +#define __u8 uint8_t
> +#define __u16 uint16_t
> +#define __u32 uint32_t
>++#define __u64 uint64_t
> +#define __s16 int16_t
> +#define __s32 int32_t
> +#define _IOC_READ IOC_OUT
>@@ -16,9 +17,9 @@
>  #include <linux/types.h>
> +#endif
>  
>- /*
>-  * The event structure itself
>-@@ -132,7 +142,7 @@ struct input_keymap_entry {
>+ #include "input-event-codes.h"
>+ 
>+@@ -145,7 +156,7 @@ struct input_mask {
>   *
>   * If the request code is not an ABS_MT value, -EINVAL is returned.
>   */
>@@ -27,7 +28,7 @@
>  
>  #define EVIOCGKEY(len)		_IOC(_IOC_READ, 'E', 0x18, len)		/* get global key state */
>  #define EVIOCGLED(len)		_IOC(_IOC_READ, 'E', 0x19, len)		/* get all LEDs */
>-@@ -147,7 +157,7 @@ struct input_keymap_entry {
>+@@ -160,7 +171,7 @@ struct input_mask {
>  #define EVIOCRMFF		_IOW('E', 0x81, int)			/* Erase a force effect */
>  #define EVIOCGEFFECTS		_IOR('E', 0x84, int)			/* Report number of effects playable at the same time */
>  
>@@ -35,4 +36,4 @@
> +#define EVIOCGRAB		_IO('E', 0x90)				/* Grab/Release device */
>  #define EVIOCREVOKE		_IOW('E', 0x91, int)			/* Revoke device access */
>  
>- #define EVIOCSCLOCKID		_IOW('E', 0xa0, int)			/* Set clockid to be used for timestamps */
>+ /**
>diff --git c/x11/libinput/files/patch-meson.build i/x11/libinput/files/patch-meson.build
>new file mode 100644
>index 000000000000..20bfe2486e79
>--- /dev/null
>+++ i/x11/libinput/files/patch-meson.build
>@@ -0,0 +1,30 @@
>+--- meson.build.orig	2017-10-30 05:16:22 UTC
>++++ meson.build
>+@@ -44,6 +44,8 @@ pkgconfig = import('pkgconfig')
>+ dep_udev = dependency('libudev')
>+ dep_mtdev = dependency('mtdev', version : '>= 1.1.0')
>+ dep_libevdev = dependency('libevdev', version : '>= 0.4')
>++dep_libepoll = declare_dependency(link_args : ['-lepoll-shim'], include_directories : [
>++     include_directories(join_paths(get_option('prefix'), 'include', 'libepoll-shim')) ])
>+ dep_lm = cc.find_library('m', required : false)
>+ dep_rt = cc.find_library('rt', required : false)
>+ 
>+@@ -145,7 +147,9 @@ src_libfilter = [
>+ 		'src/filter.h',
>+ 		'src/filter-private.h'
>+ ]
>+-libfilter = static_library('filter', src_libfilter)
>++libfilter = static_library('filter', src_libfilter,
>++			   dependencies : dep_udev,
>++			   include_directories : includes_include)
>+ dep_libfilter = declare_dependency(link_with : libfilter)
>+ 
>+ ############ libinput.so ############
>+@@ -184,6 +188,7 @@ deps_libinput = [
>+ 	dep_mtdev,
>+ 	dep_udev,
>+ 	dep_libevdev,
>++	dep_libepoll,
>+ 	dep_lm,
>+ 	dep_rt,
>+ 	dep_libwacom,
>diff --git c/x11/libinput/files/patch-src_Makefile.am i/x11/libinput/files/patch-src_Makefile.am
>deleted file mode 100644
>index 0ba6f7bbfaa2..000000000000
>--- c/x11/libinput/files/patch-src_Makefile.am
>+++ /dev/null
>@@ -1,21 +0,0 @@
>---- src/Makefile.am.orig	2017-02-11 05:10:33 UTC
>-+++ src/Makefile.am
>-@@ -38,6 +38,7 @@ libinput_la_LIBADD = $(MTDEV_LIBS) \
>- 		     $(LIBUDEV_LIBS) \
>- 		     $(LIBEVDEV_LIBS) \
>- 		     $(LIBWACOM_LIBS) \
>-+		     -lepoll-shim \
>- 		     libinput-util.la
>- 
>- libinput_la_CFLAGS = -I$(top_srcdir)/include \
>-@@ -61,8 +62,8 @@ libfilter_la_SOURCES = \
>- 	filter.c \
>- 	filter.h \
>- 	filter-private.h
>--libfilter_la_LIBADD =
>--libfilter_la_CFLAGS =
>-+libfilter_la_LIBADD = $(LIBUDEV_LIBS)
>-+libfilter_la_CFLAGS = -I$(top_srcdir)/include $(LIBUDEV_CFLAGS)
>- 
>- libinput_la_LDFLAGS = -version-info $(LIBINPUT_LT_VERSION) -shared \
>- 		      -Wl,--version-script=$(srcdir)/libinput.sym
>diff --git c/x11/libinput/files/patch-src_libinput-util.c i/x11/libinput/files/patch-src_libinput-util.c
>deleted file mode 100644
>index 5344b4b97325..000000000000
>--- c/x11/libinput/files/patch-src_libinput-util.c
>+++ /dev/null
>@@ -1,12 +0,0 @@
>---- src/libinput-util.c.orig	2017-01-17 04:53:51 UTC
>-+++ src/libinput-util.c
>-@@ -36,6 +36,9 @@
>- #include <stdbool.h>
>- #include <stdio.h>
>- #include <stdlib.h>
>-+#ifdef __FreeBSD__
>-+#include <xlocale.h>
>-+#endif
>- 
>- #include "libinput-util.h"
>- #include "libinput-private.h"
>diff --git c/x11/libinput/files/patch-src_libinput-util.h i/x11/libinput/files/patch-src_libinput-util.h
>new file mode 100644
>index 000000000000..91a907762b9f
>--- /dev/null
>+++ i/x11/libinput/files/patch-src_libinput-util.h
>@@ -0,0 +1,12 @@
>+--- src/libinput-util.h.orig	2017-10-30 05:16:22 UTC
>++++ src/libinput-util.h
>+@@ -39,6 +39,9 @@
>+ #include <string.h>
>+ #include <time.h>
>+ #include <unistd.h>
>++#ifdef __FreeBSD__
>++#include <xlocale.h>
>++#endif
>+ 
>+ #include "libinput.h"
>+ 
>diff --git c/x11/libinput/files/patch-udev_Makefile.am i/x11/libinput/files/patch-udev_Makefile.am
>deleted file mode 100644
>index 6572e9447b43..000000000000
>--- c/x11/libinput/files/patch-udev_Makefile.am
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- udev/Makefile.am.orig	2017-02-11 05:10:33 UTC
>-+++ udev/Makefile.am
>-@@ -19,6 +19,7 @@ endif
>- 
>- libinput_model_quirks_SOURCES = libinput-model-quirks.c
>- libinput_model_quirks_CFLAGS = \
>-+			       -I$(top_srcdir)/include \
>- 			       -I$(top_srcdir)/src \
>- 			       $(LIBUDEV_CFLAGS) \
>- 			       $(GCC_CFLAGS)
>diff --git c/x11/libinput/pkg-descr i/x11/libinput/pkg-descr
>index c49ab938858f..7b74c6f2a0c0 100644
>--- c/x11/libinput/pkg-descr
>+++ i/x11/libinput/pkg-descr
>@@ -4,4 +4,4 @@ device handling, input device event processing and abstraction so
> minimize the amount of custom input code compositors need to provide
> the common set of functionality that users expect.
> 
>-WWW: http://www.freedesktop.org/wiki/Software/libinput/
>+WWW: https://www.freedesktop.org/wiki/Software/libinput/
>diff --git c/x11/libinput/pkg-plist i/x11/libinput/pkg-plist
>index bf933edaca16..ca193a0899fb 100644
>--- c/x11/libinput/pkg-plist
>+++ i/x11/libinput/pkg-plist
>@@ -12,9 +12,19 @@ lib/udev/rules.d/80-libinput-device-groups.rules
> lib/udev/rules.d/90-libinput-model-quirks.rules
> libdata/pkgconfig/libinput.pc
> libexec/libinput/libinput-debug-events
>-libexec/libinput/libinput-debug-gui
>+%%DEBUGGUI%%libexec/libinput/libinput-debug-gui
> libexec/libinput/libinput-list-devices
> libexec/libinput/libinput-measure
>+libexec/libinput/libinput-measure-touch-size
>+libexec/libinput/libinput-measure-touchpad-pressure
> libexec/libinput/libinput-measure-touchpad-tap
>+libexec/libinput/libinput-measure-trackpoint-range
> man/man1/libinput-debug-events.1.gz
>+%%DEBUGGUI%%man/man1/libinput-debug-gui.1.gz
> man/man1/libinput-list-devices.1.gz
>+man/man1/libinput-measure-touch-size.1.gz
>+man/man1/libinput-measure-touchpad-pressure.1.gz
>+man/man1/libinput-measure-touchpad-tap.1.gz
>+man/man1/libinput-measure-trackpoint-range.1.gz
>+man/man1/libinput-measure.1.gz
>+man/man1/libinput.1.gz

Actions: View | Diff

Attachments on bug 222905: 187052 | 187852 | 187854 | 188571 | 188894 | 189969 | 192391 | 198118 | 200661 | 201353