Index: audio/baresip/Makefile =================================================================== --- audio/baresip/Makefile +++ audio/baresip/Makefile @@ -29,7 +29,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 OSS AULOOP_DESC= Audio-loop test module @@ -37,6 +37,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 +++ audio/baresip/Makefile.depends @@ -4,7 +4,7 @@ BV32_DEPEND= # nonexistent CONS_DEPEND= # unnecessary DTLS_SRTP_DEPEND= # unnecessary -EVDEV_DEPEND= +EVDEV_DEPEND= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto 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: comms/lirc/Makefile =================================================================== --- comms/lirc/Makefile +++ comms/lirc/Makefile @@ -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 INSTALL_TARGET= install-strip USES= alias autoreconf gmake libtool python tar:bzip2 Index: comms/svxlink/Makefile =================================================================== --- comms/svxlink/Makefile +++ comms/svxlink/Makefile @@ -21,14 +21,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/evdev-proto USE_GITHUB= yes GH_ACCOUNT= sm0svx GH_PROJECT= svxlink -USES= cmake tcl groff +USES= cmake tcl groff pkgconfig CMAKE_SOURCE_PATH= ${WRKSRC}/src CMAKE_ARGS+= -DMAN_INSTALL_DIR:FILEPATH=${MANDIRS} \ -DLOCAL_STATE_DIR=/var Index: devel/evdev-proto/Makefile =================================================================== --- devel/evdev-proto/Makefile +++ devel/evdev-proto/Makefile @@ -0,0 +1,57 @@ +# $FreeBSD$ + +PORTNAME= evdev-proto +PORTVERSION= 4.13 +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= wulf@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:]]+/ /' \ + ${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 Index: devel/evdev-proto/distinfo =================================================================== --- devel/evdev-proto/distinfo +++ devel/evdev-proto/distinfo @@ -0,0 +1,7 @@ +TIMESTAMP = 1507751436 +SHA256 (input.h) = 92e2cfa9199750420e0dfa6900553363df164884807f3935bcb7f024b0a386dd +SIZE (input.h) = 15439 +SHA256 (input-event-codes.h) = 6e5daff2de70b83a8097f5d38cc669b77b683dfbd816422fb274c1c98b9216e1 +SIZE (input-event-codes.h) = 24158 +SHA256 (uinput.h) = 282e1500d3c28ca5164b92d6a4ec6ef45ef09277cec751dba74319f5d0e49ae3 +SIZE (uinput.h) = 9212 Index: devel/evdev-proto/pkg-descr =================================================================== --- devel/evdev-proto/pkg-descr +++ devel/evdev-proto/pkg-descr @@ -0,0 +1 @@ +This port installs the input event device header files. Index: devel/evemu/Makefile =================================================================== --- devel/evemu/Makefile +++ devel/evemu/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= evemu -PORTVERSION= 2.6.0 -CATEGORIES= devel +PORTVERSION= 2.7.0 +CATEGORIES= devel MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/ MAINTAINER= wulf@FreeBSD.org @@ -11,10 +11,10 @@ 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 python:2,build pathfix libtool pkgconfig localbase +USES= tar:xz pathfix libtool pkgconfig localbase OPTIONS_DEFINE= MANPAGES PYTHON OPTIONS_DEFAULT=MANPAGES @@ -25,11 +25,12 @@ MANPAGES_CONFIGURE_ENV= XMLTO=${LOCALBASE}/bin/minixmlto MANPAGES_CONFIGURE_ENV_OFF= ac_cv_path_XMLTO="" \ ac_cv_path_ASCIIDOC="" -PYTHON_RUN_DEPENDS= ${PYTHON_CMD}:${PYTHON_PORTSDIR} +PYTHON_USES= python:2 +PYTHON_USES_OFF= python:2,build PYTHON_CONFIGURE_ENABLE= python-bindings GNU_CONFIGURE= yes -CFLAGS+= -D_WITH_DPRINTF -include stdlib.h +CFLAGS+= -D_WITH_DPRINTF -include stdlib.h -include limits.h USE_LDCONFIG= yes INSTALL_TARGET= install-strip REINPLACE_ARGS= -i '' Index: devel/evemu/distinfo =================================================================== --- devel/evemu/distinfo +++ devel/evemu/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491102615 -SHA256 (evemu-2.6.0.tar.xz) = ed81dd4552ffeb92c346b47e56b249c67f1cb37d5b31fc073ea0ad4858ae3dcc -SIZE (evemu-2.6.0.tar.xz) = 507032 +TIMESTAMP = 1507059414 +SHA256 (evemu-2.7.0.tar.xz) = 78c9400d55eeeb5ab75161360543f9376438c4da4934cb34cdda5b46021ae379 +SIZE (evemu-2.7.0.tar.xz) = 509308 Index: devel/evemu/files/patch-tools_evemu-record.c =================================================================== --- devel/evemu/files/patch-tools_evemu-record.c +++ devel/evemu/files/patch-tools_evemu-record.c @@ -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) { Index: devel/evemu/pkg-plist =================================================================== --- devel/evemu/pkg-plist +++ devel/evemu/pkg-plist @@ -7,7 +7,7 @@ lib/libevemu.a lib/libevemu.so lib/libevemu.so.3 -lib/libevemu.so.3.0.3 +lib/libevemu.so.3.0.4 %%PYTHON%%%%PYTHON_SITELIBDIR%%/evemu/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/evemu/__init__.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/evemu/__init__.%%PYTHON_PYOEXTENSION%% Index: devel/libevdev/Makefile =================================================================== --- devel/libevdev/Makefile +++ devel/libevdev/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libevdev -PORTVERSION= 1.4.4 +PORTVERSION= 1.5.7 CATEGORIES= devel MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/ @@ -11,22 +11,41 @@ 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 pathfix python:build tar:xz compiler localbase 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_LIB_DEPENDS= libcheck.so:devel/check +TEST_TARGET= check +TEST_WRKSRC= ${WRKSRC}/test +.endif + +.include + +# Do not allow clang optimize out calloc return value. +# Otherwise queue (over)allocation test fails +.if ${COMPILER_TYPE} == clang +CPPFLAGS+= -fno-builtin +.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 +.include Index: devel/libevdev/distinfo =================================================================== --- devel/libevdev/distinfo +++ devel/libevdev/distinfo @@ -1,2 +1,3 @@ -SHA256 (libevdev-1.4.4.tar.xz) = ed9979369b6a6e28f5897d099538549ecffb2b7c00c1b717eb77c31d85bc45a9 -SIZE (libevdev-1.4.4.tar.xz) = 409856 +TIMESTAMP = 1497275877 +SHA256 (libevdev-1.5.7.tar.xz) = a1e59e37a2f0d397ffd7e83b73af0e638db83b8dd08902ef0f651a21cc1dd422 +SIZE (libevdev-1.5.7.tar.xz) = 407452 Index: devel/libevdev/files/patch-libevdev_libevdev-uinput.c =================================================================== --- devel/libevdev/files/patch-libevdev_libevdev-uinput.c +++ devel/libevdev/files/patch-libevdev_libevdev-uinput.c @@ -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 Index: devel/libevdev/files/patch-test_test-libevdev-events.c =================================================================== --- devel/libevdev/files/patch-test_test-libevdev-events.c +++ devel/libevdev/files/patch-test_test-libevdev-events.c @@ -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); Index: devel/libevdev/files/patch-test_test-libevdev-has-event.c =================================================================== --- devel/libevdev/files/patch-test_test-libevdev-has-event.c +++ devel/libevdev/files/patch-test_test-libevdev-has-event.c @@ -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); + Index: devel/libevdev/files/patch-test_test-libevdev-init.c =================================================================== --- devel/libevdev/files/patch-test_test-libevdev-init.c +++ devel/libevdev/files/patch-test_test-libevdev-init.c @@ -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); Index: devel/libevdev/files/patch-test_test-main.c =================================================================== --- devel/libevdev/files/patch-test_test-main.c +++ devel/libevdev/files/patch-test_test-main.c @@ -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) Index: devel/libevdev/pkg-plist =================================================================== --- devel/libevdev/pkg-plist +++ 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.19 libdata/pkgconfig/libevdev.pc man/man3/libevdev.3.gz Index: devel/libmtdev/Makefile =================================================================== --- devel/libmtdev/Makefile +++ devel/libmtdev/Makefile @@ -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/evdev-proto 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 +++ devel/libmtdev/files/patch-test-mtdev-test.c @@ -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) + { Index: devel/libudev-devd/Makefile =================================================================== --- devel/libudev-devd/Makefile +++ devel/libudev-devd/Makefile @@ -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/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 Index: devel/py-evdev/Makefile =================================================================== --- devel/py-evdev/Makefile +++ devel/py-evdev/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= evdev -PORTVERSION= 0.5.0 +PORTVERSION= 0.7.0 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/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} \ -name '*.so' -exec ${STRIP_CMD} {} + Index: devel/py-evdev/distinfo =================================================================== --- devel/py-evdev/distinfo +++ 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 = 1507760387 +SHA256 (evdev-0.7.0.tar.gz) = 57edafc469a414f58b51af1bfb9ee2babb9f626dd2df530d71c1176871850aa1 +SIZE (evdev-0.7.0.tar.gz) = 22623 Index: multimedia/kdenlive/Makefile =================================================================== --- multimedia/kdenlive/Makefile +++ multimedia/kdenlive/Makefile @@ -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/evdev-proto +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 +++ multimedia/lives/Makefile @@ -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/videodev.h:multimedia/v4l_compat \ ${LOCALBASE}/bin/analyseplugin:audio/ladspa LIB_DEPENDS= libasound.so:audio/alsa-lib \ libjack.so:audio/jack \ Index: multimedia/v4l_compat/Makefile =================================================================== --- multimedia/v4l_compat/Makefile +++ multimedia/v4l_compat/Makefile @@ -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 +++ multimedia/v4l_compat/pkg-plist @@ -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 +++ x11-drivers/xf86-input-evdev/Makefile @@ -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/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 Index: x11-drivers/xf86-input-libinput/Makefile =================================================================== --- x11-drivers/xf86-input-libinput/Makefile +++ x11-drivers/xf86-input-libinput/Makefile @@ -10,6 +10,7 @@ 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 Index: x11-drivers/xf86-input-synaptics/Makefile =================================================================== --- x11-drivers/xf86-input-synaptics/Makefile +++ x11-drivers/xf86-input-synaptics/Makefile @@ -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/evdev-proto EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev .include Index: x11-drivers/xf86-input-wacom/Makefile =================================================================== --- x11-drivers/xf86-input-wacom/Makefile +++ x11-drivers/xf86-input-wacom/Makefile @@ -10,7 +10,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= pathfix Index: x11-drivers/xf86-input-wacom/files/patch-src-wcmValidateDevice.c =================================================================== --- x11-drivers/xf86-input-wacom/files/patch-src-wcmValidateDevice.c +++ x11-drivers/xf86-input-wacom/files/patch-src-wcmValidateDevice.c @@ -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/kf5-kwayland/Makefile =================================================================== --- x11/kf5-kwayland/Makefile +++ x11/kf5-kwayland/Makefile @@ -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/evdev-proto LIB_DEPENDS= libwayland-client.so:graphics/wayland USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig \ Index: x11/libinput/Makefile =================================================================== --- x11/libinput/Makefile +++ x11/libinput/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libinput -PORTVERSION= 1.6.0 +PORTVERSION= 1.8.3 CATEGORIES= x11 MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/ @@ -8,23 +8,32 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Generic input library -BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat +LICENSE= MIT + +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 \ libudev.so:devel/libudev-devd \ libmtdev.so:devel/libmtdev -USES= autoreconf gmake libtool pathfix pkgconfig tar:xz +OPTIONS_DEFINE= DEBUG_GUI LIBWACOM +OPTIONS_DEFAULT=LIBWACOM +DEBUG_GUI_DESC= Build the GUI event viewer +LIBWACOM_DESC= Libwacom support +OPTIONS_SUB= yes + +DEBUG_GUI_USE= GNOME=gtk30,glib20,cairo +DEBUG_GUI_CONFIGURE_ENABLE= debug-gui +LIBWACOM_LIB_DEPENDS= libwacom.so:x11/libwacom +LIBWACOM_CONFIGURE_ENABLE= libwacom + +USES= autoreconf gmake libtool localbase pathfix pkgconfig tar:xz +EXTRACT_AFTER_ARGS= --exclude include # supplied linux/input.h USE_LDCONFIG= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-documentation --disable-tests --without-libunwind CPPFLAGS+= -I${LOCALBASE}/include/libepoll-shim INSTALL_TARGET= install-strip -post-patch: - ${REINPLACE_CMD} -e 's|program_invocation_short_name|getprogname()|' \ - ${WRKSRC}/tools/libinput-list-devices.c \ - ${WRKSRC}/tools/ptraccel-debug.c ${WRKSRC}/tools/shared.c - .include Index: x11/libinput/distinfo =================================================================== --- x11/libinput/distinfo +++ x11/libinput/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1486789508 -SHA256 (libinput-1.6.0.tar.xz) = b7534f518d735c643aedca2fb4694683dfddc8d0600cfb628c87a18e65255832 -SIZE (libinput-1.6.0.tar.xz) = 927656 +TIMESTAMP = 1507750244 +SHA256 (libinput-1.8.3.tar.xz) = 2fe2e2f52f0971a9c43541b8f26582ca8df6ed4bb9050e85eb40d4ff6b13142d +SIZE (libinput-1.8.3.tar.xz) = 941832 Index: x11/libinput/files/patch-Makefile.am =================================================================== --- x11/libinput/files/patch-Makefile.am +++ x11/libinput/files/patch-Makefile.am @@ -1,8 +1,8 @@ ---- Makefile.am.orig 2017-02-11 05:10:33 UTC +--- Makefile.am.orig 2017-10-12 00:20:57 UTC +++ Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src doc test tools udev -+SUBDIRS = src doc tools udev ++SUBDIRS = src doc test tools ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} Index: x11/libinput/files/patch-configure.ac =================================================================== --- x11/libinput/files/patch-configure.ac +++ x11/libinput/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2017-10-04 03:31:13 UTC ++++ configure.ac +@@ -67,7 +67,7 @@ PKG_CHECK_MODULES(LIBUDEV, [libudev]) + PKG_CHECK_MODULES(LIBEVDEV, [libevdev >= 1.3]) + + AC_CHECK_LIB([m], [atan2]) +-AC_CHECK_LIB([rt], [clock_gettime]) ++AC_SEARCH_LIBS([clock_gettime], [rt]) + + if test "x$GCC" = "xyes"; then + GCC_CXXFLAGS="-Wall -Wextra -Wno-unused-parameter -g -fvisibility=hidden" Index: x11/libinput/files/patch-include_linux_input.h =================================================================== --- x11/libinput/files/patch-include_linux_input.h +++ x11/libinput/files/patch-include_linux_input.h @@ -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 */ Index: x11/libinput/files/patch-src_Makefile.am =================================================================== --- x11/libinput/files/patch-src_Makefile.am +++ x11/libinput/files/patch-src_Makefile.am @@ -1,14 +1,14 @@ ---- src/Makefile.am.orig 2017-02-11 05:10:33 UTC +--- src/Makefile.am.orig 2017-10-12 00:20:57 UTC +++ src/Makefile.am -@@ -38,6 +38,7 @@ libinput_la_LIBADD = $(MTDEV_LIBS) \ +@@ -40,6 +40,7 @@ libinput_la_LIBADD = $(MTDEV_LIBS) \ $(LIBUDEV_LIBS) \ $(LIBEVDEV_LIBS) \ $(LIBWACOM_LIBS) \ -+ -lepoll-shim \ ++ -lepoll-shim -lrt \ libinput-util.la - - libinput_la_CFLAGS = -I$(top_srcdir)/include \ -@@ -61,8 +62,8 @@ libfilter_la_SOURCES = \ + libinput_la_LDFLAGS = $(GCOV_LDFLAGS) \ + -version-info $(LIBINPUT_LT_VERSION) -shared \ +@@ -69,8 +70,8 @@ libfilter_la_SOURCES = \ filter.c \ filter.h \ filter-private.h @@ -17,5 +17,5 @@ +libfilter_la_LIBADD = $(LIBUDEV_LIBS) +libfilter_la_CFLAGS = -I$(top_srcdir)/include $(LIBUDEV_CFLAGS) - libinput_la_LDFLAGS = -version-info $(LIBINPUT_LT_VERSION) -shared \ - -Wl,--version-script=$(srcdir)/libinput.sym + pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfig_DATA = libinput.pc Index: x11/libinput/files/patch-src_evdev.c =================================================================== --- x11/libinput/files/patch-src_evdev.c +++ x11/libinput/files/patch-src_evdev.c @@ -1,11 +1,20 @@ ---- src/evdev.c.orig 2017-01-19 21:36:55 UTC +--- src/evdev.c.orig 2017-10-04 03:31:13 UTC +++ src/evdev.c -@@ -25,6 +25,8 @@ +@@ -1974,6 +1974,17 @@ evdev_device_dispatch(void *data) - #include "config.h" - -+#include -+ - #include - #include - #include + if (rc != -EAGAIN && rc != -EINTR) { + libinput_remove_source(libinput, device->source); ++ /* ++ * Dirty hack to allow cuse-based evdev backends to release ++ * character device file when device has been detached ++ * but still have it descriptor opened. ++ * Issuing evdev_device_suspend() here leads to SIGSEGV ++ */ ++ int dummy_fd = open("/dev/null", O_RDONLY | O_CLOEXEC); ++ if (dummy_fd >= 0) { ++ dup2(dummy_fd, device->fd); ++ close(dummy_fd); ++ } + device->source = NULL; + } + } Index: x11/libinput/files/patch-src_libinput-private.h =================================================================== --- x11/libinput/files/patch-src_libinput-private.h +++ x11/libinput/files/patch-src_libinput-private.h @@ -1,10 +0,0 @@ ---- src/libinput-private.h.orig 2017-01-18 04:32:06 UTC -+++ src/libinput-private.h -@@ -29,6 +29,7 @@ - - #include - #include -+#include - - #include "linux/input.h" - Index: x11/libinput/files/patch-src_libinput-util.h =================================================================== --- x11/libinput/files/patch-src_libinput-util.h +++ x11/libinput/files/patch-src_libinput-util.h @@ -0,0 +1,24 @@ +--- src/libinput-util.h.orig 2017-10-04 03:31:13 UTC ++++ src/libinput-util.h +@@ -39,6 +39,10 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#include ++#endif + + #include "libinput.h" + +@@ -132,6 +136,10 @@ bool list_empty(const struct list *list); + #endif + + #define LIBINPUT_EXPORT __attribute__ ((visibility("default"))) ++ ++#ifdef __FreeBSD__ ++#define program_invocation_short_name getprogname() ++#endif + + static inline void * + zalloc(size_t size) Index: x11/libinput/files/patch-src_libinput-util.c =================================================================== --- x11/libinput/files/patch-src_libinput-util.c +++ x11/libinput/files/patch-src_libinput-util.c @@ -1,12 +0,0 @@ ---- src/libinput-util.c.orig 2017-01-17 04:53:51 UTC -+++ src/libinput-util.c -@@ -36,6 +36,9 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include -+#endif - - #include "libinput-util.h" - #include "libinput-private.h" Index: x11/libinput/files/patch-src_libinput.pc.in =================================================================== --- x11/libinput/files/patch-src_libinput.pc.in +++ x11/libinput/files/patch-src_libinput.pc.in @@ -0,0 +1,9 @@ +--- src/libinput.pc.in.orig 2017-10-04 03:31:13 UTC ++++ src/libinput.pc.in +@@ -10,5 +10,5 @@ Description: Input device library + Version: @LIBINPUT_VERSION@ + Cflags: -I${includedir} + Libs: -L${libdir} -linput +-Libs.private: -lm -lrt ++Libs.private: @LIBS@ + Requires.private: libudev Index: x11/libinput/files/patch-src_path-seat.c =================================================================== --- x11/libinput/files/patch-src_path-seat.c +++ x11/libinput/files/patch-src_path-seat.c @@ -1,15 +0,0 @@ ---- src/path-seat.c.orig 2017-01-19 05:27:32 UTC -+++ src/path-seat.c -@@ -23,10 +23,11 @@ - - #include "config.h" - -+#include -+ - #include - #include - #include --#include - #include - - #include "path-seat.h" Index: x11/libinput/files/patch-tools_Makefile.am =================================================================== --- x11/libinput/files/patch-tools_Makefile.am +++ x11/libinput/files/patch-tools_Makefile.am @@ -1,24 +0,0 @@ ---- tools/Makefile.am.orig 2017-02-11 05:10:33 UTC -+++ tools/Makefile.am -@@ -11,8 +11,8 @@ AM_CXXFLAGS = $(GCC_CXXFLAGS) - libshared_la_SOURCES = \ - shared.c \ - shared.h --libshared_la_CFLAGS = $(AM_CFLAGS) $(LIBEVDEV_CFLAGS) --libshared_la_LIBADD = $(LIBEVDEV_LIBS) -+libshared_la_CFLAGS = $(AM_CFLAGS) $(LIBEVDEV_CFLAGS) $(LIBUDEV_CFLAGS) -+libshared_la_LIBADD = $(LIBEVDEV_LIBS) $(LIBUDEV_LIBS) - - event_debug_SOURCES = event-debug.c - event_debug_LDADD = ../src/libinput.la libshared.la $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS) -@@ -20,8 +20,9 @@ event_debug_LDFLAGS = -no-install - event_debug_CFLAGS = $(AM_CFLAGS) $(LIBUDEV_CFLAGS) $(LIBEVDEV_CFLAGS) - - ptraccel_debug_SOURCES = ptraccel-debug.c --ptraccel_debug_LDADD = ../src/libfilter.la ../src/libinput.la -+ptraccel_debug_LDADD = ../src/libfilter.la ../src/libinput.la $(LIBUDEV_LIBS) - ptraccel_debug_LDFLAGS = -no-install -+ptraccel_debug_CFLAGS = $(LIBUDEV_CFLAGS) - - libinput_list_devices_SOURCES = libinput-list-devices.c - libinput_list_devices_LDADD = ../src/libinput.la libshared.la $(LIBUDEV_LIBS) Index: x11/libinput/files/patch-udev_Makefile.am =================================================================== --- x11/libinput/files/patch-udev_Makefile.am +++ x11/libinput/files/patch-udev_Makefile.am @@ -1,10 +0,0 @@ ---- udev/Makefile.am.orig 2017-02-11 05:10:33 UTC -+++ udev/Makefile.am -@@ -19,6 +19,7 @@ endif - - libinput_model_quirks_SOURCES = libinput-model-quirks.c - libinput_model_quirks_CFLAGS = \ -+ -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - $(LIBUDEV_CFLAGS) \ - $(GCC_CFLAGS) Index: x11/libinput/pkg-plist =================================================================== --- x11/libinput/pkg-plist +++ x11/libinput/pkg-plist @@ -1,14 +1,19 @@ +bin/libinput bin/libinput-debug-events bin/libinput-list-devices include/libinput.h lib/libinput.so lib/libinput.so.10 -lib/libinput.so.10.11.2 -lib/udev/hwdb.d/90-libinput-model-quirks.hwdb -lib/udev/libinput-device-group -lib/udev/libinput-model-quirks -lib/udev/rules.d/80-libinput-device-groups.rules -lib/udev/rules.d/90-libinput-model-quirks.rules +lib/libinput.so.10.13.0 libdata/pkgconfig/libinput.pc +libexec/libinput/libinput-debug-events +%%DEBUG_GUI%%libexec/libinput/libinput-debug-gui +libexec/libinput/libinput-list-devices +libexec/libinput/libinput-measure +libexec/libinput/libinput-measure-touchpad-tap man/man1/libinput-debug-events.1.gz +%%DEBUG_GUI%%man/man1/libinput-debug-gui.1.gz man/man1/libinput-list-devices.1.gz +man/man1/libinput-measure-touchpad-tap.1.gz +man/man1/libinput-measure.1.gz +man/man1/libinput.1.gz Index: x11/libwacom/Makefile =================================================================== --- x11/libwacom/Makefile +++ x11/libwacom/Makefile @@ -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,6 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS= libgudev-1.0.so:devel/libgudev USES= gettext-runtime gmake libtool localbase pkgconfig \ @@ -20,5 +21,10 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip +CONFIGURE_ENV= ac_cv_prog_HAVE_DOXYGEN="" +post-patch: + @${REINPLACE_CMD} -e 's/-printf "%P\\n"/-print0 | xargs -0 basename/' \ + ${WRKSRC}/data/Makefile.in + .include Index: x11/libwacom/pkg-plist =================================================================== --- x11/libwacom/pkg-plist +++ x11/libwacom/pkg-plist @@ -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