From 957235cf19a691360c720f7913672adda4258ed0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Oct 2018 11:03:14 +0100 Subject: gentoo resync : 07.10.2018 --- media-video/obs-studio/Manifest | 10 +- media-video/obs-studio/metadata.xml | 2 +- media-video/obs-studio/obs-studio-21.0.2.ebuild | 111 --------------------- media-video/obs-studio/obs-studio-21.1.2.ebuild | 12 +-- media-video/obs-studio/obs-studio-22.0.3.ebuild | 122 ++++++++++++++++++++++++ media-video/obs-studio/obs-studio-9999.ebuild | 12 +-- 6 files changed, 139 insertions(+), 130 deletions(-) delete mode 100644 media-video/obs-studio/obs-studio-21.0.2.ebuild create mode 100644 media-video/obs-studio/obs-studio-22.0.3.ebuild (limited to 'media-video/obs-studio') diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest index c45f64c1df9c..eccc7b5ea390 100644 --- a/media-video/obs-studio/Manifest +++ b/media-video/obs-studio/Manifest @@ -1,8 +1,8 @@ AUX obs-studio-21.0.2-qt-5.11.0.patch 1078 BLAKE2B 4681ae50ae11fed00b227966cbac478d4c9606a0f520fb31c0f736f6dad428222cadee5c46b29e2467928fb5adb43f2c4e18aba31db105f6738c3c3e4dca43c5 SHA512 a640a894921f065c58236c2c09a93984f9f3c32a00934bec3a55ad7636d623a0df2e847bd86d9f184ee62284c5bcfe18cb1a9e4943b05260ee6cc0e38dc1bc2a AUX obs-studio-21.1.2-use-less-automagic.patch 5284 BLAKE2B 43e9b7fc9c4699c77037a7e28668137e0ffb24de285b9f560d2ccb6214c54640893a5d34e179087f7b2dfce49a97ea8465df97bbac232ed7c013d580bbb6019a SHA512 00774c36e3437c5828677f71ff33e467fab3957b9622092ba3d2501769796ab5b6e4328b898ee9e92ee32dfef78f9797d03bb602bc68ad294202f180298afb38 -DIST obs-studio-21.0.2.tar.gz 5904469 BLAKE2B e4e7c1f2b445f1db6b76df0c7a12dd41ffd95e7ea5669d7efc3387cc0fd15e268d864b5da3da5c07d04bc57692a88a53a67351a370621b1a6ca648405d030454 SHA512 a22597ac3a85d4c72b9b1ff886367b158498b6b0141acfd2bdb096a2bd9d29cdfad900dfc00f870eaf0aad66836093579f37b278fa90ccd7b49022e849c1c590 DIST obs-studio-21.1.2.tar.gz 5959232 BLAKE2B 12ae6f5e76093df52f44e7f45c06fe5486c8cea875438b8c78ae429fa82ccd0a6ff9d7ab15139877eca26713ab204158b7f92fb7cbefa52a3950814d28962fe7 SHA512 5143d3a87b3a54d2a06d236fc6f6d5945ab337004c30eda0438026f4b7607776b82771636d55fcc2c8ab34e041d8ecad99dc843b6b3f4371303d1b7dc349d938 -EBUILD obs-studio-21.0.2.ebuild 2698 BLAKE2B 6383b7f1bb453a355a70b7c010f78afbf9f88d51f8e14f5c11717474d944f8023ec5240935e9ce842f3ac11a620a31eb4e3feb7608608b5cb8e5bbf723cb18a4 SHA512 75f5cec89258c5862a3dcfce606edb994c5e72ef750eefcf533c59702fa9270c8ed1700436fa8efe0b8535bda965b0aae91dc741067c289dabcf62e3f96413b0 -EBUILD obs-studio-21.1.2.ebuild 3034 BLAKE2B 28f24d09d1522e5c8ae1d53a12cc542bf89caa3eb8155ccd0a0ac30d7be66db578832e4a7417a06b29ce57956f0514ecac2174ced0d60de35478da1bad85bad2 SHA512 aeab926019077d31a2ff5a38f0f16bc5d25237bce923a292b8b2677cbc3c1e19e84206aba01d730f503337b250661b427f98284e4641968d6dc67eaa2458bb9c -EBUILD obs-studio-9999.ebuild 2954 BLAKE2B 71c8b8798e707e87624bbbfc35f8dbde6de6fdc5921307932a84eff6bda423b91f71721e2ca959bfd6fa1de7fbe9ffea2f2a89e08a718d2d004aac33740e5f26 SHA512 eb50971179f1790c66a1258af7dc86d74e5f4ab1d442f675eff48733b7f2f0d57f085b614347e04a35b14a1552b5893462536089223570d2474f6dafec36fe74 -MISC metadata.xml 1125 BLAKE2B cbdc7581bf9c0ae676245bfe24e6bba5914286747c338a8fe56842bc65e6d8ac7b7413f429d8c30ef7d05fecefedc1cffdf60a37433510b79819625f30b0d744 SHA512 f64f485a39668d40e5bd0edcc5f19c57954acd96e1631bb3615e472d566091a70b9ee55548e0dca4e435c017ded350d7be5d1d07ad0ec9cefe94b196d8dcd3d4 +DIST obs-studio-22.0.3.tar.gz 6015365 BLAKE2B e2c3aec7f97bbad2ec70a46d59035335d605a478ab1e4ff10a077d81c9ade5deef1ca56cf3ffc46d4d2ab89339d98a68aa5ca8c6ca240ed82939b59803af151c SHA512 491f7ce44c741d144c621eb645fe00604e1eb98ff7dac03dffe51ba78a742e6015e1f96f21aad69e16a22d9546b6cdb51b5c1a4defd96e7c64f099de83a31f04 +EBUILD obs-studio-21.1.2.ebuild 3029 BLAKE2B cfb1e5a15d0dba8f6eea1db0f9f314c69fdb26bff4a77ef1d4fe9cff6b4d3abfc49db3266b52dd09026f3eb5b5923349ca5808bbc6d2f5ee4796406efde5bf12 SHA512 f95541d0de438d10677d6e09b5ab3e8edeedeb6b6a205d2673d40ad2e9297462f1fc6cfb8d47fbb758ff9d246ceb7541f4687801b4a61c5cda30be56d8db7087 +EBUILD obs-studio-22.0.3.ebuild 2984 BLAKE2B 764a2e4531569baa9970ac73b1967ca6e61ee3ba2c5129ac8cf3d3b5e7c9e0d43c9abbe23fde1f39ddc208ce5729723e0ba96de2abade0f53da0ec2018c71995 SHA512 36df6dc1a1796035722b9e92859e19c1372fbc0c6b5cafde1d661a4edb32b0dc63203581336f4114b0068d63e8c76b7f3922306a16c54f77405dd229fa65265d +EBUILD obs-studio-9999.ebuild 2913 BLAKE2B ed7c95a02586593b998795c5f53fdd37f14f6e10e2c27c829d46edade5008e6acb9046842b06df7b924c4e9d5f7956e07473c4b8d972680ce44a9ace698cf6ef SHA512 63fe9c288e177a213d7b4689d97a0214500a325848210fa59b5cc6aa340d7711681eb1b999e9db029c494cbb6e04ba49543b6fccf4e26d856558db79ba72fceb +MISC metadata.xml 1122 BLAKE2B 608bff24775bd69702b19d9b1db4260ed1e5bf7d932f917d3a27d284a791374211c7fec019bd3a742552cf11142df3d2a4877d81645244bc81a6df5e60ae9f71 SHA512 29291de223d1d70f78b419c05fec1cca18e8dcd52ed5619dff51a130f9e064369378e9e803f3dd5e7c86c9f505ae506917ec04e2c9adadfcc1a23c9aeb27192f diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml index 74a7f582c048..89c066c043bd 100644 --- a/media-video/obs-studio/metadata.xml +++ b/media-video/obs-studio/metadata.xml @@ -17,7 +17,7 @@ Build support for scripting via Luajit. Enable NVENC encoding for nVidia video cards. Build support for scripting via Python 3. - Enable noise suppression filter support via + Enable noise suppression filter support via media-libs/speexdsp. diff --git a/media-video/obs-studio/obs-studio-21.0.2.ebuild b/media-video/obs-studio/obs-studio-21.0.2.ebuild deleted file mode 100644 index 208ad0004506..000000000000 --- a/media-video/obs-studio/obs-studio-21.0.2.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -CMAKE_MIN_VERSION=3.9.6 - -inherit cmake-utils gnome2-utils - -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 nvenc pulseaudio truetype v4l" - -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] - nvenc? ( media-video/ffmpeg:=[nvenc] ) - 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 ) - pulseaudio? ( media-sound/pulseaudio ) - truetype? ( - media-libs/fontconfig - media-libs/freetype - ) - v4l? ( media-libs/libv4l ) -" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -PATCHES="${FILESDIR}/${PN}-21.0.2-qt-5.11.0.patch" - -CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) - -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_V4L2=$(usex !v4l) - -DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick) - -DOBS_MULTIARCH_SUFFIX=${libdir#lib} - -DOBS_VERSION_OVERRIDE=${PV} - -DUNIX_STRUCTURE=1 - ) - 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 - - if ! has_version "media-libs/speexdsp"; then - elog - elog "For the speexdsp-based noise suppression filter" - elog "to be available, the 'media-libs/speexdsp' package needs" - elog "to be installed." - elog - fi -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/media-video/obs-studio/obs-studio-21.1.2.ebuild b/media-video/obs-studio/obs-studio-21.1.2.ebuild index 062b0f414089..bba5ad05ece0 100644 --- a/media-video/obs-studio/obs-studio-21.1.2.ebuild +++ b/media-video/obs-studio/obs-studio-21.1.2.ebuild @@ -4,9 +4,8 @@ EAPI=6 PYTHON_COMPAT=( python{3_4,3_5,3_6} ) -CMAKE_MIN_VERSION=3.9.6 -inherit cmake-utils gnome2-utils python-any-r1 +inherit cmake-utils gnome2-utils python-single-r1 if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -22,7 +21,8 @@ HOMEPAGE="https://obsproject.com" LICENSE="GPL-2" SLOT="0" -IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speexdsp truetype v4l" +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 @@ -46,10 +46,10 @@ COMMON_DEPEND=" imagemagick? ( media-gfx/imagemagick:= ) jack? ( virtual/jack ) luajit? ( dev-lang/luajit:2 ) - nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] ) + nvenc? ( media-video/ffmpeg:=[nvenc] ) pulseaudio? ( media-sound/pulseaudio ) python? ( ${PYTHON_DEPS} ) - speexdsp? ( media-libs/speexdsp ) + speex? ( media-libs/speexdsp ) truetype? ( media-libs/fontconfig media-libs/freetype @@ -77,7 +77,7 @@ src_configure() { -DDISABLE_JACK=$(usex !jack) -DDISABLE_LIBFDK=$(usex !fdk) -DDISABLE_PULSEAUDIO=$(usex !pulseaudio) - -DDISABLE_SPEEXDSP=$(usex !speexdsp) + -DDISABLE_SPEEXDSP=$(usex !speex) -DDISABLE_V4L2=$(usex !v4l) -DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick) -DOBS_MULTIARCH_SUFFIX=${libdir#lib} diff --git a/media-video/obs-studio/obs-studio-22.0.3.ebuild b/media-video/obs-studio/obs-studio-22.0.3.ebuild new file mode 100644 index 000000000000..987d58bb89bf --- /dev/null +++ b/media-video/obs-studio/obs-studio-22.0.3.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{3_4,3_5,3_6} ) + +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:=[nvenc] ) + 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" ) + +CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) + +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 +} diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index 4558c2f4e954..d3014eda9ede 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -4,9 +4,8 @@ EAPI=6 PYTHON_COMPAT=( python{3_4,3_5,3_6} ) -CMAKE_MIN_VERSION=3.9.6 -inherit cmake-utils gnome2-utils python-any-r1 +inherit cmake-utils gnome2-utils python-single-r1 if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -22,7 +21,8 @@ HOMEPAGE="https://obsproject.com" LICENSE="GPL-2" SLOT="0" -IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speexdsp truetype v4l" +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 @@ -49,7 +49,7 @@ COMMON_DEPEND=" nvenc? ( media-video/ffmpeg:=[nvenc(+),video_cards_nvidia(+)] ) pulseaudio? ( media-sound/pulseaudio ) python? ( ${PYTHON_DEPS} ) - speexdsp? ( media-libs/speexdsp ) + speex? ( media-libs/speexdsp ) truetype? ( media-libs/fontconfig media-libs/freetype @@ -62,8 +62,6 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND}" -PATCHES="${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch" - CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) src_configure() { @@ -74,7 +72,7 @@ src_configure() { -DDISABLE_JACK=$(usex !jack) -DDISABLE_LIBFDK=$(usex !fdk) -DDISABLE_PULSEAUDIO=$(usex !pulseaudio) - -DDISABLE_SPEEXDSP=$(usex !speexdsp) + -DDISABLE_SPEEXDSP=$(usex !speex) -DDISABLE_V4L2=$(usex !v4l) -DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick) -DOBS_MULTIARCH_SUFFIX=${libdir#lib} -- cgit v1.2.3