diff --git a/multimedia/libv4l/Makefile b/multimedia/libv4l/Makefile index 7c0a122b415e..d838a52f8dd7 100644 --- a/multimedia/libv4l/Makefile +++ b/multimedia/libv4l/Makefile @@ -1,124 +1,124 @@ # Created by: Andrew Thompson # Check v4l_compat and v4l-utils slave ports PORTNAME?= libv4l PORTVERSION= 1.20.0 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v4l-utils- CATEGORIES= multimedia MAINTAINER= multimedia@FreeBSD.org COMMENT?= Video4Linux library LICENSE= GPLv2 LGPL21 LICENSE_COMB= dual USES= compiler:c11 tar:bzip2 USE_GITHUB= yes GH_ACCOUNT= hselasky GH_PROJECT= v4l-utils -GH_TUPLE= hselasky:webcamd:v5.10.6.0:webcamd \ - torvalds:linux:v5.10-rc6:linux +GH_TUPLE= hselasky:webcamd:v5.13.2.2:webcamd \ + torvalds:linux:v5.13-rc2:linux -WEBCAMDDIR= ${WRKDIR}/webcamd-5.10.6.0 +WEBCAMDDIR= ${WRKDIR}/webcamd-5.13.2.2 LINUXDIR= ${WRKDIR}/linux-* .if ${PORTNAME} == v4l-utils || ${PORTNAME} == libv4l LIB_DEPENDS+= libargp.so:devel/argp-standalone \ libudev.so:devel/libudev-devd BUILD_DEPENDS+= gsed>0:textproc/gsed \ v4l_compat>=${PORTVERSION}:multimedia/v4l_compat GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USES+= autoreconf gettext-tools gmake iconv jpeg libtool pathfix pkgconfig USE_LDCONFIG= yes CONFIGURE_ARGS= \ --disable-qv4l2 \ --disable-qvidcap \ --disable-nls BINARY_ALIAS= sed=gsed INSTALL_TARGET= install-strip .endif .if ${PORTNAME} == v4l_compat RUN_DEPENDS+= evdev-proto>=5.3:devel/evdev-proto .endif .if ${PORTNAME} == v4l-utils USES+= perl5 BUILD_DEPENDS+= libv4l>=${PORTVERSION}:multimedia/libv4l LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim \ libv4l2.so:multimedia/libv4l CPPFLAGS+= -I${LOCALBASE}/include/libepoll-shim LDFLAGS+= -lepoll-shim CONFIGURE_ARGS+= \ --enable-v4l-utils \ --without-v4l2-compliance .endif .if ${PORTNAME} == libv4l CONFIGURE_ENV+= \ libudev_CFLAGS=" " CONFIGURE_ARGS+= \ --disable-v4l-utils \ --enable-dyn-libv4l \ --enable-libdvbv5 .endif post-patch: # Remove old FreeBSD include files (to be removed upstream) @${RM} -r ${WRKSRC}/contrib/freebsd/include/* # Create symbolic link for Linux sources @(${RM} -r ${WEBCAMDDIR}/media_tree && ${LN} -s ${LINUXDIR} ${WEBCAMDDIR}/media_tree) # Apply webcamd patches first @(cd ${WEBCAMDDIR}/patches && ${SH} ./do_patch.sh) # Patch all source files @${FIND} ${WRKSRC} ${LINUXDIR}/include/uapi \ -type f \( -iname "*.[ch]" -or -iname "*.cpp" -or -iname "cec-gen.pl" \) | \ ${XARGS} -n 10 ${REINPLACE_CMD} \ -e 's|__inline__|inline|g' \ -e 's|__u8|uint8_t|g' \ -e 's|__s8|int8_t|g' \ -e 's|__le16|uint16_t|g' \ -e 's|__be16|uint16_t|g' \ -e 's|__u16|uint16_t|g' \ -e 's|__s16|int16_t|g' \ -e 's|__le32|uint32_t|g' \ -e 's|__be32|uint32_t|g' \ -e 's|__u32|uint32_t|g' \ -e 's|__s32|int32_t|g' \ -e 's|__le64|uint64_t|g' \ -e 's|__be64|uint64_t|g' \ -e 's|__u64|uint64_t|g' \ -e 's|__s64|int64_t|g' \ -e 's|uint16_t_to_cpu|letoh16|g' \ -e 's|uint32_t_to_cpu|letoh32|g' \ -e 's|uint64_t_to_cpu|letoh64|g' \ -e 's|error_t|int|g' \ -e 's|"gettext.h"||g' \ -e 's|MSG_MORE|0|g' \ -e 's|EBADR|EFAULT|g' \ -e 's|ENONET|EHOSTDOWN|g' \ -e 's|_IOC_READ|IOC_OUT|g' \ -e 's|_IOC_WRITE|IOC_IN|g' \ -e 's|_IOC_NONE|IOC_VOID|g' \ -e 's|||g' \ -e 's|||g' \ -e 's|"compiler.h"||g' \ -e 's|fallthrough;|;|g' \ -e 's|||g' \ -e 's|||g' \ -e '/^.*\.*/d' \ -e 's|||g' \ -e 's|||g' \ -e 's|||g' \ -e 's|||g' \ -e 's|||g' \ -e 's|/usr/bin/perl|${LOCALBASE}/bin/perl|g' \ -e 's|__user||g' .include diff --git a/multimedia/libv4l/distinfo b/multimedia/libv4l/distinfo index dc24e83fe587..823b0339e0ae 100644 --- a/multimedia/libv4l/distinfo +++ b/multimedia/libv4l/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1606936269 +TIMESTAMP = 1621686769 SHA256 (hselasky-v4l-utils-v4l-utils-1.20.0_GH0.tar.gz) = 1a2bcc1fa5182f718c982c6ee58d0756dca602639ab6b9a9caff021272b33646 SIZE (hselasky-v4l-utils-v4l-utils-1.20.0_GH0.tar.gz) = 1620489 -SHA256 (hselasky-webcamd-v5.10.6.0_GH0.tar.gz) = e6c2627130c369fa6cb0a2b30850ccd44735f755127677be457bc5a783b7b3e2 -SIZE (hselasky-webcamd-v5.10.6.0_GH0.tar.gz) = 267471 -SHA256 (torvalds-linux-v5.10-rc6_GH0.tar.gz) = d139d4cc8eb8b27364adc774c0df0feac39389beb4357a36d628a48c92fed393 -SIZE (torvalds-linux-v5.10-rc6_GH0.tar.gz) = 185316277 +SHA256 (hselasky-webcamd-v5.13.2.2_GH0.tar.gz) = a9164a5731be35c5f79aecf8ccbd0e11d3ea7e1a29f81b356def5b08954bacb1 +SIZE (hselasky-webcamd-v5.13.2.2_GH0.tar.gz) = 272186 +SHA256 (torvalds-linux-v5.13-rc2_GH0.tar.gz) = 34673cea88f7e5399b704bcacc088b3f14f5800dadf04af6a90b19c35ad3777f +SIZE (torvalds-linux-v5.13-rc2_GH0.tar.gz) = 192612873 diff --git a/multimedia/libv4l/files/patch-utils_common_fwht-ctrls.h b/multimedia/libv4l/files/patch-utils_common_fwht-ctrls.h new file mode 100644 index 000000000000..d1518d1f70a4 --- /dev/null +++ b/multimedia/libv4l/files/patch-utils_common_fwht-ctrls.h @@ -0,0 +1,24 @@ +--- utils/common/fwht-ctrls.h.orig 2021-05-22 12:52:28 UTC ++++ utils/common/fwht-ctrls.h +@@ -11,21 +11,6 @@ + #ifndef _FWHT_CTRLS_H_ + #define _FWHT_CTRLS_H_ + +-#define V4L2_CTRL_TYPE_FWHT_PARAMS 0x0105 +- + #define V4L2_CID_MPEG_VIDEO_FWHT_PARAMS (V4L2_CID_MPEG_BASE + 292) +- +-struct v4l2_ctrl_fwht_params { +- __u64 backward_ref_ts; +- __u32 version; +- __u32 width; +- __u32 height; +- __u32 flags; +- __u32 colorspace; +- __u32 xfer_func; +- __u32 ycbcr_enc; +- __u32 quantization; +-}; +- + + #endif