From: Peter Michael Green <plugwash@debian.org>
Date: Thu, 16 Sep 2021 12:18:28 +0000 (+0000)
Subject: Manual merge of version 0.7.1-3+rpi1 and 0.9.1-2 to produce 0.9.1-2+rpi1
X-Git-Tag: archive/raspbian/0.9.1-2+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8c7ffb22d08202cff66210f6d9a9a6e02b878661;p=dav1d.git

Manual merge of version 0.7.1-3+rpi1 and 0.9.1-2 to produce 0.9.1-2+rpi1
---

0b5041fa28590602a13c72ca9828edc897ce2633
diff --cc debian/changelog
index 8ba6aa7,da1e751..3af6467
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,43 +1,51 @@@
- dav1d (0.7.1-3+rpi1) bullseye-staging; urgency=medium
++dav1d (0.9.1-2+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>  Sun, 12 Jul 2020 23:43:27 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 16 Sep 2021 12:13:55 +0000
++
+ dav1d (0.9.1-2) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Dylan Aïssi <daissi@debian.org>  Mon, 06 Sep 2021 20:20:36 +0200
+ 
+ dav1d (0.9.1-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Add more copyright holders in d/copyright.
+ 
+  -- Dylan Aïssi <daissi@debian.org>  Fri, 30 Jul 2021 11:21:25 +0200
+ 
+ dav1d (0.9.0-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Update d/libdav1d5.symbols.
+   * Bump year in d/copyright.
+ 
+  -- Dylan Aïssi <daissi@debian.org>  Mon, 17 May 2021 14:45:02 +0200
+ 
+ dav1d (0.8.2-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Bump year in d/copyright.
+ 
+  -- Dylan Aïssi <daissi@debian.org>  Wed, 12 May 2021 10:45:22 +0200
+ 
+ dav1d (0.8.1-1) experimental; urgency=medium
+ 
+   [ Vasyl Gello ]
+   * Team upload.
+   * New upstream version 0.8.1
+   * Bump SONAME to libdav1d5
+ 
+   [ Dylan Aïssi ]
+   * Remove part to disable asm on x32 in d/rules,
+       should be fixed in upstream makefile.
+ 
+  -- Dylan Aïssi <daissi@debian.org>  Thu, 28 Jan 2021 21:10:20 +0100
  
  dav1d (0.7.1-3) unstable; urgency=high
  
diff --cc debian/rules
index d7f13a8,dd672f6..8815f11
--- a/debian/rules
+++ b/debian/rules
@@@ -7,9 -7,11 +7,13 @@@ export DEB_BUILD_MAINT_OPTIONS=hardenin
  
  CONFIG_ARGS:=	--buildtype="release"
  
- DEB_HOST_ARCH?=$(shell dpkg-architecture -qDEB_HOST_ARCH)
- #ifeq (x32,$(DEB_HOST_ARCH))
 +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: