Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/
Date: Sat, 02 Oct 2021 23:58:36
Message-Id: 1633219098.f17eaaab6e0ada4ba1827997a5e0302933c9cace.ionen@gentoo
1 commit: f17eaaab6e0ada4ba1827997a5e0302933c9cace
2 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 29 19:44:11 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 2 23:58:18 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f17eaaab
7
8 media-video/obs-studio: update CEF/EAPI-8/deps/messages
9
10 Package-Manager: Portage-3.0.24, Repoman-3.0.3
11 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
12 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
13
14 media-video/obs-studio/obs-studio-9999.ebuild | 24 ++++++++++--------------
15 1 file changed, 10 insertions(+), 14 deletions(-)
16
17 diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
18 index 4c9f4cd3f3a..6e23d6b2b47 100644
19 --- a/media-video/obs-studio/obs-studio-9999.ebuild
20 +++ b/media-video/obs-studio/obs-studio-9999.ebuild
21 @@ -1,15 +1,15 @@
22 # Copyright 1999-2021 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 -EAPI=7
26 +EAPI=8
27
28 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
29 LUA_COMPAT=( luajit )
30 PYTHON_COMPAT=( python3_{8..10} )
31
32 -inherit xdg cmake lua-single python-single-r1
33 +inherit cmake lua-single python-single-r1 xdg
34
35 -OBS_BROWSER_COMMIT="f1a61c5a2579e5673765c31a47c2053d4b502d4b"
36 +OBS_BROWSER_COMMIT="2a338b7c76d5dd0a6b23f1d49affefd40213b0e9"
37 CEF_DIR="cef_binary_4280_linux64"
38
39 if [[ ${PV} == 9999 ]]; then
40 @@ -43,6 +43,7 @@ BDEPEND="
41 python? ( dev-lang/swig )
42 "
43 DEPEND="
44 + dev-libs/glib:2
45 dev-libs/jansson:=
46 dev-qt/qtcore:5
47 dev-qt/qtdeclarative:5
48 @@ -55,6 +56,7 @@ DEPEND="
49 dev-qt/qtwidgets:5
50 dev-qt/qtx11extras:5
51 dev-qt/qtxml:5
52 + media-libs/libglvnd
53 media-libs/x264:=
54 media-video/ffmpeg:=[x264]
55 net-misc/curl
56 @@ -70,6 +72,7 @@ DEPEND="
57 alsa? ( media-libs/alsa-lib )
58 browser? (
59 app-accessibility/at-spi2-atk
60 + app-accessibility/at-spi2-core:2
61 dev-libs/atk
62 dev-libs/expat
63 dev-libs/glib
64 @@ -77,7 +80,9 @@ DEPEND="
65 dev-libs/nss
66 media-libs/alsa-lib
67 media-libs/fontconfig
68 + media-libs/mesa[gbm(+)]
69 net-print/cups
70 + x11-libs/libdrm
71 x11-libs/libXScrnSaver
72 x11-libs/libXcursor
73 x11-libs/libXdamage
74 @@ -137,7 +142,7 @@ src_unpack() {
75 src_configure() {
76 local libdir=$(get_libdir)
77 local mycmakeargs=(
78 - $(usex browser -DCEF_ROOT_DIR=../${CEF_DIR} '')
79 + $(usev browser -DCEF_ROOT_DIR=../${CEF_DIR})
80 -DBUILD_BROWSER=$(usex browser)
81 -DBUILD_VST=no
82 -DENABLE_WAYLAND=$(usex wayland)
83 @@ -148,6 +153,7 @@ src_configure() {
84 -DDISABLE_LIBFDK=$(usex !fdk)
85 -DENABLE_PIPEWIRE=$(usex pipewire)
86 -DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
87 + $(cmake_use_find_package pulseaudio PulseAudio)
88 -DDISABLE_SPEEXDSP=$(usex !speex)
89 -DDISABLE_V4L2=$(usex !v4l)
90 -DDISABLE_VLC=$(usex !vlc)
91 @@ -198,16 +204,6 @@ pkg_postinst() {
92 elog
93 fi
94
95 - if ! has_version "sys-apps/dbus"; then
96 - elog
97 - elog "The 'sys-apps/dbus' package is not installed, but"
98 - elog "could be used for disabling hibernating, screensaving,"
99 - elog "and sleeping. Where it is not installed,"
100 - elog "'xdg-screensaver reset' is used instead"
101 - elog "(if 'x11-misc/xdg-utils' is installed)."
102 - elog
103 - fi
104 -
105 if use python; then
106 ewarn "This ebuild applies a patch that is not yet accepted upstream,"
107 ewarn "and while it fixes Python support at least to some extent, it"