gentoo resync : 14.07.2018

8 files changed, 269 insertions, 153 deletions

diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 3ba4f5305b55..c45f64c1df9c 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,8 +1,8 @@
-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
+AUX obs-studio-21.0.2-qt-5.11.0.patch 1078 BLAKE2B 4681ae50ae11fed00b227966cbac478d4c9606a0f520fb31c0f736f6dad428222cadee5c46b29e2467928fb5adb43f2c4e18aba31db105f6738c3c3e4dca43c5 SHA512 a640a894921f065c58236c2c09a93984f9f3c32a00934bec3a55ad7636d623a0df2e847bd86d9f184ee62284c5bcfe18cb1a9e4943b05260ee6cc0e38dc1bc2a
+AUX obs-studio-21.1.2-use-less-automagic.patch 5284 BLAKE2B 43e9b7fc9c4699c77037a7e28668137e0ffb24de285b9f560d2ccb6214c54640893a5d34e179087f7b2dfce49a97ea8465df97bbac232ed7c013d580bbb6019a SHA512 00774c36e3437c5828677f71ff33e467fab3957b9622092ba3d2501769796ab5b6e4328b898ee9e92ee32dfef78f9797d03bb602bc68ad294202f180298afb38
 DIST obs-studio-21.0.2.tar.gz 5904469 BLAKE2B e4e7c1f2b445f1db6b76df0c7a12dd41ffd95e7ea5669d7efc3387cc0fd15e268d864b5da3da5c07d04bc57692a88a53a67351a370621b1a6ca648405d030454 SHA512 a22597ac3a85d4c72b9b1ff886367b158498b6b0141acfd2bdb096a2bd9d29cdfad900dfc00f870eaf0aad66836093579f37b278fa90ccd7b49022e849c1c590
-EBUILD obs-studio-20.1.0.ebuild 2692 BLAKE2B 9d13fc4dd911875bc65e15afd8456fb2f4976501806e543d81b10dfd9d9461be6d000cf61a88e7c90835bbe7c7dcadc5132d25fb90f2e099209c91ea4ef1f7ee SHA512 0bcac3a178efabe8c624aea855018ba24965fba71dde5ee3ee79b3601896850e488daf2d84665d398c23cb1fef0d3fffd727a073268f16271e2292061f4ed0ea
-EBUILD obs-studio-20.1.3.ebuild 2592 BLAKE2B b86a8844f978bda0ecbe155e690bbc866880284634f9074da462451a7a8566e4be5f3b7f1b6234f1b7af44f899aa0da33129089d2d10718bbbbe8bc2bb69e368 SHA512 267f6408a44bf81d41c887b2cfbe225edba24d50ad88e6b3aef32b6e3e2f82a8af5f5fc82738c2012dfffaa31b40b3d76d1463a448f08076d4c5bd99c19d3eb8
-EBUILD obs-studio-21.0.2.ebuild 2638 BLAKE2B 8cc9aae34f58c24abc03e40f7fab8d6baa1d41c61d94114c6f297067fecf7e990c716c6798511e9f8c04b7926623c1b5248acd265fa846445fba2f9300bbd0cf SHA512 00605409f48ebeb8425a1f2c3cb2578774808cc6a9e1209957da5cd274436b5bd1d6e2dedb594feb13a4753f01e47d63fa3aefcb96fde720c251496dc46906a5
-EBUILD obs-studio-9999.ebuild 2561 BLAKE2B db86d0ee2d707beeb1944bd90d5897b79ea116174cf5cca35ce5806b9a4036565df1524c748a36c91209ff17b86bf45e9e6dd789d9cfef82231c0f3fccbf8850 SHA512 936dca63cdb45c8fe29174f1240c451f2c0d5799bc7c56a065fd5ea72aa872e4a8515faa8c50fa2888d8b8648b9adc410a408270372c7066c907421e75ee3a64
-MISC metadata.xml 861 BLAKE2B 42089cc2bf8ac8af65906efa8ebaa2c3254c972f4a60ca72b3420a8e4ff502ca1e17cdc2dd226fd077b918c4616b641274b941c229aa054b6da4ea3bd2caf37b SHA512 c06b0accbc7daa4b0e242b4b41689f77844d15f0c004ca9ca60e81fa03cc8b4c8b3feda309e00f09731e74b85934651437f3e982a361f58038b1d7909b12fae0
+DIST obs-studio-21.1.2.tar.gz 5959232 BLAKE2B 12ae6f5e76093df52f44e7f45c06fe5486c8cea875438b8c78ae429fa82ccd0a6ff9d7ab15139877eca26713ab204158b7f92fb7cbefa52a3950814d28962fe7 SHA512 5143d3a87b3a54d2a06d236fc6f6d5945ab337004c30eda0438026f4b7607776b82771636d55fcc2c8ab34e041d8ecad99dc843b6b3f4371303d1b7dc349d938
+EBUILD obs-studio-21.0.2.ebuild 2698 BLAKE2B 6383b7f1bb453a355a70b7c010f78afbf9f88d51f8e14f5c11717474d944f8023ec5240935e9ce842f3ac11a620a31eb4e3feb7608608b5cb8e5bbf723cb18a4 SHA512 75f5cec89258c5862a3dcfce606edb994c5e72ef750eefcf533c59702fa9270c8ed1700436fa8efe0b8535bda965b0aae91dc741067c289dabcf62e3f96413b0
+EBUILD obs-studio-21.1.2.ebuild 3034 BLAKE2B 28f24d09d1522e5c8ae1d53a12cc542bf89caa3eb8155ccd0a0ac30d7be66db578832e4a7417a06b29ce57956f0514ecac2174ced0d60de35478da1bad85bad2 SHA512 aeab926019077d31a2ff5a38f0f16bc5d25237bce923a292b8b2677cbc3c1e19e84206aba01d730f503337b250661b427f98284e4641968d6dc67eaa2458bb9c
+EBUILD obs-studio-9999.ebuild 2954 BLAKE2B 71c8b8798e707e87624bbbfc35f8dbde6de6fdc5921307932a84eff6bda423b91f71721e2ca959bfd6fa1de7fbe9ffea2f2a89e08a718d2d004aac33740e5f26 SHA512 eb50971179f1790c66a1258af7dc86d74e5f4ab1d442f675eff48733b7f2f0d57f085b614347e04a35b14a1552b5893462536089223570d2474f6dafec36fe74
+MISC metadata.xml 1125 BLAKE2B cbdc7581bf9c0ae676245bfe24e6bba5914286747c338a8fe56842bc65e6d8ac7b7413f429d8c30ef7d05fecefedc1cffdf60a37433510b79819625f30b0d744 SHA512 f64f485a39668d40e5bd0edcc5f19c57954acd96e1631bb3615e472d566091a70b9ee55548e0dca4e435c017ded350d7be5d1d07ad0ec9cefe94b196d8dcd3d4
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
new file mode 100644
index 000000000000..6eb7f7c3ca8d
--- /dev/null
+++ b/media-video/obs-studio/files/obs-studio-21.0.2-qt-5.11.0.patch
@@ -0,0 +1,28 @@
+From 4fd06b9825465ae5eb2a9b862cdb89098f655f14 Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+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/files/obs-studio-21.1.2-use-less-automagic.patch b/media-video/obs-studio/files/obs-studio-21.1.2-use-less-automagic.patch
new file mode 100644
index 000000000000..2c28c8e080d5
--- /dev/null
+++ b/media-video/obs-studio/files/obs-studio-21.1.2-use-less-automagic.patch
@@ -0,0 +1,167 @@
+From eee6541153cfb6788ee088181781793de100e54c Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Mon, 9 Jul 2018 02:20:10 +0300
+Subject: [PATCH 1/2] deps/obs-scripting: Use less automagic for Lua/Python
+ detection
+
+This adds build-time options for disabling the Lua and/or Python
+scripting support in cases where users do not wish to build
+it, but have the required libraries installed.
+---
+ deps/obs-scripting/CMakeLists.txt | 73 +++++++++++++++++++------------
+ 1 file changed, 45 insertions(+), 28 deletions(-)
+
+diff --git a/deps/obs-scripting/CMakeLists.txt b/deps/obs-scripting/CMakeLists.txt
+index 835c1b30..46412779 100644
+--- a/deps/obs-scripting/CMakeLists.txt
++++ b/deps/obs-scripting/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ cmake_minimum_required(VERSION 2.8)
+ 
+ if(NOT ENABLE_SCRIPTING)
++	message(STATUS "Scripting plugin disabled")
+ 	return()
+ endif()
+ 
+@@ -11,44 +12,60 @@ if(MSVC)
+ 		w32-pthreads)
+ endif()
+ 
+-find_package(Luajit QUIET)
+-find_package(PythonDeps QUIET)
+-find_package(SwigDeps QUIET 2)
++option(DISABLE_LUA "Disable Lua scripting support" OFF)
++option(DISABLE_PYTHON "Disable Python scripting support" OFF)
+ 
+ set(COMPILE_PYTHON FALSE CACHE BOOL "" FORCE)
+ set(COMPILE_LUA FALSE CACHE BOOL "" FORCE)
+ 
+-if(NOT SWIG_FOUND)
+-	message(STATUS "Scripting: SWIG not found; scripting disabled")
+-	return()
+-endif()
++if(NOT DISABLE_LUA)
++	find_package(Luajit QUIET)
+ 
+-if(NOT PYTHONLIBS_FOUND AND NOT LUAJIT_FOUND)
+-	message(STATUS "Scripting: Neither Python 3 nor Luajit was found; scripting plugin disabled")
+-	return()
+-endif()
+-
+-if(NOT LUAJIT_FOUND)
+-	message(STATUS "Scripting: Luajit not found; Luajit support disabled")
++	if(NOT DISABLE_LUA AND NOT LUAJIT_FOUND)
++		message(STATUS "Luajit support not found.")
++		set(LUAJIT_FOUND FALSE)
++	else()
++		message(STATUS "Scripting: Luajit supported")
++		set(COMPILE_LUA TRUE CACHE BOOL "" FORCE)
++	endif()
+ else()
+-	message(STATUS "Scripting: Luajit supported")
+-	set(COMPILE_LUA TRUE CACHE BOOL "" FORCE)
++	message(STATUS "Scripting: Luajit support disabled")
++	set(LUAJIT_FOUND FALSE)
+ endif()
+ 
+-if(NOT PYTHONLIBS_FOUND)
+-	message(STATUS "Scripting: Python 3 not found; Python support disabled")
++if(NOT DISABLE_PYTHON)
++	find_package(PythonDeps QUIET)
++
++	if(NOT DISABLE_PYTHON AND NOT PYTHONLIBS_FOUND)
++		message(STATUS "Python support not found.")
++		set(PYTHON_FOUND FALSE)
++		set(PYTHONLIBS_FOUND FALSE)
++	else()
++		message(STATUS "Scripting: Python 3 supported")
++		set(PYTHON_FOUND TRUE)
++		set(COMPILE_PYTHON TRUE CACHE BOOL "" FORCE)
++
++		get_filename_component(PYTHON_LIB "${PYTHON_LIBRARIES}" NAME)
++		string(REGEX REPLACE "\\.[^.]*$" "" PYTHON_LIB ${PYTHON_LIB})
++
++		if(WIN32)
++			string(REGEX REPLACE "_d" "" PYTHON_LIB "${PYTHON_LIB}")
++		endif()
++	endif()
++else()
++	message(STATUS "Scripting: Python 3 support disabled")
+ 	set(PYTHON_FOUND FALSE)
+ 	set(PYTHONLIBS_FOUND FALSE)
+-else()
+-	message(STATUS "Scripting: Python 3 supported")
+-	set(PYTHON_FOUND TRUE)
+-	set(COMPILE_PYTHON TRUE CACHE BOOL "" FORCE)
+-
+-	get_filename_component(PYTHON_LIB "${PYTHON_LIBRARIES}" NAME)
+-	string(REGEX REPLACE "\\.[^.]*$" "" PYTHON_LIB ${PYTHON_LIB})
+-	if(WIN32)
+-		string(REGEX REPLACE "_d" "" PYTHON_LIB "${PYTHON_LIB}")
+-	endif()
++endif()
++
++find_package(SwigDeps QUIET 2)
++
++if(NOT SWIG_FOUND)
++	message(STATUS "Scripting: SWIG not found; scripting disabled")
++endif()
++
++if(NOT PYTHONLIBS_FOUND AND NOT LUAJIT_FOUND)
++	message(STATUS "Scripting: Neither Python 3 nor Luajit was found; scripting plugin disabled")
+ endif()
+ 
+ set(SCRIPTING_ENABLED ON CACHE BOOL "Interal global cmake variable" FORCE)
+-- 
+2.18.0
+
+From 79006adaf2b93ed4ddc07ff236a9ed1fcd09e47f Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Wed, 11 Jul 2018 02:08:51 +0300
+Subject: [PATCH 2/2] obs-filters: Use less automagic for SpeexDSP detection
+
+This adds a build-time option for disabling the SpeexDSP-based
+Noise Suppression filter support in cases where users do not
+wish to build it, but have the required library installed.
+---
+ plugins/obs-filters/CMakeLists.txt | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+diff --git a/plugins/obs-filters/CMakeLists.txt b/plugins/obs-filters/CMakeLists.txt
+index ec4289cc..4d862b0a 100644
+--- a/plugins/obs-filters/CMakeLists.txt
++++ b/plugins/obs-filters/CMakeLists.txt
+@@ -1,13 +1,23 @@
+ project(obs-filters)
+ 
+-find_package(Libspeexdsp QUIET)
+-if(LIBSPEEXDSP_FOUND)
+-	set(obs-filters_LIBSPEEXDSP_SOURCES
+-		noise-suppress-filter.c)
+-	set(obs-filters_LIBSPEEXDSP_LIBRARIES
+-		${LIBSPEEXDSP_LIBRARIES})
++option(DISABLE_SPEEXDSP "Disable building of the SpeexDSP-based Noise Suppression filter" OFF)
++
++if(DISABLE_SPEEXDSP)
++	message(STATUS "SpeexDSP support disabled")
++	set(LIBSPEEXDSP_FOUND FALSE)
+ else()
+-	message(STATUS "Speexdsp library not found, speexdsp filters disabled")
++	find_package(Libspeexdsp QUIET)
++
++	if(NOT LIBSPEEXDSP_FOUND)
++		message(STATUS "SpeexDSP support not found")
++		set(LIBSPEEXDSP_FOUND FALSE)
++	else()
++		message(STATUS "SpeexDSP supported")
++		set(obs-filters_LIBSPEEXDSP_SOURCES
++			noise-suppress-filter.c)
++		set(obs-filters_LIBSPEEXDSP_LIBRARIES
++			${LIBSPEEXDSP_LIBRARIES})
++	endif()
+ endif()
+ 
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/obs-filters-config.h.in"
+-- 
+2.18.0
+
diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml
index 27ed2bccb4cb..74a7f582c048 100644
--- a/media-video/obs-studio/metadata.xml
+++ b/media-video/obs-studio/metadata.xml
@@ -14,9 +14,13 @@
   <use>
     <flag name="fdk">Enable libfdk support for AAC encoding.</flag>
     <flag name="imagemagick">Use ImageMagick for image loading instead of FFmpeg.</flag>
-    <flag name="nvenc">Enable NVENC encoding for nVidia video cards</flag>
+    <flag name="luajit">Build support for scripting via Luajit.</flag>
+    <flag name="nvenc">Enable NVENC encoding for nVidia video cards.</flag>
+    <flag name="python">Build support for scripting via Python 3.</flag>
+    <flag name="speexdsp">Enable noise suppression filter support via
+      <pkg>media-libs/speexdsp</pkg>.</flag>
   </use>
   <upstream>
-    <remote-id type="github">jp9000/obs-studio</remote-id>
+    <remote-id type="github">obsproject/obs-studio</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-video/obs-studio/obs-studio-20.1.0.ebuild b/media-video/obs-studio/obs-studio-20.1.0.ebuild
deleted file mode 100644
index 727eac660202..000000000000
--- a/media-video/obs-studio/obs-studio-20.1.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 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}"
-
-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/speexdsp"; then
-		elog
-		elog "For the speexdsp-based noise suppression filter"
-		elog "to be available, the 'media-libs/speexdsp' package needs"
-		elog "to be installed."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-video/obs-studio/obs-studio-21.0.2.ebuild b/media-video/obs-studio/obs-studio-21.0.2.ebuild
index db4647c07d16..208ad0004506 100644
--- a/media-video/obs-studio/obs-studio-21.0.2.ebuild
+++ b/media-video/obs-studio/obs-studio-21.0.2.ebuild
@@ -9,10 +9,10 @@ inherit cmake-utils gnome2-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
+	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
 	EGIT_SUBMODULES=()
 else
