diff options
Diffstat (limited to 'media-video/obs-studio')
-rw-r--r-- | media-video/obs-studio/Manifest | 11 | ||||
-rw-r--r-- | media-video/obs-studio/files/obs-studio-20.0.1-fix-curl-crash.patch | 46 | ||||
-rw-r--r-- | media-video/obs-studio/files/obs-studio-ImageMagick-header-path.patch | 70 | ||||
-rw-r--r-- | media-video/obs-studio/obs-studio-18.0.2.ebuild | 17 | ||||
-rw-r--r-- | media-video/obs-studio/obs-studio-19.0.2.ebuild | 17 | ||||
-rw-r--r-- | media-video/obs-studio/obs-studio-20.0.1-r1.ebuild | 121 | ||||
-rw-r--r-- | media-video/obs-studio/obs-studio-20.0.1.ebuild | 17 | ||||
-rw-r--r-- | media-video/obs-studio/obs-studio-9999.ebuild | 15 |
8 files changed, 302 insertions, 12 deletions
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest index 7bc2e87b5dfe..3b8791bf64dd 100644 --- a/media-video/obs-studio/Manifest +++ b/media-video/obs-studio/Manifest @@ -1,9 +1,12 @@ +AUX obs-studio-20.0.1-fix-curl-crash.patch 2240 SHA256 459532f3fee6e24274a93d4364dbc1be5b2cdfa3b592687ea6068927efb0a839 SHA512 dcb09aadf3dad1af5e0de2b83a9ce0b7c9d89911a1cdecd6d40cda6d46f5de2d90ff42d8572f45e9933938a37f5017a7e1160a6885a5247aad2c74c075960688 WHIRLPOOL 013f44817cd8f0b3586b02e4878dce39a1b78bbf2262bd41dddcd4ad0d6dab7242ab5d81c7c4d8e3195887da70c4f32ff00212e2951dc8dcc5c022113d535cd3 +AUX obs-studio-ImageMagick-header-path.patch 2466 SHA256 043654f06cedf7e5f2f66144ecfdc5405ab8977ab0a1177bc69bf255c29d9bfa SHA512 c352671edbfe8de6ca92c3155dddc5f4116e2f0c0e1197f73bc2b59749f0015458e93c892519bc4c1bbfbc89874411f3287092d67951d8ae365cb0411302a2a2 WHIRLPOOL 4fdf33a059efeb3f0d88949b0f39e5715ae4288413a5862ca3678bbdc3491ed24753623ea6a8c699679f3f4bbc2f752b1f6f3fef8c26dbf73c175aaa926d3ddf DIST obs-studio-18.0.2.tar.gz 6073678 SHA256 1cfbad3439b1d581b4f5b47792ccc4dae231acaf37178808811ff4e2b68feb0a SHA512 5d03791438e73e1b7689b319d4a7bb2235a178655061e816309a115026207db11053e3c27c08c5dde4f3638b3bb424ebb3bf3748bbbe828374a06abe75b2e39d WHIRLPOOL 66e3a425dd4029f3649e50fcc88d57f7e85133e16ae65e56b69d5e7ad584df37f6d51079419d47ec79397e321388c762715bab14f797f1fc40d1980cafa9c785 DIST obs-studio-19.0.2.tar.gz 5509958 SHA256 c7846e09f13061587d844588c538276aec6d498c8f9a4518fc3d8bb206776f01 SHA512 8e2c720d713f6b3fdfb0ce64252cba3129644155be75e0942250bb616700ba62acdb04265a7a6d0ce9406282fbbf85d662d7bdc36736c36be89fd726c8bbf5a9 WHIRLPOOL 7200a787ef1afc848fabf52193210a3309456b799da8cbd083d5914723e2c721dc3f7269d5b23edee3fd61c61314c96f11c683b5585d13d8b19536e3480f1f5c DIST obs-studio-20.0.1.tar.gz 5610534 SHA256 3241667f180816b860622fd9ac572a86375a9a766ac45c69a886dcbdaf524643 SHA512 891be96bbe18a2de4af8efd2eaeb54c388332ac7d93a66efcc18208af9ef2dfe3981f81ba351bdb16a93b2d66bcfef4f5277d3d8746261f0beb1f324ed9a7534 WHIRLPOOL d43526496775a409c75212ab53c30ebe3d55250583761c58ab5bf9cbe958c5ac4174ea7a3692a133d0be58265862b9e4a62515afa85b429d4d601b0b102a1ec6 -EBUILD obs-studio-18.0.2.ebuild 2521 SHA256 6dae8e8027b9508804764ebaa541fdabad3bd83e3d1d45a02caae4e210f8b0f3 SHA512 a38744046a22b585760a7bb595216b52d7b4eb0068f61a6b7eb4c8638e1673911e1341fdf089d30363396dd95becef0794dd0066811db759d8859b7740afa319 WHIRLPOOL 3a8302fe33bdc6ca453f11c277edc25d61bf2630e332022e6dc329729ab72f724c66f6d620bb2080b33b6be1282d1e4939669e4862e99660bd08ccf06a3d6ab0 -EBUILD obs-studio-19.0.2.ebuild 2521 SHA256 6dae8e8027b9508804764ebaa541fdabad3bd83e3d1d45a02caae4e210f8b0f3 SHA512 a38744046a22b585760a7bb595216b52d7b4eb0068f61a6b7eb4c8638e1673911e1341fdf089d30363396dd95becef0794dd0066811db759d8859b7740afa319 WHIRLPOOL 3a8302fe33bdc6ca453f11c277edc25d61bf2630e332022e6dc329729ab72f724c66f6d620bb2080b33b6be1282d1e4939669e4862e99660bd08ccf06a3d6ab0 -EBUILD obs-studio-20.0.1.ebuild 2521 SHA256 6dae8e8027b9508804764ebaa541fdabad3bd83e3d1d45a02caae4e210f8b0f3 SHA512 a38744046a22b585760a7bb595216b52d7b4eb0068f61a6b7eb4c8638e1673911e1341fdf089d30363396dd95becef0794dd0066811db759d8859b7740afa319 WHIRLPOOL 3a8302fe33bdc6ca453f11c277edc25d61bf2630e332022e6dc329729ab72f724c66f6d620bb2080b33b6be1282d1e4939669e4862e99660bd08ccf06a3d6ab0 -EBUILD obs-studio-9999.ebuild 2490 SHA256 6f72bde787721014c790a9af4368df45c83a5a2ff0d55861b65bebeb6b2c0785 SHA512 ff53f57440c881f59f4652d89baa9fb67932990e915e4b652962abe9901810c8174d7eabae1ea854364bf65f94d0b9edef2eec01887e620ac1dca9e98c01ec17 WHIRLPOOL 010e3c4d5ab5b31a8288a66aee71e198cf73bc73f62f1af0e10d8a919391a0116946b662e573a7c58b5153805e2f69612d47311d76443865c4f07ffe5508810f +EBUILD obs-studio-18.0.2.ebuild 2744 SHA256 1e6470059421743702d1438d78b92b9a18b3ca9d9ea7690ba061d444d2cfbb09 SHA512 56157c010fd5e108cd6ce8a6689595fe19b3dfd3357c47323ce495bafcff0fbd39546ba166aa04c622031ff74f7f1dabc78211863dce7bc86abfa633870c5c94 WHIRLPOOL a6a11eb73b0f7284e03173021f5751626efc033aaa6645c6212e9a8c2c050cf50d9eea798b3ab0d5ebc6432eaacdee985d6e5ed283e83ed1a224c846be3cc016 +EBUILD obs-studio-19.0.2.ebuild 2744 SHA256 1e6470059421743702d1438d78b92b9a18b3ca9d9ea7690ba061d444d2cfbb09 SHA512 56157c010fd5e108cd6ce8a6689595fe19b3dfd3357c47323ce495bafcff0fbd39546ba166aa04c622031ff74f7f1dabc78211863dce7bc86abfa633870c5c94 WHIRLPOOL a6a11eb73b0f7284e03173021f5751626efc033aaa6645c6212e9a8c2c050cf50d9eea798b3ab0d5ebc6432eaacdee985d6e5ed283e83ed1a224c846be3cc016 +EBUILD obs-studio-20.0.1-r1.ebuild 2798 SHA256 7c12481e3b3bd77473f4b1596d1aa5480f1f642e381494828673b938bf9830f3 SHA512 252a30b740c525bb975a20cd70a6a5987a3c13bf7b7235fb58a74b0f233b21fe5bdc9a4a32612d3de1184a3d31dfb0e8e32afb9e16dbccdf224f190d19dd22df WHIRLPOOL 4b14b33a6e182fd60b8ea28062040d68aff3b54c088199869a3ca2d366e93865628040b4187b97a1e2ffd383ea9e10a60e129ab12a66f195d325be6ec66503b1 +EBUILD obs-studio-20.0.1.ebuild 2744 SHA256 1e6470059421743702d1438d78b92b9a18b3ca9d9ea7690ba061d444d2cfbb09 SHA512 56157c010fd5e108cd6ce8a6689595fe19b3dfd3357c47323ce495bafcff0fbd39546ba166aa04c622031ff74f7f1dabc78211863dce7bc86abfa633870c5c94 WHIRLPOOL a6a11eb73b0f7284e03173021f5751626efc033aaa6645c6212e9a8c2c050cf50d9eea798b3ab0d5ebc6432eaacdee985d6e5ed283e83ed1a224c846be3cc016 +EBUILD obs-studio-9999.ebuild 2654 SHA256 e745f5db8303efb1794b971d6fa17056ed96a00760177a1814d55362b01d881c SHA512 e5a0695d6f87e4335fbf3a51898f05e7ec00c7c9fca12c6a8d71374e54e4fb3389cb711fdc4be4908cc8063297b04528ca9b302e54898871c537d0cd671b2cf8 WHIRLPOOL 86687b0e844c84d89bd64654e5bad06aedcd1168d35041361748c3aba739292d9d8e981eb945f4dbebacf6a83921581efe7669f60624ec0bd02c5a421da83794 MISC ChangeLog 2578 SHA256 0b32345d309d129d538db25a3de7c29a842fa90e96dd7512d29ccfe72cea3dbd SHA512 e1beab278a575b4059dad958ca01c03bb09cd839cc53b6345ed048bed591ba4222612828f676528877cbf42a2bd7e0eb564891ed7ecd50508f6d367307239cee WHIRLPOOL 93cb13b159a9282db547bc7bbedf159e1e585bbdc4e6a50ef96e8d3d6120b40d2131788373bef15b1521f005c6826b7eda66ce5c79151a3bc59535e101aba74e MISC metadata.xml 909 SHA256 55f67f48fe98631bfc8b02782383bad96c275c71fb24e7517b70329b3a04e1f7 SHA512 4f6d22797545b133c0783c97761d2cb4a4da1b251f39f586f4901023f09ad7b6f1bcdc841990b931740849c168d8ca2f91975f9f6fd59feff64895145cc6bd5e WHIRLPOOL 049025abd31fb656fd0bdcdbb449920eb3f50fdd2489ce7288f1c98d5f85d1b0813ca4c3615239351e184646eea25c732b8f0b4da978b039ad0597140b7e607c diff --git a/media-video/obs-studio/files/obs-studio-20.0.1-fix-curl-crash.patch b/media-video/obs-studio/files/obs-studio-20.0.1-fix-curl-crash.patch new file mode 100644 index 000000000000..178bb2e6715d --- /dev/null +++ b/media-video/obs-studio/files/obs-studio-20.0.1-fix-curl-crash.patch @@ -0,0 +1,46 @@ +From 379137d039e8db4a4f5f4dd8b56aaa21600fe962 Mon Sep 17 00:00:00 2001 +From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> +Date: Tue, 19 Sep 2017 15:33:55 +0200 +Subject: [PATCH] file-updater: fix crash due to network timeout + +If there is no network connection, OBS crashes after 5 minutes idling +with following crash: + +*** longjmp causes uninitialized stack frame ***: obs terminated +======= Backtrace: ========= +/lib64/libc.so.6(+0x6f1e3)[0x7f8f95f901e3] +/lib64/libc.so.6(__fortify_fail+0x37)[0x7f8f96018ba7] +/lib64/libc.so.6(+0xf7add)[0x7f8f96018add] +/lib64/libc.so.6(__longjmp_chk+0x29)[0x7f8f96018a39] +/usr/lib64/libcurl.so.4(+0xa5d5)[0x7f8f979b75d5] +/lib64/libpthread.so.0(+0x10e30)[0x7f8f962cae30] +/lib64/libc.so.6(__poll+0x2d)[0x7f8f95fff46d] +/usr/lib64/libglib-2.0.so.0(+0x4a64c)[0x7f8f91b5564c] +/usr/lib64/libglib-2.0.so.0(g_main_context_iteration+0x2c)[0x7f8f91b5575c] +/usr/lib64/libQt5Core.so.5(_ZN20QEventDispatcherGlib13processEventsE6QFlagsIN10QEventLoop17ProcessEventsFlagEE+0x5f)[0x7f8f9706c1ff] +/usr/lib64/libQt5Core.so.5(_ZN10QEventLoop4execE6QFlagsINS_17ProcessEventsFlagEE+0xfa)[0x7f8f9701defa] +/usr/lib64/libQt5Core.so.5(_ZN16QCoreApplication4execEv+0x9c)[0x7f8f970258fc] +obs(main+0x5ac)[0x4773dc] +/lib64/libc.so.6(__libc_start_main+0xf0)[0x7f8f95f41700] +obs(_start+0x29)[0x478389] + +Internet search [1] revealed that this is a libcurl bug that can be worked +around by asking curl not to install signal handlers. + +[1] https://stackoverflow.com/a/10755612 +--- + deps/file-updater/file-updater/file-updater.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/deps/file-updater/file-updater/file-updater.c b/deps/file-updater/file-updater/file-updater.c +index ec639aeee..b8d649e05 100644 +--- a/deps/file-updater/file-updater/file-updater.c ++++ b/deps/file-updater/file-updater/file-updater.c +@@ -117,6 +117,7 @@ static bool do_http_request(struct update_info *info, const char *url, + curl_easy_setopt(info->curl, CURLOPT_WRITEFUNCTION, http_write); + curl_easy_setopt(info->curl, CURLOPT_WRITEDATA, info); + curl_easy_setopt(info->curl, CURLOPT_FAILONERROR, true); ++ curl_easy_setopt(info->curl, CURLOPT_NOSIGNAL, 1); + + if (!info->remote_url) { + // We only care about headers from the main package file diff --git a/media-video/obs-studio/files/obs-studio-ImageMagick-header-path.patch b/media-video/obs-studio/files/obs-studio-ImageMagick-header-path.patch new file mode 100644 index 000000000000..ca1de74973bb --- /dev/null +++ b/media-video/obs-studio/files/obs-studio-ImageMagick-header-path.patch @@ -0,0 +1,70 @@ +From affb84f98477bb490554f56bf82ebffcefa0ec42 Mon Sep 17 00:00:00 2001 +From: Jimi Huotari <chiitoo@gentoo.org> +Date: Tue, 5 Sep 2017 23:30:24 +0300 +Subject: [PATCH 1/3] libobs: Fix ImageMagick header path + +Since ImageMagick 7, the header path has been changed. This commit +implements a check for the version being used, and includes the +header as is appropriate. + +Special thanks to Hu. + +Mantis-Bug: https://obsproject.com/mantis/view.php?id=966 + +Gentoo-Bug: https://bugs.gentoo.org/627520 +--- + libobs/CMakeLists.txt | 6 ++++++ + libobs/graphics/graphics-magick.c | 6 ++++++ + libobs/obsconfig.h.in | 3 +++ + 3 files changed, 15 insertions(+) + +diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt +index cd2b80e1..e91f366a 100644 +--- a/libobs/CMakeLists.txt ++++ b/libobs/CMakeLists.txt +@@ -31,6 +31,12 @@ option(LIBOBS_PREFER_IMAGEMAGICK "Prefer ImageMagick over ffmpeg for image loadi + if(NOT FFMPEG_AVCODEC_FOUND OR (ImageMagick_MagickCore_FOUND AND LIBOBS_PREFER_IMAGEMAGICK)) + message(STATUS "Using ImageMagick for image loading in libobs") + ++ if(${ImageMagick_VERSION_STRING} LESS 7) ++ set(LIBOBS_IMAGEMAGICK_DIR_STYLE LIBOBS_IMAGEMAGICK_DIR_STYLE_6L) ++ elseif(${ImageMagick_VERSION_STRING} GREATER_EQUAL 7) ++ set(LIBOBS_IMAGEMAGICK_DIR_STYLE LIBOBS_IMAGEMAGICK_DIR_STYLE_7GE) ++ endif() ++ + set(libobs_image_loading_SOURCES + graphics/graphics-magick.c) + set(libobs_image_loading_LIBRARIES +diff --git a/libobs/graphics/graphics-magick.c b/libobs/graphics/graphics-magick.c +index c106bfa6..6e4e1e96 100644 +--- a/libobs/graphics/graphics-magick.c ++++ b/libobs/graphics/graphics-magick.c +@@ -1,8 +1,14 @@ + #include "graphics.h" ++#include "obsconfig.h" + + #define MAGICKCORE_QUANTUM_DEPTH 16 + #define MAGICKCORE_HDRI_ENABLE 0 ++ ++#if LIBOBS_IMAGEMAGICK_DIR_STYLE == LIBOBS_IMAGEMAGICK_DIR_STYLE_6L + #include <magick/MagickCore.h> ++#elif LIBOBS_IMAGEMAGICK_DIR_STYLE == LIBOBS_IMAGEMAGICK_DIR_STYLE_7GE ++#include <MagickCore/MagickCore.h> ++#endif + + void gs_init_image_deps() + { +diff --git a/libobs/obsconfig.h.in b/libobs/obsconfig.h.in +index f86962d5..cc1f4005 100644 +--- a/libobs/obsconfig.h.in ++++ b/libobs/obsconfig.h.in +@@ -17,3 +17,6 @@ + #define OBS_UNIX_STRUCTURE @OBS_UNIX_STRUCTURE@ + #define BUILD_CAPTIONS @BUILD_CAPTIONS@ + #define HAVE_DBUS @HAVE_DBUS@ ++#define LIBOBS_IMAGEMAGICK_DIR_STYLE_6L 6 ++#define LIBOBS_IMAGEMAGICK_DIR_STYLE_7GE 7 ++#define LIBOBS_IMAGEMAGICK_DIR_STYLE @LIBOBS_IMAGEMAGICK_DIR_STYLE@ +-- +2.14.1 + diff --git a/media-video/obs-studio/obs-studio-18.0.2.ebuild b/media-video/obs-studio/obs-studio-18.0.2.ebuild index 07c1a8007eb9..d742e19dd528 100644 --- a/media-video/obs-studio/obs-studio-18.0.2.ebuild +++ b/media-video/obs-studio/obs-studio-18.0.2.ebuild @@ -21,7 +21,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l" -DEPEND=" +COMMON_DEPEND=" >=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 @@ -49,7 +49,20 @@ DEPEND=" ) v4l? ( media-libs/libv4l ) " -RDEPEND="${DEPEND}" +DEPEND="${COMMON_DEPEND} + imagemagick? ( + || ( + <media-gfx/imagemagick-7 + ( + >=media-gfx/imagemagick-7 + >=dev-util/cmake-3.9 + ) + ) + ) +" +RDEPEND="${COMMON_DEPEND}" + +PATCHES="${FILESDIR}/${PN}-ImageMagick-header-path.patch" CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) diff --git a/media-video/obs-studio/obs-studio-19.0.2.ebuild b/media-video/obs-studio/obs-studio-19.0.2.ebuild index 07c1a8007eb9..d742e19dd528 100644 --- a/media-video/obs-studio/obs-studio-19.0.2.ebuild +++ b/media-video/obs-studio/obs-studio-19.0.2.ebuild @@ -21,7 +21,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l" -DEPEND=" +COMMON_DEPEND=" >=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 @@ -49,7 +49,20 @@ DEPEND=" ) v4l? ( media-libs/libv4l ) " -RDEPEND="${DEPEND}" +DEPEND="${COMMON_DEPEND} + imagemagick? ( + || ( + <media-gfx/imagemagick-7 + ( + >=media-gfx/imagemagick-7 + >=dev-util/cmake-3.9 + ) + ) + ) +" +RDEPEND="${COMMON_DEPEND}" + +PATCHES="${FILESDIR}/${PN}-ImageMagick-header-path.patch" CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) diff --git a/media-video/obs-studio/obs-studio-20.0.1-r1.ebuild b/media-video/obs-studio/obs-studio-20.0.1-r1.ebuild new file mode 100644 index 000000000000..d8c5d14af743 --- /dev/null +++ b/media-video/obs-studio/obs-studio-20.0.1-r1.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils gnome2-utils + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git" + EGIT_SUBMODULES=() +else + SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~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 pulseaudio truetype v4l" + +COMMON_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/qttest:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + media-video/ffmpeg:=[x264] + net-misc/curl + x11-libs/libXcomposite + x11-libs/libXinerama + x11-libs/libXrandr + alsa? ( media-libs/alsa-lib ) + fdk? ( media-libs/fdk-aac:= ) + imagemagick? ( media-gfx/imagemagick:= ) + jack? ( virtual/jack ) + pulseaudio? ( media-sound/pulseaudio ) + truetype? ( + media-libs/fontconfig + media-libs/freetype + ) + v4l? ( media-libs/libv4l ) +" +DEPEND="${COMMON_DEPEND} + imagemagick? ( + || ( + <media-gfx/imagemagick-7 + ( + >=media-gfx/imagemagick-7 + >=dev-util/cmake-3.9 + ) + ) + ) +" +RDEPEND="${COMMON_DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-20.0.1-fix-curl-crash.patch" + "${FILESDIR}/${PN}-ImageMagick-header-path.patch" +) + +CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) + +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_V4L2=$(usex !v4l) + -DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick) + -DOBS_MULTIARCH_SUFFIX=${libdir#lib} + -DOBS_VERSION_OVERRIDE=${PV} + -DUNIX_STRUCTURE=1 + ) + cmake-utils_src_configure +} + +pkg_postinst() { + gnome2_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 + + if ! has_version "media-libs/speex"; then + elog + elog "For the speexdsp-based noise suppression filter" + elog "to be available, the 'media-libs/speex' package needs" + elog "to be installed." + elog + fi +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/media-video/obs-studio/obs-studio-20.0.1.ebuild b/media-video/obs-studio/obs-studio-20.0.1.ebuild index 07c1a8007eb9..d742e19dd528 100644 --- a/media-video/obs-studio/obs-studio-20.0.1.ebuild +++ b/media-video/obs-studio/obs-studio-20.0.1.ebuild @@ -21,7 +21,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l" -DEPEND=" +COMMON_DEPEND=" >=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 @@ -49,7 +49,20 @@ DEPEND=" ) v4l? ( media-libs/libv4l ) " -RDEPEND="${DEPEND}" +DEPEND="${COMMON_DEPEND} + imagemagick? ( + || ( + <media-gfx/imagemagick-7 + ( + >=media-gfx/imagemagick-7 + >=dev-util/cmake-3.9 + ) + ) + ) +" +RDEPEND="${COMMON_DEPEND}" + +PATCHES="${FILESDIR}/${PN}-ImageMagick-header-path.patch" CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index 5753b7708bdc..06c66b0e0b22 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -21,7 +21,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l" -DEPEND=" +COMMON_DEPEND=" >=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 @@ -49,7 +49,18 @@ DEPEND=" ) v4l? ( media-libs/libv4l ) " -RDEPEND="${DEPEND}" +DEPEND="${COMMON_DEPEND} + imagemagick? ( + || ( + <media-gfx/imagemagick-7 + ( + >=media-gfx/imagemagick-7 + >=dev-util/cmake-3.9 + ) + ) + ) +" +RDEPEND="${COMMON_DEPEND}" CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) |