git: 85b9ede53bca - main - multimedia/x264: fix build with llvm 16

The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=85b9ede53bca1be06c48b601f7968054cdca0e5f

commit 85b9ede53bca1be06c48b601f7968054cdca0e5f
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-06-25 22:50:27 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2023-06-25 23:21:37 +0000

    multimedia/x264: fix build with llvm 16
    
    common/ppc/pixel.c:1576:31: error: incompatible function pointer types assigning to 'x264_pixel_cmp_x3_t' (aka 'void (*)(unsigned char *, unsigned char *, unsigned char *, unsigned char *, long, int *)') from 'int (uint8_t *, uint8_t *, uint8_t *, uint8_t *, intptr_t, int *)' (aka 'int (unsigned char *, unsigned char *, unsigned char *, unsigned char *, long, int *)') [-Wincompatible-function-pointer-types]
        pixf->sad_x3[PIXEL_8x16]  = pixel_sad_x3_8x16_altivec;
                                  ^ ~~~~~~~~~~~~~~~~~~~~~~~~~
    common/ppc/pixel.c:1578:31: error: incompatible function pointer types assigning to 'x264_pixel_cmp_x3_t' (aka 'void (*)(unsigned char *, unsigned char *, unsigned char *, unsigned char *, long, int *)') from 'int (uint8_t *, uint8_t *, uint8_t *, uint8_t *, intptr_t, int *)' (aka 'int (unsigned char *, unsigned char *, unsigned char *, unsigned char *, long, int *)') [-Wincompatible-function-pointer-types]
        pixf->sad_x3[PIXEL_8x8]   = pixel_sad_x3_8x8_altivec;
                                  ^ ~~~~~~~~~~~~~~~~~~~~~~~~
    common/ppc/pixel.c:1581:31: error: incompatible function pointer types assigning to 'x264_pixel_cmp_x4_t' (aka 'void (*)(unsigned char *, unsigned char *, unsigned char *, unsigned char *, unsigned char *, long, int *)') from 'int (uint8_t *, uint8_t *, uint8_t *, uint8_t *, uint8_t *, intptr_t, int *)' (aka 'int (unsigned char *, unsigned char *, unsigned char *, unsigned char *, unsigned char *, long, int *)') [-Wincompatible-function-pointer-types]
        pixf->sad_x4[PIXEL_8x16]  = pixel_sad_x4_8x16_altivec;
                                  ^ ~~~~~~~~~~~~~~~~~~~~~~~~~
    common/ppc/pixel.c:1583:31: error: incompatible function pointer types assigning to 'x264_pixel_cmp_x4_t' (aka 'void (*)(unsigned char *, unsigned char *, unsigned char *, unsigned char *, unsigned char *, long, int *)') from 'int (uint8_t *, uint8_t *, uint8_t *, uint8_t *, uint8_t *, intptr_t, int *)' (aka 'int (unsigned char *, unsigned char *, unsigned char *, unsigned char *, unsigned char *, long, int *)') [-Wincompatible-function-pointer-types]
        pixf->sad_x4[PIXEL_8x8]   = pixel_sad_x4_8x8_altivec;
                                  ^ ~~~~~~~~~~~~~~~~~~~~~~~~
---
 multimedia/x264/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index c8465cd5dcd2..173ca9366c60 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -129,4 +129,10 @@ pre-build:
 	@(${RM} ${WRKSRC}/x264_config.h)
 .endif
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+CFLAGS+=	-Wno-error=incompatible-function-pointer-types
+.endif
+
 .include <bsd.port.mk>