gentoo resync : 06.01.2018

3 files changed, 114 insertions, 12 deletions

diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 34c10549ba16..60a984b2fe6e 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -3,9 +3,11 @@ AUX obs-studio-ImageMagick-header-path.patch 2466 BLAKE2B 7cc86c1f7787427c9d475e
 DIST obs-studio-19.0.2.tar.gz 5509958 BLAKE2B a21ed69dacb982e5f2bf31b62b85622cedb458b5ceb5bb10ccc099725f7d9c7da43c88bf40da432226f1077e036005fb28435643ed365a8a0f374875544b884f SHA512 8e2c720d713f6b3fdfb0ce64252cba3129644155be75e0942250bb616700ba62acdb04265a7a6d0ce9406282fbbf85d662d7bdc36736c36be89fd726c8bbf5a9
 DIST obs-studio-20.0.1.tar.gz 5610534 BLAKE2B 6db7a2bc591e88dac2f9450f60403095fc7e637f806657b0eb6fc928fd16fcae7a3d4a933b4bcad8b609fbf2197404bd675467a112e6aee84b9f023b9089a388 SHA512 891be96bbe18a2de4af8efd2eaeb54c388332ac7d93a66efcc18208af9ef2dfe3981f81ba351bdb16a93b2d66bcfef4f5277d3d8746261f0beb1f324ed9a7534
 DIST obs-studio-20.1.0.tar.gz 5637636 BLAKE2B 11f42c894af9d8b58ef71eda4c669b557b1b69d8df48d2414ae6d4eda1b8ecb70bb15814a302b87c5b49a43323f772a92ee5dc4a6a58302723b6b1ebf1e35123 SHA512 fd0c4b910b9a07644a9ddb72c2622d1fac67878a8bf445d7ab33385aafa23a5207f89971c428a3be01fa851141d9cbb55e86ca81201928783227fc730d12b962
+DIST obs-studio-20.1.3.tar.gz 5638299 BLAKE2B 8956e0ae444c05bc452284a730ba4cba7be9209d82f8b63f9cd0455ed73411eadc61825773c6ca5fe20435082399c72d3aaf8671c3830454d9237cc92ca4450f SHA512 9d7c6892fe8940df6c1f1686f07722ea554b5996e72b702758d670a75f1220de59295c0a7b8b6445825a86623521061f64b7672bbe7526aefc9a12bab902ed74
 EBUILD obs-studio-19.0.2.ebuild 2744 BLAKE2B 0abfae58cd3587d874009bdc3298f4377f8d82e5a7f3177cf2aa003542c1bbe0608cc56eff6ce7670f24db76dd6b09d30f5dab7c4e74f529726899c16c11d743 SHA512 56157c010fd5e108cd6ce8a6689595fe19b3dfd3357c47323ce495bafcff0fbd39546ba166aa04c622031ff74f7f1dabc78211863dce7bc86abfa633870c5c94
 EBUILD obs-studio-20.0.1-r1.ebuild 2798 BLAKE2B d85280877b1efd17b0fff6e6b16f78184d3d0ba0b86d1a6710853e7b5629035a37ad7852ca756a3208e7b6b2d380a2585e1cd2cdd6a314c7714f2ff4bbcb45ba SHA512 252a30b740c525bb975a20cd70a6a5987a3c13bf7b7235fb58a74b0f233b21fe5bdc9a4a32612d3de1184a3d31dfb0e8e32afb9e16dbccdf224f190d19dd22df
 EBUILD obs-studio-20.0.1.ebuild 2744 BLAKE2B 0abfae58cd3587d874009bdc3298f4377f8d82e5a7f3177cf2aa003542c1bbe0608cc56eff6ce7670f24db76dd6b09d30f5dab7c4e74f529726899c16c11d743 SHA512 56157c010fd5e108cd6ce8a6689595fe19b3dfd3357c47323ce495bafcff0fbd39546ba166aa04c622031ff74f7f1dabc78211863dce7bc86abfa633870c5c94
 EBUILD obs-studio-20.1.0.ebuild 2686 BLAKE2B edf1253f87dc6a4d36ee2f646fca4781509ffd8a283e1f009b4434a27d611499b5b1ae27ba2eb44cff5f8ec5edc24c3a561172638d73e6690dba554a92071e64 SHA512 30a3d1bc2f224528d217ab1e855892a373fa434bdd62a13c0935da9cc49f04ffae9e1739a0b7bde6b0cdf77f0ff92ad53d669ca1777411a4b551610d0ed9690c
-EBUILD obs-studio-9999.ebuild 2654 BLAKE2B b617676a3382babd6fffaf4ec10eae218c6c2021e6d22c00a031bbebc78341f99400c001ed69f3c2f5c3e7e9f2a099822bbf0cf6b977e60ff6028f4434cd838b SHA512 e5a0695d6f87e4335fbf3a51898f05e7ec00c7c9fca12c6a8d71374e54e4fb3389cb711fdc4be4908cc8063297b04528ca9b302e54898871c537d0cd671b2cf8
+EBUILD obs-studio-20.1.3.ebuild 2586 BLAKE2B ab1b7ad6b11824405ac4881f40e00772af295b2a1b254f47d06ed8af020534a3f0b5f9a47b401c9d2c0d88b986bb8ddb08dcff209a0485c90587ef7afc9f7992 SHA512 c64b5531c041ad2b59760f11ce3b7f113d10f3a73c011184e0f3e345fbf24b3bf37aa75712508ef8e5273b818d63c2b60bb1c30597ddd19a62915b39cce36c47
+EBUILD obs-studio-9999.ebuild 2555 BLAKE2B d3c3c891bc882342390a80629de22489c8de481e7b170bb3bd21f9c7829403d01c1a07064860dd94d36a31c47f27123836725bfecacfee6178b83352cfde0ba0 SHA512 b2a0e4a3143bbed4e10fa89ac80b5d0b3ecf8d4b023ea4122d47a8481a9bc417f131429abd60a6d79f54c05d3bc0657a8a84a31e313d57eee0f4ab712e6654d1
 MISC metadata.xml 786 BLAKE2B b9a6db2b9d7895bc67945b2f745f7cd442d0a80688f55a2cb0428f9142a90168e76045aa4045c0bc346ee2cadec09967c6bfd552ee4e2ddbba35804b14efab59 SHA512 94ee6c6239b9befb24c87cb647aaed5b87c374deab3791df5742714e7cfabd28cb07822d2cb9a17b310b82f11e2daa6216bb14b327752a7b2a8ddfc9e7062492
diff --git a/media-video/obs-studio/obs-studio-20.1.3.ebuild b/media-video/obs-studio/obs-studio-20.1.3.ebuild
new file mode 100644
index 000000000000..58da26fc60b2
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-20.1.3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 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/jp9000/obs-studio.git"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/jp9000/${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 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]
+	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}"
+
+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/speex"; then
+		elog
+		elog "For the speexdsp-based noise suppression filter"
+		elog "to be available, the 'media-libs/speex' package needs"
+		elog "to be 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 06c66b0e0b22..e790219d6877 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+CMAKE_MIN_VERSION=3.9.6
+
 inherit cmake-utils gnome2-utils
 
 if [[ ${PV} == *9999 ]]; then
@@ -49,17 +51,7 @@ COMMON_DEPEND="
 	)
 	v4l? ( media-libs/libv4l )
 "
-DEPEND="${COMMON_DEPEND}
-	imagemagick? (
-		|| (
-			<media-gfx/imagemagick-7
-			(
-				>=media-gfx/imagemagick-7
-				>=dev-util/cmake-3.9
-			)
-		)
-	)
-"
+DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )