From nobody Wed Nov 10 19:06:48 2021 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 B21BE1842E15; Wed, 10 Nov 2021 19:06:49 +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 4HqDqF1Q7lz53y6; Wed, 10 Nov 2021 19:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 EB39E1DEA8; Wed, 10 Nov 2021 19:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AAJ6mdq002091; Wed, 10 Nov 2021 19:06:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AAJ6mgs002090; Wed, 10 Nov 2021 19:06:48 GMT (envelope-from git) Date: Wed, 10 Nov 2021 19:06:48 GMT Message-Id: <202111101906.1AAJ6mgs002090@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 1d042b735977 - main - graphics/libavif: unbreak build with Clang 13 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d042b735977c6d3c5b163cf9e49651be06da63f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d042b735977c6d3c5b163cf9e49651be06da63f commit 1d042b735977c6d3c5b163cf9e49651be06da63f Author: Jan Beich AuthorDate: 2021-11-10 13:37:52 +0000 Commit: Jan Beich CommitDate: 2021-11-10 19:06:01 +0000 graphics/libavif: unbreak build with Clang 13 In file included from /wrkdirs/usr/ports/graphics/libavif/work/libavif-0.9.2/contrib/gdk-pixbuf/loader.c:9: In file included from /usr/local/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-io.h:35: In file included from /usr/local/include/glib-2.0/glib.h:30: In file included from /usr/local/include/glib-2.0/glib/galloca.h:32: /usr/local/include/glib-2.0/glib/gtypes.h:458:24: error: identifier '_GLIB_CHECKED_ADD_U32' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] static inline gboolean _GLIB_CHECKED_ADD_U32 (guint32 *dest, guint32 a, guint32 b) { ^ /usr/local/include/glib-2.0/glib/gtypes.h:460:24: error: identifier '_GLIB_CHECKED_MUL_U32' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] static inline gboolean _GLIB_CHECKED_MUL_U32 (guint32 *dest, guint32 a, guint32 b) { ^ /usr/local/include/glib-2.0/glib/gtypes.h:462:24: error: identifier '_GLIB_CHECKED_ADD_U64' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] static inline gboolean _GLIB_CHECKED_ADD_U64 (guint64 *dest, guint64 a, guint64 b) { ^ /usr/local/include/glib-2.0/glib/gtypes.h:463:3: warning: '_Static_assert' is a C11 extension [-Wc11-extensions] G_STATIC_ASSERT(sizeof (unsigned long long) == sizeof (guint64)); ^ /usr/local/include/glib-2.0/glib/gmacros.h:819:31: note: expanded from macro 'G_STATIC_ASSERT' #define G_STATIC_ASSERT(expr) _Static_assert (expr, "Expression evaluates to false") ^ In file included from /wrkdirs/usr/ports/graphics/libavif/work/libavif-0.9.2/contrib/gdk-pixbuf/loader.c:9: In file included from /usr/local/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-io.h:35: In file included from /usr/local/include/glib-2.0/glib.h:30: In file included from /usr/local/include/glib-2.0/glib/galloca.h:32: /usr/local/include/glib-2.0/glib/gtypes.h:465:24: error: identifier '_GLIB_CHECKED_MUL_U64' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] static inline gboolean _GLIB_CHECKED_MUL_U64 (guint64 *dest, guint64 a, guint64 b) { ^ /usr/local/include/glib-2.0/glib/gtypes.h:495:16: error: identifier '_GDoubleIEEE754' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] typedef union _GDoubleIEEE754 GDoubleIEEE754; ^ /usr/local/include/glib-2.0/glib/gtypes.h:496:16: error: identifier '_GFloatIEEE754' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] typedef union _GFloatIEEE754 GFloatIEEE754; ^ /usr/local/include/glib-2.0/glib/gtypes.h:545:16: error: identifier '_GTimeVal' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] typedef struct _GTimeVal GTimeVal GLIB_DEPRECATED_TYPE_IN_2_62_FOR(GDateTime); ^ In file included from /wrkdirs/usr/ports/graphics/libavif/work/libavif-0.9.2/contrib/gdk-pixbuf/loader.c:9: In file included from /usr/local/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-io.h:35: In file included from /usr/local/include/glib-2.0/glib.h:31: /usr/local/include/glib-2.0/glib/garray.h:36:16: error: identifier '_GBytes' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] typedef struct _GBytes GBytes; ^ /usr/local/include/glib-2.0/glib/garray.h:37:16: error: identifier '_GArray' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] typedef struct _GArray GArray; ^ /usr/local/include/glib-2.0/glib/garray.h:38:16: error: identifier '_GByteArray' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] typedef struct _GByteArray GByteArray; ^ /usr/local/include/glib-2.0/glib/garray.h:39:16: error: identifier '_GPtrArray' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] typedef struct _GPtrArray GPtrArray; ^ In file included from /wrkdirs/usr/ports/graphics/libavif/work/libavif-0.9.2/contrib/gdk-pixbuf/loader.c:9: In file included from /usr/local/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-io.h:35: In file included from /usr/local/include/glib-2.0/glib.h:32: In file included from /usr/local/include/glib-2.0/glib/gasyncqueue.h:32: In file included from /usr/local/include/glib-2.0/glib/gthread.h:33: /usr/local/include/glib-2.0/glib/gerror.h:41:16: error: identifier '_GError' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] typedef struct _GError GError; ^ In file included from /wrkdirs/usr/ports/graphics/libavif/work/libavif-0.9.2/contrib/gdk-pixbuf/loader.c:9: In file included from /usr/local/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-io.h:35: In file included from /usr/local/include/glib-2.0/glib.h:32: In file included from /usr/local/include/glib-2.0/glib/gasyncqueue.h:32: In file included from /usr/local/include/glib-2.0/glib/gthread.h:34: /usr/local/include/glib-2.0/glib/gutils.h:274:16: error: identifier '_GDebugKey' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] typedef struct _GDebugKey GDebugKey; ^ In file included from /wrkdirs/usr/ports/graphics/libavif/work/libavif-0.9.2/contrib/gdk-pixbuf/loader.c:9: In file included from /usr/local/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-io.h:35: In file included from /usr/local/include/glib-2.0/glib.h:32: In file included from /usr/local/include/glib-2.0/glib/gasyncqueue.h:32: /usr/local/include/glib-2.0/glib/gthread.h:49:16: error: identifier '_GThread' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] typedef struct _GThread GThread; ^ /usr/local/include/glib-2.0/glib/gthread.h:51:16: error: identifier '_GMutex' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] typedef union _GMutex GMutex; ^ /usr/local/include/glib-2.0/glib/gthread.h:52:16: error: identifier '_GRecMutex' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] typedef struct _GRecMutex GRecMutex; ^ /usr/local/include/glib-2.0/glib/gthread.h:53:16: error: identifier '_GRWLock' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] typedef struct _GRWLock GRWLock; ^ /usr/local/include/glib-2.0/glib/gthread.h:54:16: error: identifier '_GCond' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] typedef struct _GCond GCond; ^ /usr/local/include/glib-2.0/glib/gthread.h:55:16: error: identifier '_GPrivate' is reserved because it starts with '_' followed by a capital letter [-Werror,-Wreserved-identifier] typedef struct _GPrivate GPrivate; ^ fatal error: too many errors emitted, stopping now [-ferror-limit=] Reported by: antoine (via bug 258209 exp-run) --- graphics/libavif/Makefile | 1 + graphics/libavif/distinfo | 2 ++ 2 files changed, 3 insertions(+) diff --git a/graphics/libavif/Makefile b/graphics/libavif/Makefile index ef42dc4b06d7..30a6588d8e41 100644 --- a/graphics/libavif/Makefile +++ b/graphics/libavif/Makefile @@ -5,6 +5,7 @@ CATEGORIES= graphics PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 2340cdb5f0c2.patch:-p1 # https://github.com/AOMediaCodec/libavif/pull/296 +PATCHFILES+= dce4c2a5f4bb.patch:-p1 # https://github.com/AOMediaCodec/libavif/pull/783 MAINTAINER= jbeich@FreeBSD.org COMMENT= Library for encoding and decoding .avif files diff --git a/graphics/libavif/distinfo b/graphics/libavif/distinfo index ebcf89370a08..fde5e928859c 100644 --- a/graphics/libavif/distinfo +++ b/graphics/libavif/distinfo @@ -3,3 +3,5 @@ SHA256 (AOMediaCodec-libavif-v0.9.3_GH0.tar.gz) = bcd9a1f57f982a9615eb7e2faf8723 SIZE (AOMediaCodec-libavif-v0.9.3_GH0.tar.gz) = 2000521 SHA256 (2340cdb5f0c2.patch) = acc0733963b7e1c9f4bb3563b052a15aff6705729ae08a50123f7a0d537396e5 SIZE (2340cdb5f0c2.patch) = 1714 +SHA256 (dce4c2a5f4bb.patch) = a516cbcce0d93791ed9e5bfa3eb6f21d3e05d2e725852698089f0a138cda2b39 +SIZE (dce4c2a5f4bb.patch) = 1471