--- audio/ardour/Makefile (revision 486944) +++ audio/ardour/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= ardour PORTVERSION= 2.8.16 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= audio MASTER_SITES= http://freebsd.nsu.ru/distfiles/ @@ -15,7 +15,7 @@ BROKEN_powerpc64= Does not build -BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS= libaubio.so:audio/aubio \ libboost_date_time.so:devel/boost-libs \ libcurl.so:ftp/curl \ --- comms/lirc/Makefile (revision 486944) +++ comms/lirc/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= lirc PORTVERSION= 0.9.0 -PORTREVISION= 9 +PORTREVISION= 10 PORTEPOCH= 1 CATEGORIES= comms MASTER_SITES= SF/${PORTNAME}/LIRC/${PORTVERSION} @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Linux Infrared Remote Control -BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto USES= alias autoreconf gmake libtool localbase python tar:bzip2 USE_XORG= sm x11 ice --- comms/svxlink/Makefile (revision 486944) +++ comms/svxlink/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME?= svxlink PORTVERSION= 15.11 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms hamradio MAINTAINER= hamradio@FreeBSD.org @@ -20,7 +20,7 @@ libopus.so:audio/opus \ librtlsdr.so:comms/rtl-sdr BUILD_DEPENDS= pkg-config:devel/pkgconf \ - ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat + ${LOCALBASE}/include/linux/input.h:devel/evdev-proto USES+= cmake compiler:c++11-lang tcl groff USE_GITHUB= yes --- devel/Makefile (revision 486944) +++ devel/Makefile (working copy) @@ -610,6 +610,7 @@ SUBDIR += etcd33 SUBDIR += etl SUBDIR += euca2ools + SUPDIR += evdev-proto SUBDIR += evemu SUBDIR += eventxx SUBDIR += evolution-gconf-tools --- devel/evdev-proto/Makefile (nonexistent) +++ devel/evdev-proto/Makefile (working copy) @@ -0,0 +1,58 @@ +# $FreeBSD$ + +PORTNAME= evdev-proto +PORTVERSION= 4.19 +CATEGORIES= devel +MASTER_SITES= https://github.com/torvalds/linux/raw/v${PORTVERSION}/include/uapi/linux/ +DISTNAME= input.h input-event-codes.h uinput.h +EXTRACT_SUFX= # empty + +MAINTAINER= x11@FreeBSD.org +COMMENT= Input event device header files + +LICENSE= GPLv2 + +NO_BUILD= yes +NO_ARCH= yes +WRKSRC= ${WRKDIR} + +PLIST_FILES= ${DISTNAME:S|^|include/linux/|} + +do-extract: + @${MKDIR} ${WRKSRC} +.for i in ${DISTNAME} + @${CP} ${DISTDIR}/${i} ${WRKSRC} +.endfor + +post-patch: + @${REINPLACE_CMD} -i '' -E -e \ + 's/__u([[:digit:]]+)/uint\1_t/g ; \ + s/__s([[:digit:]]+)/int\1_t/g ; \ + /# *include/ s||| ; \ + /# *include[[:space:]]+/d ; \ + /EVIOC(RMFF|GRAB|REVOKE)/ s/_IOW(.*), *int/_IOWINT\1/ ; \ + /EVIOCGKEYCODE/ s/_IOR/_IOWR/ ; \ + /EVIOCGMASK/ s/_IOR/_IOW/ ; \ + /EVIOCGMTSLOTS/ s/_IOC_READ/IOC_INOUT/ ; \ + /#define/ s/_IOC_READ/IOC_OUT/ ; \ + /#define/ s/_IOC_WRITE/IOC_IN/ ; \ + s/[[:space:]]+__user[[:space:]]+/ / ; \ + /__USE_TIME_BITS64/ s|^#if (.*)$$|#if 1 /* \1 */|' \ + ${WRKSRC}/input.h + @${REINPLACE_CMD} -i '' -E -e \ + 's/__u([[:digit:]]+)/uint\1_t/g ; \ + s/__s([[:digit:]]+)/int\1_t/g ; \ + /# *include/s||| ; \ + /#define/ s/_IOW(.*), *int/_IOWINT\1/ ; \ + /#define/ s/_IOW(.*), *char\*/_IO\1/ ; \ + /#define/ s/_IOC_READ/IOC_OUT/' \ + ${WRKSRC}/uinput.h + +do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/include/linux/ +.for i in ${DISTNAME} + ${INSTALL_DATA} ${WRKSRC}/${i} \ + ${STAGEDIR}${PREFIX}/include/linux/ +.endfor + +.include --- devel/evdev-proto/distinfo (nonexistent) +++ devel/evdev-proto/distinfo (working copy) @@ -0,0 +1,7 @@ +TIMESTAMP = 1544273147 +SHA256 (input.h) = 6daff6404fe93484d1c53f8f8bd49d3ae2094f3c1b41871e05a9ba5c8eecc420 +SIZE (input.h) = 15929 +SHA256 (input-event-codes.h) = a736ca688b6d5fd5d0f52d77b620387dd1f0d360ebba53106ca7be96a8231249 +SIZE (input-event-codes.h) = 24313 +SHA256 (uinput.h) = 9123b078f13047c34797332c4f835e5f1e418387e9a950024920faa5a1186974 +SIZE (uinput.h) = 9276 --- devel/evdev-proto/pkg-descr (nonexistent) +++ devel/evdev-proto/pkg-descr (working copy) @@ -0,0 +1, @@ +This port installs the input event device header files. --- devel/evemu/Makefile (revision 486944) +++ devel/evemu/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= evemu PORTVERSION= 2.6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/ @@ -12,7 +12,7 @@ LICENSE= GPLv3 -BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS= libevdev.so:devel/libevdev USES= tar:xz pathfix libtool pkgconfig localbase --- devel/evemu/files/patch-tools_evemu-record.c (revision 486944) +++ devel/evemu/files/patch-tools_evemu-record.c (nonexistent) @@ -1,12 +0,0 @@ ---- tools/evemu-record.c.orig 2016-03-01 14:10:40 UTC -+++ tools/evemu-record.c -@@ -209,6 +209,9 @@ out: - return rc; - } - -+/* Fix broken linux/input.h ioctl define found in multimedia/v4l_compat as of 2017-04-02 */ -+#undef EVIOCGRAB -+#define EVIOCGRAB _IOWINT('E', 0x90) - static inline bool test_grab_device(int fd) - { - if (ioctl(fd, EVIOCGRAB, (void*)1) < 0) { --- devel/libevdev/Makefile (revision 486944) +++ devel/libevdev/Makefile (working copy) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libevdev -PORTVERSION= 1.4.4 -PORTREVISION= 1 +PORTVERSION= 1.6.0 CATEGORIES= devel MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/ @@ -12,19 +11,18 @@ LICENSE= MIT # without linux/*.h LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat -RUN_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto USES= gmake libtool pathfix python:build tar:xz -EXTRACT_AFTER_ARGS= --exclude include # v4l_compat +EXTRACT_AFTER_ARGS= --exclude include # evdev-proto GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_path_DOXYGEN="" -CPPFLAGS+= -I${LOCALBASE}/include # v4l_compat +CPPFLAGS+= -I${LOCALBASE}/include # evdev-proto INSTALL_TARGET= install-strip USE_LDCONFIG= yes post-patch: - @${REINPLACE_CMD} -e '/input\.h/s,top_srcdir,LOCALBASE,' \ + @${REINPLACE_CMD} -e '/input\.h/s,top_srcdir,LOCALBASE,g' \ ${WRKSRC}/libevdev/Makefile.in # XXX tools require signalfd(2), test require /dev/uinput @${REINPLACE_CMD} -e '/^SUBDIRS/s,tools test,,' \ --- devel/libevdev/distinfo (revision 486944) +++ devel/libevdev/distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (libevdev-1.4.4.tar.xz) = ed9979369b6a6e28f5897d099538549ecffb2b7c00c1b717eb77c31d85bc45a9 -SIZE (libevdev-1.4.4.tar.xz) = 409856 +TIMESTAMP = 1544273955 +SHA256 (libevdev-1.6.0.tar.xz) = f5005c865987d980cc1279b9ec6131b06a89fd9892f649f2a68262b8786ef814 +SIZE (libevdev-1.6.0.tar.xz) = 411512 --- devel/libevdev/pkg-plist (revision 486944) +++ devel/libevdev/pkg-plist (working copy) @@ -3,6 +3,6 @@ lib/libevdev.a lib/libevdev.so lib/libevdev.so.2 -lib/libevdev.so.2.1.10 +lib/libevdev.so.2.2.0 libdata/pkgconfig/libevdev.pc man/man3/libevdev.3.gz --- devel/libmtdev/Makefile (revision 486944) +++ devel/libmtdev/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= mtdev PORTVERSION= 1.1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://bitmath.org/code/${PORTNAME}/ PKGNAMEPREFIX= lib @@ -13,12 +13,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat -RUN_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto USES= libtool pathfix tar:bz2 GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include # v4l_compat +CPPFLAGS+= -I${LOCALBASE}/include # evdev-proto INSTALL_TARGET= install-strip USE_LDCONFIG= yes --- devel/libmtdev/files/patch-test-mtdev-test.c (nonexistent) +++ devel/libmtdev/files/patch-test-mtdev-test.c (working copy) @@ -0,0 +1,16 @@ +--- test/mtdev-test.c.orig 2014-02-28 22:48:23.000000000 +0400 ++++ test/mtdev-test.c 2015-04-03 02:57:56.890923000 +0300 +@@ -28,11 +28,12 @@ + + #include + #include ++#include + #include + #include + + /* year-proof millisecond event time */ +-typedef __u64 mstime_t; ++typedef uint64_t mstime_t; + + static int use_event(const struct input_event *ev) + { --- devel/libudev-devd/Makefile (revision 486944) +++ devel/libudev-devd/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= libudev-devd PORTVERSION= 0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= x11@FreeBSD.org @@ -10,14 +10,13 @@ LICENSE= BSD2CLAUSE -BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat -LIB_DEPENDS= libevdev.so:devel/libevdev +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto USE_GITHUB= yes GH_ACCOUNT= FreeBSDDesktop GH_TAGNAME= b7aa09f -USES= dos2unix autoreconf gmake libtool localbase pathfix pkgconfig +USES= autoreconf gmake libtool localbase pathfix pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip --- devel/py-evdev/Makefile (revision 486944) +++ devel/py-evdev/Makefile (working copy) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= evdev -PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTVERSION= 1.1.2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,16 +12,23 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto USES= python USE_PYTHON= autoplist distutils -CPPFLAGS+= -I${LOCALBASE}/include # v4l_compat +CPPFLAGS+= -I${LOCALBASE}/include # evdev-proto -post-patch: - @${REINPLACE_CMD} -e '/header/s,/usr,${LOCALBASE},' \ - ${WRKSRC}/${PYSETUP} +EVDEV_INCLUDES= ${LOCALBASE}/include +PYDISTUTILS_BUILD_TARGET= build_ecodes +PYDISTUTILS_BUILDARGS+= --evdev-headers ${EVDEV_INCLUDES}/linux/input.h:${EVDEV_INCLUDES}/linux/input-event-codes.h:${EVDEV_INCLUDES}/linux/uinput.h +PYDISTUTILS_BUILDARGS+= build_ext +PYDISTUTILS_BUILDARGS+= --include-dirs ${EVDEV_INCLUDES} + +# Supply install target with evdev headers path +PYDISTUTILS_INSTALL_TARGET= ${PYDISTUTILS_BUILD_TARGET} \ + ${PYDISTUTILS_BUILDARGS} install + post-install: ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \ -name '*.so' -exec ${STRIP_CMD} {} + --- devel/py-evdev/distinfo (revision 486944) +++ devel/py-evdev/distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (evdev-0.5.0.tar.gz) = 509f0f6ce5a12315fcad0b7f9b41cbdfc5c5f49a7cecdd6a88ce5c1d04f6827c -SIZE (evdev-0.5.0.tar.gz) = 23931 +TIMESTAMP = 1544283919 +SHA256 (evdev-1.1.2.tar.gz) = 2dd67291be20e70643e8ef6f2381efc10e0c6e44a32abb3c1db74996ea3b0351 +SIZE (evdev-1.1.2.tar.gz) = 23308 --- devel/py-evdev/files/patch-v4l_compat (revision 486944) +++ devel/py-evdev/files/patch-v4l_compat (working copy) @@ -1,9 +1,9 @@ -# XXX Patch churn from GSoC 2014, expect v4l_compat for now +# XXX Patch churn from GSoC 2014, expect evdev-proto for now ---- evdev/genecodes.py~ 2014-10-07 20:16:56 UTC +--- evdev/genecodes.py.orig 2018-09-01 16:36:39 UTC +++ evdev/genecodes.py -@@ -11,11 +11,7 @@ import os, sys, re - +@@ -30,12 +30,8 @@ uname = ' '.join(uname) + #----------------------------------------------------------------------------- template = r''' #include -#ifdef __FreeBSD__ @@ -10,11 +10,12 @@ -#include -#else #include + #include -#endif /* Automatically generated by evdev.genecodes */ /* Generated on %s */ ---- evdev/input.c.orig 2014-10-07 20:16:59 UTC +--- evdev/input.c.orig 2018-09-01 16:36:39 UTC +++ evdev/input.c @@ -18,11 +18,7 @@ #include @@ -28,7 +29,7 @@ #define MAX_NAME_SIZE 256 ---- evdev/uinput.c.orig 2014-10-07 20:17:06 UTC +--- evdev/uinput.c.orig 2018-09-01 17:45:42 UTC +++ evdev/uinput.c @@ -8,13 +8,8 @@ #include @@ -42,5 +43,5 @@ #include -#endif - int _uinput_close(int fd) - { + + // Workaround for installing on kernels newer than 4.4. --- devel/sdl20/Makefile (revision 486944) +++ devel/sdl20/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= sdl2 PORTVERSION= 2.0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://www.libsdl.org/release/ DISTNAME= SDL2-${PORTVERSION} @@ -260,7 +260,7 @@ CONFIGURE_ARGS+= --enable-video-wayland \ --enable-wayland-shared BUILD_DEPENDS+= wayland-protocols>0:graphics/wayland-protocols \ - ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat + ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS+= libwayland-egl.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon .else --- multimedia/gstreamer1-plugins/Makefile.common (revision 486944) +++ multimedia/gstreamer1-plugins/Makefile.common (working copy) @@ -273,7 +273,7 @@ # gl gst_gl_USES= gl gst_gl_USE_GL= gl glu glesv2 egl -gst_gl_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat +gst_gl_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto gst_gl_LIB_DEPENDS= libgraphene-1.0.so:graphics/graphene gst_gl_CONFIGURE_ARGS= --enable-gl --enable-glx \ --enable-egl --enable-gles2 --- multimedia/kdenlive/Makefile (revision 486944) +++ multimedia/kdenlive/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= kdenlive DISTVERSION= ${KDE_APPLICATIONS_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libmlt.so:multimedia/mlt -BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto RUN_DEPENDS= ffmpeg${FFMPEG_SUFX}:multimedia/ffmpeg${FFMPEG_SUFX} \ ${LOCALBASE}/lib/mlt/libmltqt.so:multimedia/mlt-qt5 --- multimedia/lives/Makefile (revision 486944) +++ multimedia/lives/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= lives PORTVERSION= 2.8.7 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= multimedia MASTER_SITES= http://lives-video.com/releases/ DISTNAME= LiVES-${PORTVERSION} @@ -14,7 +14,7 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat \ +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ ${LOCALBASE}/bin/analyseplugin:audio/ladspa LIB_DEPENDS= libasound.so:audio/alsa-lib \ libjack.so:audio/jack \ --- multimedia/v4l_compat/Makefile (revision 486944) +++ multimedia/v4l_compat/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= v4l_compat -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= Video4Linux IOCTL header files @@ -14,7 +14,7 @@ PLIST= ${.CURDIR}/pkg-plist LIBV4L_SLAVE= compat -BASE_HEADERS= input.h uinput.h ivtv.h v4l2-controls.h \ +BASE_HEADERS= ivtv.h v4l2-controls.h \ v4l2-common.h videodev2.h DVB_HEADERS= audio.h dmx.h frontend.h video.h EXTRA_HEADERS= ca.h net.h osd.h version.h --- multimedia/v4l_compat/pkg-plist (revision 486944) +++ multimedia/v4l_compat/pkg-plist (working copy) @@ -6,9 +6,7 @@ include/linux/dvb/osd.h include/linux/dvb/version.h include/linux/dvb/video.h -include/linux/input.h include/linux/ivtv.h -include/linux/uinput.h include/linux/v4l2-common.h include/linux/v4l2-controls.h include/linux/videodev.h --- net/freerdp/Makefile (revision 486944) +++ net/freerdp/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= freerdp DISTVERSION= 2.0.0-rc3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net comms ipv6 PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -75,7 +75,7 @@ SSE_CMAKE_BOOL= WITH_SSE2 WAYLAND_DESC= Build FreeRDP Wayland client -WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat +WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libwayland-cursor.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon --- x11/kf5-kwayland/Makefile (revision 486944) +++ x11/kf5-kwayland/Makefile (working copy) @@ -2,12 +2,13 @@ PORTNAME= kwayland DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 Client and Server library wrapper for the Wayland libraries -BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS= libwayland-client.so:graphics/wayland LICENSE= LGPL21 LGPL3 --- x11/libinput/Makefile (revision 486944) +++ x11/libinput/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= libinput PORTVERSION= 1.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/ @@ -9,7 +9,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Generic input library -BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS= libevdev.so:devel/libevdev \ libepoll-shim.so:devel/libepoll-shim \ libwacom.so:x11/libwacom \ @@ -17,6 +17,7 @@ libmtdev.so:devel/libmtdev USES= autoreconf gmake libtool pathfix pkgconfig tar:xz +EXTRACT_AFTER_ARGS= --exclude include # evdev-proto USE_LDCONFIG= yes GNU_CONFIGURE= yes --- x11/libinput/files/patch-include_linux_input.h (revision 486944) +++ x11/libinput/files/patch-include_linux_input.h (nonexistent) @@ -1,38 +0,0 @@ ---- include/linux/input.h.orig 2016-12-05 05:15:21 UTC -+++ include/linux/input.h -@@ -11,7 +11,17 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#define __u8 uint8_t -+#define __u16 uint16_t -+#define __u32 uint32_t -+#define __s16 int16_t -+#define __s32 int32_t -+#define _IOC_READ IOC_OUT -+#define _IOC_WRITE IOC_IN -+#else - #include -+#endif - - /* - * The event structure itself -@@ -132,7 +142,7 @@ struct input_keymap_entry { - * - * If the request code is not an ABS_MT value, -EINVAL is returned. - */ --#define EVIOCGMTSLOTS(len) _IOC(_IOC_READ, 'E', 0x0a, len) -+#define EVIOCGMTSLOTS(len) _IOC(IOC_INOUT, 'E', 0x0a, len) - - #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 { - #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 */ - --#define EVIOCGRAB _IOW('E', 0x90, int) /* Grab/Release device */ -+#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 */ --- x11/plasma5-kwayland-integration/Makefile (revision 486944) +++ x11/plasma5-kwayland-integration/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= kwayland-integration DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-plasma MAINTAINER= kde@FreeBSD.org @@ -9,7 +10,7 @@ LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libwayland-client.so:graphics/wayland -BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto USES= cmake:outsource compiler:c++11-lib cpe kde:5 qt:5 tar:xz USE_KDE= ecm idletime wayland windowsystem --- x11-drivers/xf86-input-evdev/Makefile (revision 486944) +++ x11-drivers/xf86-input-evdev/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-input-evdev PORTVERSION= 2.10.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -11,10 +11,9 @@ LICENSE= MIT # various styles LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS= libevdev.so:devel/libevdev \ libmtdev.so:devel/libmtdev -RUN_DEPENDS= webcamd>=3.1.0.1:multimedia/webcamd XORG_CAT= driver USES= pathfix --- x11-drivers/xf86-input-synaptics/Makefile (revision 486944) +++ x11-drivers/xf86-input-synaptics/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-input-synaptics PORTVERSION= 1.9.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -19,7 +19,7 @@ EVDEV_DESC= Use evdev for input events (requires kernel support) EVDEV_CONFIGURE_ENV= BUILD_EVENTCOMM=yes -EVDEV_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat +EVDEV_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev .include --- x11-drivers/xf86-input-wacom/Makefile (revision 486944) +++ x11-drivers/xf86-input-wacom/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-input-wacom PORTVERSION= 0.36.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MASTER_SITES= https://github.com/linuxwacom/${PORTNAME}/releases/download/${DISTNAME}/ @@ -11,7 +11,7 @@ LICENSE= GPLv2+ -BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto RUN_DEPENDS= webcamd>=3.1.0.1:multimedia/webcamd USES= gmake pathfix --- x11-drivers/xf86-input-wacom/files/patch-src-wcmValidateDevice.c (revision 486944) +++ x11-drivers/xf86-input-wacom/files/patch-src-wcmValidateDevice.c (working copy) @@ -29,6 +29,15 @@ if (match) xf86Msg(X_WARNING, "%s: device file already in use by %s. " "Ignoring.\n", pInfo->name, pDevices->name); +@@ -123,7 +124,7 @@ ret: + static struct + { + const char* type; +- __u16 tool[3]; /* tool array is terminated by 0 */ ++ uint16_t tool[3]; /* tool array is terminated by 0 */ + } wcmType [] = + { + { "stylus", { BTN_TOOL_PEN, 0 } }, @@ -205,6 +206,10 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo case 0x314: /* Intuos Pro S */ case 0x315: /* Intuos Pro M */ --- x11-drivers/xf86-video-qxl/Makefile (revision 486944) +++ x11-drivers/xf86-video-qxl/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= xf86-video-qxl DISTVERSION= 0.1.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= ports@FreeBSD.org @@ -11,7 +11,7 @@ LICENSE= MIT BUILD_DEPENDS= spice-protocol>=0.12.10:devel/spice-protocol \ - ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat + ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS= libspice-server.so:devel/libspice-server USES= localbase:ldflags pkgconfig python:2.7 shebangfix --- x11-wm/plasma5-kwin/Makefile (revision 486944) +++ x11-wm/plasma5-kwin/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= kwin DISTVERSION= ${KDE_PLASMA_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm kde kde-plasma MAINTAINER= kde@FreeBSD.org @@ -24,7 +24,7 @@ libxcb-image.so:x11/xcb-util-image \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxkbcommon.so:x11/libxkbcommon -BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat \ +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ Xwayland:x11-servers/xwayland RUN_DEPENDS= Xwayland:x11-servers/xwayland