Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 10 Mar 2022 00:28:58 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7c476b8e8535 - main - multimedia/aom: unbreak JXL after 735e0191b649
Message-ID:  <202203100028.22A0Sw6o046391@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7c476b8e8535293af22bae9988dfd56ee4c43224

commit 7c476b8e8535293af22bae9988dfd56ee4c43224
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-03-09 23:22:13 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-03-10 00:28:06 +0000

    multimedia/aom: unbreak JXL after 735e0191b649
---
 multimedia/aom/Makefile | 6 +++---
 multimedia/aom/distinfo | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index b1c1814e3e73..d0f524193d07 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -3,6 +3,9 @@ DISTVERSIONPREFIX=	v
 DISTVERSION=	3.3.0
 CATEGORIES=	multimedia
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	b389ce89bdb6.patch:-p1 # unbreak JXL
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	AV1 reference encoder/decoder
 
@@ -28,9 +31,6 @@ JXL_DESC=		Encoding tuning for Butteraugli
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 JXL_USES=		pkgconfig
 JXL_CMAKE_ON=		-DCONFIG_TUNE_BUTTERAUGLI:STRING=1
-JXL_BROKEN=		fails to build after \
-			https://aomedia.googlesource.com/aom/+/dba4f0f3efda%5E!/ \
-			https://aomedia.googlesource.com/aom/+/b89e8f8f7a2c%5E!/
 
 VMAF_DESC=		Encoding tuning for VMAF
 VMAF_LIB_DEPENDS=	libvmaf.so:multimedia/vmaf
diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo
index 80ef7cafede8..5b86847f970c 100644
--- a/multimedia/aom/distinfo
+++ b/multimedia/aom/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1644909642
 SHA256 (jbeich-aom-v3.3.0_GH0.tar.gz) = 298ced1f5aeed8f7c4e21138eeb646b19486e9c6e2d711640f4ae5822ad330c1
 SIZE (jbeich-aom-v3.3.0_GH0.tar.gz) = 4768166
+SHA256 (b389ce89bdb6.patch) = ce109a4b912c4400a46f09532bf3c059c3a661100cb85b8ae80d22ba64af8875
+SIZE (b389ce89bdb6.patch) = 2392



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203100028.22A0Sw6o046391>