Date: Mon, 15 Apr 2024 13:09:57 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 83b8a2d57146 - main - multimedia/libv4l: remove false dependency on argp Message-ID: <202404151309.43FD9vXJ067849@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=83b8a2d57146ff9ea2d1f357ba440290124e2198 commit 83b8a2d57146ff9ea2d1f357ba440290124e2198 Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2024-04-15 12:53:15 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2024-04-15 13:07:37 +0000 multimedia/libv4l: remove false dependency on argp libv4l does not need libargp but the configrue script does, work around the configure script --- multimedia/libv4l/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/multimedia/libv4l/Makefile b/multimedia/libv4l/Makefile index f6acdfb90541..5c261d7ad34f 100644 --- a/multimedia/libv4l/Makefile +++ b/multimedia/libv4l/Makefile @@ -2,7 +2,7 @@ PORTNAME?= libv4l PORTVERSION= 1.23.0 -PORTREVISION?= 3 +PORTREVISION?= 4 DISTVERSIONPREFIX= v4l-utils- CATEGORIES= multimedia @@ -26,8 +26,7 @@ WEBCAMDDIR= ${WRKDIR}/webcamd-5.17.1.0 LINUXDIR= ${WRKDIR}/linux-* .if ${PORTNAME} == v4l-utils || ${PORTNAME} == libv4l -LIB_DEPENDS+= libargp.so:devel/argp-standalone \ - libudev.so:devel/libudev-devd +LIB_DEPENDS+= libudev.so:devel/libudev-devd BUILD_DEPENDS+= gsed>0:textproc/gsed \ v4l_compat>=${PORTVERSION}:multimedia/v4l_compat @@ -53,7 +52,8 @@ RUN_DEPENDS+= evdev-proto>=5.3:devel/evdev-proto USES+= perl5 BUILD_DEPENDS+= libv4l>=${PORTVERSION}:multimedia/libv4l LIB_DEPENDS+= libepoll-shim-interpose.so:devel/libepoll-shim \ - libv4l2.so:multimedia/libv4l + libv4l2.so:multimedia/libv4l \ + libargp.so:devel/argp-standalone CPPFLAGS+= `pkg-config --cflags epoll-shim-interpose` LDFLAGS+= `pkg-config --libs epoll-shim-interpose` CONFIGURE_ARGS+= \ @@ -63,7 +63,9 @@ CONFIGURE_ARGS+= \ .if ${PORTNAME} == libv4l CONFIGURE_ENV+= \ - libudev_CFLAGS=" " + libudev_CFLAGS=" " \ + ac_cv_header_argp_h=yes \ + ac_cv_search_argp_parse="none required" CONFIGURE_ARGS+= \ --disable-v4l-utils \ --enable-dyn-libv4l \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404151309.43FD9vXJ067849>