From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4308E1580E0 for ; Mon, 02 Jun 2025 22:45:54 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 2603E342FF2 for ; Mon, 02 Jun 2025 22:45:54 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 13A081102CD; Mon, 02 Jun 2025 22:45:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 028051102CD for ; Mon, 02 Jun 2025 22:45:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A819F342FF2 for ; Mon, 02 Jun 2025 22:45:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4688B2529 for ; Mon, 02 Jun 2025 22:45:51 +0000 (UTC) From: "Jimi Huotari" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" Message-ID: <1748904344.5f20551bb40ecf106227e0730d06d3aac5fe91d2.chiitoo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/obs-studio/obs-studio-31.0.3-r2.ebuild media-video/obs-studio/obs-studio-9999.ebuild X-VCS-Directories: media-video/obs-studio/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: 5f20551bb40ecf106227e0730d06d3aac5fe91d2 X-VCS-Branch: master Date: Mon, 02 Jun 2025 22:45:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 95dc0327-be5b-45d0-9286-3aa42b5d9791 X-Archives-Hash: 3e772406b0b7cf9af0de06daade85409 commit: 5f20551bb40ecf106227e0730d06d3aac5fe91d2 Author: Azamat H. Hackimov gmail com> AuthorDate: Thu May 29 15:17:21 2025 +0000 Commit: Jimi Huotari gentoo 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 gmail.com> Signed-off-by: Jimi Huotari 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