commit: bb366ed0af82e479f39d9c9e393318a18159280c Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Fri Feb 16 23:09:31 2018 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Sun Feb 18 17:15:14 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb366ed0
media-video/obs-studio: remove older versions and unused patches. Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-video/obs-studio/Manifest | 2 - .../files/obs-studio-20.0.1-fix-curl-crash.patch | 46 -------- .../files/obs-studio-ImageMagick-header-path.patch | 70 ------------ media-video/obs-studio/obs-studio-19.0.2.ebuild | 118 -------------------- media-video/obs-studio/obs-studio-20.0.1-r1.ebuild | 121 --------------------- media-video/obs-studio/obs-studio-20.0.1.ebuild | 118 -------------------- 6 files changed, 475 deletions(-) diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest index cb00e934454..4eac8d16cff 100644 --- a/media-video/obs-studio/Manifest +++ b/media-video/obs-studio/Manifest @@ -1,5 +1,3 @@ -DIST obs-studio-19.0.2.tar.gz 5509958 BLAKE2B a21ed69dacb982e5f2bf31b62b85622cedb458b5ceb5bb10ccc099725f7d9c7da43c88bf40da432226f1077e036005fb28435643ed365a8a0f374875544b884f SHA512 8e2c720d713f6b3fdfb0ce64252cba3129644155be75e0942250bb616700ba62acdb04265a7a6d0ce9406282fbbf85d662d7bdc36736c36be89fd726c8bbf5a9 -DIST obs-studio-20.0.1.tar.gz 5610534 BLAKE2B 6db7a2bc591e88dac2f9450f60403095fc7e637f806657b0eb6fc928fd16fcae7a3d4a933b4bcad8b609fbf2197404bd675467a112e6aee84b9f023b9089a388 SHA512 891be96bbe18a2de4af8efd2eaeb54c388332ac7d93a66efcc18208af9ef2dfe3981f81ba351bdb16a93b2d66bcfef4f5277d3d8746261f0beb1f324ed9a7534 DIST obs-studio-20.1.0.tar.gz 5637636 BLAKE2B 11f42c894af9d8b58ef71eda4c669b557b1b69d8df48d2414ae6d4eda1b8ecb70bb15814a302b87c5b49a43323f772a92ee5dc4a6a58302723b6b1ebf1e35123 SHA512 fd0c4b910b9a07644a9ddb72c2622d1fac67878a8bf445d7ab33385aafa23a5207f89971c428a3be01fa851141d9cbb55e86ca81201928783227fc730d12b962 DIST obs-studio-20.1.3.tar.gz 5638299 BLAKE2B 8956e0ae444c05bc452284a730ba4cba7be9209d82f8b63f9cd0455ed73411eadc61825773c6ca5fe20435082399c72d3aaf8671c3830454d9237cc92ca4450f SHA512 9d7c6892fe8940df6c1f1686f07722ea554b5996e72b702758d670a75f1220de59295c0a7b8b6445825a86623521061f64b7672bbe7526aefc9a12bab902ed74 DIST obs-studio-21.0.2.tar.gz 5904469 BLAKE2B e4e7c1f2b445f1db6b76df0c7a12dd41ffd95e7ea5669d7efc3387cc0fd15e268d864b5da3da5c07d04bc57692a88a53a67351a370621b1a6ca648405d030454 SHA512 a22597ac3a85d4c72b9b1ff886367b158498b6b0141acfd2bdb096a2bd9d29cdfad900dfc00f870eaf0aad66836093579f37b278fa90ccd7b49022e849c1c590 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 deleted file mode 100644 index 178bb2e6715..00000000000 --- a/media-video/obs-studio/files/obs-studio-20.0.1-fix-curl-crash.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 379137d039e8db4a4f5f4dd8b56aaa21600fe962 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire <[email protected]> -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 deleted file mode 100644 index ca1de74973b..00000000000 --- a/media-video/obs-studio/files/obs-studio-ImageMagick-header-path.patch +++ /dev/null @@ -1,70 +0,0 @@ -From affb84f98477bb490554f56bf82ebffcefa0ec42 Mon Sep 17 00:00:00 2001 -From: Jimi Huotari <[email protected]> -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-19.0.2.ebuild b/media-video/obs-studio/obs-studio-19.0.2.ebuild deleted file mode 100644 index d742e19dd52..00000000000 --- a/media-video/obs-studio/obs-studio-19.0.2.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# 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}-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-r1.ebuild b/media-video/obs-studio/obs-studio-20.0.1-r1.ebuild deleted file mode 100644 index d8c5d14af74..00000000000 --- a/media-video/obs-studio/obs-studio-20.0.1-r1.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# 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 deleted file mode 100644 index d742e19dd52..00000000000 --- a/media-video/obs-studio/obs-studio-20.0.1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# 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}-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 -}
