From nobody Tue Jul 05 20:55:29 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E7F5A1D0D39A; Tue, 5 Jul 2022 20:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lcw1F69JXz3p8h; Tue, 5 Jul 2022 20:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657054529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6lAuKgYRJCGe1oTOwS7MRXhYw41rr/fknRFPx/Iw0pI=; b=ew+K2T4lSJN0psvB2izx5k/MzfFEjxrgVjUY7gVpuX2H5iKsj79FaL3sCMptGva00dkyMY PRllp4p+WaFa3glQbFyCglKwvf6VNtXLmp6ixfO7GPquiYE3lAZZsB217zf+biEIJGsx9A pv8CD3OpjetOJtQiGNgOreNCIrvGV+nADBSj/eBCMbqix59ClcuOUmUdbl7vjWUrjSbU1W +WPRWAVYCbU6W1xCmSB4V9Li6IWohwMzALuNubiTZS1gjT1CFTv8YtEXFtElVrc1gNg1bI 2AtoaSsKfIoV05LN1ZU4N2ZISN0BWDDIgCD/Py10ABjN/ENcCYiakAQaYyPSsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B3EA54F98; Tue, 5 Jul 2022 20:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 265KtTVw044406; Tue, 5 Jul 2022 20:55:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 265KtT6Q044405; Tue, 5 Jul 2022 20:55:29 GMT (envelope-from git) Date: Tue, 5 Jul 2022 20:55:29 GMT Message-Id: <202207052055.265KtT6Q044405@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 04db4ece5bdc - main - devel/libepoll-shim: update to 0.0.20220703 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04db4ece5bdc66c75c8c4ff557e20a06c99e8bf0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657054529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6lAuKgYRJCGe1oTOwS7MRXhYw41rr/fknRFPx/Iw0pI=; b=B0mG9ccSaTo2cEkzWp9oehdPKEz0YBw34RQsI4K90NhzeLZ+Gszredpxmx8gZRm8rR2YmT 1v2f6IJQit3nYbcnvBI6HmiqAXQezCWzDbvgqZOuSRCdXqKSl7bju2Us8hRtKcPtei63gL HMbOlMYIvt96V5igdykiEAFMemESVoovG/jhYKEdAoc08YK4av7qR1DmJhGaCwwtU9G/dh 9J9KeuUM/zx04pKk0S4FUzWmTwkRiKJWiFq/DAdxJX3us8USMb/FTb/EH7mRzqn8iDolpB lMWiEplBHGXvTzB41qiLP+qMsRg81coIw8dL2U99g7CAMdtYjOE8Er6GpdNgow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657054529; a=rsa-sha256; cv=none; b=rY5bCAlj988m9DdWWDmlSjP+y77JomUl+zhZdWDxm9lRI5ytaQoCCbZbSWLmGyMnPoFMnA mu/35i8XTRPNYr7WxDfrD6qY9d7H9Jb6p28pRkEx+tOCDgPXFFOvZcI0MOTRIcGeWQhtxn cxXmed/vHvVzer1068gfqcV2OTqg5dnl8kXIuYgwysLQ7EWUtEDxPMYfHxgCgyy/DzXWbH /rEo761bLGZwir8zvrQg/7PBrxq6YQvi2udiker7VK4EUuED6SGekEZPn/qW4wR0BcrxPq 32qPOScKlnn5p0Q9QiqkxpIUufAtQ7FvcbPbDKraDY5IqFPu5Imx/fva/R9m1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=04db4ece5bdc66c75c8c4ff557e20a06c99e8bf0 commit 04db4ece5bdc66c75c8c4ff557e20a06c99e8bf0 Author: Jan Beich AuthorDate: 2022-06-07 20:00:01 +0000 Commit: Jan Beich CommitDate: 2022-07-05 20:54:47 +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 Co-authored-by: Hans Petter Selasky --- devel/libepoll-shim/Makefile | 2 +- devel/libepoll-shim/distinfo | 6 +++--- devel/libepoll-shim/pkg-plist | 3 +++ multimedia/libv4l/Makefile | 7 ++++--- multimedia/v4l-utils/Makefile | 1 + sysutils/rshim-user-space/Makefile | 3 ++- sysutils/rshim-user-space/files/patch-configure.ac | 16 ++++++++++++++++ 7 files changed, 30 insertions(+), 8 deletions(-) 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/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..6949114d609b 100644 --- a/multimedia/libv4l/Makefile +++ b/multimedia/libv4l/Makefile @@ -3,6 +3,7 @@ PORTNAME?= libv4l PORTVERSION= 1.23.0 +PORTREVISION?= 0 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/multimedia/v4l-utils/Makefile b/multimedia/v4l-utils/Makefile index d3b68c98c868..ae7a4a51eec7 100644 --- a/multimedia/v4l-utils/Makefile +++ b/multimedia/v4l-utils/Makefile @@ -1,6 +1,7 @@ # Created by: Juergen Lock PORTNAME?= v4l-utils +PORTREVISION= 1 COMMENT= Video4Linux utilities 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\"'")