From nobody Fri Dec 8 18:14:02 2023 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 4SmzmW089Vz538wM; Fri, 8 Dec 2023 18:14:03 +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 4SmzmV5z51z3ZkG; Fri, 8 Dec 2023 18:14:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702059242; 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=rQVpFlhhg/v4WVjpX0iScP3bTZjouVxR+dlfnZwyBiQ=; b=FlbF+WybcOIVrvt1+261eoC3EohOi2q8WUhFuFHZ6ZvEqCJEvSmqz0+pZH+ZFHwbzsM4hM 2WTl9JOmSO5zl/14GaEMTzAoElrIAbs++wQTPD1ifKQYANg6aU5qiBYTLr5rluXC/fT/ns cnTGwGAPMaE/366pHSt/nqg+t6HWD0/fCp2sj7qIu9tB4ddNLKQs9S1w+OpXxJJwbPLr+N Nk9mkveEtG2zTtdP/X4z12k2ES7GKySsLGn77LG/y8vfoHw+OEuoHiG8JPirJaSEwZtOOm t91we7bj860Re4W16QHhoWt31j2Sq0D1eRRAO8UiyHgvRlNngddi9dTzcF53XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702059242; a=rsa-sha256; cv=none; b=cnfNjJJ7yoAFRko1RG4hvmwEJCrH4cu1Ngt71UpAf9GMjiL44a2srSj42C3nq1goaC9k+z wUnWOR9duHT4TPRftGCFYSgZ19jAyEZmebZ4RpdibnBzwqnljDmYBjebrMtk3aXSNNYKRc Z/bMT4Urvr1D3h6LzE1rc0trcI0MJ3GCtIj3jNA9q9EBxeOHO8twmnP/uMFM58ZBZB2MRH r2VyeuzGO1YHscL/v5/yW52Dt04sredv6K+76jMZG/yfMN5adsplUdrE2GvRGLak8kkIPw k9fPA3Lo4G2pL8XoJ46ucHlD1iBPDXO0cksymCu9zsVXUgfUJJdnMC5gba6NGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702059242; 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=rQVpFlhhg/v4WVjpX0iScP3bTZjouVxR+dlfnZwyBiQ=; b=rse91w2ghhwHHr1soeUrpfb33hEQb4PyZxqGpKDHcGCqIwxzV82IHKYs9+ueBNcyxCtLn8 wwDhwnUQyt2oZCt9ElqgMY7hyLHWkuwR6++QZo4RiZKqb1bvh/18R0kTfizHa6Sj8jZBLJ X5u/UESz7zmREO2UojPyLgUBegHUR2RN+JqdfKikTg4H9vt3A/ihOL8OPUlK+gsN02NXkx FHTjt+7MGeqH2aVypraCuBtsL8W3FipqlGbLTOSBbAHvFM4V5t+OUN9Zt8l1MKzYJk/YTh r3q6li6W8DcIvAwOh97a0iuFFWvwiqyL1tN9M7amJqN6mTqvToG0QZniA2BQtg== 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 4SmzmV4TdQzXHZ; Fri, 8 Dec 2023 18:14:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B8IE2vO035170; Fri, 8 Dec 2023 18:14:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B8IE2ZP035167; Fri, 8 Dec 2023 18:14:02 GMT (envelope-from git) Date: Fri, 8 Dec 2023 18:14:02 GMT Message-Id: <202312081814.3B8IE2ZP035167@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 8d620ddb78b6 - main - multimedia/handbrake: Update version 1.6.1=>1.7.1 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d620ddb78b6b8531b273a590c2372653c9fb527 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=8d620ddb78b6b8531b273a590c2372653c9fb527 commit 8d620ddb78b6b8531b273a590c2372653c9fb527 Author: Yuichiro NAITO AuthorDate: 2023-12-08 17:39:43 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-12-08 18:13:49 +0000 multimedia/handbrake: Update version 1.6.1=>1.7.1 Changelog: https://github.com/HandBrake/HandBrake/releases/tag/1.7.1 PR: 275546 Approved by: submitter is maintainer --- multimedia/handbrake/Makefile | 21 ++++++++-------- multimedia/handbrake/distinfo | 28 ++++++++++++---------- .../files/patch-contrib_x265__10bit_module.defs | 13 ---------- .../files/patch-contrib_x265__12bit_module.defs | 13 ---------- multimedia/handbrake/files/patch-libhb_nlmeans.c | 11 --------- .../handbrake/files/patch-libhb_nlmeans__x86.c | 11 --------- .../handbrake/files/patch-scripts_repo-info.sh | 8 +++---- multimedia/handbrake/pkg-plist | 9 ++++--- 8 files changed, 33 insertions(+), 81 deletions(-) diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index 6a4c24203b1a..063db57fd14f 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -1,6 +1,5 @@ PORTNAME= handbrake -DISTVERSION= 1.6.1 -PORTREVISION= 3 +DISTVERSION= 1.7.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 @@ -15,12 +14,13 @@ WWW= https://handbrake.fr/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 powerpc64le +ONLY_FOR_ARCHS= amd64 powerpc powerpc64 powerpc64le BUILD_DEPENDS= bash:shells/bash \ nasm:devel/nasm \ cmake:devel/cmake-core \ - meson:devel/meson + meson:devel/meson \ + git:devel/git@lite LIB_DEPENDS= libdbus-1.so:devel/dbus \ libgudev-1.0.so:devel/libgudev \ libharfbuzz.so:print/harfbuzz \ @@ -45,15 +45,16 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \ USES= autoreconf:build compiler:c11 gmake iconv libtool:build \ localbase:ldflags ninja:build pkgconfig python:build -CONTRIB_FILES= SVT-AV1-v1.4.1.tar.gz \ +CONTRIB_FILES= SVT-AV1-v1.7.0.tar.gz \ fdk-aac-2.0.2.tar.gz \ - ffmpeg-5.1.2.tar.bz2 \ + ffmpeg-6.1.tar.bz2 \ libbluray-1.3.4.tar.bz2 \ libdvdnav-6.1.1.tar.bz2 \ libdvdread-6.1.3.tar.bz2 \ - dav1d-1.0.0.tar.bz2 \ - x265-snapshot-20221130-12747.tar.gz \ - zimg-3.0.4.tar.gz + dav1d-1.3.0.tar.bz2 \ + dovi_tool-libdovi-3.1.2.tar.gz \ + x265-snapshot-20230403-12776.tar.gz \ + zimg-3.0.5.tar.gz .if !defined(PACKAGE_BUILDING) # DVDCSS version hardcoded in contrib/libdvdread/libdvdread-5.0.0-6-gcb1ae87/src/dvd_input.c (dlopen'ed) @@ -81,7 +82,6 @@ LDFLAGS+= -L${BUILD_WRKSRC}/contrib/lib 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 @@ -105,7 +105,6 @@ VPL_CONFIGURE_ON= --enable-qsv X11_CONFIGURE_ENV= COMPILER_PATH=${LOCALBASE}/bin X11_MAKE_ENV= COMPILER_PATH=${LOCALBASE}/bin -X11_CONFIGURE_ON= --disable-gtk-update-checks X11_CONFIGURE_OFF= --disable-gtk X11_LIB_DEPENDS= libvpx.so:multimedia/libvpx \ libnotify.so:devel/libnotify diff --git a/multimedia/handbrake/distinfo b/multimedia/handbrake/distinfo index 212ab79a37ea..83ce3b03fe57 100644 --- a/multimedia/handbrake/distinfo +++ b/multimedia/handbrake/distinfo @@ -1,21 +1,23 @@ -TIMESTAMP = 1674806008 -SHA256 (handbrake/HandBrake-1.6.1-source.tar.bz2) = 94ccfe03db917a91650000c510f7fd53f844da19f19ad4b4be1b8f6bc31a8d4c -SIZE (handbrake/HandBrake-1.6.1-source.tar.bz2) = 15934833 -SHA256 (handbrake/SVT-AV1-v1.4.1.tar.gz) = e3f7fc194afc6c90b43e0b80fa24c09940cb03bea394e0e1f5d1ded18e9ab23f -SIZE (handbrake/SVT-AV1-v1.4.1.tar.gz) = 10105880 +TIMESTAMP = 1701225459 +SHA256 (handbrake/HandBrake-1.7.1-source.tar.bz2) = 733e42c8f254f6c2f8f6b40f0d3572fd49167ebf30742beae605effa16939edc +SIZE (handbrake/HandBrake-1.7.1-source.tar.bz2) = 16184405 +SHA256 (handbrake/SVT-AV1-v1.7.0.tar.gz) = ce0973584f1a187aa4abf63f509ff8464397120878e322a3153f87e9c161fc4f +SIZE (handbrake/SVT-AV1-v1.7.0.tar.gz) = 10164910 SHA256 (handbrake/fdk-aac-2.0.2.tar.gz) = 7812b4f0cf66acda0d0fe4302545339517e702af7674dd04e5fe22a5ade16a90 SIZE (handbrake/fdk-aac-2.0.2.tar.gz) = 2506597 -SHA256 (handbrake/ffmpeg-5.1.2.tar.bz2) = 39a0bcc8d98549f16c570624678246a6ac736c066cebdb409f9502e915b22f2b -SIZE (handbrake/ffmpeg-5.1.2.tar.bz2) = 12074437 +SHA256 (handbrake/ffmpeg-6.1.tar.bz2) = eb7da3de7dd3ce48a9946ab447a7346bd11a3a85e6efb8f2c2ce637e7f547611 +SIZE (handbrake/ffmpeg-6.1.tar.bz2) = 12637240 SHA256 (handbrake/libbluray-1.3.4.tar.bz2) = 478ffd68a0f5dde8ef6ca989b7f035b5a0a22c599142e5cd3ff7b03bbebe5f2b SIZE (handbrake/libbluray-1.3.4.tar.bz2) = 756323 SHA256 (handbrake/libdvdnav-6.1.1.tar.bz2) = c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48 SIZE (handbrake/libdvdnav-6.1.1.tar.bz2) = 367606 SHA256 (handbrake/libdvdread-6.1.3.tar.bz2) = ce35454997a208cbe50e91232f0e73fb1ac3471965813a13b8730a8f18a15369 SIZE (handbrake/libdvdread-6.1.3.tar.bz2) = 395439 -SHA256 (handbrake/dav1d-1.0.0.tar.bz2) = 4a4eb6cecbc8c26916ef58886d478243de8bcc46710b369c04d6891b0155ac0f -SIZE (handbrake/dav1d-1.0.0.tar.bz2) = 960470 -SHA256 (handbrake/x265-snapshot-20221130-12747.tar.gz) = 1a2418fd757a3d92928acacef2ae8ddb71f7aecc8803890eacb55f6e3a62bba5 -SIZE (handbrake/x265-snapshot-20221130-12747.tar.gz) = 1615531 -SHA256 (handbrake/zimg-3.0.4.tar.gz) = 219d1bc6b7fde1355d72c9b406ebd730a4aed9c21da779660f0a4c851243e32f -SIZE (handbrake/zimg-3.0.4.tar.gz) = 326578 +SHA256 (handbrake/dav1d-1.3.0.tar.bz2) = bde8db3d0583a4f3733bb5a4ac525556ffd03ab7dcd8a6e7c091bee28d9466b1 +SIZE (handbrake/dav1d-1.3.0.tar.bz2) = 1033699 +SHA256 (handbrake/dovi_tool-libdovi-3.1.2.tar.gz) = 3c74f8f6afdb7d4be97210df201a28a48676b2ebe10c20961176e81e2fd98c36 +SIZE (handbrake/dovi_tool-libdovi-3.1.2.tar.gz) = 450556 +SHA256 (handbrake/x265-snapshot-20230403-12776.tar.gz) = 23898695c5520e9e971d12e88125d5ad03ad67f462fc8ecaa016b48adad7cb20 +SIZE (handbrake/x265-snapshot-20230403-12776.tar.gz) = 1622414 +SHA256 (handbrake/zimg-3.0.5.tar.gz) = a9a0226bf85e0d83c41a8ebe4e3e690e1348682f6a2a7838f1b8cbff1b799bcf +SIZE (handbrake/zimg-3.0.5.tar.gz) = 326694 diff --git a/multimedia/handbrake/files/patch-contrib_x265__10bit_module.defs b/multimedia/handbrake/files/patch-contrib_x265__10bit_module.defs deleted file mode 100644 index 97a275e16f8b..000000000000 --- a/multimedia/handbrake/files/patch-contrib_x265__10bit_module.defs +++ /dev/null @@ -1,13 +0,0 @@ ---- contrib/x265_10bit/module.defs.orig 2022-12-28 17:43:46.000000000 +0900 -+++ contrib/x265_10bit/module.defs 2022-12-30 15:14:26.792279000 +0900 -@@ -16,6 +16,10 @@ - X265_10.CONFIGURE.shared = -DENABLE_SHARED=OFF - X265_10.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy - -+ifneq (x86_64,$(BUILD.machine)) -+ X265_10.CONFIGURE.extra += -DENABLE_ASSEMBLY=0 -+endif -+ - ifneq (1,$(FEATURE.numa)) - X265_10.CONFIGURE.extra += -DENABLE_LIBNUMA=OFF - endif diff --git a/multimedia/handbrake/files/patch-contrib_x265__12bit_module.defs b/multimedia/handbrake/files/patch-contrib_x265__12bit_module.defs deleted file mode 100644 index 0c8707c9b66e..000000000000 --- a/multimedia/handbrake/files/patch-contrib_x265__12bit_module.defs +++ /dev/null @@ -1,13 +0,0 @@ ---- contrib/x265_12bit/module.defs.orig 2022-12-28 17:43:46.000000000 +0900 -+++ contrib/x265_12bit/module.defs 2022-12-30 15:15:35.013585000 +0900 -@@ -16,6 +16,10 @@ - X265_12.CONFIGURE.shared = -DENABLE_SHARED=OFF - X265_12.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DMAIN12=ON -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy - -+ifneq (x86_64,$(BUILD.machine)) -+ X265_12.CONFIGURE.extra += -DENABLE_ASSEMBLY=0 -+endif -+ - ifneq (1,$(FEATURE.numa)) - X265_12.CONFIGURE.extra += -DENABLE_LIBNUMA=OFF - endif diff --git a/multimedia/handbrake/files/patch-libhb_nlmeans.c b/multimedia/handbrake/files/patch-libhb_nlmeans.c deleted file mode 100644 index 31247216dbac..000000000000 --- a/multimedia/handbrake/files/patch-libhb_nlmeans.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libhb/nlmeans.c.orig 2022-12-28 17:43:46.000000000 +0900 -+++ libhb/nlmeans.c 2022-12-30 17:08:30.322878000 +0900 -@@ -241,7 +241,7 @@ - pv->nlmeans_prefilter = nlmeans_prefilter_8; - pv->nlmeans_deborder = nlmeans_deborder_8; - pv->nlmeans_plane = nlmeans_plane_8; -- #if defined(ARCH_X86) -+ #if defined(ARCH_X86_64) - nlmeans_init_x86(functions); - #endif - break; diff --git a/multimedia/handbrake/files/patch-libhb_nlmeans__x86.c b/multimedia/handbrake/files/patch-libhb_nlmeans__x86.c deleted file mode 100644 index 2c5049ed62db..000000000000 --- a/multimedia/handbrake/files/patch-libhb_nlmeans__x86.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libhb/nlmeans_x86.c.orig 2022-12-28 17:43:46.000000000 +0900 -+++ libhb/nlmeans_x86.c 2022-12-30 15:25:11.147350000 +0900 -@@ -10,7 +10,7 @@ - - #include "handbrake/handbrake.h" // needed for ARCH_X86 - --#if defined(ARCH_X86) -+#if defined(ARCH_X86_64) - - #include - diff --git a/multimedia/handbrake/files/patch-scripts_repo-info.sh b/multimedia/handbrake/files/patch-scripts_repo-info.sh index e00f06222ddd..5cfac8c244fd 100644 --- a/multimedia/handbrake/files/patch-scripts_repo-info.sh +++ b/multimedia/handbrake/files/patch-scripts_repo-info.sh @@ -1,11 +1,11 @@ ---- scripts/repo-info.sh.orig 2021-08-15 11:58:50 UTC +--- scripts/repo-info.sh.orig 2023-11-12 12:42:45 UTC +++ scripts/repo-info.sh @@ -1,7 +1,7 @@ - #!/usr/bin/env bash + #!/bin/sh # # Retrieves git repository info for directory ${1} using command ${2} - +exit 1 - function repo_info() + repo_info() { - local repo_dir git_exe commit upstream err + # Process args diff --git a/multimedia/handbrake/pkg-plist b/multimedia/handbrake/pkg-plist index c185d647a973..58dff1638400 100644 --- a/multimedia/handbrake/pkg-plist +++ b/multimedia/handbrake/pkg-plist @@ -2,20 +2,23 @@ bin/HandBrakeCLI %%X11%%bin/ghb %%X11%%bin/HandBrake %%X11%%share/applications/fr.handbrake.ghb.desktop -%%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/bg/LC_MESSAGES/ghb.mo +%%X11%%share/locale/ca/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 %%X11%%share/locale/es/LC_MESSAGES/ghb.mo %%X11%%share/locale/eu/LC_MESSAGES/ghb.mo +%%X11%%share/locale/fi/LC_MESSAGES/ghb.mo %%X11%%share/locale/fr/LC_MESSAGES/ghb.mo %%X11%%share/locale/he/LC_MESSAGES/ghb.mo %%X11%%share/locale/hr/LC_MESSAGES/ghb.mo %%X11%%share/locale/it/LC_MESSAGES/ghb.mo %%X11%%share/locale/ja/LC_MESSAGES/ghb.mo +%%X11%%share/locale/ka/LC_MESSAGES/ghb.mo %%X11%%share/locale/ko/LC_MESSAGES/ghb.mo %%X11%%share/locale/nl/LC_MESSAGES/ghb.mo %%X11%%share/locale/no/LC_MESSAGES/ghb.mo @@ -33,8 +36,4 @@ bin/HandBrakeCLI %%X11%%share/locale/uk_UA/LC_MESSAGES/ghb.mo %%X11%%share/locale/zh_CN/LC_MESSAGES/ghb.mo %%X11%%share/locale/zh_TW/LC_MESSAGES/ghb.mo -%%X11%%share/locale/bg/LC_MESSAGES/ghb.mo -%%X11%%share/locale/ca/LC_MESSAGES/ghb.mo -%%X11%%share/locale/fi/LC_MESSAGES/ghb.mo -%%X11%%share/locale/ka/LC_MESSAGES/ghb.mo %%X11%%share/metainfo/fr.handbrake.ghb.metainfo.xml