From d15e2b644efa1addd6de1e1c25452e325cbd84ea Mon Sep 17 00:00:00 2001 From: Jimi Huotari Date: Wed, 28 Apr 2021 10:06:02 +0300 Subject: media-video/obs-studio: raise python support to 3.8 and 3.9 With a patch. Closes: https://bugs.gentoo.org/754006 Closes: https://bugs.gentoo.org/784989 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Jimi Huotari Closes: https://github.com/gentoo/gentoo/pull/20574 Signed-off-by: Andreas Sturmlechner --- .../files/obs-studio-26.1.2-python-3.8.patch | 24 +++ media-video/obs-studio/obs-studio-26.1.2-r1.ebuild | 167 +++++++++++++++++++++ media-video/obs-studio/obs-studio-9999.ebuild | 17 ++- 3 files changed, 205 insertions(+), 3 deletions(-) create mode 100644 media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch create mode 100644 media-video/obs-studio/obs-studio-26.1.2-r1.ebuild (limited to 'media-video') 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 +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/obs-studio-26.1.2-r1.ebuild b/media-video/obs-studio/obs-studio-26.1.2-r1.ebuild new file mode 100644 index 000000000000..3e12ab881f7e --- /dev/null +++ b/media-video/obs-studio/obs-studio-26.1.2-r1.ebuild @@ -0,0 +1,167 @@ +# 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 ) +PYTHON_COMPAT=( python3_{7..9} ) + +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}-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 + 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_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..c6e7b77ff6b7 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 @@ -78,6 +77,8 @@ DEPEND=" " 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 @@ -148,6 +149,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 } -- cgit v1.2.3-65-gdbad