diff options
Diffstat (limited to 'media-video/obs-studio')
| -rw-r--r-- | media-video/obs-studio/Manifest | 8 | ||||
| -rw-r--r-- | media-video/obs-studio/files/obs-studio-21.1.2-use-less-automagic.patch | 167 | ||||
| -rw-r--r-- | media-video/obs-studio/files/obs-studio-22.0.3-fdk-build-fix.patch | 52 | ||||
| -rw-r--r-- | media-video/obs-studio/obs-studio-23.0.1.ebuild (renamed from media-video/obs-studio/obs-studio-22.0.3.ebuild) | 21 | ||||
| -rw-r--r-- | media-video/obs-studio/obs-studio-9999.ebuild | 16 |
5 files changed, 19 insertions, 245 deletions
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest index 6f41b1a1d87d..9a8eed59297b 100644 --- a/media-video/obs-studio/Manifest +++ b/media-video/obs-studio/Manifest @@ -1,6 +1,4 @@ -AUX obs-studio-21.1.2-use-less-automagic.patch 5284 BLAKE2B 43e9b7fc9c4699c77037a7e28668137e0ffb24de285b9f560d2ccb6214c54640893a5d34e179087f7b2dfce49a97ea8465df97bbac232ed7c013d580bbb6019a SHA512 00774c36e3437c5828677f71ff33e467fab3957b9622092ba3d2501769796ab5b6e4328b898ee9e92ee32dfef78f9797d03bb602bc68ad294202f180298afb38 -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-22.0.3.ebuild 3168 BLAKE2B 7bbdd693dd3e76732fe4f097295ea179117c1ed3b32911ee8f7958a396d4783b9b300e2e66a35412986b4d443d2dc8e710da77b41b0433a39198749d67fae687 SHA512 06c6b315ea1544e1e48369eff4b9dd22278030ba5045756f55a379bba964db9e2dc14dd1a0766e45db52b1e62e405e8d13c8841d5e0d461795fbf72448acde59 -EBUILD obs-studio-9999.ebuild 3010 BLAKE2B 4669e7f87289f4f2d2530edba03d80681d130daaefc84e29dd5590c163736858180a1807b95dc9f991c96373ec076bf6b1959c0a3e736e4a46d90d7d370563e5 SHA512 5e6f735e6037ada9b35a4eed27b61165ee017e57576deb4f5b3278f1476f6f6ea8035873786c2e243041c2822fd2a1675664452c7404ab66e5dd3d2666a0104c +DIST obs-studio-23.0.1.tar.gz 6223214 BLAKE2B c3b65ad9134aefc36a3fa33b8d185a1ee76f76c10edd30d5ad8a7af86605c4e7b3b8d83c5570203d926655131f7c20f4ef11dcbf55c7af745efc2b68d4933c54 SHA512 6877d4bf635a9769d634683a85075a5fe3a5de1fcc83882647dfbc379a897eee05b69c2159e290ff73f53aa7c03027ea4ea15e1169de57c2c50f4e504eff410f +EBUILD obs-studio-23.0.1.ebuild 3012 BLAKE2B 5a19f9b6daa0523ef9fe912cb8cbcba3c3b7cbcd714ddfaf41200246fa27f9b4c9c021c096994ed8cadb52dbabe4cb05148a39dc2632c14ceb85c87e3c19d5a0 SHA512 76f6cd30b54f98d732e8cca4bff4fb476435319c44e706ae621c2e7d17bc620a1e784c893c5bb6a79dcaf7a6f3476a604418f855a3dc5d4e0087049d428a64e0 +EBUILD obs-studio-9999.ebuild 2981 BLAKE2B 532a7a5ac6d7db36e6c0e8217310fbd891ed2e24fd1873a7e327d60256e0ed41bfcc33371d2d2ef5669786002b7900a113b62006457ea3405492bab2bd2eb2e4 SHA512 a9885c2461dd79a62410c9de6e2e03428e4345d9bc75a077edadf44e61c558fa75d55d6eae0b98f83a622e8a08b3dbe5a5d6ab3aeb5eed8a8fb65a1aeaafa6a0 MISC metadata.xml 1122 BLAKE2B 608bff24775bd69702b19d9b1db4260ed1e5bf7d932f917d3a27d284a791374211c7fec019bd3a742552cf11142df3d2a4877d81645244bc81a6df5e60ae9f71 SHA512 29291de223d1d70f78b419c05fec1cca18e8dcd52ed5619dff51a130f9e064369378e9e803f3dd5e7c86c9f505ae506917ec04e2c9adadfcc1a23c9aeb27192f 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; diff --git a/media-video/obs-studio/obs-studio-22.0.3.ebuild b/media-video/obs-studio/obs-studio-23.0.1.ebuild index c15bd0ab0710..ef63ca589b65 100644 --- a/media-video/obs-studio/obs-studio-22.0.3.ebuild +++ b/media-video/obs-studio/obs-studio-23.0.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} ) @@ -24,7 +24,11 @@ SLOT="0" IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -COMMON_DEPEND=" +BDEPEND=" + luajit? ( dev-lang/swig ) + python? ( dev-lang/swig ) +" +DEPEND=" >=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 @@ -61,16 +65,7 @@ COMMON_DEPEND=" ) v4l? ( media-libs/libv4l ) " -DEPEND="${COMMON_DEPEND} - luajit? ( dev-lang/swig ) - python? ( dev-lang/swig ) -" -RDEPEND="${COMMON_DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch" - "${FILESDIR}/${PN}-22.0.3-fdk-build-fix.patch" # bug 672430 -) +RDEPEND="${DEPEND}" 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 9cd8bdd75172..abb6a6df16e0 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} ) @@ -24,7 +24,11 @@ SLOT="0" IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -COMMON_DEPEND=" +BDEPEND=" + luajit? ( dev-lang/swig ) + python? ( dev-lang/swig ) +" +DEPEND=" >=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 @@ -61,11 +65,7 @@ COMMON_DEPEND=" ) v4l? ( media-libs/libv4l ) " -DEPEND="${COMMON_DEPEND} - luajit? ( dev-lang/swig ) - python? ( dev-lang/swig ) -" -RDEPEND="${COMMON_DEPEND}" +RDEPEND="${DEPEND}" CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) |