diff options
Diffstat (limited to 'media-video/obs-studio')
| -rw-r--r-- | media-video/obs-studio/Manifest | 10 | ||||
| -rw-r--r-- | media-video/obs-studio/files/obs-studio-26.1.2-fix-alsa-crash.patch | 30 | ||||
| -rw-r--r-- | media-video/obs-studio/metadata.xml | 1 | ||||
| -rw-r--r-- | media-video/obs-studio/obs-studio-27.1.3.ebuild (renamed from media-video/obs-studio/obs-studio-26.1.2-r2.ebuild) | 113 | ||||
| -rw-r--r-- | media-video/obs-studio/obs-studio-9999.ebuild | 24 |
5 files changed, 95 insertions, 83 deletions
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest index eacbf5fff0ce..fbefdfe209d0 100644 --- a/media-video/obs-studio/Manifest +++ b/media-video/obs-studio/Manifest @@ -1,10 +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 653 BLAKE2B 6fbafacb2b2a7dc7dbb15f63eea9463e7c26744caab9399146bd404227d6b7e4119cbeb8f93b4b5c81399d342f02b002d79ad72d2a8dde3317d8f5a67f163dc9 SHA512 598701d227feab450d2f8db40d18b7380dcbedb13b6586deb481b7164c33e12e04b1d5babdadbe073d5af0ac899d783f7a2a2d2ed020f19edb6146cfd00798af DIST cef_binary_4280_linux64.tar.bz2 79740715 BLAKE2B c648a9a4205094450f9eae407e98cbc3da2b7cd81b3c19c4f52cfa3efcca01dce40528018996c65f026eb97520d78040165d1906b0d19236a86e76ec39c58c26 SHA512 060a5a8716a75b4b96dfb6ac28c132e22b93107915d680311c1b9d4fd12c7712a9e3497338eac6d2b9f4e74f2dc005a75d195c597bba049e4731fe3724f519ba +DIST obs-browser-2a338b7c76d5dd0a6b23f1d49affefd40213b0e9.tar.gz 89474 BLAKE2B ff76a884ffbb7765430a14a7de2955164e9d8823f5dd48bd85e6d0452022b706517e935d813ad78a45adf5eca95fda02e17ae81dbd721145d3ecd169c5a70537 SHA512 bcc8e38505b3cabd7c0e3edcd34ed21141efaa09a9bb0af79fefb57e315531f0ee089b79696802fa052659f66e0becf304286ef82afcf16283ed6664cb5cedd4 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-r2.ebuild 4008 BLAKE2B f4dff57e5e7edf5c6b5a7512cdaab44c764704ae4f9faa2023258d53c1f7f80246c8625b18b7148df37a457c84a9d3e70b9f0d2005a22de0911e5dd7010bfb8f SHA512 08a92ab707e07d73a89cb2227f9bec4790fdc2d62d7e7f8c5cc35a2375ba1269906b90a00f08b70b1737705fd4c7bd619a3ead879fef3d91fda1b605f604d26e +DIST obs-studio-27.1.3.tar.gz 15994678 BLAKE2B 5544a1ecdb04dca7f6422936ea5499a206b4beb8e5332605c18cd72a91ce73aa74ff06c49a106931822c1c413ee94d383942f173a71f2b21168a00495b4e301f SHA512 04c11c79e3b091aa9ea8fc6674c9fbcaa1c924fe049f68e9be63f63724c31305d6e4fb33aecdd4d0095d20013e2ee188983f6938b175257368d2260681c2fb39 EBUILD obs-studio-27.0.1-r1.ebuild 5401 BLAKE2B 33a0bde9d9e7ca353f7b14ace507eefaca53dc9ba52ee079c02032789dc851060386d114a5d9f0d5936e6f8bce8d7c535e99ad10a5b2778bbdff0aa6ee41a2a9 SHA512 e95c75cb4c6f08794a12501941660b7a8a2f75bcb4e26315101c67d5e34bdd66b62213f707f176a146531cb314ed9931603df0c3c60f6c52076a8dc4e6e7de34 -EBUILD obs-studio-9999.ebuild 5401 BLAKE2B 33a0bde9d9e7ca353f7b14ace507eefaca53dc9ba52ee079c02032789dc851060386d114a5d9f0d5936e6f8bce8d7c535e99ad10a5b2778bbdff0aa6ee41a2a9 SHA512 e95c75cb4c6f08794a12501941660b7a8a2f75bcb4e26315101c67d5e34bdd66b62213f707f176a146531cb314ed9931603df0c3c60f6c52076a8dc4e6e7de34 -MISC metadata.xml 1581 BLAKE2B d05f9c5d2df5f8c866391d442b464d861d0fcf969dd2509e61b0c6de37fd297a9c89d4610642f87ad12e1fec5b13c401cd7121b2edbfc75e070ddea2c6e5ad86 SHA512 809d3758b41687a9e107cc3f14e7592cba52a74833c6f49581e7c20abb77bb88ff23ee8bb923ee0fee5c090408ceb4aa9799b51a477c2e6feb50ce38eb373a19 +EBUILD obs-studio-27.1.3.ebuild 5234 BLAKE2B e89b74d8a6bf22634981acc3c6dfbbc6dbb1c9bd00356ee87afbe45c182014779bd54cc3666c06dfd7c888ada0b467d2bb471cdcd00edb44e326422e52750283 SHA512 1dde6de38391affd8d3b4c20e6ee8902f88dcdf53c9e134e43d658f28ee6470d05b346aa9b44611c9e0936dd8d431760043080567e65698be69e306974e28dbb +EBUILD obs-studio-9999.ebuild 5234 BLAKE2B e89b74d8a6bf22634981acc3c6dfbbc6dbb1c9bd00356ee87afbe45c182014779bd54cc3666c06dfd7c888ada0b467d2bb471cdcd00edb44e326422e52750283 SHA512 1dde6de38391affd8d3b4c20e6ee8902f88dcdf53c9e134e43d658f28ee6470d05b346aa9b44611c9e0936dd8d431760043080567e65698be69e306974e28dbb +MISC metadata.xml 1492 BLAKE2B 640e009dbc42a2f994c0737bf7e301738a52b541cc21b3a569d8988aa75614bf36541a0560fd6c690fca2d65134d8e71e8dae5ee8c19ab6d471dc431c7e2d38b SHA512 47de7d50138f441074dc81157410345790e4def50abe109b961781aba36f47fe413642f44143398be3a23ab8e8c40479622654b8d845bf976468ac8c994007fa diff --git a/media-video/obs-studio/files/obs-studio-26.1.2-fix-alsa-crash.patch b/media-video/obs-studio/files/obs-studio-26.1.2-fix-alsa-crash.patch deleted file mode 100644 index 2e52926febac..000000000000 --- a/media-video/obs-studio/files/obs-studio-26.1.2-fix-alsa-crash.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 41367bb2b4732507248f2b3c2e43e2aa46c5ef2a Mon Sep 17 00:00:00 2001 -From: Jimi Huotari <chiitoo@gentoo.org> -Date: Wed, 30 Dec 2020 03:14:34 +0200 -Subject: [PATCH] UI: Fix crash when no audio backends are available - -This commit prevents a crash in, for example, Linux configurations -where PulseAudio is disabled, which leads into 'mod' being 'null', -which in turn leads into a segmentation fault when an ALSA source -is selected. - -Closes https://github.com/obsproject/obs-studio/issues/3485 ---- - UI/context-bar-controls.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/UI/context-bar-controls.cpp b/UI/context-bar-controls.cpp -index 9dff8979a2..9ef850b6d1 100644 ---- a/UI/context-bar-controls.cpp -+++ b/UI/context-bar-controls.cpp -@@ -179,6 +179,10 @@ void AudioCaptureToolbar::Init() - - obs_module_t *mod = - get_os_module("win-wasapi", "mac-capture", "linux-pulseaudio"); -+ if (!mod) { -+ return; -+ } -+ - const char *device_str = - get_os_text(mod, "Device", "CoreAudio.Device", "Device"); - ui->deviceLabel->setText(device_str); diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml index de6926e47499..b16a1b2e5db5 100644 --- a/media-video/obs-studio/metadata.xml +++ b/media-video/obs-studio/metadata.xml @@ -19,7 +19,6 @@ <flag name="browser">Enable browser source support via (precompiled) CEF.</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">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> diff --git a/media-video/obs-studio/obs-studio-26.1.2-r2.ebuild b/media-video/obs-studio/obs-studio-27.1.3.ebuild index 0ff7ff59c0e0..6e23d6b2b473 100644 --- a/media-video/obs-studio/obs-studio-26.1.2-r2.ebuild +++ b/media-video/obs-studio/obs-studio-27.1.3.ebuild @@ -1,30 +1,39 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 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 cmake lua-single python-single-r1 xdg -if [[ ${PV} == *9999 ]]; then +OBS_BROWSER_COMMIT="2a338b7c76d5dd0a6b23f1d49affefd40213b0e9" +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 fdk imagemagick jack lua nvenc pulseaudio python speex +ssl truetype v4l vlc" +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,10 +43,11 @@ BDEPEND=" python? ( dev-lang/swig ) " DEPEND=" - >=dev-libs/jansson-2.5:= + dev-libs/glib:2 + dev-libs/jansson:= 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 @@ -46,24 +56,46 @@ DEPEND=" dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 + media-libs/libglvnd media-libs/x264:= 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 + app-accessibility/at-spi2-core:2 + dev-libs/atk + dev-libs/expat + dev-libs/glib + dev-libs/nspr + dev-libs/nss + media-libs/alsa-lib + media-libs/fontconfig + media-libs/mesa[gbm(+)] + net-print/cups + x11-libs/libdrm + 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:= ) pulseaudio? ( media-sound/pulseaudio ) python? ( ${PYTHON_DEPS} ) speex? ( media-libs/speexdsp ) @@ -74,12 +106,21 @@ DEPEND=" ) 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-fix-alsa-crash.patch" - "${FILESDIR}/${PN}-26.1.2-python-3.8.patch" # https://github.com/obsproject/obs-studio/pull/3335 + "${FILESDIR}/${PN}-26.1.2-python-3.8.patch" ) pkg_setup() { @@ -87,24 +128,45 @@ 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=( + $(usev 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) + $(cmake_use_find_package pulseaudio 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) + + # 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} ) @@ -125,13 +187,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 @@ -141,18 +204,6 @@ pkg_postinst() { 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" @@ -161,7 +212,3 @@ pkg_postinst() { 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 4c9f4cd3f3a8..6e23d6b2b473 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) LUA_COMPAT=( luajit ) PYTHON_COMPAT=( python3_{8..10} ) -inherit xdg cmake lua-single python-single-r1 +inherit cmake lua-single python-single-r1 xdg -OBS_BROWSER_COMMIT="f1a61c5a2579e5673765c31a47c2053d4b502d4b" +OBS_BROWSER_COMMIT="2a338b7c76d5dd0a6b23f1d49affefd40213b0e9" CEF_DIR="cef_binary_4280_linux64" if [[ ${PV} == 9999 ]]; then @@ -43,6 +43,7 @@ BDEPEND=" python? ( dev-lang/swig ) " DEPEND=" + dev-libs/glib:2 dev-libs/jansson:= dev-qt/qtcore:5 dev-qt/qtdeclarative:5 @@ -55,6 +56,7 @@ DEPEND=" dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 + media-libs/libglvnd media-libs/x264:= media-video/ffmpeg:=[x264] net-misc/curl @@ -70,6 +72,7 @@ DEPEND=" alsa? ( media-libs/alsa-lib ) browser? ( app-accessibility/at-spi2-atk + app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib @@ -77,7 +80,9 @@ DEPEND=" dev-libs/nss media-libs/alsa-lib media-libs/fontconfig + media-libs/mesa[gbm(+)] net-print/cups + x11-libs/libdrm x11-libs/libXScrnSaver x11-libs/libXcursor x11-libs/libXdamage @@ -137,7 +142,7 @@ src_unpack() { src_configure() { local libdir=$(get_libdir) local mycmakeargs=( - $(usex browser -DCEF_ROOT_DIR=../${CEF_DIR} '') + $(usev browser -DCEF_ROOT_DIR=../${CEF_DIR}) -DBUILD_BROWSER=$(usex browser) -DBUILD_VST=no -DENABLE_WAYLAND=$(usex wayland) @@ -148,6 +153,7 @@ src_configure() { -DDISABLE_LIBFDK=$(usex !fdk) -DENABLE_PIPEWIRE=$(usex pipewire) -DDISABLE_PULSEAUDIO=$(usex !pulseaudio) + $(cmake_use_find_package pulseaudio PulseAudio) -DDISABLE_SPEEXDSP=$(usex !speex) -DDISABLE_V4L2=$(usex !v4l) -DDISABLE_VLC=$(usex !vlc) @@ -198,16 +204,6 @@ pkg_postinst() { 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" |