From 8dddba70191e258bd9130f6294002bcd214ad3d3 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Wed, 16 Jun 2021 23:46:02 +0000 Subject: graphics/libjxl: unbreak with libc++ 12 In file included from tools/cpu/os_specific.cc:60: /usr/include/sys/cpuset.h:153:12: error: unknown type name 'cpusetid_t' int cpuset(cpusetid_t *); ^ /usr/include/sys/cpuset.h:154:18: error: unknown type name 'cpuwhich_t'; did you mean '__cpuwhich_t'? int cpuset_setid(cpuwhich_t, id_t, cpusetid_t); ^ /usr/include/sys/_types.h:146:14: note: '__cpuwhich_t' declared here typedef int __cpuwhich_t; /* which parameter for cpuset. */ ^ In file included from tools/cpu/os_specific.cc:60: /usr/include/sys/cpuset.h:154:30: error: unknown type name 'id_t'; did you mean 'pid_t'? int cpuset_setid(cpuwhich_t, id_t, cpusetid_t); ^ /usr/include/time.h:95:18: note: 'pid_t' declared here typedef __pid_t pid_t; ^ In file included from tools/cpu/os_specific.cc:60: /usr/include/sys/cpuset.h:154:36: error: unknown type name 'cpusetid_t' int cpuset_setid(cpuwhich_t, id_t, cpusetid_t); ^ /usr/include/sys/cpuset.h:155:18: error: unknown type name 'cpulevel_t'; did you mean '__cpulevel_t'? int cpuset_getid(cpulevel_t, cpuwhich_t, id_t, cpusetid_t *); ^ /usr/include/sys/_types.h:147:14: note: '__cpulevel_t' declared here typedef int __cpulevel_t; /* level parameter for cpuset. */ ^ In file included from tools/cpu/os_specific.cc:60: /usr/include/sys/cpuset.h:155:30: error: unknown type name 'cpuwhich_t'; did you mean '__cpuwhich_t'? int cpuset_getid(cpulevel_t, cpuwhich_t, id_t, cpusetid_t *); ^ /usr/include/sys/_types.h:146:14: note: '__cpuwhich_t' declared here typedef int __cpuwhich_t; /* which parameter for cpuset. */ ^ In file included from tools/cpu/os_specific.cc:60: /usr/include/sys/cpuset.h:155:42: error: unknown type name 'id_t'; did you mean 'pid_t'? int cpuset_getid(cpulevel_t, cpuwhich_t, id_t, cpusetid_t *); ^ /usr/include/time.h:95:18: note: 'pid_t' declared here typedef __pid_t pid_t; ^ In file included from tools/cpu/os_specific.cc:60: /usr/include/sys/cpuset.h:155:48: error: unknown type name 'cpusetid_t' int cpuset_getid(cpulevel_t, cpuwhich_t, id_t, cpusetid_t *); ^ /usr/include/sys/cpuset.h:156:24: error: unknown type name 'cpulevel_t'; did you mean '__cpulevel_t'? int cpuset_getaffinity(cpulevel_t, cpuwhich_t, id_t, size_t, cpuset_t *); ^ /usr/include/sys/_types.h:147:14: note: '__cpulevel_t' declared here typedef int __cpulevel_t; /* level parameter for cpuset. */ ^ In file included from tools/cpu/os_specific.cc:60: /usr/include/sys/cpuset.h:156:36: error: unknown type name 'cpuwhich_t'; did you mean '__cpuwhich_t'? int cpuset_getaffinity(cpulevel_t, cpuwhich_t, id_t, size_t, cpuset_t *); ^ /usr/include/sys/_types.h:146:14: note: '__cpuwhich_t' declared here typedef int __cpuwhich_t; /* which parameter for cpuset. */ ^ In file included from tools/cpu/os_specific.cc:60: /usr/include/sys/cpuset.h:156:48: error: unknown type name 'id_t'; did you mean 'pid_t'? int cpuset_getaffinity(cpulevel_t, cpuwhich_t, id_t, size_t, cpuset_t *); ^ /usr/include/time.h:95:18: note: 'pid_t' declared here typedef __pid_t pid_t; ^ In file included from tools/cpu/os_specific.cc:60: /usr/include/sys/cpuset.h:157:24: error: unknown type name 'cpulevel_t'; did you mean '__cpulevel_t'? int cpuset_setaffinity(cpulevel_t, cpuwhich_t, id_t, size_t, const cpuset_t *); ^ /usr/include/sys/_types.h:147:14: note: '__cpulevel_t' declared here typedef int __cpulevel_t; /* level parameter for cpuset. */ ^ In file included from tools/cpu/os_specific.cc:60: /usr/include/sys/cpuset.h:157:36: error: unknown type name 'cpuwhich_t'; did you mean '__cpuwhich_t'? int cpuset_setaffinity(cpulevel_t, cpuwhich_t, id_t, size_t, const cpuset_t *); ^ /usr/include/sys/_types.h:146:14: note: '__cpuwhich_t' declared here typedef int __cpuwhich_t; /* which parameter for cpuset. */ ^ In file included from tools/cpu/os_specific.cc:60: /usr/include/sys/cpuset.h:157:48: error: unknown type name 'id_t'; did you mean 'pid_t'? int cpuset_setaffinity(cpulevel_t, cpuwhich_t, id_t, size_t, const cpuset_t *); ^ /usr/include/time.h:95:18: note: 'pid_t' declared here typedef __pid_t pid_t; ^ Reported by: pkg-fallout --- graphics/libjxl/Makefile | 3 +++ graphics/libjxl/distinfo | 2 ++ 2 files changed, 5 insertions(+) diff --git a/graphics/libjxl/Makefile b/graphics/libjxl/Makefile index 5654652546fd..8b8997ddacf4 100644 --- a/graphics/libjxl/Makefile +++ b/graphics/libjxl/Makefile @@ -4,6 +4,9 @@ DISTVERSION= 0.3.7 PORTREVISION= 2 CATEGORIES= graphics +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= adb32f3f8f37.patch:-p1 # https://github.com/libjxl/libjxl/pull/193 + MAINTAINER= jbeich@FreeBSD.org COMMENT= JPEG XL reference encoder/decoder diff --git a/graphics/libjxl/distinfo b/graphics/libjxl/distinfo index 1b5ffd1cedee..27926757f755 100644 --- a/graphics/libjxl/distinfo +++ b/graphics/libjxl/distinfo @@ -9,3 +9,5 @@ SHA256 (lvandeve-lodepng-48e5364_GH0.tar.gz) = 41e0bcc686e31ee2d51a6c87c0089045f SIZE (lvandeve-lodepng-48e5364_GH0.tar.gz) = 239988 SHA256 (webmproject-sjpeg-868ab55_GH0.tar.gz) = ffe757b376fed2fd94473f8625c25f82a3a23aa317fb1bbf1ac8159b6e0a7726 SIZE (webmproject-sjpeg-868ab55_GH0.tar.gz) = 2472084 +SHA256 (adb32f3f8f37.patch) = 5003a64f11166147d9ac15ff5d59c512a6acabc0220dc752ff71292e25da0a99 +SIZE (adb32f3f8f37.patch) = 5662 -- cgit v1.2.3