From: Raspbian automatic forward porter Date: Fri, 6 Aug 2021 23:42:04 +0000 (+0100) Subject: Merge version 2:0.160.3011+gitcde9a93-2+rpi1 and 2:0.160.3011+gitcde9a93-2.1 to produ... X-Git-Tag: raspbian/2%0.160.3011+gitcde9a93-2.1+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a32e251d6c26d5e1bfb1250056403738059b93f2;p=x264.git Merge version 2:0.160.3011+gitcde9a93-2+rpi1 and 2:0.160.3011+gitcde9a93-2.1 to produce 2:0.160.3011+gitcde9a93-2.1+rpi1 --- 436708e0a935a8330e66497ba5a1733b0fd3257a diff --cc debian/changelog index 1c8640b,48948f9..9a12b4e --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,9 +1,19 @@@ - x264 (2:0.160.3011+gitcde9a93-2+rpi1) bullseye-staging; urgency=medium ++x264 (2:0.160.3011+gitcde9a93-2.1+rpi1) bullseye-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 Sat, 01 Aug 2020 10:26:18 +0000 ++ -- Raspbian forward porter Fri, 06 Aug 2021 23:42:04 +0000 ++ + x264 (2:0.160.3011+gitcde9a93-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fix to support GPAC >= 0.8.0. (Closes: #975441) + + -- Adrian Bunk Thu, 15 Jul 2021 15:06:22 +0300 x264 (2:0.160.3011+gitcde9a93-2) unstable; urgency=medium