View | Details | Raw Unified | Return to bug 233787 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 233787