Date: Thu, 27 Apr 2023 20:15:15 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: e7f276b2099a - main - multimedia/ffmpeg: unbreak with clang 15 on i386 after 685e477b807c Message-ID: <202304272015.33RKFFpN062419@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=e7f276b2099aee34cbb73dc1dcbd099196b8f3b2 commit e7f276b2099aee34cbb73dc1dcbd099196b8f3b2 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-04-27 17:54:50 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304272015.33RKFFpN062419>