svn commit: r531199 - in head/multimedia: libv4l v4l-utils v4l_compat
Hans Petter Selasky
hselasky at FreeBSD.org
Thu Apr 9 10:38:13 UTC 2020
Author: hselasky
Date: Thu Apr 9 10:38:12 2020
New Revision: 531199
URL: https://svnweb.freebsd.org/changeset/ports/531199
Log:
Use PORTNAME to distinguish among the Video4Linux sub-ports.
This reduces duplicated variable information.
Approved by: pi (implicit)
Modified:
head/multimedia/libv4l/Makefile
head/multimedia/v4l-utils/Makefile
head/multimedia/v4l_compat/Makefile
Modified: head/multimedia/libv4l/Makefile
==============================================================================
--- head/multimedia/libv4l/Makefile Thu Apr 9 10:35:02 2020 (r531198)
+++ head/multimedia/libv4l/Makefile Thu Apr 9 10:38:12 2020 (r531199)
@@ -17,12 +17,10 @@ COMMENT?= Video4Linux library
LICENSE= GPLv2 LGPL21
LICENSE_COMB= dual
-LIBV4L_SLAVE?= no
-
USES= tar:bzip2
WRKSRC= ${WRKDIR}/v4l-utils-${PORTVERSION}
-.if ${LIBV4L_SLAVE} != compat
+.if ${PORTNAME} == v4l-utils || ${PORTNAME} == libv4l
BUILD_DEPENDS+= v4l_compat>=${PORTVERSION}:multimedia/v4l_compat
GNU_CONFIGURE= yes
@@ -35,7 +33,7 @@ CONFIGURE_ARGS= --enable-libdvbv5 \
--without-libudev
INSTALL_TARGET= install-strip
-. if ${LIBV4L_SLAVE} == utils
+. if ${PORTNAME} == v4l-utils
BUILD_DEPENDS+= libv4l>=${PORTVERSION}:multimedia/libv4l
LIB_DEPENDS+= libargp.so:devel/argp-standalone \
libv4l2.so:multimedia/libv4l
@@ -64,7 +62,7 @@ post-patch:
s|__u16|uint16_t|g; s|__s16|int16_t|g; \
s|__u32|uint32_t|g; s|__s32|int32_t|g; \
s|__u64|uint64_t|g; s|__s64|int64_t|g'
-.if ${LIBV4L_SLAVE} == compat
+.if ${PORTNAME} == v4l_compat
.for patch in ${HEADER_PATCHES}
@cd ${WRKDIR}/linux && ${PATCH} -p2 < ${FILESDIR}/${patch}
.endfor
Modified: head/multimedia/v4l-utils/Makefile
==============================================================================
--- head/multimedia/v4l-utils/Makefile Thu Apr 9 10:35:02 2020 (r531198)
+++ head/multimedia/v4l-utils/Makefile Thu Apr 9 10:38:12 2020 (r531199)
@@ -9,7 +9,6 @@ COMMENT= Video4Linux utilities
MASTERDIR= ${.CURDIR}/../libv4l
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-LIBV4L_SLAVE= utils
INSTALL_WRKSRC= ${WRKSRC}/utils
Modified: head/multimedia/v4l_compat/Makefile
==============================================================================
--- head/multimedia/v4l_compat/Makefile Thu Apr 9 10:35:02 2020 (r531198)
+++ head/multimedia/v4l_compat/Makefile Thu Apr 9 10:38:12 2020 (r531199)
@@ -12,7 +12,6 @@ MASTERDIR= ${.CURDIR}/../libv4l
EXTRADIR= ${WRKSRC}/../linux
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
-LIBV4L_SLAVE= compat
BASE_HEADERS= ivtv.h v4l2-controls.h \
v4l2-common.h videodev2.h
More information about the svn-ports-all
mailing list