From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/
Date: Mon, 25 Apr 2022 20:19:21 +0000 (UTC) [thread overview]
Message-ID: <1650917927.e504c5bc0669909802c6f895f1c073225e98a6f1.ionen@gentoo> (raw)
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
next reply other threads:[~2022-04-25 20:19 UTC|newest]
Thread overview: 163+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-25 20:19 Ionen Wolkens [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-08 0:38 [gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/ Jimi Huotari
2025-03-08 0:38 Jimi Huotari
2025-02-11 20:25 Jimi Huotari
2025-02-11 20:25 Jimi Huotari
2025-01-16 23:05 Jimi Huotari
2025-01-16 22:12 Jimi Huotari
2025-01-07 19:54 Sam James
2024-12-30 17:38 Jimi Huotari
2024-12-13 22:06 Jimi Huotari
2024-12-13 22:06 Jimi Huotari
2024-12-07 13:40 Jimi Huotari
2024-12-07 13:40 Jimi Huotari
2024-08-28 18:36 Jimi Huotari
2024-08-22 6:50 Jimi Huotari
2024-08-22 5:58 Jimi Huotari
2024-08-22 5:58 Jimi Huotari
2024-07-23 14:59 Jimi Huotari
2024-07-13 11:38 Jimi Huotari
2024-07-13 11:38 Jimi Huotari
2024-07-13 0:05 Jimi Huotari
2024-06-22 15:39 Jimi Huotari
2024-06-22 15:39 Jimi Huotari
2024-06-22 15:39 Jimi Huotari
2024-04-04 19:55 Jimi Huotari
2024-04-04 19:55 Jimi Huotari
2024-04-04 19:44 Jimi Huotari
2024-03-20 21:30 Jimi Huotari
2024-03-07 19:55 Andrew Ammerlaan
2024-01-31 7:18 Joonas Niilola
2023-12-28 2:57 Sam James
2023-12-16 20:56 Jimi Huotari
2023-12-16 20:56 Jimi Huotari
2023-11-24 15:52 Jimi Huotari
2023-10-21 19:18 Jimi Huotari
2023-10-05 19:34 Mart Raudsepp
2023-07-26 17:41 Jimi Huotari
2023-07-26 17:41 Jimi Huotari
2023-07-25 14:53 Jimi Huotari
2023-07-17 21:45 Jimi Huotari
2023-07-17 21:45 Jimi Huotari
2023-06-19 14:05 Jimi Huotari
2023-06-19 14:05 Jimi Huotari
2023-06-19 14:05 Jimi Huotari
2023-05-29 18:08 Jimi Huotari
2023-05-29 18:08 Jimi Huotari
2023-05-29 18:08 Jimi Huotari
2023-05-09 19:08 Jimi Huotari
2023-05-09 19:08 Jimi Huotari
2023-05-06 11:00 Jimi Huotari
2023-05-06 11:00 Jimi Huotari
2023-05-06 11:00 Jimi Huotari
2023-02-06 4:21 Jimi Huotari
2023-02-06 4:21 Jimi Huotari
2023-01-11 13:04 Jimi Huotari
2023-01-11 13:04 Jimi Huotari
2023-01-10 21:28 Jimi Huotari
2023-01-10 21:28 Jimi Huotari
2022-11-23 1:45 Sam James
2022-11-12 6:14 Sam James
2022-11-08 16:20 Jimi Huotari
2022-11-08 16:20 Jimi Huotari
2022-11-08 16:20 Jimi Huotari
2022-04-25 20:19 Ionen Wolkens
2022-04-25 20:19 Ionen Wolkens
2022-04-01 19:43 Ionen Wolkens
2022-03-13 11:43 David Seifert
2022-03-04 18:14 Ionen Wolkens
2022-03-04 18:14 Ionen Wolkens
2022-02-23 1:39 Ionen Wolkens
2022-02-23 1:39 Ionen Wolkens
2022-02-23 1:39 Ionen Wolkens
2022-02-17 1:06 Ionen Wolkens
2022-02-17 1:06 Ionen Wolkens
2022-02-17 1:06 Ionen Wolkens
2022-01-22 0:34 Ionen Wolkens
2021-10-26 22:02 Ionen Wolkens
2021-10-26 22:02 Ionen Wolkens
2021-10-08 2:29 Ionen Wolkens
2021-10-08 2:29 Ionen Wolkens
2021-10-02 23:58 Ionen Wolkens
2021-10-02 23:58 Ionen Wolkens
2021-09-25 19:08 Sam James
2021-07-01 16:57 Ionen Wolkens
2021-07-01 16:57 Ionen Wolkens
2021-07-01 16:57 Ionen Wolkens
2021-07-01 16:57 Ionen Wolkens
2021-05-07 21:23 Andreas Sturmlechner
2021-05-07 21:23 Andreas Sturmlechner
2021-01-31 15:16 Andreas Sturmlechner
2020-12-22 20:06 Rick Farina
2020-12-22 19:45 Rick Farina
2020-12-16 6:08 Sam James
2020-12-04 3:16 Rick Farina
2020-08-10 20:55 Lars Wendler
2020-07-27 16:40 Sam James
2020-05-19 18:11 Georgy Yakovlev
2020-05-19 18:11 Georgy Yakovlev
2020-05-14 15:57 Rick Farina
2020-05-10 11:42 Andreas Sturmlechner
2020-05-04 13:39 Rick Farina
2020-05-02 11:31 Andreas Sturmlechner
2020-05-02 11:31 Andreas Sturmlechner
2020-04-03 20:35 Andreas Sturmlechner
2020-04-03 20:35 Andreas Sturmlechner
2020-03-24 17:54 Rick Farina
2020-03-19 16:01 Rick Farina
2020-02-26 15:25 Ben Kohler
2019-12-26 21:11 Andreas Sturmlechner
2019-12-26 21:11 Andreas Sturmlechner
2019-11-03 17:19 Andreas Sturmlechner
2019-11-03 17:19 Andreas Sturmlechner
2019-11-03 17:19 Andreas Sturmlechner
2019-06-22 11:44 Andreas Sturmlechner
2019-05-08 22:56 Andreas Sturmlechner
2019-05-08 22:56 Andreas Sturmlechner
2019-04-06 20:34 Andreas Sturmlechner
2019-04-06 20:34 Andreas Sturmlechner
2019-04-06 20:34 Andreas Sturmlechner
2019-02-28 22:49 Patrice Clement
2019-02-28 22:49 Patrice Clement
2018-12-03 2:43 Jonathan Callen
2018-11-13 20:33 Craig Andrews
2018-10-09 10:02 Andreas Sturmlechner
2018-10-04 14:31 Andreas Sturmlechner
2018-10-04 14:31 Andreas Sturmlechner
2018-10-04 14:31 Andreas Sturmlechner
2018-10-04 14:31 Andreas Sturmlechner
2018-10-04 14:31 Andreas Sturmlechner
2018-10-04 14:31 Andreas Sturmlechner
2018-10-04 14:31 Andreas Sturmlechner
2018-07-13 9:36 Tony Vroon
2018-07-13 9:36 Tony Vroon
2018-07-13 9:36 Tony Vroon
2018-07-13 9:36 Tony Vroon
2018-07-13 9:36 Tony Vroon
2018-03-25 21:59 Patrice Clement
2018-02-18 17:16 Patrice Clement
2018-02-18 17:16 Patrice Clement
2018-01-06 2:14 Andreas Sturmlechner
2018-01-06 2:14 Andreas Sturmlechner
2017-10-27 21:02 Patrice Clement
2017-10-27 21:02 Patrice Clement
2017-10-19 21:37 Jonas Stein
2017-10-11 21:23 Patrice Clement
2017-08-15 7:54 Patrice Clement
2017-08-15 7:54 Patrice Clement
2017-05-23 19:49 Michał Górny
2017-05-23 19:49 Michał Górny
2017-05-07 18:33 Michał Górny
2017-05-07 18:33 Michał Górny
2017-03-02 10:03 Michael Palimaka
2017-01-26 22:57 David Seifert
2017-01-26 22:57 David Seifert
2016-12-29 12:25 Michael Palimaka
2016-12-29 12:25 Michael Palimaka
2016-12-29 12:25 Michael Palimaka
2016-10-03 19:30 Patrice Clement
2016-10-03 19:30 Patrice Clement
2016-10-03 19:30 Patrice Clement
2016-08-14 19:39 Michael Palimaka
2016-07-17 13:33 Patrice Clement
2016-07-03 13:09 Patrice Clement
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1650917927.e504c5bc0669909802c6f895f1c073225e98a6f1.ionen@gentoo \
--to=ionen@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox