git: 8db5a0b9c26b - main - multimedia/handbrake: update to 1.5.1

From: Piotr Kubaj <pkubaj_at_FreeBSD.org>
Date: Fri, 21 Jan 2022 17:14:44 UTC
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8db5a0b9c26b0ee8ce550f0255cd1743bd9f5614

commit 8db5a0b9c26b0ee8ce550f0255cd1743bd9f5614
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2022-01-21 17:07:57 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2022-01-21 17:07:57 +0000

    multimedia/handbrake: update to 1.5.1
    
    Differential revision:  https://reviews.freebsd.org/D33937
    Submitted by:   naito.yuichiro_gmail.com (maintainer)
---
 multimedia/handbrake/Makefile                      | 27 +++++++++++-----------
 multimedia/handbrake/distinfo                      | 18 +++++++--------
 multimedia/handbrake/files/patch-libhb_module.defs | 15 ++++++++++++
 multimedia/handbrake/pkg-plist                     |  1 +
 4 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index b49af93efa8f..ff69c08b591e 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -1,8 +1,7 @@
 # Created by: Andrew Thompson <andy@fud.org.nz>
 
 PORTNAME=	handbrake
-DISTVERSION=	1.4.2
-PORTREVISION=	1
+DISTVERSION=	1.5.1
 CATEGORIES=	multimedia
 MASTER_SITES=	https://github.com/HandBrake/HandBrake/releases/download/${DISTVERSION}/
 MASTER_SITES+=	https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/:contrib
@@ -47,13 +46,13 @@ USES=		autoreconf:build compiler:c11 gmake iconv libtool:build \
 		localbase:ldflags ninja:build pkgconfig python:3.6+,build
 
 CONTRIB_FILES=	fdk-aac-2.0.1.tar.gz \
-		ffmpeg-4.4.tar.bz2 \
+		ffmpeg-4.4.1.tar.bz2 \
 		libbluray-1.3.0.tar.bz2 \
 		libdvdnav-6.1.1.tar.bz2 \
 		libdvdread-6.1.1.tar.bz2 \
-		dav1d-0.9.0.tar.bz2 \
+		dav1d-0.9.2.tar.bz2 \
 		x265_3.5.tar.gz \
-		zimg-3.0.1.tar.gz
+		zimg-3.0.3.tar.gz
 
 .if !defined(PACKAGE_BUILDING)
 # DVDCSS version hardcoded in contrib/libdvdread/libdvdread-5.0.0-6-gcb1ae87/src/dvd_input.c (dlopen'ed)
@@ -79,16 +78,17 @@ NOPRECIOUSMAKEVARS=	yes			# for ffmpeg and x264
 # Enforce linking to bundled libraries instead of system libraries
 LDFLAGS+=	-L${BUILD_WRKSRC}/contrib/lib
 
-OPTIONS_DEFINE=		FDK_AAC MFX X11
-OPTIONS_DEFAULT=	MFX X11
-OPTIONS_EXCLUDE_powerpc=	MFX
-OPTIONS_EXCLUDE_powerpc64=	MFX
-OPTIONS_EXCLUDE_powerpc64le=	MFX
+OPTIONS_DEFINE=		FDK_AAC VPL X11
+OPTIONS_DEFAULT=	VPL X11
+OPTIONS_EXCLUDE_i386=	VPL
+OPTIONS_EXCLUDE_powerpc=	VPL
+OPTIONS_EXCLUDE_powerpc64=	VPL
+OPTIONS_EXCLUDE_powerpc64le=	VPL
 
 OPTIONS_SUB=	yes
 
 FDK_AAC_DESC=	Enable non-free Fraunhofer FDK AAC codec
-MFX_DESC=	Intel MediaSDK (aka Quick Sync Video)
+VPL_DESC=	Intel oneVPL (aka Quick Sync Video)
 X11_DESC=	Build GTK+3 based GUI program
 
 FDK_AAC_CONFIGURE_ENABLE=	fdk-aac
@@ -97,9 +97,10 @@ LICENSE_NAME_FDK_AAC=		Software License for The Fraunhofer FDK AAC Codec Library
 LICENSE_FILE_FDK_AAC=		${WRKDIR}/${DISTFILES:Mfdk*:R:R}/NOTICE
 LICENSE_PERMS_FDK_AAC=		dist-mirror pkg-mirror auto-accept
 
-MFX_LIB_DEPENDS=	libmfx.so:multimedia/intel-media-sdk \
+VPL_LIB_DEPENDS=	libvpl.so:multimedia/onevpl \
+			libmfx.so:multimedia/intel-media-sdk \
 			libva-drm.so:multimedia/libva
-MFX_CONFIGURE_ON=	--enable-qsv
+VPL_CONFIGURE_ON=	--enable-qsv
 
 X11_CONFIGURE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
 X11_MAKE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
