summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJimi Huotari <chiitoo@gentoo.org>2019-02-27 02:23:31 +0200
committerPatrice Clement <monsieurp@gentoo.org>2019-02-28 23:49:32 +0100
commita2b062dd635f1aaa21ee81e9e6abd7a1c4e45f79 (patch)
treee25bf0d66824ef3c69ed930f5df4cd274575c653 /media-video
parentmedia-video/obs-studio: version bump to 23.0.1. (diff)
downloadgentoo-a2b062dd635f1aaa21ee81e9e6abd7a1c4e45f79.tar.gz
gentoo-a2b062dd635f1aaa21ee81e9e6abd7a1c4e45f79.tar.bz2
gentoo-a2b062dd635f1aaa21ee81e9e6abd7a1c4e45f79.zip
media-video/obs-studio: remove old version and unused patches.
Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Jimi Huotari <chiitoo@gentoo.org> Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'media-video')
-rw-r--r--media-video/obs-studio/Manifest1
-rw-r--r--media-video/obs-studio/files/obs-studio-21.1.2-use-less-automagic.patch167
-rw-r--r--media-video/obs-studio/files/obs-studio-22.0.3-fdk-build-fix.patch52
-rw-r--r--media-video/obs-studio/obs-studio-22.0.3.ebuild134
4 files changed, 0 insertions, 354 deletions
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 8210c29f369..4e440484dd9 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,2 +1 @@
-DIST obs-studio-22.0.3.tar.gz 6015365 BLAKE2B e2c3aec7f97bbad2ec70a46d59035335d605a478ab1e4ff10a077d81c9ade5deef1ca56cf3ffc46d4d2ab89339d98a68aa5ca8c6ca240ed82939b59803af151c SHA512 491f7ce44c741d144c621eb645fe00604e1eb98ff7dac03dffe51ba78a742e6015e1f96f21aad69e16a22d9546b6cdb51b5c1a4defd96e7c64f099de83a31f04
DIST obs-studio-23.0.1.tar.gz 6223214 BLAKE2B c3b65ad9134aefc36a3fa33b8d185a1ee76f76c10edd30d5ad8a7af86605c4e7b3b8d83c5570203d926655131f7c20f4ef11dcbf55c7af745efc2b68d4933c54 SHA512 6877d4bf635a9769d634683a85075a5fe3a5de1fcc83882647dfbc379a897eee05b69c2159e290ff73f53aa7c03027ea4ea15e1169de57c2c50f4e504eff410f
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 2c28c8e080d..00000000000
--- 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 73329cf8040..00000000000
--- 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-22.0.3.ebuild
deleted file mode 100644
index c15bd0ab071..00000000000
--- a/media-video/obs-studio/obs-studio-22.0.3.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,3_7} )
-
-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.1.2-use-less-automagic.patch"
- "${FILESDIR}/${PN}-22.0.3-fdk-build-fix.patch" # bug 672430
-)
-
-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
-}