Verified Commit c1fcba06 authored by flussence's avatar flussence

obs-studio-9999: ebuild updates

  - Removed obsolete updater crash patch (it's disabled by default now)
  - Fixed USE=ssl (upstream now uses mbedtls, no more libressl hacks)
  - Fixed git fetching to not fetch submodules, as we use system libs
  - Added support for Python/Lua scripting APIs
  - Added support for sys-libs/libcxx
  - Made the bundled decklink plugin optional, for less compiling
parent db7fbcbd
diff --git a/plugins/rtmp-services/rtmp-services-main.c b/plugins/rtmp-services/rtmp-services-main.c
index 584a56dc2c3a..dd1fddf4777e 100644
--- a/plugins/rtmp-services/rtmp-services-main.c
+++ b/plugins/rtmp-services/rtmp-services-main.c
@@ -76,7 +76,7 @@ bool obs_module_load(void)
proc_handler_add(ph, "void twitch_ingests_refresh(int seconds)",
refresh_callback, NULL);
-#if !defined(_WIN32) || CHECK_FOR_SERVICE_UPDATES
+#if 0
char *local_dir = obs_module_file("");
char *cache_dir = obs_module_config_path("");
diff --git a/plugins/rtmp-services/twitch.c b/plugins/rtmp-services/twitch.c
index 6e26cd5f120f..e01d203dd78c 100644
--- a/plugins/rtmp-services/twitch.c
+++ b/plugins/rtmp-services/twitch.c
@@ -7,7 +7,9 @@
#include "twitch.h"
+#if 0
static update_info_t *twitch_update_info = NULL;
+#endif
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
static bool ingests_refreshed = false;
static bool ingests_refreshing = false;
@@ -167,11 +169,13 @@ void twitch_ingests_refresh(int seconds)
if (!os_atomic_load_bool(&ingests_refreshing)) {
os_atomic_set_bool(&ingests_refreshing, true);
+#if 0
twitch_update_info = update_info_create_single(
"[twitch ingest update] ",
get_module_name(),
"https://ingest.twitch.tv/api/v2/ingests",
twitch_ingest_update, NULL);
+#endif
}
/* wait five seconds max when loading ingests for the first time */
@@ -218,7 +222,9 @@ void load_twitch_data(void)
void unload_twitch_data(void)
{
+#if 0
update_info_destroy(twitch_update_info);
+#endif
free_ingests();
pthread_mutex_destroy(&mutex);
}
......@@ -9,10 +9,14 @@
<bugs-to>https://obsproject.com/mantis/</bugs-to>
</upstream>
<use>
<flag name="decklink">Enable bundled plugin for BlackMagic DeckLink devices</flag>
<flag name="fdk">Use <pkg>media-libs/fdk-aac</pkg> for high-quality AAC encoding</flag>
<flag name="imagemagick">Prefer ImageMagick for image loading instead of FFmpeg</flag>
<flag name="libcxx">Build using libc++ instead of libstdc++ (clang only)</flag>
<flag name="luajit">Enable the Lua scripting API</flag>
<flag name="python">Enable the Python scripting API</flag>
<flag name="qt5">Build the main OBS UI (you probably want this)</flag>
<flag name="ssl">Adds RTMPS (encrypted RTMP) support</flag>
<flag name="ssl">Add RTMPS (RTMP over TLS) support</flag>
<flag name="vlc">Add video source plugin using <pkg>media-video/vlc</pkg></flag>
</use>
</pkgmetadata>
......@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit cmake-utils multilib
PYTHON_COMPAT=( python3_{5,6,7} )
inherit cmake-utils multilib python-single-r1
DESCRIPTION="FOSS software for video recording and live streaming"
HOMEPAGE="https://obsproject.com"
......@@ -10,6 +11,7 @@ MY_REPO_URI="https://github.com/jp9000/obs-studio"
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="${MY_REPO_URI}.git"
EGIT_SUBMODULES=()
inherit git-r3
else
KEYWORDS="~amd64 ~x86"
......@@ -18,9 +20,10 @@ fi
LICENSE="GPL-2"
SLOT="0"
IUSE="alsa fdk jack imagemagick libressl pulseaudio +qt5 ssl truetype udev v4l vlc"
IUSE="alsa decklink fdk jack imagemagick libcxx luajit pulseaudio python +qt5 ssl speex truetype udev v4l vlc"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
DEPEND="
RDEPEND="
dev-libs/jansson
media-libs/x264
net-misc/curl
......@@ -35,15 +38,16 @@ DEPEND="
imagemagick? ( media-gfx/imagemagick )
!imagemagick? ( virtual/ffmpeg )
jack? ( media-sound/jack-audio-connection-kit )
ssl? (
libressl? ( dev-libs/libressl )
!libressl? ( dev-libs/openssl:0 )
)
libcxx? ( sys-libs/libcxx )
luajit? ( dev-lang/luajit:2 )
python? ( ${PYTHON_DEPS} )
qt5? (
dev-qt/qtcore:5
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
)
speex? ( media-libs/speexdsp )
ssl? ( net-libs/mbedtls )
truetype? (
media-libs/fontconfig
media-libs/freetype
......@@ -51,26 +55,37 @@ DEPEND="
udev? ( virtual/udev )
v4l? ( media-libs/libv4l )
vlc? ( media-video/vlc )"
RDEPEND="${DEPEND}"
DEPEND="
${DEPEND}
luajit? ( dev-lang/swig )
python? ( dev-lang/swig )"
PATCHES=( "${FILESDIR}"/bug-633596-workaround-for-"${PV}".patch )
pkg_setup() {
use python && python-single-r1_pkg_setup
}
src_configure() {
local libdir
libdir="$(get_libdir)"
local mycmakeargs+=(
"-DDISABLE_ALSA=$(usex !alsa)"
"-DDISABLE_DECKLINK=$(usex !decklink)"
"-DDISABLE_FREETYPE=$(usex !truetype)"
"-DDISABLE_JACK=$(usex !jack)"
"-DDISABLE_LIBFDK=$(usex !fdk)"
"-DDISABLE_LUAJIT=$(usex !luajit)"
"-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)"
"-DDISABLE_PYTHON=$(usex !python)"
"-DDISABLE_SPEEXDSP=$(usex !speex)"
"-DDISABLE_UDEV=$(usex !udev)"
"-DDISABLE_UI=$(usex !qt5)"
"-DDISABLE_V4L2=$(usex !v4l)"
"-DDISABLE_VLC=$(usex !vlc)"
"-DENABLE_SCRIPTING=$(use luajit || use python && printf yes || printf no)"
"-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)"
"-DUSE_SSL=$(usex ssl)"
"-DOBS_MULTIARCH_SUFFIX=${libdir#lib}"
"-DUSE_LIBC++=$(usex libcxx)"
"-DWITH_RTMPS=$(usex ssl)"
)
cmake-utils_src_configure
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment