From 69051588e2f955485fe5d45d45e616bc60a2de57 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 31 Jan 2021 18:57:01 +0000 Subject: gentoo resync : 31.01.2021 --- media-video/obs-studio/Manifest | 10 +- .../files/obs-studio-26.1.2-fix-alsa-crash.patch | 30 ++++ media-video/obs-studio/metadata.xml | 1 - media-video/obs-studio/obs-studio-25.0.8-r1.ebuild | 150 -------------------- .../obs-studio/obs-studio-25.0.8-r100.ebuild | 2 +- media-video/obs-studio/obs-studio-26.1.2.ebuild | 155 +++++++++++++++++++++ media-video/obs-studio/obs-studio-9999.ebuild | 2 +- 7 files changed, 193 insertions(+), 157 deletions(-) create mode 100644 media-video/obs-studio/files/obs-studio-26.1.2-fix-alsa-crash.patch delete mode 100644 media-video/obs-studio/obs-studio-25.0.8-r1.ebuild create mode 100644 media-video/obs-studio/obs-studio-26.1.2.ebuild (limited to 'media-video/obs-studio') diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest index 7daa17085561..e769cbf7bc85 100644 --- a/media-video/obs-studio/Manifest +++ b/media-video/obs-studio/Manifest @@ -1,6 +1,8 @@ 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 -EBUILD obs-studio-25.0.8-r1.ebuild 3601 BLAKE2B 1e95f46ef29bfa1c27b941eb3ce652192c66b00f0b8c242bef92215101b944c490aac0d90fb06e5ca210f1c0c39e2daf0ceb81cb2867b87ec159ebde00bb32d2 SHA512 7fc4415408c26a96196e2e3882c4ccaff4b62ab024ffa2ea120102ea03b1a250eff54cf992c9a1c20498fea24066da6fedfb46114ea50806d544ab147c9e2bf5 -EBUILD obs-studio-25.0.8-r100.ebuild 3660 BLAKE2B 8cd29fc9130dc3e43353d103d6cf113e8c2416e6555bc6edb91a132f0db53938d78039728e38288c706e683f922d2597d1256d9706bcc916e766507ab7b6b6e2 SHA512 83895b1caa8d8dcfb4623676d50f58a828eb0e28660c447eadc0760903145488eb9cc8812f0cec8588d618c284b2ccd2eb242769a80c6b2105569088a7f1d161 -EBUILD obs-studio-9999.ebuild 3601 BLAKE2B 9c53d2e61df60268a1ed95bacc8ed0e1466f89b814a3a1def95d3a6d900fa3aa817247dfafed0d9725d444c5aef210bf4b25c076ab14b086ba76ece5d9e1d6bf SHA512 edceb8e6b1fbef66f6556d441143303841458da7c2143c833569b69ffa95631049616ee009084cd94cea8ad7ef92d70d779714e1e5bf7edc63f3f9451858776d -MISC metadata.xml 1333 BLAKE2B 64d005a96fe4861ab30cc51ff8f9b37dfc6e24eda2149b487ca2f5af9db663f2a2ce564ff4953c6cf5b35d425d1fb1c3774c86e610db0eb336119baddcbc52b5 SHA512 06ab2cd75b521a2753fdc7e379ed67bd2179a74f0868324af4365a2bffa6c132528fd72b98d319bc0a924cad9bb006e382093f368602fb5dd7dc94db94ae703b +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 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 new file mode 100644 index 000000000000..2e52926febac --- /dev/null +++ b/media-video/obs-studio/files/obs-studio-26.1.2-fix-alsa-crash.patch @@ -0,0 +1,30 @@ +From 41367bb2b4732507248f2b3c2e43e2aa46c5ef2a Mon Sep 17 00:00:00 2001 +From: Jimi Huotari +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 cd2070e38ea0..603cd8cc27ce 100644 --- a/media-video/obs-studio/metadata.xml +++ b/media-video/obs-studio/metadata.xml @@ -14,7 +14,6 @@ Enable libfdk support for AAC encoding. Use ImageMagick for image loading instead of FFmpeg. - Build support for scripting via Luajit. Enable NVENC encoding for nVidia video cards. Build support for scripting via Python 3. Enable noise suppression filter support via diff --git a/media-video/obs-studio/obs-studio-25.0.8-r1.ebuild b/media-video/obs-studio/obs-studio-25.0.8-r1.ebuild deleted file mode 100644 index 19d4a9a037eb..000000000000 --- a/media-video/obs-studio/obs-studio-25.0.8-r1.ebuild +++ /dev/null @@ -1,150 +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 ) -# Does not work with 3.8+ https://bugs.gentoo.org/754006 -PYTHON_COMPAT=( python3_{6,7} ) - -inherit cmake-utils 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 luajit nvenc pulseaudio python speex +ssl truetype v4l vlc" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -BDEPEND=" - luajit? ( 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 ) - luajit? ( dev-lang/luajit:2 ) - 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 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 luajit || use python; then - mycmakeargs+=( - -DDISABLE_LUA=$(usex !luajit) - -DDISABLE_PYTHON=$(usex !python) - -DENABLE_SCRIPTING=yes - ) - else - mycmakeargs+=( -DENABLE_SCRIPTING=no ) - fi - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_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-25.0.8-r100.ebuild b/media-video/obs-studio/obs-studio-25.0.8-r100.ebuild index 0032ba06fca0..f0f5aacc1e9e 100644 --- a/media-video/obs-studio/obs-studio-25.0.8-r100.ebuild +++ b/media-video/obs-studio/obs-studio-25.0.8-r100.ebuild @@ -6,7 +6,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_{6,7} ) +PYTHON_COMPAT=( python3_7 ) inherit cmake lua-single python-single-r1 xdg-utils diff --git a/media-video/obs-studio/obs-studio-26.1.2.ebuild b/media-video/obs-studio/obs-studio-26.1.2.ebuild new file mode 100644 index 000000000000..9833f5fb6b6c --- /dev/null +++ b/media-video/obs-studio/obs-studio-26.1.2.ebuild @@ -0,0 +1,155 @@ +# 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 ) + +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" ) + +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-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index 481cfe79ce98..e9173352238b 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -6,7 +6,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_{6,7} ) +PYTHON_COMPAT=( python3_7 ) inherit cmake lua-single python-single-r1 xdg-utils -- cgit v1.2.3