diff -Nru ffmpeg-4.4/debian/changelog ffmpeg-4.4/debian/changelog --- ffmpeg-4.4/debian/changelog 2021-09-09 20:45:41.000000000 +0000 +++ ffmpeg-4.4/debian/changelog 2021-09-23 15:40:00.000000000 +0000 @@ -1,3 +1,10 @@ +ffmpeg (7:4.4-6+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 7:4.4-5+rpi1 by Peter Michael Green at Sun, 05 Sep 2021 20:59:14 +0000] + * Link with libatomic on armhf too. + + -- Raspbian forward porter Thu, 23 Sep 2021 15:40:00 +0000 + ffmpeg (7:4.4-6) unstable; urgency=medium * debian/*.symbols: Bump version of symbols to match upstream release diff -Nru ffmpeg-4.4/debian/rules ffmpeg-4.4/debian/rules --- ffmpeg-4.4/debian/rules 2021-08-22 19:05:42.000000000 +0000 +++ ffmpeg-4.4/debian/rules 2021-09-23 15:40:00.000000000 +0000 @@ -79,7 +79,7 @@ --enable-sdl2 # link with -latomic on armel and mipsel (https://trac.ffmpeg.org/ticket/9275) -ifneq (,$(filter armel mipsel,$(DEB_HOST_ARCH))) +ifneq (,$(filter armel armhf mipsel,$(DEB_HOST_ARCH))) CONFIG += --extra-libs=-latomic endif