Attachment 235079 Details for Bug 265017 – libepollshim update (v2)

[patch] libepollshim update (v2)

v2.patch (text/plain), 4.92 KB, created by Hans Petter Selasky on 2022-07-05 10:11:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hans Petter Selasky

Created: 2022-07-05 10:11:30 UTC

Size: 4.92 KB

patch

obsolete

>commit 2fad469e878250a96a3ab548dacf074bd22e76df
>Author: Jan Beich <jbeich@FreeBSD.org>
>Date:   Tue Jun 7 20:00:01 2022 +0000
>
>    devel/libepoll-shim: update to 0.0.20220703
>    
>    Changes:        https://github.com/jiixyj/epoll-shim/compare/v0.0.20210418...v0.0.20220703
>    Reported by:    portscout
>    PR:             265017
>    Approved by:    manu
>
>diff --git a/devel/libepoll-shim/Makefile b/devel/libepoll-shim/Makefile
>index d5ad62c3e276..48f470426956 100644
>--- a/devel/libepoll-shim/Makefile
>+++ b/devel/libepoll-shim/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	libepoll-shim
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	0.0.20210418
>+DISTVERSION=	0.0.20220703
> CATEGORIES=	devel
> 
> MAINTAINER=	x11@FreeBSD.org
>diff --git a/devel/libepoll-shim/distinfo b/devel/libepoll-shim/distinfo
>index e1e49934cd93..9c182d9de36d 100644
>--- a/devel/libepoll-shim/distinfo
>+++ b/devel/libepoll-shim/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1618774132
>-SHA256 (jiixyj-epoll-shim-v0.0.20210418_GH0.tar.gz) = 10d5ff1f4389e121fa2a07e0873eb61030ae655af9fd6980661eaa7fbb682b06
>-SIZE (jiixyj-epoll-shim-v0.0.20210418_GH0.tar.gz) = 91936
>+TIMESTAMP = 1656867430
>+SHA256 (jiixyj-epoll-shim-v0.0.20220703_GH0.tar.gz) = 2f21eaaa38b7dd0dfdd677c6bbeb58d7ae6fdc270f267cd07dc1f1d7e85af7d2
>+SIZE (jiixyj-epoll-shim-v0.0.20220703_GH0.tar.gz) = 99131
>diff --git a/devel/libepoll-shim/files/patch-epoll-shim-interpose.pc.cmakein b/devel/libepoll-shim/files/patch-epoll-shim-interpose.pc.cmakein
>new file mode 100644
>index 000000000000..6a10fec48349
>--- /dev/null
>+++ b/devel/libepoll-shim/files/patch-epoll-shim-interpose.pc.cmakein
>@@ -0,0 +1,8 @@
>+--- epoll-shim-interpose.pc.cmakein.orig	2022-07-05 09:50:16 UTC
>++++ epoll-shim-interpose.pc.cmakein
>+@@ -9,4 +9,4 @@ Description: Small epoll implementation using kqueue (
>+ Version: 
>+ Requires: epoll-shim
>+ Libs: -L${libdir} -lepoll-shim-interpose
>+-Cflags: -DEPOLL_SHIM_DISABLE_WRAPPER_MACROS
>++Cflags: -I${includedir}/libepoll-shim -DEPOLL_SHIM_DISABLE_WRAPPER_MACROS
>diff --git a/devel/libepoll-shim/pkg-plist b/devel/libepoll-shim/pkg-plist
>index c8b071aea53a..2b866364c8f0 100644
>--- a/devel/libepoll-shim/pkg-plist
>+++ b/devel/libepoll-shim/pkg-plist
>@@ -9,6 +9,9 @@ include/libepoll-shim/sys/timerfd.h
> lib/cmake/epoll-shim/epoll-shim-config.cmake
> lib/cmake/epoll-shim/epoll-shim-targets-%%CMAKE_BUILD_TYPE%%.cmake
> lib/cmake/epoll-shim/epoll-shim-targets.cmake
>+lib/libepoll-shim-interpose.so
>+lib/libepoll-shim-interpose.so.0
> lib/libepoll-shim.so
> lib/libepoll-shim.so.0
>+libdata/pkgconfig/epoll-shim-interpose.pc
> libdata/pkgconfig/epoll-shim.pc
>diff --git a/multimedia/libv4l/Makefile b/multimedia/libv4l/Makefile
>index ff1a2d757e7b..0ebfcba55e76 100644
>--- a/multimedia/libv4l/Makefile
>+++ b/multimedia/libv4l/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME?=	libv4l
> PORTVERSION=	1.23.0
>+PORTREVISION=	1
> DISTVERSIONPREFIX=	v4l-utils-
> CATEGORIES=	multimedia
> 
>@@ -50,10 +51,10 @@ RUN_DEPENDS+=	evdev-proto>=5.3:devel/evdev-proto
> .if ${PORTNAME} == v4l-utils
> USES+=		perl5
> BUILD_DEPENDS+=	libv4l>=${PORTVERSION}:multimedia/libv4l
>-LIB_DEPENDS+=	libepoll-shim.so:devel/libepoll-shim \
>+LIB_DEPENDS+=	libepoll-shim-interpose.so:devel/libepoll-shim \
> 		libv4l2.so:multimedia/libv4l
>-CPPFLAGS+=	-I${LOCALBASE}/include/libepoll-shim
>-LDFLAGS+=	-lepoll-shim
>+CPPFLAGS+=	`pkg-config --cflags epoll-shim-interpose`
>+LDFLAGS+=	`pkg-config --libs epoll-shim-interpose`
> CONFIGURE_ARGS+= \
> 	--enable-v4l-utils \
> 	--without-v4l2-compliance
>diff --git a/sysutils/rshim-user-space/Makefile b/sysutils/rshim-user-space/Makefile
>index 0942d10c1133..ef7fdbd68fdf 100644
>--- a/sysutils/rshim-user-space/Makefile
>+++ b/sysutils/rshim-user-space/Makefile
>@@ -3,6 +3,7 @@
> PORTNAME=	rshim-user-space
> DISTVERSIONPREFIX=	rshim-
> DISTVERSION=		2.0.6-11
>+PORTREVISION=		1
> PORTEPOCH=		1
> 
> MAINTAINER=	hselasky@FreeBSD.org
>@@ -12,7 +13,7 @@ LICENSE=	BSD3CLAUSE
> 
> CATEGORIES=	sysutils
> 
>-LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
>+LIB_DEPENDS=	libepoll-shim-interpose.so:devel/libepoll-shim \
> 		libpci.so:devel/libpci \
> 		libpciaccess.so:devel/libpciaccess
> 
>diff --git a/sysutils/rshim-user-space/files/patch-configure.ac b/sysutils/rshim-user-space/files/patch-configure.ac
>new file mode 100644
>index 000000000000..f9ea602c64ac
>--- /dev/null
>+++ b/sysutils/rshim-user-space/files/patch-configure.ac
>@@ -0,0 +1,16 @@
>+--- 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\"'")

Actions: View | Diff

Attachments on bug 265017: 235057 | 235079 | 235080