From nobody Thu Apr 27 20:15:15 2023 X-Original-To: dev-commits-ports-all@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 4Q6n6C2Mjjz47tfx; Thu, 27 Apr 2023 20:15:15 +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 4Q6n6C1v9Pz4Hp9; Thu, 27 Apr 2023 20:15:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682626515; 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=teFU9JqkWg9RI5/G5WzSVZ8iD7YPM2Sk7mvfpNXvfiw=; b=WbvOt3Kf4LANhZJoXrFq9HIZFglW+WWYeuCevCS30y5Lv1T6/55cwrQS8HX+xUu05KGXMs IC20veBPcABdJww5obzF0npCO94SIx/NZABCXuGaiWaymfdnsNaA4QiwoaV99L1PbPaczy FfW9F9HNNzENCC8oduEWR3lQMw2Ezv7fNYgfztHe38rQ099IkUZTQrx+6odG0sJ2md6wza 6SuMKANnn46qdnL0KqV7OhI/bDBNIkByK7lN9sOa0QbvHnhcb6KNtE98xKob/6Z0fZhKAt L8qR1moU5TYbXXreHPkotYCtRJj/o+kmbJukgr0PLd8+GSmEEIZ+OBtWWkNE7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682626515; 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=teFU9JqkWg9RI5/G5WzSVZ8iD7YPM2Sk7mvfpNXvfiw=; b=mulRBkGSEf4o8l3xiFDU+YGt1fbcbmkp8gZ84yWvJE7+88wwjds9Tt8kE/ZwtyhBQA9fRa VOZnyoG88yIJ9BSWWkJwfk5RQ5dnfNMxq4CnJWPU1Siwmqhk9wirOgyshsLigOFEybl0br kMDIYjNGkSAU3Mke/eFlc4G9PoM8de8hM3hxCybKOH8Tjj56RY4mlYU1J6JuoNy/VwNuY6 QgpFcjKYlbTAFMMElY+nnLUbV9yDE7sIcAi/QvyiSoYZZYUk5dgdQIibVZeidRL7vAyY7a I/zZaYvctAZ4fddItYAKo25oqxPN5l6r1x7JjW1vvlFH0//gj5nL3GGtVCFKjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682626515; a=rsa-sha256; cv=none; b=JbWhOD1fWLTGxgkk+cHUu69z6SBO2O5tJhZpnmlD2wJ8bRSrL+6s17ptCmsl0e2KLW4+Ha WJh6UUacsJFKiOQ+ip4Jf98r2hUYS9nRx7YMPH3SIeEZTlCWUeqdHBubA/YwPzRdBKPaYg V49qyqndG6shfjw81R22wv5Q7NqKC4TPqADmgqMQmhgKRCwJi0Rj9FMNK3wy9OfpeuZULM uO034OWTWLRK+H/XZ37yrjGszEq2GQuXLFEA+xXlIz2INXSinCKif4AAC1WzrOoEKVx36Z Il/sU2WQkB4By5HxMJ+T7lEFHCoaByZAkFcywK1r3OzMuVUL0031OFlTYKwKsA== 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 4Q6n6C10sPzX8Z; Thu, 27 Apr 2023 20:15:15 +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 33RKFFlI062420; Thu, 27 Apr 2023 20:15:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RKFFpN062419; Thu, 27 Apr 2023 20:15:15 GMT (envelope-from git) Date: Thu, 27 Apr 2023 20:15:15 GMT Message-Id: <202304272015.33RKFFpN062419@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: e7f276b2099a - main - multimedia/ffmpeg: unbreak with clang 15 on i386 after 685e477b807c List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: e7f276b2099aee34cbb73dc1dcbd099196b8f3b2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=e7f276b2099aee34cbb73dc1dcbd099196b8f3b2 commit e7f276b2099aee34cbb73dc1dcbd099196b8f3b2 Author: Jan Beich AuthorDate: 2023-04-27 17:54:50 +0000 Commit: Jan Beich CommitDate: 2023-04-27 20:15:06 +0000 multimedia/ffmpeg: unbreak with clang 15 on i386 after 685e477b807c ./libavutil/vulkan.c:1173:70: error: incompatible integer to pointer conversion assigning to 'void *' from 'VkDescriptorSetLayout' (aka 'unsigned long long') [-Wint-conversion] pl->desc_staging[spawn_pipeline_layout.setLayoutCount++] = pl->desc_layout[i]; ^ ~~~~~~~~~~~~~~~~~~ ./libavutil/vulkan.c:1272:29: error: incompatible integer to pointer conversion assigning to 'void *' from 'VkDescriptorSet' (aka 'unsigned long long') [-Wint-conversion] pl->desc_staging[i] = pl->desc_set[i*pl->qf->nb_queues + pl->qf->cur_queue]; ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PR: 261302 Reported by: antoine --- multimedia/ffmpeg/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index f16fa8855ec5..b362ceda66cb 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -627,6 +627,7 @@ INSTALL_TARGET= install-progs install-doc install-data \ DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} MAKE_ENV+= V=1 +CFLAGS_i386= -Wno-error=int-conversion LDFLAGS_aarch64=-Wl,-z,notext LDFLAGS_armv6= -Wl,-z,notext LDFLAGS_armv7= -Wl,-z,notext