Attachment #235079 for bug #265017

Lines 2-8 Link Here

(-)b/devel/libepoll-shim/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= libepoll-shim	3	PORTNAME= libepoll-shim
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 0.0.20210418	5	DISTVERSION= 0.0.20220703
6	CATEGORIES= devel	6	CATEGORIES= devel
7		7
8	MAINTAINER= x11@FreeBSD.org	8	MAINTAINER= x11@FreeBSD.org

Lines 1-3 Link Here

(-)b/devel/libepoll-shim/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1618774132	1	TIMESTAMP = 1656867430
2	SHA256 (jiixyj-epoll-shim-v0.0.20210418_GH0.tar.gz) = 10d5ff1f4389e121fa2a07e0873eb61030ae655af9fd6980661eaa7fbb682b06	2	SHA256 (jiixyj-epoll-shim-v0.0.20220703_GH0.tar.gz) = 2f21eaaa38b7dd0dfdd677c6bbeb58d7ae6fdc270f267cd07dc1f1d7e85af7d2
3	SIZE (jiixyj-epoll-shim-v0.0.20210418_GH0.tar.gz) = 91936	3	SIZE (jiixyj-epoll-shim-v0.0.20220703_GH0.tar.gz) = 99131

Added Link Here

(-)b/devel/libepoll-shim/files/patch-epoll-shim-interpose.pc.cmakein (+8 lines)
1	--- epoll-shim-interpose.pc.cmakein.orig 2022-07-05 09:50:16 UTC
2	+++ epoll-shim-interpose.pc.cmakein
3	@@ -9,4 +9,4 @@ Description: Small epoll implementation using kqueue (
4	Version:
5	Requires: epoll-shim
6	Libs: -L${libdir} -lepoll-shim-interpose
7	-Cflags: -DEPOLL_SHIM_DISABLE_WRAPPER_MACROS
8	+Cflags: -I${includedir}/libepoll-shim -DEPOLL_SHIM_DISABLE_WRAPPER_MACROS

Lines 9-14 include/libepoll-shim/sys/timerfd.h Link Here

(-)b/devel/libepoll-shim/pkg-plist (+3 lines)
9	lib/cmake/epoll-shim/epoll-shim-config.cmake	9	lib/cmake/epoll-shim/epoll-shim-config.cmake
10	lib/cmake/epoll-shim/epoll-shim-targets-%%CMAKE_BUILD_TYPE%%.cmake	10	lib/cmake/epoll-shim/epoll-shim-targets-%%CMAKE_BUILD_TYPE%%.cmake
11	lib/cmake/epoll-shim/epoll-shim-targets.cmake	11	lib/cmake/epoll-shim/epoll-shim-targets.cmake
		12	lib/libepoll-shim-interpose.so
		13	lib/libepoll-shim-interpose.so.0
12	lib/libepoll-shim.so	14	lib/libepoll-shim.so
13	lib/libepoll-shim.so.0	15	lib/libepoll-shim.so.0
		16	libdata/pkgconfig/epoll-shim-interpose.pc
14	libdata/pkgconfig/epoll-shim.pc	17	libdata/pkgconfig/epoll-shim.pc





PORTNAME?=	libv4l
PORTVERSION=	1.23.0
PORTREVISION=	1
DISTVERSIONPREFIX=	v4l-utils-
CATEGORIES=	multimedia


.if ${PORTNAME} == v4l-utils
USES+=		perl5
BUILD_DEPENDS+=	libv4l>=${PORTVERSION}:multimedia/libv4l
LIB_DEPENDS+=	libepoll-shim-interpose.so:devel/libepoll-shim \
		libv4l2.so:multimedia/libv4l
CPPFLAGS+=	`pkg-config --cflags epoll-shim-interpose`
LDFLAGS+=	`pkg-config --libs epoll-shim-interpose`
CONFIGURE_ARGS+= \
	--enable-v4l-utils \
	--without-v4l2-compliance

Lines 3-8 Link Here

(-)b/sysutils/rshim-user-space/Makefile (-1 / +2 lines)
3	PORTNAME= rshim-user-space	3	PORTNAME= rshim-user-space
4	DISTVERSIONPREFIX= rshim-	4	DISTVERSIONPREFIX= rshim-
5	DISTVERSION= 2.0.6-11	5	DISTVERSION= 2.0.6-11
		6	PORTREVISION= 1
6	PORTEPOCH= 1	7	PORTEPOCH= 1
7		8
8	MAINTAINER= hselasky@FreeBSD.org	9	MAINTAINER= hselasky@FreeBSD.org
Lines 12-18 LICENSE= BSD3CLAUSE Link Here
12		13
13	CATEGORIES= sysutils	14	CATEGORIES= sysutils
14		15
15	LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \	16	LIB_DEPENDS= libepoll-shim-interpose.so:devel/libepoll-shim \
16	libpci.so:devel/libpci \	17	libpci.so:devel/libpci \
17	libpciaccess.so:devel/libpciaccess	18	libpciaccess.so:devel/libpciaccess
18		19




--- configure.ac.orig	2022-07-05 09:38:08 UTC
+++ configure.ac
@@ -91,10 +91,9 @@ fi
 ])
 
 if test $backend = freebsd; then
-AC_SUBST(CPPFLAGS, "$CPPFLAGS -I${prefix}/include/libepoll-shim")
-AC_SUBST(LDFLAGS, "$LDFLAGS -L${prefix}/lib")
-AC_CHECK_HEADERS([sys/epoll.h],[],[AC_MSG_ERROR([Missing libepoll-shim])])
-AC_CHECK_LIB(epoll-shim, epoll_create1)
+PKG_CHECK_MODULES([EPOLLSHIM], [epoll-shim-interpose])
+AC_SUBST(CPPFLAGS, "$CPPFLAGS $EPOLLSHIM_CFLAGS")
+AC_SUBST(LDFLAGS, "$LDFLAGS $EPOLLSHIM_LIBS")
 AC_SUBST(CPPFLAGS, "$CPPFLAGS -DDEFAULT_RSHIM_CONFIG_FILE='\"${prefix}/etc/rshim.conf\"'")
 else
 AC_SUBST(CPPFLAGS, "$CPPFLAGS -DDEFAULT_RSHIM_CONFIG_FILE='\"/etc/rshim.conf\"'")

Return to bug 265017

Lines 3-8 Link Here

(-)b/multimedia/libv4l/Makefile (-3 / +4 lines)
3		3
4	PORTNAME?= libv4l	4	PORTNAME?= libv4l
5	PORTVERSION= 1.23.0	5	PORTVERSION= 1.23.0
		6	PORTREVISION= 1
6	DISTVERSIONPREFIX= v4l-utils-	7	DISTVERSIONPREFIX= v4l-utils-
7	CATEGORIES= multimedia	8	CATEGORIES= multimedia
8		9
Lines 50-59 RUN_DEPENDS+= evdev-proto>=5.3:devel/evdev-proto Link Here
50	.if ${PORTNAME} == v4l-utils	51	.if ${PORTNAME} == v4l-utils
51	USES+= perl5	52	USES+= perl5
52	BUILD_DEPENDS+= libv4l>=${PORTVERSION}:multimedia/libv4l	53	BUILD_DEPENDS+= libv4l>=${PORTVERSION}:multimedia/libv4l
53	LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim \	54	LIB_DEPENDS+= libepoll-shim-interpose.so:devel/libepoll-shim \
54	libv4l2.so:multimedia/libv4l	55	libv4l2.so:multimedia/libv4l
55	CPPFLAGS+= -I${LOCALBASE}/include/libepoll-shim	56	CPPFLAGS+= `pkg-config --cflags epoll-shim-interpose`
56	LDFLAGS+= -lepoll-shim	57	LDFLAGS+= `pkg-config --libs epoll-shim-interpose`
57	CONFIGURE_ARGS+= \	58	CONFIGURE_ARGS+= \
58	--enable-v4l-utils \	59	--enable-v4l-utils \
59	--without-v4l2-compliance	60	--without-v4l2-compliance

Added Link Here

(-)b/sysutils/rshim-user-space/files/patch-configure.ac (+16 lines)
1	--- configure.ac.orig 2022-07-05 09:38:08 UTC
2	+++ configure.ac
3	@@ -91,10 +91,9 @@ fi
4	])
5
6	if test $backend = freebsd; then
7	-AC_SUBST(CPPFLAGS, "$CPPFLAGS -I${prefix}/include/libepoll-shim")
8	-AC_SUBST(LDFLAGS, "$LDFLAGS -L${prefix}/lib")
9	-AC_CHECK_HEADERS([sys/epoll.h],[],[AC_MSG_ERROR([Missing libepoll-shim])])
10	-AC_CHECK_LIB(epoll-shim, epoll_create1)
11	+PKG_CHECK_MODULES([EPOLLSHIM], [epoll-shim-interpose])
12	+AC_SUBST(CPPFLAGS, "$CPPFLAGS $EPOLLSHIM_CFLAGS")
13	+AC_SUBST(LDFLAGS, "$LDFLAGS $EPOLLSHIM_LIBS")
14	AC_SUBST(CPPFLAGS, "$CPPFLAGS -DDEFAULT_RSHIM_CONFIG_FILE='\"${prefix}/etc/rshim.conf\"'")
15	else
16	AC_SUBST(CPPFLAGS, "$CPPFLAGS -DDEFAULT_RSHIM_CONFIG_FILE='\"/etc/rshim.conf\"'")