gentoo resync : 14.07.2018

2 files changed, 195 insertions, 0 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
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
+