Bug#1097496: obs-studio: diff for NMU version 30.2.3+dfsg-3.1
Control: tags 1097496 + patch
Control: tags 1097496 + pending
Dear maintainer,
I've prepared an NMU for obs-studio (versioned as 30.2.3+dfsg-3.1) and
uploaded it to DELAYED/15. Please feel free to tell me if I should
cancel it.
cu
Adrian
diffstat for obs-studio-30.2.3+dfsg obs-studio-30.2.3+dfsg
changelog | 7 +++
patches/0001-deps-json11-Fix-compile-error-on-GCC-15.patch | 24 +++++++++++++
patches/series | 1
3 files changed, 32 insertions(+)
diff -Nru obs-studio-30.2.3+dfsg/debian/changelog obs-studio-30.2.3+dfsg/debian/changelog
--- obs-studio-30.2.3+dfsg/debian/changelog 2025-04-25 21:49:45.000000000 +0300
+++ obs-studio-30.2.3+dfsg/debian/changelog 2025-10-05 20:35:32.000000000 +0300
@@ -1,3 +1,10 @@
+obs-studio (30.2.3+dfsg-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport upstream fix for FTBFS with GCC 15. (Closes: #1097496)
+
+ -- Adrian Bunk <bunk@debian.org> Sun, 05 Oct 2025 20:35:32 +0300
+
obs-studio (30.2.3+dfsg-3) unstable; urgency=medium
* Backport stephematician's patch for v4l2loopback-0.14 compat.
diff -Nru obs-studio-30.2.3+dfsg/debian/patches/0001-deps-json11-Fix-compile-error-on-GCC-15.patch obs-studio-30.2.3+dfsg/debian/patches/0001-deps-json11-Fix-compile-error-on-GCC-15.patch
--- obs-studio-30.2.3+dfsg/debian/patches/0001-deps-json11-Fix-compile-error-on-GCC-15.patch 1970-01-01 02:00:00.000000000 +0200
+++ obs-studio-30.2.3+dfsg/debian/patches/0001-deps-json11-Fix-compile-error-on-GCC-15.patch 2025-10-05 20:35:02.000000000 +0300
@@ -0,0 +1,24 @@
+From a1baa54a27a810afa07eb43c88ced6eb2defeba3 Mon Sep 17 00:00:00 2001
+From: Tarulia <mihawk.90+git@googlemail.com>
+Date: Sun, 30 Mar 2025 06:18:47 +0200
+Subject: deps/json11: Fix compile error on GCC 15+
+
+---
+ deps/json11/json11.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/deps/json11/json11.cpp b/deps/json11/json11.cpp
+index 88024e922..45dbbcbe6 100644
+--- a/deps/json11/json11.cpp
++++ b/deps/json11/json11.cpp
+@@ -22,6 +22,7 @@
+ #include "json11.hpp"
+ #include <cassert>
+ #include <cmath>
++#include <cstdint>
+ #include <cstdlib>
+ #include <cstdio>
+ #include <limits>
+--
+2.30.2
+
diff -Nru obs-studio-30.2.3+dfsg/debian/patches/series obs-studio-30.2.3+dfsg/debian/patches/series
--- obs-studio-30.2.3+dfsg/debian/patches/series 2025-04-25 21:49:45.000000000 +0300
+++ obs-studio-30.2.3+dfsg/debian/patches/series 2025-10-05 20:35:32.000000000 +0300
@@ -15,3 +15,4 @@
Use-time64_t-everywhere.patch
linux-v4l2-Save-device-by-id-or-path.patch
0017-Fix-virtual-cam.patch
+0001-deps-json11-Fix-compile-error-on-GCC-15.patch
Reply to: