diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2018-12-19 09:09:11 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2018-12-19 09:09:11 +0000 |
| commit | 248c6b5c09f123b4b2cbda5d5a71292f914516d0 (patch) | |
| tree | 573e75ef1898d818b9f9ec7c562fec3bc1120a64 | |
| parent | 81f404a02706a759b935d2bcadb05e3f6caae3f0 (diff) | |
Notes
49 files changed, 330 insertions, 145 deletions
diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile index 7347a862f857..d024ee49fec3 100644 --- a/audio/ardour/Makefile +++ b/audio/ardour/Makefile @@ -3,7 +3,7 @@ PORTNAME= ardour PORTVERSION= 2.8.16 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= audio MASTER_SITES= http://freebsd.nsu.ru/distfiles/ @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING 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 \ diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile index 801f2537c4d1..fb435adf21ff 100644 --- a/comms/lirc/Makefile +++ b/comms/lirc/Makefile @@ -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 @@ MASTER_SITES= SF/${PORTNAME}/LIRC/${PORTVERSION} 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 diff --git a/comms/svxlink/Makefile b/comms/svxlink/Makefile index 819954dfb055..82dc25805538 100644 --- a/comms/svxlink/Makefile +++ b/comms/svxlink/Makefile @@ -3,7 +3,7 @@ PORTNAME?= svxlink PORTVERSION= 15.11 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= comms hamradio MAINTAINER= hamradio@FreeBSD.org @@ -20,7 +20,7 @@ LIB_DEPENDS?= libgsm.so:audio/gsm \ 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 diff --git a/devel/Makefile b/devel/Makefile index bba9639e93af..5e2f0e170009 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -612,6 +612,7 @@ SUBDIR += etcd33 SUBDIR += etl SUBDIR += euca2ools + SUPDIR += evdev-proto SUBDIR += evemu SUBDIR += eventxx SUBDIR += evolution-gconf-tools diff --git a/devel/evdev-proto/Makefile b/devel/evdev-proto/Makefile new file mode 100644 index 000000000000..4a59ebd1d707 --- /dev/null +++ b/devel/evdev-proto/Makefile @@ -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|<sys/ioctl.h>|<sys/ioccom.h>| ; \ + /# *include[[:space:]]+<linux\/types.h>/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|<linux/types.h>|<sys/types.h>| ; \ + /#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 <bsd.port.mk> diff --git a/devel/evdev-proto/distinfo b/devel/evdev-proto/distinfo new file mode 100644 index 000000000000..db090ee8dd1d --- /dev/null +++ b/devel/evdev-proto/distinfo @@ -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 diff --git a/devel/evdev-proto/pkg-descr b/devel/evdev-proto/pkg-descr new file mode 100644 index 000000000000..950c6ab03039 --- /dev/null +++ b/devel/evdev-proto/pkg-descr @@ -0,0 +1 @@ +This port installs the input event device header files. diff --git a/devel/evemu/Makefile b/devel/evemu/Makefile index 7e0cab4f5751..99a99aa0d239 100644 --- a/devel/evemu/Makefile +++ b/devel/evemu/Makefile @@ -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 @@ COMMENT= Records and replays EVDEV descriptions and events 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 diff --git a/devel/evemu/files/patch-tools_evemu-record.c b/devel/evemu/files/patch-tools_evemu-record.c deleted file mode 100644 index f09d9fdc7381..000000000000 --- a/devel/evemu/files/patch-tools_evemu-record.c +++ /dev/null @@ -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) { diff --git a/devel/libevdev/Makefile b/devel/libevdev/Makefile index ebc32ba0df17..dd42dc889dd2 100644 --- a/devel/libevdev/Makefile +++ b/devel/libevdev/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libevdev -PORTVERSION= 1.4.4 -PORTREVISION= 1 +PORTVERSION= 1.5.9 CATEGORIES= devel MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/ @@ -12,22 +11,33 @@ COMMENT= Linux Event Device library 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 +LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim -USES= gmake libtool pathfix python:build tar:xz +USES= gmake libtool localbase pathfix pkgconfig python:build tar:xz EXTRACT_AFTER_ARGS= --exclude include # v4l_compat GNU_CONFIGURE= yes -CONFIGURE_ENV= ac_cv_path_DOXYGEN="" -CPPFLAGS+= -I${LOCALBASE}/include # v4l_compat +CONFIGURE_ENV= ac_cv_path_DOXYGEN="" ac_cv_path_VALGRIND="" +CPPFLAGS+= -I${LOCALBASE}/include/libepoll-shim INSTALL_TARGET= install-strip USE_LDCONFIG= yes +# Test requires /dev/uinput and should be run as root +.if exists(/dev/uinput) +TEST_USES+= pkgconfig +TEST_DEPENDS= checkmk:devel/check +TEST_TARGET= check +TEST_WRKSRC= ${WRKSRC}/test +.endif + 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,,' \ - ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e '/^LIBS = /s/$$/ -pthread -lrt -lepoll-shim/' \ + ${WRKSRC}/tools/Makefile.in + @${REINPLACE_CMD} -e 's|program_invocation_short_name|getprogname()|' \ + ${WRKSRC}/tools/mouse-dpi-tool.c \ + ${WRKSRC}/tools/touchpad-edge-detector.c \ + ${WRKSRC}/tools/libevdev-tweak-device.c .include <bsd.port.mk> diff --git a/devel/libevdev/distinfo b/devel/libevdev/distinfo index 606b4098fc0a..83224e5f8150 100644 --- a/devel/libevdev/distinfo +++ b/devel/libevdev/distinfo @@ -1,2 +1,3 @@ -SHA256 (libevdev-1.4.4.tar.xz) = ed9979369b6a6e28f5897d099538549ecffb2b7c00c1b717eb77c31d85bc45a9 -SIZE (libevdev-1.4.4.tar.xz) = 409856 +TIMESTAMP = 1522696039 +SHA256 (libevdev-1.5.9.tar.xz) = e1663751443bed9d3e76a4fe2caf6fa866a79705d91cacad815c04e706198a75 +SIZE (libevdev-1.5.9.tar.xz) = 408200 diff --git a/devel/libevdev/files/patch-libevdev_libevdev-uinput.c b/devel/libevdev/files/patch-libevdev_libevdev-uinput.c new file mode 100644 index 000000000000..c6f92480bca9 --- /dev/null +++ b/devel/libevdev/files/patch-libevdev_libevdev-uinput.c @@ -0,0 +1,40 @@ +--- libevdev/libevdev-uinput.c.orig 2017-05-04 00:37:30 UTC ++++ libevdev/libevdev-uinput.c +@@ -182,6 +182,7 @@ libevdev_uinput_get_fd(const struct libevdev_uinput *u + return uinput_dev->fd; + } + ++#if defined(linux) + static int is_event_device(const struct dirent *dent) { + return strncmp("event", dent->d_name, 5) == 0; + } +@@ -213,10 +214,12 @@ fetch_device_node(const char *path) + static int is_input_device(const struct dirent *dent) { + return strncmp("input", dent->d_name, 5) == 0; + } ++#endif + + static int + fetch_syspath_and_devnode(struct libevdev_uinput *uinput_dev) + { ++#if defined(linux) + struct dirent **namelist; + int ndev, i; + int rc; +@@ -290,6 +293,16 @@ fetch_syspath_and_devnode(struct libevdev_uinput *uinp + free(namelist); + + return uinput_dev->devnode ? 0 : -1; ++#elif defined(__FreeBSD__) ++ char devnode[80]; ++ if (ioctl(uinput_dev->fd, UI_GET_SYSNAME(sizeof(devnode)), devnode) < 0) ++ return -1; ++ asprintf(&uinput_dev->devnode, "/dev/input/%s", devnode); ++ uinput_dev->syspath = strdup(uinput_dev->devnode); ++ return 0; ++#else ++ return -1; ++#endif + } + + static int diff --git a/devel/libevdev/files/patch-test_test-libevdev-events.c b/devel/libevdev/files/patch-test_test-libevdev-events.c new file mode 100644 index 000000000000..b4d960c1daf6 --- /dev/null +++ b/devel/libevdev/files/patch-test_test-libevdev-events.c @@ -0,0 +1,20 @@ +--- test/test-libevdev-events.c.orig 2017-05-04 00:37:30 UTC ++++ test/test-libevdev-events.c +@@ -1057,7 +1057,7 @@ START_TEST(test_syn_delta_late_sync) + } while (rc >= 0); + + /* force enough events to trigger a SYN_DROPPED */ +- for (i = 0; i < 100; i++) { ++ for (i = 0; i < 200; i++) { + uinput_device_event(uidev, EV_ABS, ABS_X, 100 + i); + uinput_device_event(uidev, EV_ABS, ABS_Y, 500 + i); + uinput_device_event(uidev, EV_ABS, ABS_MT_POSITION_X, 100 + i); +@@ -1152,7 +1152,7 @@ START_TEST(test_syn_delta_late_sync) + } while (rc >= 0); + + /* force enough events to trigger a SYN_DROPPED */ +- for (i = 0; i < 100; i++) { ++ for (i = 0; i < 200; i++) { + uinput_device_event(uidev, EV_ABS, ABS_X, 100 + i); + uinput_device_event(uidev, EV_ABS, ABS_Y, 500 + i); + uinput_device_event(uidev, EV_ABS, ABS_MT_POSITION_X, 100 + i); diff --git a/devel/libevdev/files/patch-test_test-libevdev-has-event.c b/devel/libevdev/files/patch-test_test-libevdev-has-event.c new file mode 100644 index 000000000000..adac5377008c --- /dev/null +++ b/devel/libevdev/files/patch-test_test-libevdev-has-event.c @@ -0,0 +1,16 @@ +--- test/test-libevdev-has-event.c.orig 2017-05-04 00:37:30 UTC ++++ test/test-libevdev-has-event.c +@@ -116,6 +116,13 @@ START_TEST(test_event_codes) + evbit++; + continue; + } ++#ifdef __FreeBSD__ ++ /* Force feedback events are not supported by FreeBSD */ ++ if (*evbit == EV_FF) { ++ evbit++; ++ continue; ++ } ++#endif + + max = libevdev_event_type_get_max(*evbit); + diff --git a/devel/libevdev/files/patch-test_test-libevdev-init.c b/devel/libevdev/files/patch-test_test-libevdev-init.c new file mode 100644 index 000000000000..c9f48d1f9aa8 --- /dev/null +++ b/devel/libevdev/files/patch-test_test-libevdev-init.c @@ -0,0 +1,11 @@ +--- test/test-libevdev-init.c.orig 2018-03-08 05:27:35 UTC ++++ test/test-libevdev-init.c +@@ -577,7 +577,7 @@ START_TEST(test_set_clock_id) + rc = libevdev_set_clock_id(dev, CLOCK_MONOTONIC); + ck_assert_int_eq(rc, 0); + +- rc = libevdev_set_clock_id(dev, CLOCK_MONOTONIC_RAW); ++ rc = libevdev_set_clock_id(dev, CLOCK_MONOTONIC_FAST); + ck_assert_int_eq(rc, -EINVAL); + + uinput_device_free(uidev); diff --git a/devel/libevdev/files/patch-test_test-main.c b/devel/libevdev/files/patch-test_test-main.c new file mode 100644 index 000000000000..3e4259a18e95 --- /dev/null +++ b/devel/libevdev/files/patch-test_test-main.c @@ -0,0 +1,26 @@ +--- test/test-main.c.orig 2018-03-08 05:27:35 UTC ++++ test/test-main.c +@@ -43,6 +43,7 @@ extern Suite *uinput_suite(void); + static int + is_debugger_attached(void) + { ++#if defined (linux) + int status; + int rc; + int pid = fork(); +@@ -66,6 +67,15 @@ is_debugger_attached(void) + } + + return rc; ++#else ++ /* ++ * Skip useless gdb test as setting CK_FORK environment variable in ++ * absence of attached debugger gives no harm to user. ++ * Moreover this test is broken on most nonlinux systems, look at ++ * discussion here: http://stackoverflow.com/questions/3596781/ ++ */ ++ return 1; ++#endif + } + + int main(void) diff --git a/devel/libevdev/pkg-plist b/devel/libevdev/pkg-plist index 0f5d673093fa..566fee11b2f9 100644 --- a/devel/libevdev/pkg-plist +++ b/devel/libevdev/pkg-plist @@ -1,8 +1,11 @@ +bin/libevdev-tweak-device +bin/mouse-dpi-tool +bin/touchpad-edge-detector include/libevdev-1.0/libevdev/libevdev-uinput.h include/libevdev-1.0/libevdev/libevdev.h lib/libevdev.a lib/libevdev.so lib/libevdev.so.2 -lib/libevdev.so.2.1.10 +lib/libevdev.so.2.1.21 libdata/pkgconfig/libevdev.pc man/man3/libevdev.3.gz diff --git a/devel/libmtdev/Makefile b/devel/libmtdev/Makefile index 96c1310edef4..d6fecb9c92c0 100644 --- a/devel/libmtdev/Makefile +++ b/devel/libmtdev/Makefile @@ -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 @@ COMMENT= Multitouch Protocol Translation Library 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 diff --git a/devel/libmtdev/files/patch-test_mtdev-test.c b/devel/libmtdev/files/patch-test_mtdev-test.c new file mode 100644 index 000000000000..f8abed45cbe3 --- /dev/null +++ b/devel/libmtdev/files/patch-test_mtdev-test.c @@ -0,0 +1,16 @@ +--- test/mtdev-test.c.orig 2014-02-28 18:48:23 UTC ++++ test/mtdev-test.c +@@ -28,11 +28,12 @@ + + #include <mtdev.h> + #include <stdio.h> ++#include <stdint.h> + #include <unistd.h> + #include <fcntl.h> + + /* year-proof millisecond event time */ +-typedef __u64 mstime_t; ++typedef uint64_t mstime_t; + + static int use_event(const struct input_event *ev) + { diff --git a/devel/libudev-devd/Makefile b/devel/libudev-devd/Makefile index 6bb510d99be0..6a65d0afb65c 100644 --- a/devel/libudev-devd/Makefile +++ b/devel/libudev-devd/Makefile @@ -2,7 +2,7 @@ PORTNAME= libudev-devd PORTVERSION= 0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= x11@FreeBSD.org @@ -10,14 +10,13 @@ COMMENT= libudev-compatible interface for devd 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 diff --git a/devel/py-evdev/Makefile b/devel/py-evdev/Makefile index 92c8f5887dce..8ed7b8db5568 100644 --- a/devel/py-evdev/Makefile +++ b/devel/py-evdev/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= evdev -PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTVERSION= 0.8.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,15 +12,22 @@ COMMENT= Bindings to the Linux input handling subsystem 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 -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 +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} \ diff --git a/devel/py-evdev/distinfo b/devel/py-evdev/distinfo index 399a3b2dac4a..f2929eefc2ad 100644 --- a/devel/py-evdev/distinfo +++ b/devel/py-evdev/distinfo @@ -1,2 +1,3 @@ -SHA256 (evdev-0.5.0.tar.gz) = 509f0f6ce5a12315fcad0b7f9b41cbdfc5c5f49a7cecdd6a88ce5c1d04f6827c -SIZE (evdev-0.5.0.tar.gz) = 23931 +TIMESTAMP = 1522711809 +SHA256 (evdev-0.8.1.tar.gz) = 3f10c22f15ffedb34519e4af2201f1a088a958efedfd50da0da1aa3887283dff +SIZE (evdev-0.8.1.tar.gz) = 22680 diff --git a/devel/sdl20/Makefile b/devel/sdl20/Makefile index 6ddc1c1102e6..a962df2c2b84 100644 --- a/devel/sdl20/Makefile +++ b/devel/sdl20/Makefile @@ -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 @@ IGNORE= option VIDEO_WAYLAND requires VIDEO_OPENGLES2 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 diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile index 02f07cb7670b..8cc1f4dceab1 100644 --- a/games/flightgear/Makefile +++ b/games/flightgear/Makefile @@ -3,6 +3,7 @@ PORTNAME= flightgear PORTVERSION= 2018.3.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} @@ -21,7 +22,8 @@ LIB_DEPENDS= libpng.so:graphics/png \ libcurl.so:ftp/curl \ libudev.so:devel/libudev-devd BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ - ${LOCALBASE}/lib/libSimGearCore.a:devel/simgear + ${LOCALBASE}/lib/libSimGearCore.a:devel/simgear \ + ${LOCALBASE}/include/linux/input.h:devel/evdev-proto RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ ${LOCALBASE}/lib/libSimGearCore.a:devel/simgear \ ${LOCALBASE}/share/flightgear/version:games/flightgear-data diff --git a/multimedia/dvb-apps/Makefile b/multimedia/dvb-apps/Makefile index db75b6a3da6c..7240c0299d5e 100644 --- a/multimedia/dvb-apps/Makefile +++ b/multimedia/dvb-apps/Makefile @@ -2,6 +2,7 @@ PORTNAME= dvb-apps PORTVERSION= 1.1.2.1505 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= LOCAL/decke DISTNAME= ${PORTNAME}-3d43b280298c @@ -12,7 +13,8 @@ COMMENT= Linux DVB API applications and utilities LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING.LGPL -BUILD_DEPENDS= ${LOCALBASE}/include/linux/dvb/version.h:multimedia/v4l_compat +BUILD_DEPENDS= ${LOCALBASE}/include/linux/dvb/version.h:multimedia/v4l_compat \ + ${LOCALBASE}/include/linux/input.h:devel/evdev-proto USES= gmake iconv perl5 tar:bzip2 diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common index 57db64464d2a..e082b0954ac7 100644 --- a/multimedia/gstreamer1-plugins/Makefile.common +++ b/multimedia/gstreamer1-plugins/Makefile.common @@ -273,7 +273,7 @@ gst_gdk_pixbuf_PLIST_FILES= ${GST_LIB_DIR}/libgstgdkpixbuf.so # 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 diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile index 37a7b2efb8a3..ba0fe4991e21 100644 --- a/multimedia/kdenlive/Makefile +++ b/multimedia/kdenlive/Makefile @@ -2,6 +2,7 @@ PORTNAME= kdenlive DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -10,7 +11,7 @@ COMMENT= KDE professional quality non-linear video editing suite 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 diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile index d4f9476c3048..a4b3557306c2 100644 --- a/multimedia/lives/Makefile +++ b/multimedia/lives/Makefile @@ -3,7 +3,7 @@ PORTNAME= lives PORTVERSION= 2.8.7 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= multimedia MASTER_SITES= http://lives-video.com/releases/ DISTNAME= LiVES-${PORTVERSION} @@ -14,7 +14,7 @@ COMMENT= Video editing system 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 \ diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index 7badee7a298c..9915d0f504be 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -4,7 +4,7 @@ PORTNAME= mpv PORTVERSION= 0.29.1 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= multimedia audio MASTER_SITES= https://waf.io/:waf @@ -143,7 +143,8 @@ VAAPI_CONFIGURE_OFF= --disable-vaapi VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_CONFIGURE_OFF= --disable-vdpau -WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.14:graphics/wayland-protocols +WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.14:graphics/wayland-protocols \ + ${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 diff --git a/multimedia/v4l_compat/Makefile b/multimedia/v4l_compat/Makefile index ab76057d753a..f5e78d7b7133 100644 --- a/multimedia/v4l_compat/Makefile +++ b/multimedia/v4l_compat/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= v4l_compat -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= Video4Linux IOCTL header files @@ -14,7 +14,7 @@ DESCR= ${.CURDIR}/pkg-descr 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 diff --git a/multimedia/v4l_compat/pkg-plist b/multimedia/v4l_compat/pkg-plist index f5a5654ac390..5f2581c698d8 100644 --- a/multimedia/v4l_compat/pkg-plist +++ b/multimedia/v4l_compat/pkg-plist @@ -6,9 +6,7 @@ include/linux/dvb/frontend.h 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 diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile index 8817cd981c25..ba4ec52a415f 100644 --- a/net/freerdp/Makefile +++ b/net/freerdp/Makefile @@ -3,7 +3,7 @@ PORTNAME= freerdp DISTVERSION= 2.0.0-rc3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net comms ipv6 PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -75,7 +75,7 @@ PULSEAUDIO_CMAKE_BOOL= WITH_PULSE 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 diff --git a/x11-drivers/xf86-input-evdev/Makefile b/x11-drivers/xf86-input-evdev/Makefile index 1efc0c58ee77..a5f1a651f6c0 100644 --- a/x11-drivers/xf86-input-evdev/Makefile +++ b/x11-drivers/xf86-input-evdev/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-input-evdev PORTVERSION= 2.10.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= X.Org event device input driver 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 diff --git a/x11-drivers/xf86-input-libinput/Makefile b/x11-drivers/xf86-input-libinput/Makefile index b0e672dfc716..86aa1f11608c 100644 --- a/x11-drivers/xf86-input-libinput/Makefile +++ b/x11-drivers/xf86-input-libinput/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-input-libinput PORTVERSION= 0.25.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -11,6 +11,7 @@ COMMENT= X.Org libinput input driver LICENSE= MIT # various styles LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS= libinput.so:x11/libinput XORG_CAT= driver diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile index 277426717d59..98d8ac0b9dea 100644 --- a/x11-drivers/xf86-input-synaptics/Makefile +++ b/x11-drivers/xf86-input-synaptics/Makefile @@ -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 @@ OPTIONS_DEFINE= EVDEV 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 <bsd.port.mk> diff --git a/x11-drivers/xf86-input-wacom/Makefile b/x11-drivers/xf86-input-wacom/Makefile index af2a169716e1..6909c075afc3 100644 --- a/x11-drivers/xf86-input-wacom/Makefile +++ b/x11-drivers/xf86-input-wacom/Makefile @@ -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 @@ COMMENT= X.Org Wacom tablet driver 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 diff --git a/x11-drivers/xf86-input-wacom/files/patch-src-wcmConfig.c b/x11-drivers/xf86-input-wacom/files/patch-src-wcmConfig.c index 76f05c9506c1..b3c447fbf58b 100644 --- a/x11-drivers/xf86-input-wacom/files/patch-src-wcmConfig.c +++ b/x11-drivers/xf86-input-wacom/files/patch-src-wcmConfig.c @@ -1,6 +1,6 @@ ---- src/wcmConfig.c~ +--- src/wcmConfig.c.orig 2018-02-12 16:43:12 UTC +++ src/wcmConfig.c -@@ -307,7 +307,7 @@ out: +@@ -311,7 +311,7 @@ out: */ static void wcmSplitName(char* devicename, char *basename, char *subdevice, char *tool, size_t len) { @@ -9,7 +9,7 @@ char *a, *b; *basename = *subdevice = *tool = '\0'; -@@ -325,6 +325,7 @@ static void wcmSplitName(char* devicenam +@@ -338,6 +338,7 @@ static void wcmSplitName(char* devicename, char *basen strncat(tool, a+1, len-1); } strncat(basename, name, len-1); diff --git a/x11-drivers/xf86-input-wacom/files/patch-src-wcmISDV4.c b/x11-drivers/xf86-input-wacom/files/patch-src-wcmISDV4.c index 0d6aaa3ccbf9..198d7e3943e5 100644 --- a/x11-drivers/xf86-input-wacom/files/patch-src-wcmISDV4.c +++ b/x11-drivers/xf86-input-wacom/files/patch-src-wcmISDV4.c @@ -1,4 +1,4 @@ ---- src/wcmISDV4.c~ +--- src/wcmISDV4.c.orig 2017-05-30 18:42:52 UTC +++ src/wcmISDV4.c @@ -24,14 +24,19 @@ #include "xf86Wacom.h" @@ -22,7 +22,7 @@ #define RESET_RELATIVE(ds) do { (ds).relwheel = 0; } while (0) /* resolution in points/m */ -@@ -192,10 +197,15 @@ static int wcmSerialValidate(InputInfoPt +@@ -195,10 +200,15 @@ static int wcmSerialValidate(InputInfoPtr pInfo, const static Bool isdv4Detect(InputInfoPtr pInfo) { @@ -39,7 +39,7 @@ if (rc == -1) return FALSE; -@@ -959,6 +969,7 @@ static Bool get_keys_vendor_tablet_id(ch +@@ -968,6 +978,7 @@ static Bool get_keys_vendor_tablet_id(char *name, Waco return TRUE; } @@ -47,7 +47,7 @@ /** * Return the content of id file from sysfs: /sys/.../device/id * -@@ -1004,6 +1015,7 @@ out: +@@ -1017,6 +1028,7 @@ out: return ret; } @@ -55,7 +55,7 @@ /** * Query the device's fd for the key bits and the tablet ID. Returns the ID -@@ -1018,11 +1030,16 @@ out: +@@ -1031,11 +1043,16 @@ out: */ static int isdv4ProbeKeys(InputInfoPtr pInfo) { @@ -73,7 +73,7 @@ return 0; common->tablet_id = 0x90; -@@ -1037,9 +1054,11 @@ static int isdv4ProbeKeys(InputInfoPtr p +@@ -1050,9 +1067,11 @@ static int isdv4ProbeKeys(InputInfoPtr pInfo) common->wcmProtocolLevel = WCM_PROTOCOL_GENERIC; if (!get_keys_vendor_tablet_id(pInfo->name, common)) { diff --git a/x11-drivers/xf86-input-wacom/files/patch-src-wcmUSB.c b/x11-drivers/xf86-input-wacom/files/patch-src-wcmUSB.c index cc0ec54e2877..33a46dff83de 100644 --- a/x11-drivers/xf86-input-wacom/files/patch-src-wcmUSB.c +++ b/x11-drivers/xf86-input-wacom/files/patch-src-wcmUSB.c @@ -1,4 +1,4 @@ ---- src/wcmUSB.c~ +--- src/wcmUSB.c.orig 2018-03-12 16:31:49 UTC +++ src/wcmUSB.c @@ -23,10 +23,17 @@ @@ -18,15 +18,15 @@ #define MAX_USB_EVENTS 32 -@@ -276,6 +283,11 @@ static struct WacomModelDesc +@@ -280,6 +287,11 @@ static struct WacomModelDesc + { WACOM_VENDOR_ID, 0x314,200000, 200000, &usbIntuosPro, "Intuos Pro S" }, { WACOM_VENDOR_ID, 0x315,200000, 200000, &usbIntuosPro, "Intuos Pro M" }, { WACOM_VENDOR_ID, 0x317,200000, 200000, &usbIntuosPro, "Intuos Pro L" }, - ++ + { WACOM_VENDOR_ID, 0x33B,200000, 200000, &usbIntuos5, "Intuos Draw small" }, + { WACOM_VENDOR_ID, 0x33C,200000, 200000, &usbIntuos5, "Intuos Art/Photo/Comic small"}, + { WACOM_VENDOR_ID, 0x33D,200000, 200000, &usbIntuos5, "Intuos Draw medium" }, + { WACOM_VENDOR_ID, 0x33E,200000, 200000, &usbIntuos5, "Intuos Art medium" }, -+ + { WACOM_VENDOR_ID, 0x3F, 200000, 200000, &usbCintiqV5, "Cintiq 21UX" }, { WACOM_VENDOR_ID, 0xC5, 200000, 200000, &usbCintiqV5, "Cintiq 20WSX" }, - { WACOM_VENDOR_ID, 0xC6, 200000, 200000, &usbCintiqV5, "Cintiq 12WX" }, diff --git a/x11-drivers/xf86-input-wacom/files/patch-src-wcmValidateDevice.c b/x11-drivers/xf86-input-wacom/files/patch-src-wcmValidateDevice.c index 71a40cffabae..1b8ebfd5f6d3 100644 --- a/x11-drivers/xf86-input-wacom/files/patch-src-wcmValidateDevice.c +++ b/x11-drivers/xf86-input-wacom/files/patch-src-wcmValidateDevice.c @@ -1,6 +1,6 @@ ---- src/wcmValidateDevice.c.orig 2015-10-23 17:26:33 UTC +--- src/wcmValidateDevice.c.orig 2018-02-13 17:35:29 UTC +++ src/wcmValidateDevice.c -@@ -34,6 +34,7 @@ static Bool wcmCheckSource(InputInfoPtr +@@ -34,6 +34,7 @@ static Bool wcmCheckSource(InputInfoPtr pInfo, dev_t m { int match = 0; InputInfoPtr pDevices = xf86FirstLocalDevice(); @@ -8,7 +8,7 @@ for (; !match && pDevices != NULL; pDevices = pDevices->next) { -@@ -51,7 +52,6 @@ static Bool wcmCheckSource(InputInfoPtr +@@ -51,7 +52,6 @@ static Bool wcmCheckSource(InputInfoPtr pInfo, dev_t m if (pInfo != pDevices) { WacomCommonPtr pCommon = ((WacomDevicePtr)pDevices->private)->common; @@ -16,7 +16,7 @@ char* psource = xf86CheckStrOption(pDevices->options, "_source", ""); if (pCommon->min_maj && -@@ -62,10 +62,11 @@ static Bool wcmCheckSource(InputInfoPtr +@@ -62,10 +62,11 @@ static Bool wcmCheckSource(InputInfoPtr pInfo, dev_t m if (strcmp(fsource, psource)) match = 1; } @@ -29,7 +29,16 @@ if (match) xf86Msg(X_WARNING, "%s: device file already in use by %s. " "Ignoring.\n", pInfo->name, pDevices->name); -@@ -205,6 +206,10 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo +@@ -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 } }, +@@ -212,6 +213,10 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo) case 0x314: /* Intuos Pro S */ case 0x315: /* Intuos Pro M */ case 0x317: /* Intuos Pro L */ @@ -40,7 +49,7 @@ case 0x26: /* I5 */ case 0x27: /* I5 */ case 0x28: /* I5 */ -@@ -623,8 +628,10 @@ int wcmNeedAutoHotplug(InputInfoPtr pInf +@@ -659,8 +664,10 @@ int wcmNeedAutoHotplug(InputInfoPtr pInfo, char **type if (!source) /* xorg.conf device, don't auto-pick type */ goto out; diff --git a/x11-drivers/xf86-video-qxl/Makefile b/x11-drivers/xf86-video-qxl/Makefile index 8034e645554a..d7c0ebd74406 100644 --- a/x11-drivers/xf86-video-qxl/Makefile +++ b/x11-drivers/xf86-video-qxl/Makefile @@ -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 @@ COMMENT= X.Org X server -- QXL display driver 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 diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile index 218dbcb9a34e..c166772612b4 100644 --- a/x11-servers/xwayland/Makefile +++ b/x11-servers/xwayland/Makefile @@ -2,12 +2,14 @@ PORTNAME= xwayland PORTVERSION= 1.19.1 +PORTREVISION= 1 COMMENT= X Clients under Wayland LICENSE= MIT -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols \ + ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libinput.so:x11/libinput diff --git a/x11-toolkits/wlc/Makefile b/x11-toolkits/wlc/Makefile index d765e8b36398..0006dcf248fa 100644 --- a/x11-toolkits/wlc/Makefile +++ b/x11-toolkits/wlc/Makefile @@ -2,7 +2,7 @@ PORTNAME= wlc PORTVERSION= 0.0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits wayland MAINTAINER= x11@FreeBSD.org @@ -14,7 +14,8 @@ EXPIRATION_DATE= 2018-12-31 LICENSE= MIT LICENSE_FILES= ${WRKSRC}/LISENSE -BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols +BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols \ + ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon \ libxcb-ewmh.so:x11/xcb-util-wm \ libwayland-server.so:graphics/wayland \ diff --git a/x11-wm/plasma5-kwin/Makefile b/x11-wm/plasma5-kwin/Makefile index bc3b06f61496..c89d862027aa 100644 --- a/x11-wm/plasma5-kwin/Makefile +++ b/x11-wm/plasma5-kwin/Makefile @@ -2,7 +2,7 @@ PORTNAME= kwin DISTVERSION= ${KDE_PLASMA_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm kde kde-plasma MAINTAINER= kde@FreeBSD.org @@ -24,7 +24,7 @@ LIB_DEPENDS= libXcursor.so:x11/libXcursor \ 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 diff --git a/x11/kde-workspace-kde4/Makefile b/x11/kde-workspace-kde4/Makefile index ac5f99d09396..a58873c62189 100644 --- a/x11/kde-workspace-kde4/Makefile +++ b/x11/kde-workspace-kde4/Makefile @@ -2,7 +2,7 @@ PORTNAME= kde-workspace PORTVERSION= ${KDE4_WORKSPACE_VERSION} -PORTREVISION= 28 +PORTREVISION= 29 CATEGORIES= x11 kde kde-applications PKGNAMESUFFIX= -kde4 @@ -28,7 +28,8 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-image.so:x11/xcb-util-image \ libxcb-keysyms.so:x11/xcb-util-keysyms -BUILD_DEPENDS= xrdb:x11/xrdb +BUILD_DEPENDS= xrdb:x11/xrdb \ + ${LOCALBASE}/include/linux/input.h:devel/evdev-proto RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:misc/kde4-xdg-env \ ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \ xprop:x11/xprop \ diff --git a/x11/kf5-kwayland/Makefile b/x11/kf5-kwayland/Makefile index 566e42288206..986c353af48c 100644 --- a/x11/kf5-kwayland/Makefile +++ b/x11/kf5-kwayland/Makefile @@ -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 diff --git a/x11/libinput/Makefile b/x11/libinput/Makefile index 9ddabdf2dd53..35597e9e54b6 100644 --- a/x11/libinput/Makefile +++ b/x11/libinput/Makefile @@ -2,14 +2,14 @@ PORTNAME= libinput PORTVERSION= 1.6.0 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/ 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 @@ LIB_DEPENDS= libevdev.so:devel/libevdev \ 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 diff --git a/x11/libinput/files/patch-include_linux_input.h b/x11/libinput/files/patch-include_linux_input.h deleted file mode 100644 index c53abdf8dc32..000000000000 --- a/x11/libinput/files/patch-include_linux_input.h +++ /dev/null @@ -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 <sys/time.h> - #include <sys/ioctl.h> - #include <sys/types.h> -+#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 <linux/types.h> -+#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 */ diff --git a/x11/plasma5-kwayland-integration/Makefile b/x11/plasma5-kwayland-integration/Makefile index 44f3122af1e1..82debf0b3fa7 100644 --- a/x11/plasma5-kwayland-integration/Makefile +++ b/x11/plasma5-kwayland-integration/Makefile @@ -2,7 +2,7 @@ PORTNAME= kwayland-integration DISTVERSION= ${KDE_PLASMA_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 kde kde-plasma MAINTAINER= kde@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Integration plugins for a Wayland-based desktop 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 |