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.000000000 +0100
+++ gst-plugins-bad1.0-1.16.2/debian/build-deps 2020-07-15 22:55:32.000000000 +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.000000000 +0100
+++ gst-plugins-bad1.0-1.16.2/debian/build-deps.in 2020-07-15 22:48:09.000000000 +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.000000000 +0100
+++ gst-plugins-bad1.0-1.16.2/debian/changelog 2020-07-15 22:56:22.000000000 +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 <sramac...@debian.org> 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.000000000 +0100
+++ gst-plugins-bad1.0-1.16.2/debian/control 2020-07-15 22:55:32.000000000 +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.000000000 +0100
+++ gst-plugins-bad1.0-1.16.2/debian/patches/29bf8d8528ec694f65c8fae310adac996322cc74.patch 2020-07-15 22:53:46.000000000 +0200
@@ -0,0 +1,46 @@
+From 29bf8d8528ec694f65c8fae310adac996322cc74 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steff...@ltnglobal.com>
+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 1970-01-01 01:00:00.000000000 +0100
+++ gst-plugins-bad1.0-1.16.2/debian/patches/fix-build-with-make-4.3.patch 2020-07-15 22:55:28.000000000 +0200
@@ -0,0 +1,29 @@
+Description: Fix build with make 4.3
+Author: Gianfranco Costamagna <locutusofb...@debian.org>
+Last-Update: 2020-07-15
+
+--- gst-plugins-bad1.0-1.16.2.orig/common/glib-gen.mak
++++ gst-plugins-bad1.0-1.16.2/common/glib-gen.mak
+@@ -5,7 +5,7 @@
+ #glib_enum_define=GST_COLOR_BALANCE
+ #glib_enum_prefix=gst_color_balance
+
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers=$(foreach h,$(glib_enum_headers),\n#include \"$(h)\")
+
+ # these are all the rules generating the relevant files
+ %-marshal.h: %-marshal.list
+--- gst-plugins-bad1.0-1.16.2.orig/common/gst-glib-gen.mak
++++ gst-plugins-bad1.0-1.16.2/common/gst-glib-gen.mak
+@@ -6,9 +6,9 @@
+ #glib_gen_prefix=gst_color_balance
+ #glib_gen_basename=colorbalance
+ #glib_gen_decl_banner=GST_EXPORT
+-#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
++#glib_gen_decl_include=#include <gst/foo/foo-prelude.h>
+
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++enum_headers=$(foreach h,$(glib_enum_headers),\n#include \"$(h)\")
+
+ # these are all the rules generating the relevant files
+ $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
diff -Nru gst-plugins-bad1.0-1.16.2/debian/patches/series gst-plugins-bad1.0-1.16.2/debian/patches/series
--- gst-plugins-bad1.0-1.16.2/debian/patches/series 2020-02-05 22:46:10.000000000 +0100
+++ gst-plugins-bad1.0-1.16.2/debian/patches/series 2020-07-15 22:54:46.000000000 +0200
@@ -2,3 +2,5 @@
02_opencv-data-path.patch
03_default-soundfont.patch
opencv.patch
+29bf8d8528ec694f65c8fae310adac996322cc74.patch
+fix-build-with-make-4.3.patch
diff -Nru gst-plugins-bad1.0-1.16.2/debian/rules gst-plugins-bad1.0-1.16.2/debian/rules
--- gst-plugins-bad1.0-1.16.2/debian/rules 2019-12-04 14:33:56.000000000 +0100
+++ gst-plugins-bad1.0-1.16.2/debian/rules 2020-07-15 22:48:09.000000000 +0200
@@ -66,7 +66,6 @@
gst_extra_build_depends += , libdrm-dev (>= 2.4.55) [linux-any]
gst_extra_build_depends += , wayland-protocols (>= 1.4) [linux-any]
gst_extra_build_depends += , libvulkan-dev [linux-any]
-gst_extra_build_depends += , libsrt-dev [linux-any]
PLUGINS += plugins-bad opencv
ifeq ($(DEB_HOST_ARCH_OS),linux)
signature.asc
Description: PGP signature
