gentoo resync : 03.03.2019

2 files changed, 0 insertions, 219 deletions

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
deleted file mode 100644
index 2c28c8e080d5..000000000000
--- a/media-video/obs-studio/files/obs-studio-21.1.2-use-less-automagic.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-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/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
deleted file mode 100644
index 73329cf8040c..000000000000
--- a/media-video/obs-studio/files/obs-studio-22.0.3-fdk-build-fix.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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;