From 248c6b5c09f123b4b2cbda5d5a71292f914516d0 Mon Sep 17 00:00:00 2001 From: Niclas Zeising Date: Wed, 19 Dec 2018 09:09:11 +0000 Subject: Split out evdev headers from multimedia/v4l_compat Split out evdev headers (input.h, input-event-codes.h, uinput.h) into their own port, devel/evdev-proto, and update those to be current with the Linux 4.19 kernel. This is done in order to be able to update the rest of the FreeBSD input stack, which is forthcoming. By splititng out the evdev headers we can update them independent of other updates in v4l_compat, which makes it easier for the graphics team to keep track of them and keep them updated as needed. Update devel/libevdev from 1.4.4 to 1.5.9 instead of trying to make it work with the updated headers. This will be further updated. Update devel/py-evdev from 0.5.0 to 0.8.1 instead of trying to make it work with the updated evdev headers. Update consumers to use devel/evdev-proto rather than multimedia/v4l_compat as needed, and bump portrevisions. This is the first step in getting the FreeBSD input stack (libevdev, libinput and so on) updated to newer versions. Many thanks to all who have helped out with testing, code and exp-runs. Apologies if I've forgotten to add any names. PR: 222905, 217248, (based on, in part), 233787 (exp-run) Submitted by: Greg V, wulf Tested by: tcberner, kde Exp-run by: antoine Approved by: portmgr (antoine) Obtained from: FreeBSDDesktop development repo https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/input https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/input-ports --- devel/Makefile | 1 + devel/evdev-proto/Makefile | 58 ++++++++++++++++++++++ devel/evdev-proto/distinfo | 7 +++ devel/evdev-proto/pkg-descr | 1 + devel/evemu/Makefile | 4 +- devel/evemu/files/patch-tools_evemu-record.c | 12 ----- devel/libevdev/Makefile | 32 ++++++++---- devel/libevdev/distinfo | 5 +- .../files/patch-libevdev_libevdev-uinput.c | 40 +++++++++++++++ .../files/patch-test_test-libevdev-events.c | 20 ++++++++ .../files/patch-test_test-libevdev-has-event.c | 16 ++++++ .../libevdev/files/patch-test_test-libevdev-init.c | 11 ++++ devel/libevdev/files/patch-test_test-main.c | 26 ++++++++++ devel/libevdev/pkg-plist | 5 +- devel/libmtdev/Makefile | 7 ++- devel/libmtdev/files/patch-test_mtdev-test.c | 16 ++++++ devel/libudev-devd/Makefile | 7 ++- devel/py-evdev/Makefile | 18 ++++--- devel/py-evdev/distinfo | 5 +- devel/sdl20/Makefile | 4 +- 20 files changed, 249 insertions(+), 46 deletions(-) create mode 100644 devel/evdev-proto/Makefile create mode 100644 devel/evdev-proto/distinfo create mode 100644 devel/evdev-proto/pkg-descr delete mode 100644 devel/evemu/files/patch-tools_evemu-record.c create mode 100644 devel/libevdev/files/patch-libevdev_libevdev-uinput.c create mode 100644 devel/libevdev/files/patch-test_test-libevdev-events.c create mode 100644 devel/libevdev/files/patch-test_test-libevdev-has-event.c create mode 100644 devel/libevdev/files/patch-test_test-libevdev-init.c create mode 100644 devel/libevdev/files/patch-test_test-main.c create mode 100644 devel/libmtdev/files/patch-test_mtdev-test.c (limited to 'devel') 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||| ; \ + /# *include[[:space:]]+/d ; \ + /EVIOC(RMFF|GRAB|REVOKE)/ s/_IOW(.*), *int/_IOWINT\1/ ; \ + /EVIOCGKEYCODE/ s/_IOR/_IOWR/ ; \ + /EVIOCGMASK/ s/_IOR/_IOW/ ; \ + /EVIOCGMTSLOTS/ s/_IOC_READ/IOC_INOUT/ ; \ + /#define/ s/_IOC_READ/IOC_OUT/ ; \ + /#define/ s/_IOC_WRITE/IOC_IN/ ; \ + s/[[:space:]]+__user[[:space:]]+/ / ; \ + /__USE_TIME_BITS64/ s|^#if (.*)$$|#if 1 /* \1 */|' \ + ${WRKSRC}/input.h + @${REINPLACE_CMD} -i '' -E -e \ + 's/__u([[:digit:]]+)/uint\1_t/g ; \ + s/__s([[:digit:]]+)/int\1_t/g ; \ + /# *include/s||| ; \ + /#define/ s/_IOW(.*), *int/_IOWINT\1/ ; \ + /#define/ s/_IOW(.*), *char\*/_IO\1/ ; \ + /#define/ s/_IOC_READ/IOC_OUT/' \ + ${WRKSRC}/uinput.h + +do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/include/linux/ +.for i in ${DISTNAME} + ${INSTALL_DATA} ${WRKSRC}/${i} \ + ${STAGEDIR}${PREFIX}/include/linux/ +.endfor + +.include 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 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 + #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) + { 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 -- cgit v1.2.3