Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/
Date: Sun, 03 Nov 2019 17:19:38
Message-Id: 1572801557.8f61805fc836037f40aed84213aacade81ef9891.asturm@gentoo
1 commit: 8f61805fc836037f40aed84213aacade81ef9891
2 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 11 09:50:05 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 3 17:19:17 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f61805f
7
8 media-video/obs-studio: add USE="ssl vlc"
9
10 When enabled, 'ssl' will allow for secure connections to servers
11 supporting RTMPS via 'net-libs/mbedtls' (previously automagic).
12
13 When enabled, 'vlc' will allow for 'media-video/vlc' to be used as a
14 media source in OBS Studio (previously automagic).
15
16 Package-Manager: Portage-2.3.76, Repoman-2.3.17
17 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
18 Closes: https://github.com/gentoo/gentoo/pull/12969
19 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
20
21 media-video/obs-studio/metadata.xml | 3 +++
22 media-video/obs-studio/obs-studio-9999.ebuild | 11 +++++++----
23 2 files changed, 10 insertions(+), 4 deletions(-)
24
25 diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml
26 index 89c066c043b..cd2070e38ea 100644
27 --- a/media-video/obs-studio/metadata.xml
28 +++ b/media-video/obs-studio/metadata.xml
29 @@ -19,6 +19,9 @@
30 <flag name="python">Build support for scripting via Python 3.</flag>
31 <flag name="speex">Enable noise suppression filter support via
32 <pkg>media-libs/speexdsp</pkg>.</flag>
33 + <flag name="ssl">Build support for TLS/SSL connections (RTMPS) via
34 + <pkg>net-libs/mbedtls</pkg>.</flag>
35 + <flag name="vlc">Build support for using <pkg>media-video/vlc</pkg> as a media source.</flag>
36 </use>
37 <upstream>
38 <remote-id type="github">obsproject/obs-studio</remote-id>
39
40 diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
41 index d86c6eab447..46578dd8dba 100644
42 --- a/media-video/obs-studio/obs-studio-9999.ebuild
43 +++ b/media-video/obs-studio/obs-studio-9999.ebuild
44 @@ -3,7 +3,8 @@
45
46 EAPI=7
47
48 -PYTHON_COMPAT=( python{3_5,3_6,3_7} )
49 +CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
50 +PYTHON_COMPAT=( python3_{5,6,7} )
51
52 inherit cmake-utils python-single-r1 xdg-utils
53
54 @@ -21,7 +22,7 @@ HOMEPAGE="https://obsproject.com"
55
56 LICENSE="GPL-2"
57 SLOT="0"
58 -IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l"
59 +IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex +ssl truetype v4l vlc"
60 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
61
62 BDEPEND="
63 @@ -60,16 +61,16 @@ DEPEND="
64 pulseaudio? ( media-sound/pulseaudio )
65 python? ( ${PYTHON_DEPS} )
66 speex? ( media-libs/speexdsp )
67 + ssl? ( net-libs/mbedtls )
68 truetype? (
69 media-libs/fontconfig
70 media-libs/freetype
71 )
72 v4l? ( media-libs/libv4l )
73 + vlc? ( media-video/vlc:= )
74 "
75 RDEPEND="${DEPEND}"
76
77 -CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
78 -
79 pkg_setup() {
80 use python && python-single-r1_pkg_setup
81 }
82 @@ -84,9 +85,11 @@ src_configure() {
83 -DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
84 -DDISABLE_SPEEXDSP=$(usex !speex)
85 -DDISABLE_V4L2=$(usex !v4l)
86 + -DDISABLE_VLC=$(usex !vlc)
87 -DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
88 -DOBS_MULTIARCH_SUFFIX=${libdir#lib}
89 -DUNIX_STRUCTURE=1
90 + -DWITH_RTMPS=$(usex ssl)
91 )
92
93 if use luajit || use python; then