commit: e2bf93f722c54d748e233c4da0a4b0612017cdf3
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 8 10:37:36 2025 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Jul 8 10:54:39 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2bf93f7
media-video/obs-studio: drop 31.0.3-r2
Also remove the now unused json11-1.0.0-include-cstdint patch.
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
media-video/obs-studio/Manifest | 1 -
.../files/json11-1.0.0-include-cstdint.patch | 12 -
media-video/obs-studio/obs-studio-31.0.3-r2.ebuild | 280 ---------------------
3 files changed, 293 deletions(-)
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 99c523ba2e43..0c2b49bd03b3 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -2,7 +2,6 @@ DIST cef_binary_6533_linux_aarch64_v4.tar.xz 337381068 BLAKE2B
7faa2b3718453ee2e
DIST cef_binary_6533_linux_x86_64_v3.tar.xz 325417284 BLAKE2B
57838fc1250d07139a656cca37e7d2e6bd99e08288af573e85fe1063b5cc5e04ff3c1a299f8464ee845ea0bc98199b939868b97605fcf351126bef6434f849b0
SHA512
bbf33b8aa0fac828388ec09b526ac6ee7680bdf7983a2d88ff85640903a1819db06bd3d1edae63616631e94d74315ac17956ac9cb2e186668771becea2afc34d
DIST obs-browser-033a23befe01e0a2f85b95af384a89b82c8d6a40.tar.gz 117011
BLAKE2B
90d21ac2f0bd9f06a41da18d7dd8a1c0d28f30855160dc69331258afa218d172d9d5a202fd3030191c89b2b443882b55a77e49baa83b033308c8c611160b9901
SHA512
7828509fa4433517adbca50f16486e979a893ce947ade0fecf3810fa94fe3098bcc37880078392754b3efddfa6da4ecddac6aaf5c698025a49614a9a800ed7b7
DIST obs-browser-b56fd78936761891475458447c1cc9058bb9c2d4.tar.gz 113837
BLAKE2B
e25b5f187d1316922e0cc53aafd44df6c4b6e5cbfc1a89c6f821912460887f3c5c5f62d3ca5a1e2f354704a073e286af245bf1bd5c3ccdf220b1d896349d1d11
SHA512
0244885ca8b64fc06108c57091474c5498c5b18755439119ebe58a387ec9a9a13a48c11149c9e8bbb64e4bdf897fdf28d67fa46fe76d1429669d140531bbf968
-DIST obs-studio-31.0.3.tar.gz 16033846 BLAKE2B
fa28a1c650735d93403193f41333a758365c40035305b7d133a0115fcc12cc01639b594b84b897643d9627410fa305825cb0cdeb664e4ea0a4b59b33021aeee6
SHA512
eeb59c0ccc530a04ead3389839efad6ae6b7b757ec5bf6df7b9bb0c393f0fa5fcec0e27e34c7e4801e11ef071518f423bb527cbf81fc3d29533d3757914706d8
DIST obs-studio-31.0.4.tar.gz 16034249 BLAKE2B
93f928ec576fa78a9b31582b4b143c0b3d2709489d3d1cf9ccce731ae03ca3218e96580805643938bb759395bd8ccae4d8106ba1cbf9bc91c6a8c457ea4024a0
SHA512
416ec3f71c954dc6509381133924331b9538b9c4d9572a19a251fa3925bc84360ded47d694b9ed546e1f075264fa685fa98bcc440c57db37a88c78da6b0b46c9
DIST obs-studio-31.1.0.tar.gz 16121035 BLAKE2B
eb1aed5cc1d685ce6c87288203acf4e7159a8fa051170958b453b5a9f713bc8f963bc6929fccbcfed1e6618ab6a70567200758f349220f7df14b384d8e89af60
SHA512
abaf4090baf121fcf471bf025085f42d8bea8ae9de037e6d32f58910993886341cdd11f3f61a7608a1bce06f12cde78d3d6d0dc5c9fd0320b8d59e166df17d41
DIST obs-websocket-40d26dbf4d29137bf88cd393a3031adb04d68bba.tar.gz 254383
BLAKE2B
ccf4af62844a05c35083028d974c5cbd631e22e91e9d2a7dace75ca4543a85f2c32b0868a46545fe3c1b9bf2b20ec577517e262b14ad9a0da1ab02786f95989b
SHA512
1436bca2110e46377b03fafa2711712959427e37d4bf96431e35f23c048dff53ab0c81d4607bcb01f9899ff3a5748e2ea9b7ee2b5fb88891ab05d55e1649e99b
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
deleted file mode 100644
index 29648cf15825..000000000000
--- a/media-video/obs-studio/files/json11-1.0.0-include-cstdint.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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-31.0.3-r2.ebuild
b/media-video/obs-studio/obs-studio-31.0.3-r2.ebuild
deleted file mode 100644
index 9557c124c31c..000000000000
--- a/media-video/obs-studio/obs-studio-31.0.3-r2.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_REMOVE_MODULES_LIST=( FindMbedTLS )
-LUA_COMPAT=( luajit )
-# For the time being upstream supports up to Python 3.12 only.
-# Any issues found with 3.13+ should be reported as a Gentoo bug.
-PYTHON_COMPAT=( python3_{11..14} )
-
-inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg
-
-CEF_AMD64="cef_binary_6533_linux_x86_64_v3"
-CEF_ARM64="cef_binary_6533_linux_aarch64_v4"
-OBS_BROWSER_COMMIT="b56fd78936761891475458447c1cc9058bb9c2d4"
-OBS_WEBSOCKET_COMMIT="c542622d7b6d41ce5875f54efdab1d4ac2967ef4"
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com";
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git";
- EGIT_SUBMODULES=(
- plugins/obs-browser
- plugins/obs-websocket
- )
-else
- SRC_URI="
- https://github.com/obsproject/${PN}/archive/${PV}.tar.gz
- -> ${P}.tar.gz
-
https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz
- -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz
-
https://github.com/obsproject/obs-websocket/archive/${OBS_WEBSOCKET_COMMIT}.tar.gz
- -> obs-websocket-${OBS_WEBSOCKET_COMMIT}.tar.gz
- "
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-SRC_URI+="
- browser? (
- amd64? (
https://cdn-fastly.obsproject.com/downloads/${CEF_AMD64}.tar.xz )
- arm64? (
https://cdn-fastly.obsproject.com/downloads/${CEF_ARM64}.tar.xz )
- )
-"
-
-LICENSE="Boost-1.0 GPL-2+ MIT Unlicense"
-SLOT="0"
-IUSE="
- +alsa browser decklink fdk jack lua mpegts nvenc pipewire pulseaudio
- python qsv sndio speex test-input truetype v4l vlc wayland websocket
-"
-REQUIRED_USE="
- browser? ( || ( alsa pulseaudio ) )
- lua? ( ${LUA_REQUIRED_USE} )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-BDEPEND="
- lua? ( dev-lang/swig )
- python? ( dev-lang/swig )
-"
-# media-video/ffmpeg[opus] required due to bug 909566
-# The websocket plug-in fails to build with 'dev-cpp/asio-1.34.0':
-# https://github.com/obsproject/obs-websocket/issues/1291
-DEPEND="
- dev-cpp/nlohmann_json
- dev-libs/glib:2
- dev-libs/jansson:=
- dev-libs/uthash
- dev-qt/qtbase:6[network,widgets,xml(+)]
- dev-qt/qtsvg:6
- media-libs/libglvnd[X]
- media-libs/libva
- media-libs/rnnoise
- media-libs/x264:=
- >=media-video/ffmpeg-6.1:=[nvenc?,opus,x264]
- net-misc/curl
- net-libs/mbedtls:3=
- sys-apps/dbus
- sys-apps/pciutils
- sys-apps/util-linux
- sys-libs/zlib:=
- x11-libs/libX11
- x11-libs/libxcb:=
- x11-libs/libXcomposite
- x11-libs/libXfixes
- x11-libs/libxkbcommon
- alsa? ( media-libs/alsa-lib )
- browser? (
- >=app-accessibility/at-spi2-core-2.46.0:2
- dev-libs/expat
- dev-libs/glib
- dev-libs/nspr
- dev-libs/nss
- media-libs/alsa-lib
- media-libs/fontconfig
- media-libs/mesa[gbm(+)]
- net-print/cups
- x11-libs/cairo
- x11-libs/libdrm
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libxkbcommon
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libxshmfence
- x11-libs/libXtst
- x11-libs/pango
- )
- fdk? ( media-libs/fdk-aac:= )
- jack? ( virtual/jack )
- lua? ( ${LUA_DEPS} )
- mpegts? (
- net-libs/librist
- net-libs/srt
- )
- nvenc? ( >=media-libs/nv-codec-headers-12 )
- pipewire? ( media-video/pipewire:= )
- pulseaudio? ( media-libs/libpulse )
- python? ( ${PYTHON_DEPS} )
- qsv? ( media-libs/libvpl )
- sndio? ( media-sound/sndio )
- speex? ( media-libs/speexdsp )
- truetype? (
- media-libs/fontconfig
- media-libs/freetype
- )
- v4l? (
- media-libs/libv4l
- virtual/udev
- )
- vlc? ( media-video/vlc:= )
- wayland? (
- dev-libs/wayland
- x11-libs/libxkbcommon
- )
- websocket? (
- <dev-cpp/asio-1.34.0
- dev-cpp/websocketpp
- dev-libs/qr-code-generator
- )
-"
-RDEPEND="${DEPEND}"
-
-QA_PREBUILT="
- usr/lib*/obs-plugins/chrome-sandbox
- usr/lib*/obs-plugins/libcef.so
- usr/lib*/obs-plugins/libEGL.so
- usr/lib*/obs-plugins/libGLESv2.so
- usr/lib*/obs-plugins/libvk_swiftshader.so
- usr/lib*/obs-plugins/libvulkan.so.1
- usr/lib*/obs-plugins/swiftshader/libEGL.so
- usr/lib*/obs-plugins/swiftshader/libGLESv2.so
-"
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
- use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- else
- rm -d ${P}/plugins/obs-browser || die
- mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser
|| die
-
- rm -d ${P}/plugins/obs-websocket || die
- mv obs-websocket-${OBS_WEBSOCKET_COMMIT}
${P}/plugins/obs-websocket || die
- fi
-}
-
-src_prepare() {
- default
-
- # -Werror=lto-type-mismatch
- # https://bugs.gentoo.org/867250
- # https://github.com/obsproject/obs-studio/issues/8988
- 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() {
- local libdir=$(get_libdir)
- local mycmakeargs=(
- -DENABLE_ALSA=$(usex alsa)
- -DENABLE_AJA=OFF
- -DENABLE_BROWSER=$(usex browser)
- -DENABLE_CCACHE=OFF
- -DENABLE_DECKLINK=$(usex decklink)
- -DENABLE_FFMPEG_NVENC=$(usex nvenc)
- -DENABLE_FREETYPE=$(usex truetype)
- -DENABLE_JACK=$(usex jack)
- -DENABLE_LIBFDK=$(usex fdk)
- -DENABLE_NEW_MPEGTS_OUTPUT=$(usex mpegts)
- -DENABLE_NVENC=$(usex nvenc)
- -DENABLE_PIPEWIRE=$(usex pipewire)
- -DENABLE_PULSEAUDIO=$(usex pulseaudio)
- -DENABLE_QSV11=$(usex qsv)
- -DENABLE_RNNOISE=ON
- -DENABLE_SNDIO=$(usex sndio)
- -DENABLE_SPEEXDSP=$(usex speex)
- -DENABLE_TEST_INPUT=$(usex test-input)
- -DENABLE_V4L2=$(usex v4l)
- -DENABLE_VLC=$(usex vlc)
- -DENABLE_VST=ON
- -DENABLE_WAYLAND=$(usex wayland)
- -DENABLE_WEBRTC=OFF # Requires libdatachannel.
- -DENABLE_WEBSOCKET=$(usex websocket)
- )
-
- if [[ ${PV} != 9999 ]]; then
- mycmakeargs+=(
- -DOBS_VERSION_OVERRIDE=${PV}
- )
- fi
-
- if use lua || use python; then
- mycmakeargs+=(
- -DENABLE_SCRIPTING_LUA=$(usex lua)
- -DENABLE_SCRIPTING_PYTHON=$(usex python)
- -DENABLE_SCRIPTING=ON
- )
- else
- mycmakeargs+=( -DENABLE_SCRIPTING=OFF )
- fi
-
- if use browser; then
- use amd64 && mycmakeargs+=(
-DCEF_ROOT_DIR=../cef_binary_6533_linux_x86_64 )
- use arm64 && mycmakeargs+=(
-DCEF_ROOT_DIR=../cef_binary_6533_linux_aarch64 )
- mycmakeargs+=( -DENABLE_WHATSNEW=ON )
- else
- mycmakeargs+=( -DENABLE_WHATSNEW=OFF )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- # external plugins may need some things not installed by default,
install them here
- insinto /usr/include/obs/UI/obs-frontend-api
- doins UI/obs-frontend-api/obs-frontend-api.h
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if ! use alsa && ! use pulseaudio; then
- elog
- elog "For the audio capture features to be available,"
- elog "at least one of the 'alsa' or 'pulseaudio' USE-flags
needs to"
- elog "be enabled."
- elog
- fi
-
- if use v4l && has_version media-video/v4l2loopback; then
- elog
- elog "Depending on system configuration, the v4l2loopback
kernel module"
- elog "may need to be loaded manually, and needs to be re-built
after"
- elog "kernel changes."
- elog
- fi
-
- optfeature "VA-API hardware encoding" media-video/ffmpeg[vaapi]
- optfeature "virtual camera support" media-video/v4l2loopback
-}
