summaryrefslogtreecommitdiff
path: root/media-video/obs-studio
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/obs-studio')
-rw-r--r--media-video/obs-studio/Manifest9
-rw-r--r--media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch24
-rw-r--r--media-video/obs-studio/metadata.xml16
-rw-r--r--media-video/obs-studio/obs-studio-25.0.8-r100.ebuild155
-rw-r--r--media-video/obs-studio/obs-studio-26.1.2-r1.ebuild (renamed from media-video/obs-studio/obs-studio-26.1.2.ebuild)18
-rw-r--r--media-video/obs-studio/obs-studio-9999.ebuild28
6 files changed, 74 insertions, 176 deletions
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index e769cbf7bc85..5740ed754124 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,8 +1,7 @@
AUX obs-studio-25.0.8-gcc-10-build.patch 1050 BLAKE2B ccf18ba3f51de72f967fbab5b1526d1fc9a9bb628a25d1caed44ca308f4a988a15fe0ab235b218b2edc4e4eef40c86545cda989f0d748af942352ad8eb091f51 SHA512 1ff0e088eed61554268009f3d8c5a23c0888bfbe860d6cb288ddf348108446c152fd87e2cb8f54613a88378d8474550632c90f924005d5e0343bf1a801339ccc
AUX obs-studio-26.1.2-fix-alsa-crash.patch 1047 BLAKE2B 5c7417042565beb47bd57ad770358e6d751f3ed08b849f279439f07ac48a1f4dace780ed23b60a3c26988e06ae9899e1ad088c04ffccd42d953e6d05f5287719 SHA512 e5261c1e6fdc5bdbdd3663225c71ee9aa40ec3f724ab69426a96f7180f2a3f6193d1a1b171aac2ba78d6a4c2a9362d060d6b7e99841754829001f087bcde7062
-DIST obs-studio-25.0.8.tar.gz 9531713 BLAKE2B 4775ca8305e1beee4d926eff728351b699ca4d52f66e53409dbcfe1f73699df0286fadc0c138cb76b8eb73e70a143719e46f030b6d15d43629bdcbf23bdb88af SHA512 a97c03dc218a4e03e48f6a7dc82b4a59ebeee2039f17be66bb847681ce9ff3d25e6e015be4af78fe44739f6fad5089b6e683d7657c2e4fde8e547df9a2594a08
+AUX obs-studio-26.1.2-python-3.8.patch 850 BLAKE2B dbaab7b41598bbbd08d77d386de58638f2dfb6d3f7254314068bed2d3ec9171903484d711d27e53b86f6585ddca7b989580f5c6968c1c04ac003157c2d9dbe73 SHA512 eba28d2027143c9ea30248b50eefc27b1cb761a24ca4561d6aca2d4813c1f57f47c6a0421d244479a9afa8d5dbc6e54066f3d70622edbf78039f3738eb2c37a3
DIST obs-studio-26.1.2.tar.gz 16624899 BLAKE2B 655a6c71d3a0ae6ae1fc2d166a148002bb17d6eaec06d5633a10fdbfe7f42e073526ede83cd36ad21c440debe870b41b43724caa00633733f1e196d918304adc SHA512 cd95fbf587f7edfe415cae75299d65c1d771bb118649fb839ae43d77145d87725c23df3360aa7b8c35ab8b62e5ec7983a8b02f8b102caa78f768eb58b4263417
-EBUILD obs-studio-25.0.8-r100.ebuild 3656 BLAKE2B ded7642022885ad3163b2583af7472666a85e265ea0d0ca3e0879cddb93c00b0e1078539f6506e83f88258583cace0a4e903f41f3d1bc1e7d92cd844421ad152 SHA512 80e697adcf0221111cb298b36158885841a430248541f484afa075bd47d862e70a327b455aab59a856e13e719deaf455e653da5f31fa805ea5fd449be6bb759e
-EBUILD obs-studio-26.1.2.ebuild 3658 BLAKE2B 65e50aec6d6fa5aef00b9a884e6654582a07d66899ccb88c0188e56b314426066bb2ef00d3b5b233cb7b5154f41c7f46a57d21399853244e6b46056a66aa71aa SHA512 ee933e3a31e7faf560e2b7ca14d03d26bfb4d5041ae5457a9c3b1e253f428f0b3d0e4c30dd2fc17fd27a70bb4d7b96eea82fb193245ca66b79c520dd28096d6a
-EBUILD obs-studio-9999.ebuild 3597 BLAKE2B 46214450fd63782a469d29dee88fab6c0fecfbc6ddb2e1fbfe5c44ae5aa9d600544745bf611d84bdf1442e2c4168d0949aa12fd86bef0d9481df422db3c75d3c SHA512 76b013916aea107ed6e5a06ee932d3ff4ad74f5e1af9f81010d6692193295783f376b4a42b5c7b8a6890ab4e0c9fdd0209da327e6c57c2b43fc784ff44e39061
-MISC metadata.xml 1262 BLAKE2B 0ff74ff065f5efdfbd8a2e0a0311bf94cbd645a7a199e97bae0a696e15840de7713413e56a52d90c6db2da5fa5da454692c1d8766e2480f33fde1d29d95df37a SHA512 e094b748cbbccbf64cbf4895b7dd8911773a2fbb5a5f166bf8895ab27ce1dd7a360c3de0246e22d78abb6a18519a117277931e30584bc8d49c7b87da6e2040a2
+EBUILD obs-studio-26.1.2-r1.ebuild 4006 BLAKE2B f7bbf701f886efa63171ea25bcc8303c54fa60bea7ad72b7160d625193aa929ccfd4a4a5adb91628025b6a5240441ee52c79a01757b22a41cf933994978789f8 SHA512 0ce7a598bf46398e054981a71a7a6e904a0f45078d2014c8c43b85b164d9c812f4a60b75f57343ea89709c73cf60cdc83f751aedd34dbc71b9bff035197c0c1b
+EBUILD obs-studio-9999.ebuild 4208 BLAKE2B 5ea108c780d22293779d1228b93e0e6e34ff5e86b49bdce31790a5c7c633bd1dcec019cc27ba94deaf6e3c2521f61b938435d44eac619d2b207bbecc725d2a47 SHA512 fea4eb48342a6fa9fa697095fd6b93c629994f6632e27b4ffeb26680512ca0a67f4a6ac9af8c5ffc30f2b336088888e9995d74fedab6b86affee9ee8396490d0
+MISC metadata.xml 1289 BLAKE2B 4004638114baeb19100daf3903ae17005853b9fa95ca4a27380c1351d2fb9245baa3b127fd6eb4c641698787a248ccc4878a884ed1d61c58f88b64df221a8ac4 SHA512 276a74edcc1109218f4a3761759e43866f59bc547999cdf186fb6296d94e122e30c09520492742f53ae5785c72ac1abfa75a024dabb8b8d07862b3011cbdaa0b
diff --git a/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch b/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch
new file mode 100644
index 000000000000..c4709c654688
--- /dev/null
+++ b/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch
@@ -0,0 +1,24 @@
+From 413fbe27ee68881f60265f0f2dd670ce42ca220e Mon Sep 17 00:00:00 2001
+From: Matt Gajownik <matt@obsproject.com>
+Date: Tue, 25 Aug 2020 19:28:26 +1000
+Subject: [PATCH] libobs/util: Fix loading Python binary modules on *nix
+
+Fixes #2222
+---
+ libobs/util/platform-nix.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libobs/util/platform-nix.c b/libobs/util/platform-nix.c
+index 26800d52f7c..997b62db1a3 100644
+--- a/libobs/util/platform-nix.c
++++ b/libobs/util/platform-nix.c
+@@ -71,7 +71,8 @@ void *os_dlopen(const char *path)
+ #ifdef __APPLE__
+ void *res = dlopen(dylib_name.array, RTLD_LAZY | RTLD_FIRST);
+ #else
+- void *res = dlopen(dylib_name.array, RTLD_LAZY);
++ void *res = dlopen(dylib_name.array,
++ RTLD_LAZY | RTLD_DEEPBIND | RTLD_GLOBAL);
+ #endif
+ if (!res)
+ blog(LOG_ERROR, "os_dlopen(%s->%s): %s\n", path,
diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml
index 603cd8cc27ce..07659c3e82fa 100644
--- a/media-video/obs-studio/metadata.xml
+++ b/media-video/obs-studio/metadata.xml
@@ -12,15 +12,15 @@
internally.
</longdescription>
<use>
- <flag name="fdk">Enable libfdk support for AAC encoding.</flag>
+ <flag name="decklink">Build the Decklink plugin.</flag>
+ <flag name="fdk">Build with LibFDK AAC support.</flag>
<flag name="imagemagick">Use ImageMagick for image loading instead of FFmpeg.</flag>
- <flag name="nvenc">Enable NVENC encoding for nVidia video cards.</flag>
- <flag name="python">Build support for scripting via Python 3.</flag>
- <flag name="speex">Enable noise suppression filter support via
- <pkg>media-libs/speexdsp</pkg>.</flag>
- <flag name="ssl">Build support for TLS/SSL connections (RTMPS) via
- <pkg>net-libs/mbedtls</pkg>.</flag>
- <flag name="vlc">Build support for using <pkg>media-video/vlc</pkg> as a media source.</flag>
+ <flag name="nvenc">Build with NVENC encoding support for nVidia video cards.</flag>
+ <flag name="pipewire">Build with PipeWire support.</flag>
+ <flag name="python">Build with scripting support for Python 3.</flag>
+ <flag name="speex">Build with Speex noise suppression filter support.</flag>
+ <flag name="ssl">Build with TLS/SSL support for RTMPS connections.</flag>
+ <flag name="vlc">Build with VLC media source support.</flag>
</use>
<upstream>
<remote-id type="github">obsproject/obs-studio</remote-id>
diff --git a/media-video/obs-studio/obs-studio-25.0.8-r100.ebuild b/media-video/obs-studio/obs-studio-25.0.8-r100.ebuild
deleted file mode 100644
index f0f5aacc1e9e..000000000000
--- a/media-video/obs-studio/obs-studio-25.0.8-r100.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-LUA_COMPAT=( luajit )
-# Does not work with 3.8+ https://bugs.gentoo.org/754006
-PYTHON_COMPAT=( python3_7 )
-
-inherit cmake lua-single python-single-r1 xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
- EGIT_SUBMODULES=()
-else
- SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa fdk imagemagick jack lua nvenc pulseaudio python speex +ssl truetype v4l vlc"
-REQUIRED_USE="
- lua? ( ${LUA_REQUIRED_USE} )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-BDEPEND="
- lua? ( dev-lang/swig )
- python? ( dev-lang/swig )
-"
-DEPEND="
- >=dev-libs/jansson-2.5
- dev-qt/qtcore:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtquickcontrols:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- dev-qt/qtxml:5
- media-libs/x264:=
- media-video/ffmpeg:=[x264]
- net-misc/curl
- sys-apps/dbus
- sys-libs/zlib
- virtual/udev
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXfixes
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libxcb
- alsa? ( media-libs/alsa-lib )
- fdk? ( media-libs/fdk-aac:= )
- imagemagick? ( media-gfx/imagemagick:= )
- jack? ( virtual/jack )
- lua? ( ${LUA_DEPS} )
- nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] )
- pulseaudio? ( media-sound/pulseaudio )
- python? ( ${PYTHON_DEPS} )
- speex? ( media-libs/speexdsp )
- ssl? ( net-libs/mbedtls:= )
- truetype? (
- media-libs/fontconfig
- media-libs/freetype
- )
- v4l? ( media-libs/libv4l )
- vlc? ( media-video/vlc:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-25.0.8-gcc-10-build.patch" )
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local libdir=$(get_libdir)
- local mycmakeargs=(
- -DDISABLE_ALSA=$(usex !alsa)
- -DDISABLE_FREETYPE=$(usex !truetype)
- -DDISABLE_JACK=$(usex !jack)
- -DDISABLE_LIBFDK=$(usex !fdk)
- -DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
- -DDISABLE_SPEEXDSP=$(usex !speex)
- -DDISABLE_V4L2=$(usex !v4l)
- -DDISABLE_VLC=$(usex !vlc)
- -DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
- -DOBS_MULTIARCH_SUFFIX=${libdir#lib}
- -DUNIX_STRUCTURE=1
- -DWITH_RTMPS=$(usex ssl)
- )
-
- if [[ ${PV} != *9999 ]]; then
- mycmakeargs+=(
- -DOBS_VERSION_OVERRIDE=${PV}
- )
- fi
-
- if use lua || use python; then
- mycmakeargs+=(
- -DDISABLE_LUA=$(usex !lua)
- -DDISABLE_PYTHON=$(usex !python)
- -DENABLE_SCRIPTING=yes
- )
- else
- mycmakeargs+=( -DENABLE_SCRIPTING=no )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- #external plugins may need some things not installed by default, install them here
- insinto /usr/include/obs/UI/obs-frontend-api
- doins UI/obs-frontend-api/obs-frontend-api.h
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-
- if ! use alsa && ! use pulseaudio; then
- elog
- elog "For the audio capture features to be available,"
- elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
- elog "be enabled."
- elog
- fi
-
- if ! has_version "sys-apps/dbus"; then
- elog
- elog "The 'sys-apps/dbus' package is not installed, but"
- elog "could be used for disabling hibernating, screensaving,"
- elog "and sleeping. Where it is not installed,"
- elog "'xdg-screensaver reset' is used instead"
- elog "(if 'x11-misc/xdg-utils' is installed)."
- elog
- fi
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/media-video/obs-studio/obs-studio-26.1.2.ebuild b/media-video/obs-studio/obs-studio-26.1.2-r1.ebuild
index 9833f5fb6b6c..3e12ab881f7e 100644
--- a/media-video/obs-studio/obs-studio-26.1.2.ebuild
+++ b/media-video/obs-studio/obs-studio-26.1.2-r1.ebuild
@@ -5,8 +5,7 @@ EAPI=7
CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
LUA_COMPAT=( luajit )
-# Does not work with 3.8+ https://bugs.gentoo.org/754006
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
inherit cmake lua-single python-single-r1 xdg-utils
@@ -78,7 +77,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-26.1.2-fix-alsa-crash.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-26.1.2-fix-alsa-crash.patch"
+ "${FILESDIR}/${PN}-26.1.2-python-3.8.patch" # https://github.com/obsproject/obs-studio/pull/3335
+)
pkg_setup() {
use lua && lua-single_pkg_setup
@@ -150,6 +152,16 @@ pkg_postinst() {
fi
}
+pkg_postinst() {
+ if use python; then
+ ewarn "This ebuild applies a patch that is not yet accepted upstream,"
+ ewarn "and while it fixes Python support at least to some extent, it"
+ ewarn "may cause other issues."
+ ewarn ""
+ ewarn "Please report any such issues to the Gentoo maintainer."
+ fi
+}
+
pkg_postrm() {
xdg_icon_cache_update
}
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index e9173352238b..f1b911e33918 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
LUA_COMPAT=( luajit )
-# Does not work with 3.8+ https://bugs.gentoo.org/754006
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
inherit cmake lua-single python-single-r1 xdg-utils
@@ -24,7 +23,7 @@ HOMEPAGE="https://obsproject.com"
LICENSE="GPL-2"
SLOT="0"
-IUSE="+alsa fdk imagemagick jack lua nvenc pulseaudio python speex +ssl truetype v4l vlc"
+IUSE="+alsa decklink fdk imagemagick jack lua nvenc pipewire pulseaudio python speex +ssl truetype v4l vlc wayland"
REQUIRED_USE="
lua? ( ${LUA_REQUIRED_USE} )
python? ( ${PYTHON_REQUIRED_USE} )
@@ -38,7 +37,7 @@ DEPEND="
>=dev-libs/jansson-2.5
dev-qt/qtcore:5
dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
+ dev-qt/qtgui:5[wayland?]
dev-qt/qtmultimedia:5
dev-qt/qtnetwork:5
dev-qt/qtquickcontrols:5
@@ -65,6 +64,7 @@ DEPEND="
jack? ( virtual/jack )
lua? ( ${LUA_DEPS} )
nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] )
+ pipewire? ( media-video/pipewire )
pulseaudio? ( media-sound/pulseaudio )
python? ( ${PYTHON_DEPS} )
speex? ( media-libs/speexdsp )
@@ -75,9 +75,12 @@ DEPEND="
)
v4l? ( media-libs/libv4l )
vlc? ( media-video/vlc:= )
+ wayland? ( dev-libs/wayland )
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-26.1.2-python-3.8.patch" ) # https://github.com/obsproject/obs-studio/pull/3335
+
pkg_setup() {
use lua && lua-single_pkg_setup
use python && python-single-r1_pkg_setup
@@ -86,10 +89,15 @@ pkg_setup() {
src_configure() {
local libdir=$(get_libdir)
local mycmakeargs=(
+ -DBUILD_BROWSER=no
+ -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_PIPEWIRE=$(usex pipewire)
-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
-DDISABLE_SPEEXDSP=$(usex !speex)
-DDISABLE_V4L2=$(usex !v4l)
@@ -148,6 +156,16 @@ pkg_postinst() {
fi
}
+pkg_postinst() {
+ if use python; then
+ ewarn "This ebuild applies a patch that is not yet accepted upstream,"
+ ewarn "and while it fixes Python support at least to some extent, it"
+ ewarn "may cause other issues."
+ ewarn ""
+ ewarn "Please report any such issues to the Gentoo maintainer."
+ fi
+}
+
pkg_postrm() {
xdg_icon_cache_update
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 21:01:31 +0000