From: Peter Michael Green <plugwash@debian.org>
Date: Thu, 23 Sep 2021 12:51:19 +0000 (+0000)
Subject: Manual merge of version 0.9.1-2+rpi1 and 0.9.2-1 to produce 0.9.2-1+rpi1
X-Git-Tag: archive/raspbian/0.9.2-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e41882deb74221ba13be7451c0d92ac3d5399105;p=dav1d.git

Manual merge of version 0.9.1-2+rpi1 and 0.9.2-1 to produce 0.9.2-1+rpi1
---

e41882deb74221ba13be7451c0d92ac3d5399105
diff --cc debian/changelog
index 3af6467,2f721a5..995be36
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- dav1d (0.9.1-2+rpi1) bookworm-staging; urgency=medium
++dav1d (0.9.2-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 0.7.1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 12 Jul 2020 23:43:27 +0000]
 +  * Disable asm, it seems to cause the resulting binary to come out
 +    armv7 contaminated.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 16 Sep 2021 12:13:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 22 Sep 2021 04:33:27 +0000
++
+ dav1d (0.9.2-1) unstable; urgency=medium
+ 
+   * New upstream version
+   * Standards-Version: 4.6.0 (routine-update)
+ 
+  -- Dylan Aïssi <daissi@debian.org>  Sun, 12 Sep 2021 14:35:05 +0200
  
  dav1d (0.9.1-2) unstable; urgency=medium
  
diff --cc debian/rules
index 8815f11,c211442..0f76a5a
--- a/debian/rules
+++ b/debian/rules
@@@ -7,15 -7,6 +7,8 @@@ export DEB_BUILD_MAINT_OPTIONS=hardenin
  
  CONFIG_ARGS:=	--buildtype="release"
  
 +CONFIG_ARGS+=	-Denable_asm=false
 +
- # Should be fixed in upstream makefile since 0.8.0
- # https://code.videolan.org/videolan/dav1d/-/commit/725f37684d
- #DEB_HOST_ARCH?=$(shell dpkg-architecture -qDEB_HOST_ARCH)
- #ifeq (x32,$(DEB_HOST_ARCH))
- #CONFIG_ARGS+=	-Denable_asm=false
- #endif
- 
  override_dh_auto_configure:
  	dh_auto_configure -- ${CONFIG_ARGS}