-	SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -55,6 +55,8 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
+PATCHES="${FILESDIR}/${PN}-21.0.2-qt-5.11.0.patch"
+
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 
 src_configure() {
diff --git a/media-video/obs-studio/obs-studio-20.1.3.ebuild b/media-video/obs-studio/obs-studio-21.1.2.ebuild
index 5faf60232c12..062b0f414089 100644
--- a/media-video/obs-studio/obs-studio-20.1.3.ebuild
+++ b/media-video/obs-studio/obs-studio-21.1.2.ebuild
@@ -3,16 +3,17 @@
 
 EAPI=6
 
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 CMAKE_MIN_VERSION=3.9.6
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils gnome2-utils python-any-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
+	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
 	EGIT_SUBMODULES=()
 else
-	SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -21,7 +22,7 @@ HOMEPAGE="https://obsproject.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l"
+IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speexdsp truetype v4l"
 
 COMMON_DEPEND="
 	>=dev-libs/jansson-2.5
@@ -44,16 +45,28 @@ COMMON_DEPEND="
 	fdk? ( media-libs/fdk-aac:= )
 	imagemagick? ( media-gfx/imagemagick:= )
 	jack? ( virtual/jack )
+	luajit? ( dev-lang/luajit:2 )
+	nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] )
 	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	speexdsp? ( media-libs/speexdsp )
 	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype
 	)
 	v4l? ( media-libs/libv4l )
 "
