Bug#962720: gst-plugins-bad1.0: diff for NMU version 1.16.2-2.2

2020-07-16 Thread peter green

(note: I am not the maintainer)
Sebastian Ramacher wrote:

I've prepared an NMU for gst-plugins-bad1.0 (versioned as 1.16.2-2.2) and
uploaded it to DELAYED/2. 


Hi, I tried adding your proposed NMU to raspbian as part of trying to get the 
x265 transition to go through there.

Unfortunately it looks like the included fix for make 4.3 (sid) breaks builds 
with make 4.2
(buster/bullseye).

https://buildd.raspbian.org/status/fetch.php?pkg=gst-plugins-bad1.0=armhf=1.16.2-2.2=1594916528

If possible it would be preferable to have a fix that works with both make 
versions. It looks like there are currently
multiple issues blocking the migration of make-dfsg 4.3 to testing.

Also I notice that your NMU fixes bug 962725 but does not mention the bug 
number in the changelog
and the NMU diff was not sent to that bug.

P.S. I still think the propsed NMU is an improvement over the status quo, since 
it is currently not possible to build
gst-plugins-bad1.0 in either bullseye or sid.



Bug#962720: gst-plugins-bad1.0: diff for NMU version 1.16.2-2.2

2020-07-15 Thread Sebastian Ramacher
Control: tags 962720 + pending

Dear maintainer,

I've prepared an NMU for gst-plugins-bad1.0 (versioned as 1.16.2-2.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Cheers
-- 
Sebastian Ramacher
diff -Nru gst-plugins-bad1.0-1.16.2/debian/build-deps gst-plugins-bad1.0-1.16.2/debian/build-deps
--- gst-plugins-bad1.0-1.16.2/debian/build-deps	2019-12-04 14:34:03.0 +0100
+++ gst-plugins-bad1.0-1.16.2/debian/build-deps	2020-07-15 22:55:32.0 +0200
@@ -64,7 +64,7 @@
 libsndfile1-dev (>= 1.0.16)
 libsoundtouch-dev (>= 1.5.0)
 libspandsp-dev
-libsrt-dev
+libsrt-gnutls-dev
 libsrtp2-dev (>= 2.1)
 libssl-dev
 libtool (>= 2.2.6)
diff -Nru gst-plugins-bad1.0-1.16.2/debian/build-deps.in gst-plugins-bad1.0-1.16.2/debian/build-deps.in
--- gst-plugins-bad1.0-1.16.2/debian/build-deps.in	2019-12-04 14:34:01.0 +0100
+++ gst-plugins-bad1.0-1.16.2/debian/build-deps.in	2020-07-15 22:48:09.0 +0200
@@ -80,6 +80,6 @@
 libopenmpt-dev
 libnice-dev (>= 0.1.14)
 libpango1.0-dev (>= 1.22)
-libsrt-dev
+libsrt-gnutls-dev
 libaom-dev
 libusrsctp-dev
diff -Nru gst-plugins-bad1.0-1.16.2/debian/changelog gst-plugins-bad1.0-1.16.2/debian/changelog
--- gst-plugins-bad1.0-1.16.2/debian/changelog	2020-02-05 22:46:23.0 +0100
+++ gst-plugins-bad1.0-1.16.2/debian/changelog	2020-07-15 22:56:22.0 +0200
@@ -1,3 +1,16 @@
+gst-plugins-bad1.0 (1.16.2-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Gianfranco Costamagna ]
+  * Replace libsrt-dev with libsrt-gnutls-dev
+  * Fix build with make 4.3 (Closes: #962720)
+
+  [ Sebastian Ramacher ]
+  * Apply upstream patch to build with new vulkan
+
+ -- Sebastian Ramacher   Wed, 15 Jul 2020 22:56:22 +0200
+
 gst-plugins-bad1.0 (1.16.2-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru gst-plugins-bad1.0-1.16.2/debian/control gst-plugins-bad1.0-1.16.2/debian/control
--- gst-plugins-bad1.0-1.16.2/debian/control	2019-12-04 14:34:03.0 +0100
+++ gst-plugins-bad1.0-1.16.2/debian/control	2020-07-15 22:55:32.0 +0200
@@ -29,7 +29,6 @@
libdrm-dev (>= 2.4.55) [linux-any],
wayland-protocols (>= 1.4) [linux-any],
libvulkan-dev [linux-any],
-   libsrt-dev [linux-any],
libgstreamer1.0-dev (>= 1.16.2),
gstreamer1.0-doc,
gstreamer1.0-plugins-base (>= 1.16.2),
@@ -81,7 +80,7 @@
libsndfile1-dev (>= 1.0.16),
libsoundtouch-dev (>= 1.5.0),
libspandsp-dev,
-   libsrt-dev,
+   libsrt-gnutls-dev,
libsrtp2-dev (>= 2.1),
libssl-dev,
libtool (>= 2.2.6),
diff -Nru gst-plugins-bad1.0-1.16.2/debian/patches/29bf8d8528ec694f65c8fae310adac996322cc74.patch gst-plugins-bad1.0-1.16.2/debian/patches/29bf8d8528ec694f65c8fae310adac996322cc74.patch
--- gst-plugins-bad1.0-1.16.2/debian/patches/29bf8d8528ec694f65c8fae310adac996322cc74.patch	1970-01-01 01:00:00.0 +0100
+++ gst-plugins-bad1.0-1.16.2/debian/patches/29bf8d8528ec694f65c8fae310adac996322cc74.patch	2020-07-15 22:53:46.0 +0200
@@ -0,0 +1,46 @@
+From 29bf8d8528ec694f65c8fae310adac996322cc74 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" 
+Date: Sat, 9 May 2020 19:59:46 +0200
+Subject: [PATCH] vulkan: Drop use of VK_RESULT_BEGIN_RANGE
+
+This was removed in Vulkan 1.2.140.
+
+> Shortly after 2020-04-24, we will be removing the automatically
+> generated `VK_*_BEGIN_RANGE`, `VK_*_END_RANGE`, and `VK_*_RANGE_SIZE`
+> tokens from the Vulkan headers. These tokens are currently defined for
+> some enumerated types, but are explicitly not part of the Vulkan API.
+> They existed only to support some Vulkan implementation internals,
+> which no longer require them. We will be accepting comments on this
+> topic in [#1230], but we strongly suggest any external projects using
+> these tokens immediately migrate away from them.
+
+[#1230]: https://github.com/KhronosGroup/Vulkan-Docs/issues/1230
+---
+ ext/vulkan/vkerror.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/ext/vulkan/vkerror.c b/ext/vulkan/vkerror.c
+index 3fec27e4d..c91589d9b 100644
+--- a/ext/vulkan/vkerror.c
 b/ext/vulkan/vkerror.c
+@@ -27,7 +27,7 @@
+ #include "vkerror.h"
+ 
+ /* *INDENT-OFF* */
+-static const struct 
++static const struct
+ {
+   VkResult result;
+   const char *str;
+@@ -63,8 +63,6 @@ _vk_result_to_string (VkResult result)
+ 
+   if (result >= 0)
+ return NULL;
+-  if (result < VK_RESULT_BEGIN_RANGE)
+-return "Unknown Error";
+ 
+   for (i = 0; i < G_N_ELEMENTS (vk_result_string_map); i++) {
+ if (result == vk_result_string_map[i].result)
+-- 
+2.26.2
+
diff -Nru gst-plugins-bad1.0-1.16.2/debian/patches/fix-build-with-make-4.3.patch gst-plugins-bad1.0-1.16.2/debian/patches/fix-build-with-make-4.3.patch
--- gst-plugins-bad1.0-1.16.2/debian/patches/fix-build-with-make-4.3.patch