gentoo resync : 24.12.2018

2 files changed, 52 insertions, 28 deletions

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;