From: Raspbian automatic forward porter Date: Sat, 17 Aug 2024 23:06:14 +0000 (+0100) Subject: Merge version 2:0.164.3108+git31e19f9-1+rpi1 and 2:0.164.3108+git31e19f9-2 to produce... X-Git-Tag: archive/raspbian/2%0.164.3108+git31e19f9-2+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=42cea59af5a2402ef8a71cada351b76010e30e7b;p=x264.git Merge version 2:0.164.3108+git31e19f9-1+rpi1 and 2:0.164.3108+git31e19f9-2 to produce 2:0.164.3108+git31e19f9-2+rpi1 --- 16044966779d24d52b4d7aa753c83069b2b9c4e6 diff --cc debian/changelog index 6b11d0f,6b45e20..c893329 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,9 +1,19 @@@ - x264 (2:0.164.3108+git31e19f9-1+rpi1) trixie-staging; urgency=medium ++x264 (2:0.164.3108+git31e19f9-2+rpi1) trixie-staging; urgency=medium + + [Changes introduced in 2:0.142.2431+gita5831aa-1+rpi2 by Peter Michael Green] + * Revert previous raspbian changes (not all of which were mentioned + in the changelog, start again from debian source) + * Pass --disable-asm for static build to prevent it being + armv7/neon contaminated. + - -- Raspbian forward porter Wed, 07 Feb 2024 16:15:28 +0000 ++ -- Raspbian forward porter Sat, 17 Aug 2024 23:06:14 +0000 ++ + x264 (2:0.164.3108+git31e19f9-2) unstable; urgency=medium + + * Team upload + * debian/patches: Fix incompatible pointer type errors on ppc64el + + -- Sebastian Ramacher Tue, 30 Jul 2024 15:11:15 +0200 x264 (2:0.164.3108+git31e19f9-1) unstable; urgency=medium