git: 3ea002fded27 - main - graphics/libjxl: replace fc75da3a3b2a with upstream version

[Jan Beich]

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3ea002fded27752e45b2bc4674a3685ef1206451

commit 3ea002fded27752e45b2bc4674a3685ef1206451
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-10-01 14:41:25 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
CommitDate: 2021-10-01 14:56:29 +0000

    graphics/libjxl: replace fc75da3a3b2a with upstream version
---
 graphics/libjxl/Makefile                     |  1 +
 graphics/libjxl/distinfo                     |  2 ++
 graphics/libjxl/files/patch-tools_cpu_cpu.cc | 13 -------------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/graphics/libjxl/Makefile b/graphics/libjxl/Makefile
index 41b39880038f..b2a8fbd19ca9 100644
--- a/graphics/libjxl/Makefile
+++ b/graphics/libjxl/Makefile
@@ -6,6 +6,7 @@ CATEGORIES=	graphics
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	adb32f3f8f37.patch:-p1 # https://github.com/libjxl/libjxl/pull/193
+PATCHFILES+=	c31dca74e68f.patch:-p1 # https://github.com/libjxl/libjxl/pull/678
 
 MAINTAINER=	jbeich at FreeBSD.org
 COMMENT=	JPEG XL reference encoder/decoder
diff --git a/graphics/libjxl/distinfo b/graphics/libjxl/distinfo
index 0d172b9ad2a9..5423c2969adb 100644
--- a/graphics/libjxl/distinfo
+++ b/graphics/libjxl/distinfo
@@ -11,3 +11,5 @@ SHA256 (webmproject-sjpeg-868ab55_GH0.tar.gz) = ffe757b376fed2fd94473f8625c25f82
 SIZE (webmproject-sjpeg-868ab55_GH0.tar.gz) = 2472084
 SHA256 (adb32f3f8f37.patch) = 52e4fd7e1bce238731a9a1a0b1c9124624c6f85766d3debaf2d2e0f017471692
 SIZE (adb32f3f8f37.patch) = 5664
+SHA256 (c31dca74e68f.patch) = c6a1412d73f1ee156d4cc978fde7e5ec91e62bae9946ebb38a5e78be7f93a253
+SIZE (c31dca74e68f.patch) = 767
diff --git a/graphics/libjxl/files/patch-tools_cpu_cpu.cc b/graphics/libjxl/files/patch-tools_cpu_cpu.cc
deleted file mode 100644
index 6a50f6aa0951..000000000000
--- a/graphics/libjxl/files/patch-tools_cpu_cpu.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- tools/cpu/cpu.cc.orig	2021-09-30 15:38:45 UTC
-+++ tools/cpu/cpu.cc
-@@ -19,7 +19,9 @@
- #endif
- 
- #if JXL_ARCH_PPC
--#include <sys/platform/ppc.h>  // __ppc_get_timebase_freq
-+#if linux
-+#include <sys/platform/ppc.h>  // NOLINT __ppc_get_timebase_freq
-+#endif
- #endif
- 
- #if JXL_ARCH_ARM