diff -Nru x264-0.152.2854+gite9a5903/debian/changelog x264-0.152.2854+gite9a5903/debian/changelog --- x264-0.152.2854+gite9a5903/debian/changelog 2018-01-19 11:36:28.000000000 +0000 +++ x264-0.152.2854+gite9a5903/debian/changelog 2018-01-24 08:15:39.000000000 +0000 @@ -1,3 +1,13 @@ +x264 (2:0.152.2854+gite9a5903-2+rpi1) buster-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, 24 Jan 2018 08:15:39 +0000 + x264 (2:0.152.2854+gite9a5903-2) unstable; urgency=medium * Team upload. diff -Nru x264-0.152.2854+gite9a5903/debian/confflags x264-0.152.2854+gite9a5903/debian/confflags --- x264-0.152.2854+gite9a5903/debian/confflags 2018-01-19 11:35:17.000000000 +0000 +++ x264-0.152.2854+gite9a5903/debian/confflags 2018-01-24 08:15:39.000000000 +0000 @@ -29,7 +29,6 @@ endif # XXX why isn't --enable-visualize used in the static build? -# TODO --disable-asm when we build an opt flavor? static_confflags += \ $(common_confflags) \ --enable-static \ @@ -156,6 +155,7 @@ do_opt := yes opt_libdir := /usr/lib/$(DEB_HOST_MULTIARCH)/neon/vfp shared_confflags += --disable-asm +static_confflags += --disable-asm endif endif