From 7f0ccc917c7abe6223784c703d86cd14755691fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Jul 2021 22:39:47 +0100 Subject: gentoo resync : 03.07.2021 --- media-video/obs-studio/Manifest | 10 +- .../files/obs-studio-26.1.2-python-3.8.patch | 12 +- media-video/obs-studio/metadata.xml | 8 +- media-video/obs-studio/obs-studio-27.0.1.ebuild | 218 +++++++++++++++++++++ media-video/obs-studio/obs-studio-9999.ebuild | 91 ++++++--- 5 files changed, 304 insertions(+), 35 deletions(-) create mode 100644 media-video/obs-studio/obs-studio-27.0.1.ebuild (limited to 'media-video/obs-studio') diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest index a063bd154591..83acef48de74 100644 --- a/media-video/obs-studio/Manifest +++ b/media-video/obs-studio/Manifest @@ -1,6 +1,10 @@ AUX obs-studio-26.1.2-fix-alsa-crash.patch 1047 BLAKE2B 5c7417042565beb47bd57ad770358e6d751f3ed08b849f279439f07ac48a1f4dace780ed23b60a3c26988e06ae9899e1ad088c04ffccd42d953e6d05f5287719 SHA512 e5261c1e6fdc5bdbdd3663225c71ee9aa40ec3f724ab69426a96f7180f2a3f6193d1a1b171aac2ba78d6a4c2a9362d060d6b7e99841754829001f087bcde7062 -AUX obs-studio-26.1.2-python-3.8.patch 850 BLAKE2B dbaab7b41598bbbd08d77d386de58638f2dfb6d3f7254314068bed2d3ec9171903484d711d27e53b86f6585ddca7b989580f5c6968c1c04ac003157c2d9dbe73 SHA512 eba28d2027143c9ea30248b50eefc27b1cb761a24ca4561d6aca2d4813c1f57f47c6a0421d244479a9afa8d5dbc6e54066f3d70622edbf78039f3738eb2c37a3 +AUX obs-studio-26.1.2-python-3.8.patch 653 BLAKE2B 6fbafacb2b2a7dc7dbb15f63eea9463e7c26744caab9399146bd404227d6b7e4119cbeb8f93b4b5c81399d342f02b002d79ad72d2a8dde3317d8f5a67f163dc9 SHA512 598701d227feab450d2f8db40d18b7380dcbedb13b6586deb481b7164c33e12e04b1d5babdadbe073d5af0ac899d783f7a2a2d2ed020f19edb6146cfd00798af +DIST cef_binary_4280_linux64.tar.bz2 79740715 BLAKE2B c648a9a4205094450f9eae407e98cbc3da2b7cd81b3c19c4f52cfa3efcca01dce40528018996c65f026eb97520d78040165d1906b0d19236a86e76ec39c58c26 SHA512 060a5a8716a75b4b96dfb6ac28c132e22b93107915d680311c1b9d4fd12c7712a9e3497338eac6d2b9f4e74f2dc005a75d195c597bba049e4731fe3724f519ba +DIST obs-browser-f1a61c5a2579e5673765c31a47c2053d4b502d4b.tar.gz 79259 BLAKE2B 28cfa46928de0b5e626b384673f7b92b3a48cb631066dda06288c51df78f06b913707a1295a5142d4521505b0678a6c639bfbb5b8a066d585fa12849578a382e SHA512 3ecab39bfb36774ac501de087ca70ecde12f408cfd54cdf12539a92e89d0cf531767a066ff77139389158c46beee423cf1848081ed187890b86241aa96f7b179 DIST obs-studio-26.1.2.tar.gz 16624899 BLAKE2B 655a6c71d3a0ae6ae1fc2d166a148002bb17d6eaec06d5633a10fdbfe7f42e073526ede83cd36ad21c440debe870b41b43724caa00633733f1e196d918304adc SHA512 cd95fbf587f7edfe415cae75299d65c1d771bb118649fb839ae43d77145d87725c23df3360aa7b8c35ab8b62e5ec7983a8b02f8b102caa78f768eb58b4263417 +DIST obs-studio-27.0.1.tar.gz 15787807 BLAKE2B c2ea571f06a81b2e87ce5d9fd010610ea6cc2753223e6373025f0389972d4638a5f3ff1802f9f0af2c631d71ebcf4603e064da804e8c89eb032b1ad5743d1bd4 SHA512 c15dda62c1f212f623914e61a90c6b1e035720fb84d64726c14f43d77ae7569777a23d04221db34347ce610e7c3407c29e726ae36412e98e34ea2ddb2072b7f3 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 +EBUILD obs-studio-27.0.1.ebuild 5399 BLAKE2B 0152786b6afc434d43fd4ddb4e1759457eb0dfcd82df0c0eca94419d28cc74ca24117f011c28b454b0ac7c56389042a1e09aaf65646b9a7bb67c95dd88b07a04 SHA512 00e97f618485ccad4af4aea7850e132116eb72c8f0456e5b4b8ddd8cf9510fa0fe50b1044c28ad4c3b7edca3592f46617438f91935fe2a5f28104e746c90adea +EBUILD obs-studio-9999.ebuild 5399 BLAKE2B 0152786b6afc434d43fd4ddb4e1759457eb0dfcd82df0c0eca94419d28cc74ca24117f011c28b454b0ac7c56389042a1e09aaf65646b9a7bb67c95dd88b07a04 SHA512 00e97f618485ccad4af4aea7850e132116eb72c8f0456e5b4b8ddd8cf9510fa0fe50b1044c28ad4c3b7edca3592f46617438f91935fe2a5f28104e746c90adea +MISC metadata.xml 1580 BLAKE2B 8acaa24642b2ec1dff1b9e899eb71d1b7a0aba123ae5a5a0267e38b5745b46bf6aab5db036e425244c102d459ff5d987bc0464b7e1ced108dca02b5fc98fd78c SHA512 4aac89628f080d1121ccb63a0a8a597e6c74c80dd2b36fd5edb5ec4b7325bc887111b9e49ec346e6b99aa67f05ade0d8fb88f9b7b755475e5efa2f8a83b458e3 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 index c4709c654688..d9e328ea4efb 100644 --- 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 @@ -1,15 +1,9 @@ -From 413fbe27ee68881f60265f0f2dd670ce42ca220e Mon Sep 17 00:00:00 2001 +https://bugs.gentoo.org/754006 + +https://github.com/obsproject/obs-studio/pull/3335 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) diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml index 07659c3e82fa..4d0c222ec605 100644 --- a/media-video/obs-studio/metadata.xml +++ b/media-video/obs-studio/metadata.xml @@ -1,10 +1,14 @@ - + chiitoo@gentoo.org Jimi Huotari + + ionen@gentoo.org + Ionen Wolkens + A rewrite of what was formerly known as "Open Broadcaster Software", software originally designed for recording and streaming live video @@ -12,6 +16,7 @@ internally. + Enable browser source support via (precompiled) CEF. Build the Decklink plugin. Build with LibFDK AAC support. Use ImageMagick for image loading instead of FFmpeg. @@ -24,5 +29,6 @@ obsproject/obs-studio + obsproject/obs-browser diff --git a/media-video/obs-studio/obs-studio-27.0.1.ebuild b/media-video/obs-studio/obs-studio-27.0.1.ebuild new file mode 100644 index 000000000000..56839893506e --- /dev/null +++ b/media-video/obs-studio/obs-studio-27.0.1.ebuild @@ -0,0 +1,218 @@ +# 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_{8..10} ) + +inherit xdg cmake lua-single python-single-r1 + +OBS_BROWSER_COMMIT="f1a61c5a2579e5673765c31a47c2053d4b502d4b" +CEF_DIR="cef_binary_4280_linux64" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git" + EGIT_SUBMODULES=( plugins/obs-browser ) +else + SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI+=" browser? ( https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz )" + KEYWORDS="~amd64 ~ppc64 ~x86" +fi +SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}.tar.bz2 )" + +DESCRIPTION="Software for Recording and Streaming Live Video Content" +HOMEPAGE="https://obsproject.com" + +LICENSE="GPL-2" +SLOT="0" +IUSE=" + +alsa browser decklink fdk jack lua nvenc pipewire + pulseaudio python speex +ssl truetype v4l vlc wayland +" +REQUIRED_USE=" + browser? ( || ( alsa pulseaudio ) ) + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +BDEPEND=" + lua? ( dev-lang/swig ) + python? ( dev-lang/swig ) +" +DEPEND=" + dev-libs/jansson + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5[wayland?] + 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 ) + browser? ( + app-accessibility/at-spi2-atk + dev-libs/atk + dev-libs/expat + dev-libs/glib + dev-libs/nspr + dev-libs/nss + media-libs/alsa-lib + media-libs/fontconfig + net-print/cups + x11-libs/libXScrnSaver + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + ) + fdk? ( media-libs/fdk-aac:= ) + 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 ) + ssl? ( net-libs/mbedtls:= ) + truetype? ( + media-libs/fontconfig + media-libs/freetype + ) + v4l? ( media-libs/libv4l ) + vlc? ( media-video/vlc:= ) + wayland? ( dev-libs/wayland ) +" +RDEPEND="${DEPEND}" + +QA_PREBUILT=" + usr/lib*/obs-plugins/chrome-sandbox + usr/lib*/obs-plugins/libEGL.so + usr/lib*/obs-plugins/libGLESv2.so + usr/lib*/obs-plugins/libcef.so + usr/lib*/obs-plugins/swiftshader/libEGL.so + usr/lib*/obs-plugins/swiftshader/libGLESv2.so +" + +PATCHES=( + "${FILESDIR}/${PN}-26.1.2-python-3.8.patch" +) + +pkg_setup() { + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_unpack() { + default + + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + elif use browser; then + rm -d ${P}/plugins/obs-browser || die + mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser || die + fi +} + +src_configure() { + local libdir=$(get_libdir) + local mycmakeargs=( + $(usex browser -DCEF_ROOT_DIR=../${CEF_DIR} '') + -DBUILD_BROWSER=$(usex browser) + -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) + -DDISABLE_VLC=$(usex !vlc) + -DOBS_MULTIARCH_SUFFIX=${libdir#lib} + -DUNIX_STRUCTURE=1 + -DWITH_RTMPS=$(usex ssl) + + # deprecated and currently cause issues + # https://github.com/obsproject/obs-studio/pull/4560#issuecomment-826345608 + -DLIBOBS_PREFER_IMAGEMAGICK=no + ) + + 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_pkg_postinst + + 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 + + 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 +} diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index f1b911e33918..56839893506e 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -5,26 +5,35 @@ EAPI=7 CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) -inherit cmake lua-single python-single-r1 xdg-utils +inherit xdg cmake lua-single python-single-r1 -if [[ ${PV} == *9999 ]]; then +OBS_BROWSER_COMMIT="f1a61c5a2579e5673765c31a47c2053d4b502d4b" +CEF_DIR="cef_binary_4280_linux64" + +if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git" - EGIT_SUBMODULES=() + EGIT_SUBMODULES=( plugins/obs-browser ) else SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI+=" browser? ( https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz )" KEYWORDS="~amd64 ~ppc64 ~x86" fi +SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}.tar.bz2 )" DESCRIPTION="Software for Recording and Streaming Live Video Content" HOMEPAGE="https://obsproject.com" LICENSE="GPL-2" SLOT="0" -IUSE="+alsa decklink fdk imagemagick jack lua nvenc pipewire pulseaudio python speex +ssl truetype v4l vlc wayland" +IUSE=" + +alsa browser decklink fdk jack lua nvenc pipewire + pulseaudio python speex +ssl truetype v4l vlc wayland +" REQUIRED_USE=" + browser? ( || ( alsa pulseaudio ) ) lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) " @@ -34,7 +43,7 @@ BDEPEND=" python? ( dev-lang/swig ) " DEPEND=" - >=dev-libs/jansson-2.5 + dev-libs/jansson dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[wayland?] @@ -50,21 +59,38 @@ DEPEND=" media-video/ffmpeg:=[x264] net-misc/curl sys-apps/dbus - sys-libs/zlib + sys-libs/zlib:= virtual/udev x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr - x11-libs/libxcb + x11-libs/libxcb:= alsa? ( media-libs/alsa-lib ) + browser? ( + app-accessibility/at-spi2-atk + dev-libs/atk + dev-libs/expat + dev-libs/glib + dev-libs/nspr + dev-libs/nss + media-libs/alsa-lib + media-libs/fontconfig + net-print/cups + x11-libs/libXScrnSaver + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + ) fdk? ( media-libs/fdk-aac:= ) - imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) lua? ( ${LUA_DEPS} ) nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] ) - pipewire? ( media-video/pipewire ) + pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-sound/pulseaudio ) python? ( ${PYTHON_DEPS} ) speex? ( media-libs/speexdsp ) @@ -79,17 +105,40 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-26.1.2-python-3.8.patch" ) # https://github.com/obsproject/obs-studio/pull/3335 +QA_PREBUILT=" + usr/lib*/obs-plugins/chrome-sandbox + usr/lib*/obs-plugins/libEGL.so + usr/lib*/obs-plugins/libGLESv2.so + usr/lib*/obs-plugins/libcef.so + usr/lib*/obs-plugins/swiftshader/libEGL.so + usr/lib*/obs-plugins/swiftshader/libGLESv2.so +" + +PATCHES=( + "${FILESDIR}/${PN}-26.1.2-python-3.8.patch" +) pkg_setup() { use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup } +src_unpack() { + default + + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + elif use browser; then + rm -d ${P}/plugins/obs-browser || die + mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser || die + fi +} + src_configure() { local libdir=$(get_libdir) local mycmakeargs=( - -DBUILD_BROWSER=no + $(usex browser -DCEF_ROOT_DIR=../${CEF_DIR} '') + -DBUILD_BROWSER=$(usex browser) -DBUILD_VST=no -DENABLE_WAYLAND=$(usex wayland) -DDISABLE_ALSA=$(usex !alsa) @@ -102,13 +151,16 @@ src_configure() { -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) + + # deprecated and currently cause issues + # https://github.com/obsproject/obs-studio/pull/4560#issuecomment-826345608 + -DLIBOBS_PREFER_IMAGEMAGICK=no ) - if [[ ${PV} != *9999 ]]; then + if [[ ${PV} != 9999 ]]; then mycmakeargs+=( -DOBS_VERSION_OVERRIDE=${PV} ) @@ -129,13 +181,14 @@ src_configure() { src_install() { cmake_src_install - #external plugins may need some things not installed by default, install them here + + # 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 + xdg_pkg_postinst if ! use alsa && ! use pulseaudio; then elog @@ -154,9 +207,7 @@ pkg_postinst() { 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" @@ -165,7 +216,3 @@ pkg_postinst() { ewarn "Please report any such issues to the Gentoo maintainer." fi } - -pkg_postrm() { - xdg_icon_cache_update -} -- cgit v1.2.3