diff --git a/multimedia/handbrake/distinfo b/multimedia/handbrake/distinfo
index ebfef8becaea..aa033bbf2775 100644
--- a/multimedia/handbrake/distinfo
+++ b/multimedia/handbrake/distinfo
@@ -1,19 +1,19 @@
-TIMESTAMP = 1633318002
-SHA256 (handbrake/HandBrake-1.4.2-source.tar.bz2) = 8b8e81b7dc2e3180f4e94e8c7f5337d2953f69f0d983ccce48096e29ed6dfb61
-SIZE (handbrake/HandBrake-1.4.2-source.tar.bz2) = 15991593
+TIMESTAMP = 1642516070
+SHA256 (handbrake/HandBrake-1.5.1-source.tar.bz2) = 3999fe06d5309c819799a73a968a8ec3840e7840c2b64af8f5cdb7fd8c9430f0
+SIZE (handbrake/HandBrake-1.5.1-source.tar.bz2) = 16137974
 SHA256 (handbrake/fdk-aac-2.0.1.tar.gz) = a4142815d8d52d0e798212a5adea54ecf42bcd4eec8092b37a8cb615ace91dc6
 SIZE (handbrake/fdk-aac-2.0.1.tar.gz) = 2488373
-SHA256 (handbrake/ffmpeg-4.4.tar.bz2) = 42093549751b582cf0f338a21a3664f52e0a9fbe0d238d3c992005e493607d0e
-SIZE (handbrake/ffmpeg-4.4.tar.bz2) = 11489948
+SHA256 (handbrake/ffmpeg-4.4.1.tar.bz2) = 8fc9f20ac5ed95115a9e285647add0eedd5cc1a98a039ada14c132452f98ac42
+SIZE (handbrake/ffmpeg-4.4.1.tar.bz2) = 11494996
 SHA256 (handbrake/libbluray-1.3.0.tar.bz2) = e2dbaf99e84e0a9725f4985bcb85d41e52c2261cc651d8884b1b790b5ef016f9
 SIZE (handbrake/libbluray-1.3.0.tar.bz2) = 754069
 SHA256 (handbrake/libdvdnav-6.1.1.tar.bz2) = c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48
 SIZE (handbrake/libdvdnav-6.1.1.tar.bz2) = 367606
 SHA256 (handbrake/libdvdread-6.1.1.tar.bz2) = 3e357309a17c5be3731385b9eabda6b7e3fa010f46022a06f104553bf8e21796
 SIZE (handbrake/libdvdread-6.1.1.tar.bz2) = 392134
-SHA256 (handbrake/dav1d-0.9.0.tar.bz2) = e0cb645f170e7a087bc76e501324177be51a8db21df22ad37b43d289d7d1f7b5
-SIZE (handbrake/dav1d-0.9.0.tar.bz2) = 771739
+SHA256 (handbrake/dav1d-0.9.2.tar.bz2) = 0d198c4fe63fe7f0395b1b17de75b21c8c4508cd3204996229355759efa30ef8
+SIZE (handbrake/dav1d-0.9.2.tar.bz2) = 833722
 SHA256 (handbrake/x265_3.5.tar.gz) = e70a3335cacacbba0b3a20ec6fecd6783932288ebc8163ad74bcc9606477cae8
 SIZE (handbrake/x265_3.5.tar.gz) = 1537044
-SHA256 (handbrake/zimg-3.0.1.tar.gz) = c50a0922f4adac4efad77427d13520ed89b8366eef0ef2fa379572951afcc73f
-SIZE (handbrake/zimg-3.0.1.tar.gz) = 326304
+SHA256 (handbrake/zimg-3.0.3.tar.gz) = 5e002992bfe8b9d2867fdc9266dc84faca46f0bfd931acc2ae0124972b6170a7
+SIZE (handbrake/zimg-3.0.3.tar.gz) = 326585
diff --git a/multimedia/handbrake/files/patch-libhb_module.defs b/multimedia/handbrake/files/patch-libhb_module.defs
new file mode 100644
index 000000000000..43f46e6260c5
--- /dev/null
+++ b/multimedia/handbrake/files/patch-libhb_module.defs
@@ -0,0 +1,15 @@
+--- libhb/module.defs.orig	2022-01-10 19:11:37 UTC
++++ libhb/module.defs
+@@ -46,7 +46,11 @@ LIBHB.GCC.D += __LIBHB__ USE_PTHREAD
+ LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include
+ 
+ ifeq (1,$(FEATURE.qsv))
+-    LIBHB.GCC.I += $(CONTRIB.build/)include/vpl
++    ifeq ($(HOST.system),freebsd))
++        LIBHB.GCC.I += $(LOCALBASE)/include/vpl
++    else
++        LIBHB.GCC.I += $(CONTRIB.build/)include/vpl
++    endif
+ endif
+ 
+ ifneq (,$(filter $(HOST.system),freebsd netbsd))
diff --git a/multimedia/handbrake/pkg-plist b/multimedia/handbrake/pkg-plist
index 38d53da426cb..bed618e8dcb6 100644
--- a/multimedia/handbrake/pkg-plist
+++ b/multimedia/handbrake/pkg-plist
@@ -5,6 +5,7 @@ bin/HandBrakeCLI
 %%X11%%share/icons/hicolor/scalable/apps/hb-icon.svg
 %%X11%%share/icons/hicolor/scalable/apps/fr.handbrake.ghb.svg
 %%X11%%share/locale/af/LC_MESSAGES/ghb.mo
+%%X11%%share/locale/co/LC_MESSAGES/ghb.mo
 %%X11%%share/locale/cs/LC_MESSAGES/ghb.mo
 %%X11%%share/locale/da/LC_MESSAGES/ghb.mo
 %%X11%%share/locale/de/LC_MESSAGES/ghb.mo