Index: audio/baresip/Makefile =================================================================== --- audio/baresip/Makefile (revision 434437) +++ audio/baresip/Makefile (working copy) @@ -30,7 +30,7 @@ L16 OPUS OSS PORTAUDIO SDL SNDFILE SPEEX SRTP STDIO UUID V4L V4L2 X11 \ DTLS_SRTP AUBRIDGE VIDBRIDGE HTTPD DSHOW DIRECTFB ACCOUNT \ NATPMP SDL MIW SNAPSHOT SELFVIEW VUMETER AULOOP CONTACT \ - MENU PRESENCE SYSLOG VIDLOOP + MENU PRESENCE SYSLOG VIDLOOP EVDEV OPTIONS_DEFAULT=CONS G711 G722 G726 L16 AULOOP_DESC= Audio-loop test module @@ -38,6 +38,7 @@ CONTACT_DESC= Contacts module CONS_DESC= Console input driver DTLS_SRTP_DESC= DTLS Secure RTP module [broken] +EVDEV_DESC= Input event device interface module G711_DESC= G.711 audio codec G722_DESC= G.722 audio codec G722_1_DESC= G.722.1 audio codec Index: audio/baresip/Makefile.depends =================================================================== --- audio/baresip/Makefile.depends (revision 434437) +++ audio/baresip/Makefile.depends (working copy) @@ -4,7 +4,7 @@ BV32_DEPEND= # nonexistent CONS_DEPEND= # unnecessary DTLS_SRTP_DEPEND= # unnecessary -EVDEV_DEPEND= +EVDEV_DEPEND= ${LOCALBASE}/include/linux/input.h:devel/libevdev-headers FFMPEG_DEPEND= ${LOCALBASE}/include/libavcodec/avcodec.h:multimedia/ffmpeg G711_DEPEND= ${LOCALBASE}/include/spandsp/g711.h:comms/spandsp G722_DEPEND= ${LOCALBASE}/include/spandsp/g722.h:comms/spandsp Index: multimedia/kdenlive/Makefile =================================================================== --- multimedia/kdenlive/Makefile (revision 434437) +++ multimedia/kdenlive/Makefile (working copy) @@ -26,7 +26,7 @@ # Keep in sync with multimedia/mlt, possibly. FFMPEG_SUFX= # Currently empty. -OPTIONS_DEFINE= DOCS DVDWIZARD FREI0R LADSPA NLS SCREENCAST V4L XINE +OPTIONS_DEFINE= DOCS DVDWIZARD FREI0R LADSPA NLS SCREENCAST V4L XINE JOGSHUTTLE OPTIONS_DEFAULT=DVDWIZARD FREI0R LADSPA SCREENCAST V4L XINE OPTIONS_SUB= yes @@ -34,6 +34,7 @@ SCREENCAST_DESC=Screen capture support via recordMyDesktop V4L_DESC= Webcam support via Video4Linux XINE_DESC= DVD preview support via xine +JOGSHUTTLE_DESC=Jog/Shuttle support DOCS_CMAKE_OFF= -DBUILD_doc:BOOL=FALSE @@ -55,9 +56,18 @@ XINE_RUN_DEPENDS= xine:multimedia/xine +# XXX: webcamd Jog/Shuttle support is not tested +JOGSHUTTLE_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/libevdev-headers +JOGSHUTTLE_RUN_DEPENDS= webcamd:multimedia/webcamd +JOGSHUTTLE_CMAKE_OFF= -DWITH_JogShuttle:BOOL=FALSE + post-patch: @${REINPLACE_CMD} -E -e '/${PORTNAME}.(menu|xpm)/ d' \ -e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \ ${PATCH_WRKSRC}/data/CMakeLists.txt +post-patch-JOGSHUTTLE-on: + @${REINPLACE_CMD} -e '/#include /d' \ + ${WRKSRC}/src/lib/external/media_ctrl/mediactrl.c + .include Index: multimedia/lives/Makefile =================================================================== --- multimedia/lives/Makefile (revision 434437) +++ multimedia/lives/Makefile (working copy) @@ -12,7 +12,7 @@ LICENSE= GPLv3 -BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat \ +BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:multimedia/v4l_compat \ ${LOCALBASE}/bin/analyseplugin:audio/ladspa LIB_DEPENDS= libasound.so:audio/alsa-lib \ libjack.so:audio/jack \ Index: comms/lirc/Makefile =================================================================== --- comms/lirc/Makefile (revision 434437) +++ comms/lirc/Makefile (working copy) @@ -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/libevdev-headers INSTALL_TARGET= install-strip USES= alias autoreconf gmake libtool python tar:bzip2 Index: comms/svxlink/Makefile =================================================================== --- comms/svxlink/Makefile (revision 434437) +++ comms/svxlink/Makefile (working copy) @@ -17,14 +17,13 @@ libsigc-2.0.so:devel/libsigc++20 \ libpopt.so:devel/popt \ libopus.so:audio/opus -BUILD_DEPENDS= pkg-config:devel/pkgconf \ - ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/libevdev-headers USE_GITHUB= yes GH_ACCOUNT= sm0svx GH_PROJECT= svxlink -USES= cmake tcl +USES= cmake tcl pkgconfig CMAKE_SOURCE_PATH= ${WRKSRC}/src CMAKE_ARGS+= -DMAN_INSTALL_DIR:FILEPATH=${MANDIRS} \ -DLOCAL_STATE_DIR=/var Index: devel/libevdev/Makefile =================================================================== --- devel/libevdev/Makefile (revision 434437) +++ devel/libevdev/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libevdev -PORTVERSION= 1.4.4 +PORTVERSION= 1.5.6 CATEGORIES= devel MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/ @@ -8,25 +8,62 @@ MAINTAINER= hselasky@FreeBSD.org COMMENT= Linux Event Device library -LICENSE= MIT # without linux/*.h -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE?= MIT # without linux/*.h -BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat -RUN_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat +LIBEVDEV_SLAVE?= no -USES= gmake libtool pathfix python:build tar:xz -EXTRACT_AFTER_ARGS= --exclude include # v4l_compat +USES= tar:xz + +.if ${LIBEVDEV_SLAVE} != headers +LICENSE_FILE= ${WRKSRC}/COPYING +USES+= gmake libtool pathfix python:build compiler GNU_CONFIGURE= yes -CONFIGURE_ENV= ac_cv_path_DOXYGEN="" -CPPFLAGS+= -I${LOCALBASE}/include # v4l_compat +BUILD_DEPENDS= ${PORTNAME}-headers>0:devel/${PORTNAME}-headers +CONFIGURE_ENV= ac_cv_path_DOXYGEN="" ac_cv_path_VALGRIND="" 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_LIB_DEPENDS= libcheck.so:devel/check +TEST_TARGET= check +TEST_WRKSRC= ${WRKSRC}/test +.endif +.endif + +.include + +# Do not allow clang optimize out calloc return value. +# Otherwise queue (over)allocation test fails +.if ${LIBEVDEV_SLAVE} != headers && ${COMPILER_TYPE} == clang +CFLAGS+= -fno-builtin +.endif + post-patch: - @${REINPLACE_CMD} -e '/input\.h/s,top_srcdir,LOCALBASE,' \ - ${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} -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/' \ + ${WRKSRC}/include/linux/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}/include/linux/uinput.h + @${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 +.include Index: devel/libevdev/distinfo =================================================================== --- devel/libevdev/distinfo (revision 434437) +++ 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 = 1484751595 +SHA256 (libevdev-1.5.6.tar.xz) = ecec7e9d66b1d3692f10b3b20aa97fb25e874a784c5552a7b1698091fef5a688 +SIZE (libevdev-1.5.6.tar.xz) = 407024 Index: devel/libevdev/files/patch-libevdev_libevdev-uinput.c =================================================================== --- devel/libevdev/files/patch-libevdev_libevdev-uinput.c (nonexistent) +++ devel/libevdev/files/patch-libevdev_libevdev-uinput.c (working copy) @@ -0,0 +1,40 @@ +--- libevdev/libevdev-uinput.c.orig 2016-08-17 00:37:01 UTC ++++ libevdev/libevdev-uinput.c +@@ -182,6 +182,7 @@ libevdev_uinput_get_fd(const struct libe + 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 libevde + 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 Property changes on: devel/libevdev/files/patch-libevdev_libevdev-uinput.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/libevdev/files/patch-test_test-libevdev-events.c =================================================================== --- devel/libevdev/files/patch-test_test-libevdev-events.c (nonexistent) +++ devel/libevdev/files/patch-test_test-libevdev-events.c (working copy) @@ -0,0 +1,20 @@ +--- test/test-libevdev-events.c.orig 2016-08-17 00:56:04 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); Property changes on: devel/libevdev/files/patch-test_test-libevdev-events.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/libevdev/files/patch-test_test-libevdev-has-event.c =================================================================== --- devel/libevdev/files/patch-test_test-libevdev-has-event.c (nonexistent) +++ devel/libevdev/files/patch-test_test-libevdev-has-event.c (working copy) @@ -0,0 +1,16 @@ +--- test/test-libevdev-has-event.c.orig 2016-08-17 00:37:01 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 (yet?) */ ++ if (*evbit == EV_FF) { ++ evbit++; ++ continue; ++ } ++#endif + + max = libevdev_event_type_get_max(*evbit); + Property changes on: devel/libevdev/files/patch-test_test-libevdev-has-event.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/libevdev/files/patch-test_test-libevdev-init.c =================================================================== --- devel/libevdev/files/patch-test_test-libevdev-init.c (nonexistent) +++ devel/libevdev/files/patch-test_test-libevdev-init.c (working copy) @@ -0,0 +1,11 @@ +--- test/test-libevdev-init.c.orig 2016-08-17 00:37:01 UTC ++++ test/test-libevdev-init.c +@@ -490,7 +490,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); Property changes on: devel/libevdev/files/patch-test_test-libevdev-init.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/libevdev/files/patch-test_test-main.c =================================================================== --- devel/libevdev/files/patch-test_test-main.c (nonexistent) +++ devel/libevdev/files/patch-test_test-main.c (working copy) @@ -0,0 +1,26 @@ +--- test/test-main.c.orig 2015-06-10 04:49:41 UTC ++++ test/test-main.c +@@ -41,6 +41,7 @@ extern Suite *uinput_suite(void); + static int + is_debugger_attached(void) + { ++#if defined (linux) + int status; + int rc; + int pid = fork(); +@@ -64,6 +65,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(int argc, char **argv) Property changes on: devel/libevdev/files/patch-test_test-main.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/libevdev/files/patch-tools_mouse-dpi-tool.c =================================================================== --- devel/libevdev/files/patch-tools_mouse-dpi-tool.c (nonexistent) +++ devel/libevdev/files/patch-tools_mouse-dpi-tool.c (working copy) @@ -0,0 +1,55 @@ +--- tools/mouse-dpi-tool.c.orig 2016-09-19 01:02:37 UTC ++++ tools/mouse-dpi-tool.c +@@ -26,7 +26,6 @@ + #endif + + #include +-#include + #include + #include + #include +@@ -50,6 +49,15 @@ struct measurements { + uint64_t us; + }; + ++ ++static volatile int sigint_catched = 0; ++static void ++sigint_handler(int signo) ++{ ++ if (signo == SIGINT) ++ sigint_catched = 1; ++} ++ + static int + usage(void) { + printf("Usage: %s /dev/input/event0\n", program_invocation_short_name); +@@ -147,24 +155,18 @@ handle_event(struct measurements *m, con + + static int + mainloop(struct libevdev *dev, struct measurements *m) { +- struct pollfd fds[2]; +- sigset_t mask; ++ struct pollfd fds[1]; + + fds[0].fd = libevdev_get_fd(dev); + fds[0].events = POLLIN; + +- sigemptyset(&mask); +- sigaddset(&mask, SIGINT); +- fds[1].fd = signalfd(-1, &mask, SFD_NONBLOCK); +- fds[1].events = POLLIN; +- +- sigprocmask(SIG_BLOCK, &mask, NULL); ++ signal(SIGINT, sigint_handler); + +- while (poll(fds, 2, -1)) { ++ while (poll(fds, 1, -1)) { + struct input_event ev; + int rc; + +- if (fds[1].revents) ++ if (sigint_catched) + break; + + do { Property changes on: devel/libevdev/files/patch-tools_mouse-dpi-tool.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/libevdev/files/patch-tools_touchpad-edge-detector.c =================================================================== --- devel/libevdev/files/patch-tools_touchpad-edge-detector.c (nonexistent) +++ devel/libevdev/files/patch-tools_touchpad-edge-detector.c (working copy) @@ -0,0 +1,54 @@ +--- tools/touchpad-edge-detector.c.orig 2016-09-15 01:57:24 UTC ++++ tools/touchpad-edge-detector.c +@@ -26,7 +26,6 @@ + #endif + + #include +-#include + #include + #include + #include +@@ -60,6 +59,14 @@ struct size { + int w, h; + }; + ++static volatile int sigint_catched = 0; ++static void ++sigint_handler(int signo) ++{ ++ if (signo == SIGINT) ++ sigint_catched = 1; ++} ++ + static int + print_current_values(const struct dimensions *d) + { +@@ -105,24 +112,18 @@ handle_event(struct dimensions *d, const + + static int + mainloop(struct libevdev *dev, struct dimensions *dim) { +- struct pollfd fds[2]; +- sigset_t mask; ++ struct pollfd fds[1]; + + fds[0].fd = libevdev_get_fd(dev); + fds[0].events = POLLIN; + +- sigemptyset(&mask); +- sigaddset(&mask, SIGINT); +- fds[1].fd = signalfd(-1, &mask, SFD_NONBLOCK); +- fds[1].events = POLLIN; +- +- sigprocmask(SIG_BLOCK, &mask, NULL); ++ signal(SIGINT, sigint_handler); + +- while (poll(fds, 2, -1)) { ++ while (poll(fds, 1, -1)) { + struct input_event ev; + int rc; + +- if (fds[1].revents) ++ if (sigint_catched) + break; + + do { Property changes on: devel/libevdev/files/patch-tools_touchpad-edge-detector.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/libevdev/pkg-plist =================================================================== --- devel/libevdev/pkg-plist (revision 434437) +++ devel/libevdev/pkg-plist (working copy) @@ -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.18 libdata/pkgconfig/libevdev.pc man/man3/libevdev.3.gz Index: devel/libevdev-headers/Makefile =================================================================== --- devel/libevdev-headers/Makefile (nonexistent) +++ devel/libevdev-headers/Makefile (working copy) @@ -0,0 +1,29 @@ +# $FreeBSD$ + +PORTNAME= libevdev +PORTREVISION= 0 +PKGNAMESUFFIX= -headers + +COMMENT= Input event device header files + +LICENSE= GPLv2 + +NO_BUILD= yes +NO_ARCH= yes + +MASTERDIR= ${.CURDIR}/../../devel/libevdev +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist +LIBEVDEV_SLAVE= headers + +HEADERS= input.h input-event-codes.h uinput.h +PLIST_FILES= ${HEADERS:S|^|include/linux/|} + +do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/include/linux/ +.for i in ${HEADERS} + ${INSTALL_DATA} ${WRKSRC}/include/linux/${i} \ + ${STAGEDIR}${PREFIX}/include/linux/ +.endfor + +.include "${MASTERDIR}/Makefile" Property changes on: devel/libevdev-headers/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/libevdev-headers/pkg-descr =================================================================== --- devel/libevdev-headers/pkg-descr (nonexistent) +++ devel/libevdev-headers/pkg-descr (working copy) @@ -0,0 +1 @@ +This port installs the event device header files. Property changes on: devel/libevdev-headers/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/libmtdev/Makefile =================================================================== --- devel/libmtdev/Makefile (revision 434437) +++ devel/libmtdev/Makefile (working copy) @@ -12,8 +12,7 @@ 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/libevdev-headers USES= libtool pathfix tar:bz2 GNU_CONFIGURE= yes Index: devel/libmtdev/files/patch-test-mtdev-test.c =================================================================== --- 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) + { Property changes on: devel/libmtdev/files/patch-test-mtdev-test.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/py-evdev/Makefile =================================================================== --- devel/py-evdev/Makefile (revision 434437) +++ devel/py-evdev/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= evdev -PORTVERSION= 0.5.0 +PORTVERSION= 0.6.4 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,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/libevdev-headers 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} \ -name '*.so' -exec ${STRIP_CMD} {} + Index: devel/py-evdev/distinfo =================================================================== --- devel/py-evdev/distinfo (revision 434437) +++ 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 = 1484753892 +SHA256 (evdev-0.6.4.tar.gz) = 5268744d8493c273614036cf6423fa175952c64fc1d8d265210e48a4437a6af2 +SIZE (evdev-0.6.4.tar.gz) = 21957 Index: devel/libudev-devd/Makefile =================================================================== --- devel/libudev-devd/Makefile (revision 434437) +++ devel/libudev-devd/Makefile (working copy) @@ -9,14 +9,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/libevdev-headers USE_GITHUB= yes GH_ACCOUNT= FreeBSDDesktop GH_TAGNAME= 5a9d2b9 -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 Index: multimedia/v4l_compat/Makefile =================================================================== --- multimedia/v4l_compat/Makefile (revision 434437) +++ multimedia/v4l_compat/Makefile (working copy) @@ -14,8 +14,7 @@ PLIST= ${.CURDIR}/pkg-plist LIBV4L_SLAVE= compat -BASE_HEADERS= input.h uinput.h ivtv.h v4l2-controls.h \ - v4l2-common.h videodev2.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 osd.h version.h Index: multimedia/v4l_compat/pkg-plist =================================================================== --- multimedia/v4l_compat/pkg-plist (revision 434437) +++ multimedia/v4l_compat/pkg-plist (working copy) @@ -5,9 +5,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 Index: x11-drivers/xf86-input-evdev/Makefile =================================================================== --- x11-drivers/xf86-input-evdev/Makefile (revision 434437) +++ x11-drivers/xf86-input-evdev/Makefile (working copy) @@ -10,10 +10,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/libevdev-headers LIB_DEPENDS= libevdev.so:devel/libevdev \ libmtdev.so:devel/libmtdev -RUN_DEPENDS= webcamd>=3.1.0.1:multimedia/webcamd XORG_CAT= driver USES= pathfix Index: x11-drivers/xf86-input-synaptics/Makefile =================================================================== --- x11-drivers/xf86-input-synaptics/Makefile (revision 434437) +++ x11-drivers/xf86-input-synaptics/Makefile (working copy) @@ -18,7 +18,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/libevdev-headers EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev .include Index: x11-drivers/xf86-input-wacom/Makefile =================================================================== --- x11-drivers/xf86-input-wacom/Makefile (revision 434437) +++ x11-drivers/xf86-input-wacom/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= GPLv2+ -BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/libevdev-headers RUN_DEPENDS= webcamd>=3.1.0.1:multimedia/webcamd USES= pathfix Index: x11-drivers/xf86-input-wacom/files/patch-src-wcmValidateDevice.c =================================================================== --- x11-drivers/xf86-input-wacom/files/patch-src-wcmValidateDevice.c (revision 434437) +++ 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 */ Index: x11/libinput/Makefile =================================================================== --- x11/libinput/Makefile (revision 434437) +++ x11/libinput/Makefile (working copy) @@ -8,7 +8,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/libevdev-headers LIB_DEPENDS= libevdev.so:devel/libevdev \ libepoll-shim.so:devel/libepoll-shim \ libwacom.so:x11/libwacom \ Index: x11/libwacom/Makefile =================================================================== --- x11/libwacom/Makefile (revision 434437) +++ x11/libwacom/Makefile (working copy) @@ -4,7 +4,7 @@ PORTNAME= libwacom PORTVERSION= 0.23 CATEGORIES= x11 -MASTER_SITES= https://sourceforge.net/projects/linuxwacom/files/libwacom/ +MASTER_SITES= SF/linuxwacom/${PORTNAME} MAINTAINER= x11@FreeBSD.org COMMENT= Adds tablet support to libinput @@ -12,13 +12,19 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/libevdev-headers LIB_DEPENDS= libgudev-1.0.so:devel/libgudev -USES= gettext-runtime gmake libtool localbase pkgconfig \ - pathfix tar:bzip2 +USES= gettext-runtime libtool localbase pkgconfig pathfix tar:bzip2 USE_GNOME= glib20 GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip +CONFIGURE_ENV= ac_cv_prog_HAVE_DOXYGEN="" +post-install: + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/data/*.tablet ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/data/libwacom.stylus ${STAGEDIR}${DATADIR} + .include Index: x11/libwacom/pkg-plist =================================================================== --- x11/libwacom/pkg-plist (revision 434437) +++ x11/libwacom/pkg-plist (working copy) @@ -5,3 +5,120 @@ lib/libwacom.so.2 lib/libwacom.so.2.5.1 libdata/pkgconfig/libwacom.pc +%%DATADIR%%/bamboo-0fg-s-p.tablet +%%DATADIR%%/bamboo-16fg-m-pt.tablet +%%DATADIR%%/bamboo-16fg-s-p.tablet +%%DATADIR%%/bamboo-16fg-s-pt.tablet +%%DATADIR%%/bamboo-16fg-s-t.tablet +%%DATADIR%%/bamboo-2fg-fun-m-pt.tablet +%%DATADIR%%/bamboo-2fg-fun-s-pt.tablet +%%DATADIR%%/bamboo-2fg-m-p.tablet +%%DATADIR%%/bamboo-2fg-s-p.tablet +%%DATADIR%%/bamboo-2fg-s-pt.tablet +%%DATADIR%%/bamboo-2fg-s-t.tablet +%%DATADIR%%/bamboo-4fg-fun-m.tablet +%%DATADIR%%/bamboo-4fg-fun-s.tablet +%%DATADIR%%/bamboo-4fg-s-pt.tablet +%%DATADIR%%/bamboo-4fg-s-t.tablet +%%DATADIR%%/bamboo-4fg-se-m-pt.tablet +%%DATADIR%%/bamboo-4fg-se-s-pt.tablet +%%DATADIR%%/bamboo-one.tablet +%%DATADIR%%/cintiq-12wx.tablet +%%DATADIR%%/cintiq-13hd.tablet +%%DATADIR%%/cintiq-13hdt.tablet +%%DATADIR%%/cintiq-20wsx.tablet +%%DATADIR%%/cintiq-21ux.tablet +%%DATADIR%%/cintiq-21ux2.tablet +%%DATADIR%%/cintiq-22hd.tablet +%%DATADIR%%/cintiq-22hdt.tablet +%%DATADIR%%/cintiq-24hd-touch.tablet +%%DATADIR%%/cintiq-24hd.tablet +%%DATADIR%%/cintiq-27hd.tablet +%%DATADIR%%/cintiq-27hdt.tablet +%%DATADIR%%/cintiq-companion-2.tablet +%%DATADIR%%/cintiq-companion-hybrid.tablet +%%DATADIR%%/cintiq-companion.tablet +%%DATADIR%%/dtf-720.tablet +%%DATADIR%%/dth-2242.tablet +%%DATADIR%%/dti-520.tablet +%%DATADIR%%/dtk-1651.tablet +%%DATADIR%%/dtk-2241.tablet +%%DATADIR%%/dtu-1031.tablet +%%DATADIR%%/dtu-1031x.tablet +%%DATADIR%%/dtu-1141.tablet +%%DATADIR%%/dtu-1631.tablet +%%DATADIR%%/dtu-1931.tablet +%%DATADIR%%/dtu-2231.tablet +%%DATADIR%%/ek-remote.tablet +%%DATADIR%%/generic.tablet +%%DATADIR%%/graphire-wireless-8x6.tablet +%%DATADIR%%/graphire3-4x5.tablet +%%DATADIR%%/graphire3-6x8.tablet +%%DATADIR%%/graphire4-4x5.tablet +%%DATADIR%%/huion-h610-pro.tablet +%%DATADIR%%/intuos-12x12.tablet +%%DATADIR%%/intuos-12x18.tablet +%%DATADIR%%/intuos-4x5.tablet +%%DATADIR%%/intuos-6x8.tablet +%%DATADIR%%/intuos-9x12.tablet +%%DATADIR%%/intuos-m-p.tablet +%%DATADIR%%/intuos-m-p2.tablet +%%DATADIR%%/intuos-m-pt.tablet +%%DATADIR%%/intuos-m-pt2.tablet +%%DATADIR%%/intuos-pro-l.tablet +%%DATADIR%%/intuos-pro-m.tablet +%%DATADIR%%/intuos-pro-s.tablet +%%DATADIR%%/intuos-s-p.tablet +%%DATADIR%%/intuos-s-p2.tablet +%%DATADIR%%/intuos-s-pt.tablet +%%DATADIR%%/intuos-s-pt2.tablet +%%DATADIR%%/intuos2-12x12.tablet +%%DATADIR%%/intuos2-12x18.tablet +%%DATADIR%%/intuos2-4x5.tablet +%%DATADIR%%/intuos2-6x8.tablet +%%DATADIR%%/intuos2-9x12.tablet +%%DATADIR%%/intuos3-12x12.tablet +%%DATADIR%%/intuos3-12x19.tablet +%%DATADIR%%/intuos3-4x5.tablet +%%DATADIR%%/intuos3-4x6.tablet +%%DATADIR%%/intuos3-6x11.tablet +%%DATADIR%%/intuos3-6x8.tablet +%%DATADIR%%/intuos3-9x12.tablet +%%DATADIR%%/intuos4-12x19.tablet +%%DATADIR%%/intuos4-4x6.tablet +%%DATADIR%%/intuos4-6x9-wl.tablet +%%DATADIR%%/intuos4-6x9.tablet +%%DATADIR%%/intuos4-8x13.tablet +%%DATADIR%%/intuos5-m.tablet +%%DATADIR%%/intuos5-s.tablet +%%DATADIR%%/intuos5-touch-l.tablet +%%DATADIR%%/intuos5-touch-m.tablet +%%DATADIR%%/intuos5-touch-s.tablet +%%DATADIR%%/isdv4-100.tablet +%%DATADIR%%/isdv4-101.tablet +%%DATADIR%%/isdv4-10d.tablet +%%DATADIR%%/isdv4-10f.tablet +%%DATADIR%%/isdv4-114.tablet +%%DATADIR%%/isdv4-116.tablet +%%DATADIR%%/isdv4-12c.tablet +%%DATADIR%%/isdv4-4004.tablet +%%DATADIR%%/isdv4-4800.tablet +%%DATADIR%%/isdv4-5000.tablet +%%DATADIR%%/isdv4-5002.tablet +%%DATADIR%%/isdv4-5040.tablet +%%DATADIR%%/isdv4-504a.tablet +%%DATADIR%%/isdv4-90.tablet +%%DATADIR%%/isdv4-93.tablet +%%DATADIR%%/isdv4-e3.tablet +%%DATADIR%%/isdv4-e5.tablet +%%DATADIR%%/isdv4-e6.tablet +%%DATADIR%%/isdv4-ec.tablet +%%DATADIR%%/isdv4-ed.tablet +%%DATADIR%%/isdv4-ef.tablet +%%DATADIR%%/libwacom.stylus +%%DATADIR%%/mobilestudio-pro-13.tablet +%%DATADIR%%/mobilestudio-pro-16.tablet +%%DATADIR%%/n-trig-pen.tablet +%%DATADIR%%/one-by-wacom-m-p.tablet +%%DATADIR%%/one-by-wacom-s-p.tablet +%%DATADIR%%/serial-wacf004.tablet Index: x11-drivers/xf86-input-libinput/Makefile =================================================================== --- x11-drivers/xf86-input-libinput/Makefile (revision 434437) +++ x11-drivers/xf86-input-libinput/Makefile (working copy) @@ -10,6 +10,7 @@ LICENSE= MIT # various styles LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/libevdev-headers LIB_DEPENDS= libinput.so:x11/libinput XORG_CAT= driver Index: x11/kf5-kwayland/Makefile =================================================================== --- x11/kf5-kwayland/Makefile (revision 434437) +++ x11/kf5-kwayland/Makefile (working copy) @@ -8,7 +8,7 @@ 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/libevdev-headers LIB_DEPENDS= libwayland-client.so:graphics/wayland USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig \