From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1389790-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 0EC3315808E
for <garchives@archives.gentoo.org>; Mon, 25 Apr 2022 20:19:25 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 27175E07D3;
Mon, 25 Apr 2022 20:19:24 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.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 pigeon.gentoo.org (Postfix) with ESMTPS id EB069E07D3
for <gentoo-commits@lists.gentoo.org>; Mon, 25 Apr 2022 20:19:23 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 E6746341818
for <gentoo-commits@lists.gentoo.org>; Mon, 25 Apr 2022 20:19:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 78214318
for <gentoo-commits@lists.gentoo.org>; Mon, 25 Apr 2022 20:19:21 +0000 (UTC)
From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" <ionen@gentoo.org>
Message-ID: <1650917927.e504c5bc0669909802c6f895f1c073225e98a6f1.ionen@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-9999.ebuild
X-VCS-Directories: media-video/obs-studio/
X-VCS-Committer: ionen
X-VCS-Committer-Name: Ionen Wolkens
X-VCS-Revision: e504c5bc0669909802c6f895f1c073225e98a6f1
X-VCS-Branch: master
Date: Mon, 25 Apr 2022 20:19:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 082dc5b1-513f-4c86-b626-fd111bd0e4bd
X-Archives-Hash: 7385fab736497c0437b421cbd3d64d41
commit: e504c5bc0669909802c6f895f1c073225e98a6f1
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 13:22:44 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 20:18:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e504c5bc
media-video/obs-studio: update CMake switches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
media-video/obs-studio/obs-studio-9999.ebuild | 47 +++++++++++++++------------
1 file changed, 26 insertions(+), 21 deletions(-)
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index b9550e6de3df..a6cf2e6112ac 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -138,30 +138,35 @@ src_unpack() {
fi
}
+src_prepare() {
+ # We have not enabled VST before, but now it will be looked for unconditionally if
+ # any plugins are enabled, so make the VST part a warning instead of fatal for now.
+ sed -i 's/FATAL_ERROR "obs-vst submodule not available/WARNING "obs-vst submodule not available/' \
+ plugins/CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
src_configure() {
local libdir=$(get_libdir)
local mycmakeargs=(
$(usev browser -DCEF_ROOT_DIR=../${CEF_DIR})
- -DBUILD_BROWSER=$(usex browser)
- -DBUILD_VST=no
- -DENABLE_WAYLAND=$(usex wayland)
- -DDISABLE_ALSA=$(usex !alsa)
- -DDISABLE_DECKLINK=$(usex !decklink)
- -DDISABLE_FREETYPE=$(usex !truetype)
- -DDISABLE_JACK=$(usex !jack)
- -DDISABLE_LIBFDK=$(usex !fdk)
+ -DENABLE_ALSA=$(usex alsa)
+ -DENABLE_AJA=OFF
+ -DENABLE_BROWSER=$(usex browser)
+ -DENABLE_DECKLINK=$(usex decklink)
+ -DENABLE_FREETYPE=$(usex truetype)
+ -DENABLE_JACK=$(usex jack)
+ -DENABLE_LIBFDK=$(usex fdk)
-DENABLE_PIPEWIRE=$(usex pipewire)
- -DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
- -DDISABLE_SPEEXDSP=$(usex !speex)
- -DDISABLE_V4L2=$(usex !v4l)
- -DDISABLE_VLC=$(usex !vlc)
+ -DENABLE_PULSEAUDIO=$(usex pulseaudio)
+ -DENABLE_RTMPS=$(usex ssl ON OFF)
+ -DENABLE_SPEEXDSP=$(usex speex)
+ -DENABLE_V4L2=$(usex v4l)
+ -DENABLE_VLC=$(usex vlc)
+ -DENABLE_WAYLAND=$(usex wayland)
-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
-DUNIX_STRUCTURE=1
- -DWITH_RTMPS=$(usex ssl)
-
- # deprecated and currently cause issues
- # https://github.com/obsproject/obs-studio/pull/4560#issuecomment-826345608
- -DLIBOBS_PREFER_IMAGEMAGICK=no
)
if [[ ${PV} != 9999 ]]; then
@@ -172,12 +177,12 @@ src_configure() {
if use lua || use python; then
mycmakeargs+=(
- -DDISABLE_LUA=$(usex !lua)
- -DDISABLE_PYTHON=$(usex !python)
- -DENABLE_SCRIPTING=yes
+ -DENABLE_SCRIPTING_LUA=$(usex lua)
+ -DENABLE_SCRIPTING_PYTHON=$(usex python)
+ -DENABLE_SCRIPTING=ON
)
else
- mycmakeargs+=( -DENABLE_SCRIPTING=no )
+ mycmakeargs+=( -DENABLE_SCRIPTING=OFF )
fi
cmake_src_configure