commit: 5f20551bb40ecf106227e0730d06d3aac5fe91d2 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Thu May 29 15:17:21 2025 +0000 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> CommitDate: Mon Jun 2 22:45:44 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f20551b
media-video/obs-studio: use net-libs/mbedtls:3 Use net-libs/mbedtls:3, fix minor QA warning about deprecated dependencies. Closes: https://bugs.gentoo.org/956807 Closes: https://github.com/gentoo/gentoo/pull/42330 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> ...studio-9999.ebuild => obs-studio-31.0.3-r2.ebuild} | 19 ++++++++++--------- media-video/obs-studio/obs-studio-9999.ebuild | 9 +++------ 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-31.0.3-r2.ebuild similarity index 94% copy from media-video/obs-studio/obs-studio-9999.ebuild copy to media-video/obs-studio/obs-studio-31.0.3-r2.ebuild index e3eee4c9b378..e3eb0f217edf 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-31.0.3-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) +CMAKE_REMOVE_MODULES_LIST=( FindFreetype 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. @@ -77,12 +77,11 @@ DEPEND=" media-libs/x264:= >=media-video/ffmpeg-6.1:=[nvenc?,opus,x264] net-misc/curl - net-libs/mbedtls:0= + net-libs/mbedtls:3= sys-apps/dbus sys-apps/pciutils sys-apps/util-linux sys-libs/zlib:= - x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcomposite @@ -90,10 +89,7 @@ DEPEND=" x11-libs/libxkbcommon alsa? ( media-libs/alsa-lib ) browser? ( - || ( - >=app-accessibility/at-spi2-core-2.46.0:2 - ( app-accessibility/at-spi2-atk dev-libs/atk ) - ) + >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib dev-libs/nspr @@ -103,6 +99,7 @@ DEPEND=" media-libs/mesa[gbm(+)] net-print/cups x11-libs/cairo + x11-libs/libdrm x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext @@ -189,6 +186,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() { @@ -251,8 +252,8 @@ src_install() { cmake_src_install # external plugins may need some things not installed by default, install them here - insinto /usr/include/obs/frontend/api - doins frontend/api/obs-frontend-api.h + insinto /usr/include/obs/UI/obs-frontend-api + doins UI/obs-frontend-api/obs-frontend-api.h } pkg_postinst() { diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index e3eee4c9b378..bd0a96c51ede 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) +CMAKE_REMOVE_MODULES_LIST=( FindFreetype 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. @@ -77,7 +77,7 @@ DEPEND=" media-libs/x264:= >=media-video/ffmpeg-6.1:=[nvenc?,opus,x264] net-misc/curl - net-libs/mbedtls:0= + net-libs/mbedtls:3= sys-apps/dbus sys-apps/pciutils sys-apps/util-linux @@ -90,10 +90,7 @@ DEPEND=" x11-libs/libxkbcommon alsa? ( media-libs/alsa-lib ) browser? ( - || ( - >=app-accessibility/at-spi2-core-2.46.0:2 - ( app-accessibility/at-spi2-atk dev-libs/atk ) - ) + >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib dev-libs/nspr
