[x264] Fix "assignment from incompatible pointer type" errors on ppc64le

commit d2bbc0d0cc510b95b7c7348c6345b6c81146965e Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net&gt; Date: Sun Mar 10 22:59:12 2024 +0100 Fix "assignment from incompatible pointer type" errors on ppc64le - Use correct build dependency on bash-completion x264-altivec-incompatible-pointer-type.patch | 21 +++++++++++++++++++++ x264.spec | 11 +++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) --- diff --git a/x264-altivec-incompatible-pointer-type.patch b/x264-altivec-incompatible-pointer-type.patch new file mode 100644 index 0000000..949e2aa --- /dev/null +++ b/x264-altivec-incompatible-pointer-type.patch @@ -0,0 +1,21 @@ +diff -up generic/common/ppc/pixel.c.orig generic/common/ppc/pixel.c +--- generic/common/ppc/pixel.c.orig 2023-10-01 16:28:26.000000000 +0200 ++++ generic/common/ppc/pixel.c 2024-03-10 22:23:23.415298686 +0100 +@@ -855,7 +855,7 @@ static void pixel_sad_x4_16x8_altivec( u + sum2v = (vec_s32_t) vec_sum4s( vec_absd( fencv, pix2v ), (vec_u32_t) sum2v ); + + #define PIXEL_SAD_X3_ALTIVEC( name, ly ) \ +-static int name( uint8_t *fenc, uint8_t *pix0, \ ++static void name( uint8_t *fenc, uint8_t *pix0, \ + uint8_t *pix1, uint8_t *pix2, \ + intptr_t i_stride, int scores[3] ) \ + { \ +@@ -965,7 +965,7 @@ static void pixel_sad_x3_16x8_altivec( u + } + + #define PIXEL_SAD_X4_ALTIVEC( name, ly ) \ +-static int name( uint8_t *fenc, \ ++static void name( uint8_t *fenc, \ + uint8_t *pix0, uint8_t *pix1, \ + uint8_t *pix2, uint8_t *pix3, \ + intptr_t i_stride, int scores[4] ) \ diff --git a/x264.spec b/x264.spec index 3bd901a..0b8c2d9 100644 --- a/x264.spec +++ b/x264.spec @@ -33,7 +33,7 @@ Summary: H264/AVC video streams encoder Name: x264 Version: 0.%{api} -Release: 12%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist} +Release: 13%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist} License: GPLv2+ URL: https://www.videolan.org/developers/x264.html Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2 @@ -44,6 +44,8 @@ Source2: version.h Patch0: x264-nover.patch # add 10b suffix to high bit depth build Patch1: x264-10b.patch +# fix assignment from incompatible pointer type errors +Patch2: x264-altivec-incompatible-pointer-type.patch Patch11: x264-opencl.patch BuildRequires: gcc @@ -57,7 +59,7 @@ BuildRequires: execstack %ifarch %{asmarch} BuildRequires: nasm %endif -BuildRequires: bash-completion +BuildRequires: pkgconfig(bash-completion) # we need to enforce the exact EVR for an ISA - not only the same ABI Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: ffmpeg-libs%{?_isa} @@ -109,6 +111,7 @@ pushd %{name}-0.%{api}-%{snapshot} cp %{SOURCE2} . %patch -P0 -p1 -b .nover %patch -P1 -p1 -b .10b +%patch -P2 -p1 -b .ptr %patch -P11 -p1 -b .opencl popd @@ -182,6 +185,10 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Mar 10 2024 Dominik Mierzejewski <dominik(a)greysector.net&gt; - 0.164-13.20231001git31e19f92 +- Fix "assignment from incompatible pointer type" errors on ppc64le +- Use correct build dependency on bash-completion + * Sun Feb 04 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 0.164-12.20231001git31e19f92 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild