gentoo resync : 24.12.2018

6 files changed, 61 insertions, 170 deletions

diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 1f01fb5fef94..6f41b1a1d87d 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,8 +1,6 @@
-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.1.2.tar.gz 5959232 BLAKE2B 12ae6f5e76093df52f44e7f45c06fe5486c8cea875438b8c78ae429fa82ccd0a6ff9d7ab15139877eca26713ab204158b7f92fb7cbefa52a3950814d28962fe7 SHA512 5143d3a87b3a54d2a06d236fc6f6d5945ab337004c30eda0438026f4b7607776b82771636d55fcc2c8ab34e041d8ecad99dc843b6b3f4371303d1b7dc349d938
+AUX obs-studio-22.0.3-fdk-build-fix.patch 1722 BLAKE2B 253b26a37c76d602ec10694af9987c1b91e7360bb01c2af1b346faef98762b2674701f526f7fcebac260904d7607ef84fc679e09e17d38f5e47a669e7bc65412 SHA512 527e24c2231d6191639d3255b6e1be37d58d68a596fce747e0fd1ebf80e35bd458d287c3e736993667cfbae458db8e2ebfab25a5457aaf102c58472144cb222b
 DIST obs-studio-22.0.3.tar.gz 6015365 BLAKE2B e2c3aec7f97bbad2ec70a46d59035335d605a478ab1e4ff10a077d81c9ade5deef1ca56cf3ffc46d4d2ab89339d98a68aa5ca8c6ca240ed82939b59803af151c SHA512 491f7ce44c741d144c621eb645fe00604e1eb98ff7dac03dffe51ba78a742e6015e1f96f21aad69e16a22d9546b6cdb51b5c1a4defd96e7c64f099de83a31f04
-EBUILD obs-studio-21.1.2.ebuild 3147 BLAKE2B 8b342dd1f7170333447f848e280e9782d9ebe14de2015be81712cc8c1b025475b5eaef5be1ed2d1eb70084d7de5340ccaa239be8938543143a18802dd5f1d54e SHA512 361d888d91502fb15cfebb87aeee71f953719b5a26987f914cc9dc43d038069bef12c6963e979a77e64e084cb5de3bf5482be65ec1b77d051faeacb3c68f89c1
-EBUILD obs-studio-22.0.3.ebuild 3102 BLAKE2B 7428fb9eee153659fd5df973c73a462db5a4abe5836b2cae38cc36586282388ca95ef18258d5f6bc8e711b3131f559767bb4f8e4db5f5c7e59ec110df3e56fac SHA512 33e4e6f1de604ffedf22d04d5ef428f33af3a8e5c4697edadcc155038db7d029fe061b3edee14ef89ef330734d39c940b80eda30df9fa4886c8510db6b9e86a0
-EBUILD obs-studio-9999.ebuild 3006 BLAKE2B d3956db1caeae26675fe91941fc3b780358cb36e7bcc2eb68ded56d31b5b9b02eaf16d9e2c8b0301780676ad0d734705e387220d720b4471e5c57a2e40675c95 SHA512 16521f48909777b04d3a427adf666616b5498799e63d2ba17350d0e6fa64f3c1beb74eb6d61d59be1bc0cc09955d349f02e3f86a6de5ab12fa89846bd19327a0
+EBUILD obs-studio-22.0.3.ebuild 3168 BLAKE2B 7bbdd693dd3e76732fe4f097295ea179117c1ed3b32911ee8f7958a396d4783b9b300e2e66a35412986b4d443d2dc8e710da77b41b0433a39198749d67fae687 SHA512 06c6b315ea1544e1e48369eff4b9dd22278030ba5045756f55a379bba964db9e2dc14dd1a0766e45db52b1e62e405e8d13c8841d5e0d461795fbf72448acde59
+EBUILD obs-studio-9999.ebuild 3010 BLAKE2B 4669e7f87289f4f2d2530edba03d80681d130daaefc84e29dd5590c163736858180a1807b95dc9f991c96373ec076bf6b1959c0a3e736e4a46d90d7d370563e5 SHA512 5e6f735e6037ada9b35a4eed27b61165ee017e57576deb4f5b3278f1476f6f6ea8035873786c2e243041c2822fd2a1675664452c7404ab66e5dd3d2666a0104c
 MISC metadata.xml 1122 BLAKE2B 608bff24775bd69702b19d9b1db4260ed1e5bf7d932f917d3a27d284a791374211c7fec019bd3a742552cf11142df3d2a4877d81645244bc81a6df5e60ae9f71 SHA512 29291de223d1d70f78b419c05fec1cca18e8dcd52ed5619dff51a130f9e064369378e9e803f3dd5e7c86c9f505ae506917ec04e2c9adadfcc1a23c9aeb27192f
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 6eb7f7c3ca8d..000000000000
--- 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 <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-22.0.3-fdk-build-fix.patch b/media-video/obs-studio/files/obs-studio-22.0.3-fdk-build-fix.patch
new file mode 100644
index 000000000000..73329cf8040c
--- /dev/null
+++ b/media-video/obs-studio/files/obs-studio-22.0.3-fdk-build-fix.patch
@@ -0,0 +1,52 @@
+From 5cf2b5fbf925412620e2a40552d6348203851cb3 Mon Sep 17 00:00:00 2001
+From: pkviet <pkv.stream@gmail.com>
+Date: Thu, 29 Nov 2018 21:10:45 +0100
+Subject: [PATCH] obs-libfdk: Compatibility fix for new API
+
+fdk-aac v2.0.0 (aacenc 4.0.0) changes the AACENC_InfoStruct:
+the encoderDelay parameter is replaced by two, nDelay and
+nDelayCore. This patch checks the lib version and adjust the parameter
+accordingly.
+---
+ plugins/obs-libfdk/obs-libfdk.c | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/plugins/obs-libfdk/obs-libfdk.c b/plugins/obs-libfdk/obs-libfdk.c
+index d6eb496184..94b139de57 100644
+--- a/plugins/obs-libfdk/obs-libfdk.c
++++ b/plugins/obs-libfdk/obs-libfdk.c
+@@ -9,7 +9,6 @@
+ 
+ #include <fdk-aac/aacenc_lib.h>
+ 
+-
+ static const char *libfdk_get_error(AACENC_ERROR err)
+ {
+ 	switch(err) {
+@@ -224,7 +223,7 @@ static bool libfdk_encode(void *data, struct encoder_frame *frame,
+ 	void *in_ptr;
+ 	void *out_ptr;
+ 	AACENC_ERROR err;
+-
++	int64_t encoderDelay;
+ 
+ 	in_ptr = frame->data[0];
+ 	in_size = enc->frame_size_bytes;
+@@ -261,10 +260,13 @@ static bool libfdk_encode(void *data, struct encoder_frame *frame,
+ 	}
+ 
+ 	*received_packet = true;
+-
+-	packet->pts  = enc->total_samples -
+-	               enc->info.encoderDelay; // TODO: Just a guess, find out if that's actualy right
+-	packet->dts  = enc->total_samples - enc->info.encoderDelay;
++#if (AACENCODER_LIB_VL0 >= 4)
++	encoderDelay= enc->info.nDelay;
++#else
++	encoderDelay= enc->info.encoderDelay;
++#endif
++	packet->pts  = enc->total_samples - encoderDelay;
++	packet->dts  = enc->total_samples - encoderDelay;
+ 	packet->data = enc->packet_buffer;
+ 	packet->size = out_args.numOutBytes;
+ 	packet->type = OBS_ENCODER_AUDIO;
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 aa981e49491a..000000000000
--- 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
-}
diff --git a/media-video/obs-studio/obs-studio-22.0.3.ebuild b/media-video/obs-studio/obs-studio-22.0.3.ebuild
index a2403c9502a5..c15bd0ab0710 100644
--- a/media-video/obs-studio/obs-studio-22.0.3.ebuild
+++ b/media-video/obs-studio/obs-studio-22.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
 
 inherit cmake-utils gnome2-utils python-single-r1
 
@@ -67,7 +67,10 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch"
+	"${FILESDIR}/${PN}-22.0.3-fdk-build-fix.patch" # bug 672430
+)
 
 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 991fa7ae9912..9cd8bdd75172 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
 
 inherit cmake-utils gnome2-utils python-single-r1