Merge ~mkukri/ubuntu/+source/libvpx:merge into ubuntu/+source/libvpx:debian/sid

[Mate Kukri]

Merge libvpx with Debian sid.

Tested to ensure patch to disable LTO still needed on noble.

[Simon Quigley (tsimonq2)]

                                 .........
                               .'------.' |
                              | .-----. | |
                              | | | | |
                            __| | | | |;. _______________
                           / |*`-----'.|.' `; //
                          / `---------' .;' //
                    /| / .''''////////;' //
                   |=| .../ ######### /;/ //|
                   |/ / / ######### // //||
                      / `-----------' // ||
                     /________________________________//| ||
                     `--------------------------------' | ||
                      : | || | || |__LL__|| || | ||
                      : | || | || | || `""'
                      n | || `""' | ||
                      M | || | ||
                        | || | ||
                        `""' `""'

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 32e4c82..835b12c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libvpx (1.13.1-2ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/rules: Disable LTO
+
+ -- Mate Kukri <[e-mail]>  Fri, 17 Nov 2023 09:45:41 +0000
+
 libvpx (1.13.1-2) unstable; urgency=medium
 
   * Upload to unstable
@@ -25,6 +32,29 @@ libvpx (1.12.0-1.1) unstable; urgency=high
 
  -- Salvatore Bonaccorso <[e-mail]>  Thu, 28 Sep 2023 23:07:11 +0200
 
+libvpx (1.12.0-1ubuntu2) mantic; urgency=medium
+
+  * SECURITY UPDATE: Heap buffer overflow in vp8 encoding
+    - debian/patches/CVE-2023-5217-1.patch: add ConfigResizeChangeThreadCount
+      to test/encode_api_test.cc.
+    - debian/patches/CVE-2023-5217-2.patch: disallow thread count changes
+      in test/encode_api_test.cc, vp8/encoder/onyx_if.c.
+    - CVE-2023-5217
+  * SECURITY UPDATE: Width mishandling in vp9 encoding
+    - debian/patches/CVE-2023-44488.patch: fix bug with smaller width
+      bigger size in test/resize_test.cc, vp9/common/vp9_alloccommon.c,
+      vp9/encoder/vp9_encoder.c.
+    - CVE-2023-44488
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 02 Oct 2023 06:43:10 -0400
+
+libvpx (1.12.0-1ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1987051). Remaining changes:
+    - d/rules: Disable LTO
+
+ -- Simon Chopin <[e-mail]>  Fri, 19 Aug 2022 10:59:05 +0200
+
 libvpx (1.12.0-1) unstable; urgency=medium
 
   * Team upload
@@ -34,6 +64,20 @@ libvpx (1.12.0-1) unstable; urgency=medium
 
  -- Sebastian Ramacher <[e-mail]>  Sat, 09 Jul 2022 15:20:25 +0200
 
+libvpx (1.11.0-2ubuntu2) jammy; urgency=high
+
+  * No change rebuild for ppc64el baseline bump.
+
+ -- Julian Andres Klode <[e-mail]>  Thu, 24 Mar 2022 17:21:29 +0100
+
+libvpx (1.11.0-2ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian, reamining Ubuntu changes:
+  * debian/rules:
+   - Disable LTO and fix FTBFS when building with GCC 11.
+
+ -- Robert Ancell <[e-mail]>  Wed, 17 Nov 2021 10:11:05 +1300
+
 libvpx (1.11.0-2) unstable; urgency=medium
 
   * Team upload
@@ -79,6 +123,13 @@ libvpx (1.10.0-1) unstable; urgency=medium
 
  -- Sebastian Ramacher <[e-mail]>  Tue, 24 Aug 2021 22:56:11 +0200
 
+libvpx (1.9.0-1ubuntu1) impish; urgency=medium
+
+  * d/rules: Disable LTO and fix FTBFS when building with GCC 11.
+    (LP: #1939640)
+
+ -- Sergio Durigan Junior <[e-mail]>  Wed, 11 Aug 2021 22:25:45 -0400
+
 libvpx (1.9.0-1) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/control b/debian/control
index f440b17..aadc121 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: libvpx
 Section: video
 Priority: optional
-Maintainer: Debian Multimedia Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Multimedia Maintainers <[e-mail]>
 Uploaders: Sebastian Dröge <[e-mail]>,
            Ondřej Nový <[e-mail]>,
            Sebastian Ramacher <[e-mail]>,
diff --git a/debian/rules b/debian/rules
index 1723117..3b6354c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND = -Wall
 export DEB_CXXFLAGS_MAINT_APPEND = -Wall
 
+# The build fails with GCC 11 when using LTO.
+export DEB_BUILD_MAINT_OPTIONS = optimize=-lto
+
 include /usr/share/dpkg/architecture.mk
 
 configure_flags += \