gentoo resync : 25.05.2018

7 files changed, 127 insertions, 16 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 2b7639dfac13..d27014b32772 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/luvcview/Manifest b/media-video/luvcview/Manifest
index 61dc9eff7d30..9fadcec5df44 100644
--- a/media-video/luvcview/Manifest
+++ b/media-video/luvcview/Manifest
@@ -1,4 +1,4 @@
 DIST luvcview_0.2.6-4.diff.gz 8227 BLAKE2B 10c01541920b24dafd55f969f4e86daa2d4bb7d73fc33b7ed3b592e080ef31a6d4e429585402e291f20898af5d48021d618ca6496a668def767fad4dced47a3f SHA512 ae0f760e08979065a072f28367fd6c399ff8bc821b79d021d0fec8bb62e36b10804f30f708de3e23ccada0596b7c57dec6d0f8b92a777046e1bfa087686e7f87
 DIST luvcview_0.2.6.orig.tar.gz 100318 BLAKE2B 94273fc4635d515c78b9604e3a1bcdfeea5f835f64f6bb1f19c192ebee5f96b7e1d3b1e7921969560e5bd111cb7e84d20806c42b64f4ab6de40e1597ffae3c99 SHA512 6d0b480c51716e36401680ae333c37f179122d04feca3e91056f77abee6dc60dac4e431e8cca999780c343d10170678ace1eb29076c9211c0cfef6d65a4599ab
-EBUILD luvcview-0.2.6.ebuild 952 BLAKE2B 9ff52d93d0ce3deac021a28b6603a8f5f19c76a1180eea71847cc50e210ceeffc8e649c4d4d9a41fbf78041c83336ece820f19190ab458c241977fe29698016d SHA512 7f355e5a7d254b0358f0d0f5092dce186be276ad4cbf48d2c919d155e2b8e84f76fd4476aa21ac9b50f2e2c69f033abed3463a25e57aa03518ec2441f8d5cd64
+EBUILD luvcview-0.2.6-r1.ebuild 936 BLAKE2B c19948ed7a0eac1357777795827027ce496dda0405f58e7ba75b2da810d1b6e23b9bbf0ca2035b58848c480a58585316c2ac22dcbaedb9a95701b31ba2e382fb SHA512 ce60dbed98786dea12665dd1c5b90d797d3b567d63087bb84d8ec272eeda1bff83e807f071d6c9a2163fa99a0a45cc5f4add18cc903cc218357f5fb0f21343c2
 MISC metadata.xml 259 BLAKE2B d0ebadef8dc30ed8fcc89ae38ab6a5d4af940b2cd75dea1494d96c37557532dea21ef0e014d09e32ae49eca64fe3d6bd56494fb7460ad69b70f40dd4b7ebc8b0 SHA512 c81aea0e68817fa210dc6f66313aee75246139e50d6324338707f11bca2173c64e88ce8440794c85eb64194ff97cf6c6760a06b4822a121e40629bdc3a04e1fd
diff --git a/media-video/luvcview/luvcview-0.2.6.ebuild b/media-video/luvcview/luvcview-0.2.6-r1.ebuild
index 093f2e4fe702..34f1275f979d 100644
--- a/media-video/luvcview/luvcview-0.2.6.ebuild
+++ b/media-video/luvcview/luvcview-0.2.6-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils toolchain-funcs
+EAPI=6
+inherit desktop toolchain-funcs
 
-PATCH_LEVEL=4
+PATCH_LEVEL="4"
 
 DESCRIPTION="USB Video Class grabber"
 HOMEPAGE="https://packages.qa.debian.org/l/luvcview.html"
