diff options
| author |   Paul Zander <negril.nx+gentoo@gmail.com> | 2024-08-23 20:31:32 +0200 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2024-08-25 16:39:28 +0100 |
| commit | ff09c09923f119209970407540201cbdabccde4f (patch) | |
| tree | aca783f02694c0d43a9c62ce3a147002f6ce2c43 /media-video/obs-studio | |
| parent | kernel-build.eclass: fix module signing with unspecified key (diff) | |
| download | gentoo-ff09c09923f119209970407540201cbdabccde4f.tar.gz gentoo-ff09c09923f119209970407540201cbdabccde4f.tar.bz2 gentoo-ff09c09923f119209970407540201cbdabccde4f.zip | |
media-video/obs-studio: Fix compilation on GCC 15
Closes: https://bugs.gentoo.org/938326
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38268
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-video/obs-studio')
| -rw-r--r-- | media-video/obs-studio/files/json11-1.0.0-include-cstdint.patch | 12 | ||||
| -rw-r--r-- | media-video/obs-studio/obs-studio-30.2.3.ebuild | 4 | ||||
| -rw-r--r-- | media-video/obs-studio/obs-studio-9999.ebuild | 4 |
3 files changed, 20 insertions, 0 deletions
diff --git a/media-video/obs-studio/files/json11-1.0.0-include-cstdint.patch b/media-video/obs-studio/files/json11-1.0.0-include-cstdint.patch new file mode 100644 index 000000000000..29648cf15825 --- /dev/null +++ b/media-video/obs-studio/files/json11-1.0.0-include-cstdint.patch @@ -0,0 +1,12 @@ +diff --git a/json11.cpp b/json11.cpp +index 9647846..8266a14 100644 +--- a/json11.cpp ++++ b/json11.cpp +@@ -22,6 +22,7 @@ + #include "json11.hpp" + #include <cassert> + #include <cmath> ++#include <cstdint> + #include <cstdlib> + #include <cstdio> + #include <limits> diff --git a/media-video/obs-studio/obs-studio-30.2.3.ebuild b/media-video/obs-studio/obs-studio-30.2.3.ebuild index d0fc789c0edc..043f43465d42 100644 --- a/media-video/obs-studio/obs-studio-30.2.3.ebuild +++ b/media-video/obs-studio/obs-studio-30.2.3.ebuild @@ -183,6 +183,10 @@ src_prepare() { use wayland && filter-lto cmake_src_prepare + + pushd deps/json11 &> /dev/null || die + eapply "${FILESDIR}/json11-1.0.0-include-cstdint.patch" + popd &> /dev/null || die } src_configure() { diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index efd7033f58ab..f2a746c3d815 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -185,6 +185,10 @@ src_prepare() { use wayland && filter-lto cmake_src_prepare + + pushd deps/json11 &> /dev/null || die + eapply "${FILESDIR}/json11-1.0.0-include-cstdint.patch" + popd &> /dev/null || die } src_configure() { |