commit: ff09c09923f119209970407540201cbdabccde4f Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Fri Aug 23 18:31:32 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Aug 25 15:39:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff09c099
media-video/obs-studio: Fix compilation on GCC 15 Closes: https://bugs.gentoo.org/938326 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/38268 Signed-off-by: Sam James <sam <AT> gentoo.org> .../obs-studio/files/json11-1.0.0-include-cstdint.patch | 12 ++++++++++++ media-video/obs-studio/obs-studio-30.2.3.ebuild | 4 ++++ media-video/obs-studio/obs-studio-9999.ebuild | 4 ++++ 3 files changed, 20 insertions(+) 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() {