@@ -16,24 +16,30 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="media-libs/libsdl
-	media-libs/libv4l"
+RDEPEND="
+	media-libs/libsdl
+	media-libs/libv4l
+	x11-libs/libX11
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
-	EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
-	EPATCH_FORCE=yes EPATCH_SUFFIX=patch epatch debian/patches
+	default
+	eapply "${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
+	eapply debian/patches/*.patch
 	sed -i -e 's:videodev.h:videodev2.h:' *.{c,h} || die
 	sed -i -e 's:-O2::' Makefile || die
 }
 
 src_compile() {
-	emake CC="$(tc-getCC) ${LDFLAGS}" || die
+	emake CC="$(tc-getCC) ${LDFLAGS}"
 }
 
 src_install() {
-	dobin luvcview || die
-	doman debian/luvcview.1 || die
-	dodoc Changelog README ToDo || die
+	dobin luvcview
+	doman debian/luvcview.1
+	dodoc Changelog README ToDo
+	make_desktop_entry ${PN}
 }
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index e35d8471c1c7..43de10b899bb 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -3,5 +3,5 @@ AUX mjpegtools-2.1.0-pic.patch 2298 BLAKE2B 9babd547b6c631845964e7ab6cb929d0b704
 AUX mjpegtools-2.1.0-sdl-cflags.patch 387 BLAKE2B ad8065afdf164335e77adf972b21c6fd7108dba3f21a56006eede02a650f7f0728950c36f9e73dbedd9713eb69f8dab010c547c472c02abd8642dc518cc43621 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602
 DIST mjpegtools-2.1.0.tar.gz 1844336 BLAKE2B 90ae51c81e18708132f26c1fb002128193168366542cadc15060ad52f664a5f90770b3039ada2a1777eab5fec9743fb24c65083de913ebd72b23dd55f6b25741 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5
 EBUILD mjpegtools-2.1.0-r2.ebuild 2856 BLAKE2B 69ecbbd0dd2a8b6176d9fa5a93e1b5321331e1f701168a809f8d1660d05855bd1cf8187073895442443bd0cdf212494985b56500bebdc531c6b092a47675eae7 SHA512 741507bd082bfdd7a46f1fa5a73cca2c7c903b922268afacc8edaf0ad43392743b79dae798abe9eab7f12f9866199d6f868c386fff930e060eb4f7543e655642
-EBUILD mjpegtools-2.1.0-r3.ebuild 2879 BLAKE2B 35b2a6360c3ac4403429aa78d3d7c35c882c5ae52ace9c03bdbc5132160ecdfe1f70e2264c99c22bdbb31cce3e4ab31c7589a221edc323226b052f00556487f6 SHA512 995c3aa3d071617b767bde3936d9773e8a575542eb8895adf21a680f5e9c1354340598b42eb97afa6c79fe3c4ad4d4181f4c92286ea61d2b143ebab6ff43cb06
+EBUILD mjpegtools-2.1.0-r3.ebuild 2877 BLAKE2B 70aa8dcd33a3708144d592e6be4ceee5cf14a94cc0c6cce465359fa7c607047ccc1d38d245cb49e09492dc27f4e88876ea27f0affd5bafba29b5e473efbd11ae SHA512 ddb70e8829c8c1c6adff6efe441d2d5eddc40c1613ae4a9de01d9474ba3b19e25beecde8def527feb3bba94ef57fd5ca903e7e6a165cf8cb7f26881d4947f69c
 MISC metadata.xml 537 BLAKE2B 9a038894ff7da6df6f8746be16e0a0f9e0586321eba052a95afd038d2625110d7dbcd2961ac8de8c14ab2fd74ccb2eb3881d64c8b96c97936e92173e2b62a67b SHA512 f3360892e77c064d2062bb963b91f031587ebed6a31b8ba2c698d969cf88998daec9ef910689f477e36921df60d2aa8bdfbe569dda701b0e375d75acfd31d79d
diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
index a12c9c11b243..54dba2b26130 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 
diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index a5dccd9f7b47..788a3a58004c 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,8 +1,10 @@
 AUX simplescreenrecorder-0.3.9-cmake.patch 3098 BLAKE2B 5f744c8b56e04022a1048f9fb37924ec4443b12da7bd8c6d8569bab302f39cbe7d697948e578e4b2f19050ff78d7a3d278d0c9481aadafc5b9883e7b84923bc4 SHA512 ffcbc6822d1d0fe833018206fc23bf3c880d5a39bb607346b78dcb6d37e320b357f73b4216d8724c30052cebe70cc0167889fbd4c1ddd2a3713cbaf8ad4ae338
 AUX simplescreenrecorder-0.3.9-pulseaudio_dep.patch 427 BLAKE2B 9ce385a87222d4684f6626db9f6be5d7efc04e84e5175a804e415f053c4c3e4684b0b7338615e74801485f1962d1f8ccc114ec357d6c1446ab56816d0880ede6 SHA512 d9616bf99d784c5ab0a1446b965ebec4e089a3ecafc2ed128dbc04747ad2511a84d679e309530369241816b662f527d7109dfb26df13888d8c4f917a99ea2c72
 DIST simplescreenrecorder-0.3.10.tar.gz 1823448 BLAKE2B 5eef2a803be90b357b08ba6a009cd9bfda73bc7c29200de50c32902598b7044aedaa0a39d9eb71ab0a660bb1a3c03f7d57ae2437203037951f06821ce8a417bb SHA512 dc7b9de386b5f87e8315695ef105dea2491d09b98b19029146dd29562fec001bf6b3fd3f30e91bc87bdb55ec87ff213567b5b17a234b0c06c6b7fe93db63d4ae
+DIST simplescreenrecorder-0.3.11.tar.gz 1823944 BLAKE2B b7692ad158b4784f0222dd47227b85d33aae7eb416ed87d2eda1040027c910ec8d0ebe6a7e164e77cb9c3f6f2756e15fe97a7f05f45c92465473d2ae90e86b34 SHA512 5919774a00cd7015cd7db40561efaea43809b9465508b7770db9eb0fc87f338746e5cd4a79a0ab6c09e516257fa80184c3dcb5ab400c0ef2c0a8cf50ea2a073f
 DIST simplescreenrecorder-0.3.9.tar.gz 1816221 BLAKE2B 995ac44da0a5e65dcb33a10b353085f6907531b2af84a0b4c5898f1a44d45676a759b94facdf7f6f311444bcb1ea2cbd8dcf143b8c6e0efac4a7eb06484d1096 SHA512 36dc30597d1cb07f060dcb667d79074851fec75f369efe349d1a1852110e663f0704fd0ec7d85fd0fc0dac27e478b7422f6e273dfecbb27ddeb6d2228217a3b2
 EBUILD simplescreenrecorder-0.3.10.ebuild 2827 BLAKE2B 97ee9516f58c00e93ffafb47e416c5d7d6b686deec24271a7c59f8f713a327b8179733d3e1f4f2a9799cbaf32206b24e6fcd9ead61bf442092b5d641d7bffc98 SHA512 42d178d475278d1d7c888215b3d11182786575eb3d7447628ee4eeda73799da27c0c291b9ca40fddb4db66a00ebdd969a8dc82b68ab9e8f67d4685eaf236d3d4
+EBUILD simplescreenrecorder-0.3.11.ebuild 2827 BLAKE2B 97ee9516f58c00e93ffafb47e416c5d7d6b686deec24271a7c59f8f713a327b8179733d3e1f4f2a9799cbaf32206b24e6fcd9ead61bf442092b5d641d7bffc98 SHA512 42d178d475278d1d7c888215b3d11182786575eb3d7447628ee4eeda73799da27c0c291b9ca40fddb4db66a00ebdd969a8dc82b68ab9e8f67d4685eaf236d3d4
 EBUILD simplescreenrecorder-0.3.9-r1.ebuild 2913 BLAKE2B da8680a70094428174dd39a169b38cedaec5a4304c031d1024fe5616832252fee8b391889e0de413d291397f3edf39eefc8027136221202f5341b51e542fc5db SHA512 33b9d71372a3fa47492e8afc0d5341b99a2ab33544ca53badabc8678e4f1b2c71a0f6592f7b7c13f6dc6120ca7390b5863ec34a6193402e9ff98245c4bb1f88f
 EBUILD simplescreenrecorder-9999.ebuild 2827 BLAKE2B 97ee9516f58c00e93ffafb47e416c5d7d6b686deec24271a7c59f8f713a327b8179733d3e1f4f2a9799cbaf32206b24e6fcd9ead61bf442092b5d641d7bffc98 SHA512 42d178d475278d1d7c888215b3d11182786575eb3d7447628ee4eeda73799da27c0c291b9ca40fddb4db66a00ebdd969a8dc82b68ab9e8f67d4685eaf236d3d4
 MISC metadata.xml 508 BLAKE2B c43c69903c35e9e1f87c94cb26b06a8d6c4dd1a51c8a3409027ab8c867e54851aa8e4bfcaf4a0a37298795ded69743e82d2b0a4e0bb84cb3d88d6a6c5c4a1c0f SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11.ebuild
new file mode 100644
index 000000000000..da1692bb1d65
--- /dev/null
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib flag-o-matic xdg-utils
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="A Simple Screen Recorder"
+HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder"
+LICENSE="GPL-3"
+PKGNAME="ssr"
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"
+	EGIT_BOOTSTRAP=""
+else
+	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PKGNAME}-${PV}"
+fi
+
+SLOT="0"
+IUSE="+asm jack mp3 pulseaudio theora vorbis vpx x264"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib:0=
+	media-libs/mesa[${MULTILIB_USEDEP}]
+	|| (
+		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
+		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
+	)
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	virtual/glu[${MULTILIB_USEDEP}]
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+pkg_setup() {
+	if [[ ${ABI} == amd64 ]]; then
+		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
+		elog "When added 32bit GLInject libraries are also included. This is"
+		elog "required if you want to use OpenGL recording on 32bit applications."
+		elog
+	fi
+
+	if { has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ; } && has_version media-libs/x264[10bit] ; then
+		ewarn
+		ewarn "media-libs/x264 is currently built with 10bit useflag."
+		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
+		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
+		ewarn "record videos with x264."
+		ewarn
+	fi
+
+	# QT requires -fPIC. Compile fails otherwise.
+	# Recently removed from the default compile options upstream
+	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
+	append-flags -fPIC
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_32BIT_GLINJECT="$(usex abi_x86_32)"
+		-DENABLE_X86_ASM="$(usex asm)"
+		-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
+		-DWITH_JACK="$(multilib_native_usex jack)"
+		-DWITH_GLINJECT="true"
+	)
+
+	# libav doesn't have AVFrame::channels
+	# https://github.com/MaartenBaert/ssr/issues/195#issuecomment-45646159
+	if has_version media-video/libav ; then
+		mycmakeargs+=( -DENABLE_FFMPEG_VERSIONS="false" )
+	fi
+
+	if multilib_is_native_abi ; then
+		mycmakeargs+=( -DWITH_QT5="true" )
+	else
+		mycmakeargs+=( -DWITH_SIMPLESCREENRECORDER="false" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}