commit: 5d26a1edd21338473ace196f549d22a6bd0b6854 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Wed Dec 12 13:19:30 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Dec 16 16:13:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d26a1ed
media-video/obs-studio: clean up older version and a patch with it Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> Package-Manager: Portage-2.3.52, Repoman-2.3.12 Closes: https://github.com/gentoo/gentoo/pull/10621 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-video/obs-studio/Manifest | 1 - .../files/obs-studio-21.0.2-qt-5.11.0.patch | 28 ----- media-video/obs-studio/obs-studio-21.1.2.ebuild | 134 --------------------- 3 files changed, 163 deletions(-) diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest index 3e83222c92a..656911ba68e 100644 --- a/media-video/obs-studio/Manifest +++ b/media-video/obs-studio/Manifest @@ -1,2 +1 @@ -DIST obs-studio-21.1.2.tar.gz 5959232 BLAKE2B 12ae6f5e76093df52f44e7f45c06fe5486c8cea875438b8c78ae429fa82ccd0a6ff9d7ab15139877eca26713ab204158b7f92fb7cbefa52a3950814d28962fe7 SHA512 5143d3a87b3a54d2a06d236fc6f6d5945ab337004c30eda0438026f4b7607776b82771636d55fcc2c8ab34e041d8ecad99dc843b6b3f4371303d1b7dc349d938 DIST obs-studio-22.0.3.tar.gz 6015365 BLAKE2B e2c3aec7f97bbad2ec70a46d59035335d605a478ab1e4ff10a077d81c9ade5deef1ca56cf3ffc46d4d2ab89339d98a68aa5ca8c6ca240ed82939b59803af151c SHA512 491f7ce44c741d144c621eb645fe00604e1eb98ff7dac03dffe51ba78a742e6015e1f96f21aad69e16a22d9546b6cdb51b5c1a4defd96e7c64f099de83a31f04 diff --git a/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch b/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch deleted file mode 100644 index 6eb7f7c3ca8..00000000000 --- a/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4fd06b9825465ae5eb2a9b862cdb89098f655f14 Mon Sep 17 00:00:00 2001 -From: Jimi Huotari <[email protected]> -Date: Sat, 17 Mar 2018 18:16:39 +0200 -Subject: [PATCH] frontend-tools: Include 'QAction' to fix build against Qt - 5.11 - -Some headers are no longer unconditionally included, leading to -build failures. - -http://code.qt.io/cgit/qt/qtbase.git/commit/?id=748836dae80a7d11901f3f0630168829076d11a8 -http://code.qt.io/cgit/qt/qtbase.git/commit/?id=000c76ada5cc21479fc479be16a7507fed6490f8 -http://code.qt.io/cgit/qt/qtbase.git/commit/?id=058474884c2505a8a00d4c59b4922bfcd3597c2f ---- - UI/frontend-plugins/frontend-tools/scripts.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/UI/frontend-plugins/frontend-tools/scripts.cpp b/UI/frontend-plugins/frontend-tools/scripts.cpp -index d923dcf610..364757e48b 100644 ---- a/UI/frontend-plugins/frontend-tools/scripts.cpp -+++ b/UI/frontend-plugins/frontend-tools/scripts.cpp -@@ -12,6 +12,7 @@ - #include <QFont> - #include <QDialogButtonBox> - #include <QResizeEvent> -+#include <QAction> - - #include <obs.hpp> - #include <obs-module.h> diff --git a/media-video/obs-studio/obs-studio-21.1.2.ebuild b/media-video/obs-studio/obs-studio-21.1.2.ebuild deleted file mode 100644 index aa981e49491..00000000000 --- a/media-video/obs-studio/obs-studio-21.1.2.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{3_4,3_5,3_6} ) - -inherit cmake-utils gnome2-utils python-single-r1 - -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 ~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 truetype v4l" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -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 ) - luajit? ( dev-lang/luajit:2 ) - nvenc? ( - || ( - <media-video/ffmpeg-4[nvenc] - >=media-video/ffmpeg-4[video_cards_nvidia] - ) - ) - pulseaudio? ( media-sound/pulseaudio ) - python? ( ${PYTHON_DEPS} ) - speex? ( media-libs/speexdsp ) - truetype? ( - media-libs/fontconfig - media-libs/freetype - ) - v4l? ( media-libs/libv4l ) -" -DEPEND="${COMMON_DEPEND} - luajit? ( dev-lang/swig ) - python? ( dev-lang/swig ) -" -RDEPEND="${COMMON_DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-21.0.2-qt-5.11.0.patch" - "${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch" -) - -CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) - -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) - -DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick) - -DOBS_MULTIARCH_SUFFIX=${libdir#lib} - -DOBS_VERSION_OVERRIDE=${PV} - -DUNIX_STRUCTURE=1 - ) - - 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 -} - -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 -} - -pkg_postrm() { - gnome2_icon_cache_update -}