-DEPEND="${COMMON_DEPEND}"
+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 )
 
 src_configure() {
@@ -64,12 +77,24 @@ src_configure() {
 		-DDISABLE_JACK=$(usex !jack)
 		-DDISABLE_LIBFDK=$(usex !fdk)
 		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		-DDISABLE_SPEEXDSP=$(usex !speexdsp)
 		-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
 }
 
@@ -93,14 +118,6 @@ pkg_postinst() {
 		elog "(if 'x11-misc/xdg-utils' is installed)."
 		elog
 	fi
-
-	if ! has_version "media-libs/speexdsp"; then
-		elog
-		elog "For the speexdsp-based noise suppression filter"
-		elog "to be available, the 'media-libs/speexdsp' package needs"
-		elog "to be installed."
-		elog
-	fi
 }
 
 pkg_postrm() {
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index e030ae7b1d73..4558c2f4e954 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -3,16 +3,17 @@
 
 EAPI=6
 
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 CMAKE_MIN_VERSION=3.9.6
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils gnome2-utils python-any-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
+	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
 	EGIT_SUBMODULES=()
 else
-	SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -21,7 +22,7 @@ HOMEPAGE="https://obsproject.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l"
+IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speexdsp truetype v4l"
 
 COMMON_DEPEND="
 	>=dev-libs/jansson-2.5
@@ -44,16 +45,25 @@ COMMON_DEPEND="
 	fdk? ( media-libs/fdk-aac:= )
 	imagemagick? ( media-gfx/imagemagick:= )
 	jack? ( virtual/jack )
+	luajit? ( dev-lang/luajit:2 )
+	nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] )
 	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	speexdsp? ( media-libs/speexdsp )
 	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype
 	)
 	v4l? ( media-libs/libv4l )
 "
-DEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	luajit? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+"
 RDEPEND="${COMMON_DEPEND}"
 
+PATCHES="${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch"
+
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 
 src_configure() {
@@ -64,11 +74,23 @@ src_configure() {
 		-DDISABLE_JACK=$(usex !jack)
 		-DDISABLE_LIBFDK=$(usex !fdk)
 		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		-DDISABLE_SPEEXDSP=$(usex !speexdsp)
 		-DDISABLE_V4L2=$(usex !v4l)
 		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
 		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
 		-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
 }
 
@@ -92,14 +114,6 @@ pkg_postinst() {
 		elog "(if 'x11-misc/xdg-utils' is installed)."
 		elog
 	fi
-
-	if ! has_version "media-libs/speexdsp"; then
-		elog
-		elog "For the speexdsp-based noise suppression filter"
-		elog "to be available, the 'media-libs/speexdsp' package needs"
-		elog "to be installed."
-		elog
-	fi
 }
 
 pkg_postrm() {