From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 24 Apr 2022 16:09:13 +0000 (+0100)
Subject: Merge version 7:4.4.1-3+rpi1 and 7:4.4.2-1 to produce 7:4.4.2-1+rpi1
X-Git-Tag: archive/raspbian/7%4.4.2-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c74ccc6763917d110c7d542a4cfc0b22dcda840d;p=ffmpeg.git

Merge version 7:4.4.1-3+rpi1 and 7:4.4.2-1 to produce 7:4.4.2-1+rpi1
---

c74ccc6763917d110c7d542a4cfc0b22dcda840d
diff --cc debian/changelog
index 1db5cc6,ffc75ea..06e29dc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- ffmpeg (7:4.4.1-3+rpi1) bookworm-staging; urgency=medium
++ffmpeg (7:4.4.2-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 7:4.4-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 05 Sep 2021 20:59:14 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 27 Jan 2022 09:12:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 24 Apr 2022 16:09:13 +0000
++
+ ffmpeg (7:4.4.2-1) unstable; urgency=medium
+ 
+   * New upstream version 4.4.2
+   * debian/rules: Disable sndio
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Mon, 18 Apr 2022 21:42:58 +0200
  
  ffmpeg (7:4.4.1-3) unstable; urgency=medium
  
diff --cc debian/rules
index 9693426,d145665..d153616
--- a/debian/rules
+++ b/debian/rules
@@@ -78,8 -78,11 +78,11 @@@ CONFIG := --prefix=/usr 
  	--enable-opengl \
  	--enable-sdl2
  
+ # disable sndio, it's pulled in via libopenal-dev and autodected
+ CONFIG += --disable-sndio
+ 
  # 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