gentoo resync : 24.12.2018

5 files changed, 45 insertions, 107 deletions

diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index f4c6a6fb0e0d..d79d764a3d33 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1,9 +1,6 @@
-AUX ffmpeg3.patch 1159 BLAKE2B 537c6ef20c0c1ea7396eaca7488487a335e18c33d8982135272bd4344961c1047ad08571e3721d532d5460e48a61ba7d1b65b716597dff6c51d8f9a0b9fc6b21 SHA512 0707e6ff0fa2098b02c58001014d9ddf09b3b9dc9f211d74143c893b0a3cb1bc12cfbb05a05cacf7599689441934a63294d7fbed1a4b4e273aea0058dc41a6ee
 AUX ffmpeg4.patch 7046 BLAKE2B 570d5a582bd76a11be2fa444cdce9c178590235eb7f1b765827dddd318ca0923206f45849ea29671e3d642b72a46eb9b58d9c2aa9735c0f312dd81f6002a488d SHA512 bc9225d94160a565bdfd524853d37d54594acae7df80c7ffd694e79943273568bd497e9e0ac24c154823bc272cfdc1f697823feb95d191aea829f331ed0daf98
-DIST guvcview-src-2.0.3.tar.gz 1062788 BLAKE2B 18cb79838e5c797fd07219345f7d7ae0a997f4360b95ceabac3c4adddf7cdef57ba23d0514e9038f05a67aef2ce6ab8e656f8a8774c843a7e1db66eaf9a1553a SHA512 976e62ffe26bd9c815ff754337a42512c6fcc9d55285e79e0505f6211a7ca2407546e433fc0e8439ea541ef51a23101b0badda2f9fcc9d197d3a2ab27983b704
-DIST guvcview-src-2.0.4.tar.gz 1120666 BLAKE2B 582d2b36effda9dd99b5ee54f42f91bdc0001cc885c3a21f67d3fdb49cac95deaf41bb1700021fc9ae438fc64926abfe9cb1366c32ff8b04e84a30ce771edc09 SHA512 9339e9cf7dc5224f1b87bb21e0ad711d9c27f4197d5f758c70edf465eb01c8c9c51542c75d686f0439f9e843a1c14c2f76835e8529b87b35a737fc5ccb01fe0a
 DIST guvcview-src-2.0.5.tar.gz 1134237 BLAKE2B 6165349005a07e3e9ea555a7b4aa731ec218f8073dfce8ac5036dd3ccbe4228aeb3b29491c8ad545d5b5ab193045704a60bfcd48459bfc56ad923b583c08f5be SHA512 b4a1216ab2effbd0022d5ba0ce266ac06a781e453d3dbedfe29b654864d3a26fe1e8b68245d76eff854281d42f1871a8a82b06f783b5115e94ec1c111aac05eb
-EBUILD guvcview-2.0.3.ebuild 1266 BLAKE2B fe89ee1d75f1340b688cbbc344e74b140f337fde49715bbabada8be880d5ef425a2c981ae75fde67092bb43c83079443a86fa0dedfe1129c7602995327f7c494 SHA512 8b2302dd8513622e99895d627006583569c17ffa033df755caa0b0128c83980e33d3163913a76bf83625d17f2a3e0617d3b40a0779aeb87398b0e14648ec9dae
-EBUILD guvcview-2.0.4.ebuild 1320 BLAKE2B 17fcab349c12b7f8aecab83f62dfe79868ecfe58bca8ec847fb5650be3edcd3391a79d59137933b925a6d3883500c0a8f2a83690fca71e7bb481a39181fbbc67 SHA512 593c8fecd6475822e55a7ec9b4b5176e032f16861c97c1f74a6dc8c3a2234991232740ea76d5d3ab1bac52831f4a1d39d979d464f300485e6e7412632427e095
+DIST guvcview-src-2.0.6.tar.gz 1131013 BLAKE2B ec8d7a82344e26890fe184d0edf77d0e415aa708bdf3cf55f96c555aaef479b1b7441a0425db035d10a6dc31f90282c169afff2d13684599ab1c005a5ea50ab1 SHA512 f73ba0a013f5afadb45c9bf60f723058ee31e99e204c951c49335a8ef9902a2caa752d6d51f6dd20ae960217cc25155e70efe4c49299a95e6780aaf8034078ec
 EBUILD guvcview-2.0.5.ebuild 1402 BLAKE2B 8601540bb8d20e7090138ffc2111d541858c9bfad0faad5d4df3e20ab86aff0e47df73d6dc4157c117051d15148511634f840b5312ba951ddfa8610e744e782b SHA512 a27b9958971f22e5f7c27fefd8c79e7446885a63e270fdad40ca199f1ac399964cc2c12f9ef20c420582dbfb8b237a4b9cda09c90c2a8a6dea43d58d7bc68616
-MISC metadata.xml 301 BLAKE2B 4364fa7d4b27716ae8088bb8f7268bfceb9a607ea39a8ab794359ee2690d134ae493ae11a344dc2f26a25a7c51cecc1a6aad892102a7d7e2ac692fa18d020ae0 SHA512 c4c12767b33b64b58f02905235bebe4337c18d5a7e33dbb02c50c29effa9d236bc137b41ff8b0948aaeab36deb6f282c57d1770d7594cc087caeac7dc1036b8c
+EBUILD guvcview-2.0.6.ebuild 1579 BLAKE2B 47e4635f1281666660f7a9c2f92b8ef80f08e663f09fc869006949790c117779b9cf42da81b1f0d117518147bdc48b3b685b2cbe24d7e7f210dc335fe518bb68 SHA512 a40bbc2033404fd765d67bce17fe8c61a50625d79745e6c0173727e2cd2edfaeecc9d4a52428cf76001f85effd183a8a5b50ca67df1b24d2aa349abd3ad0bb49
+MISC metadata.xml 380 BLAKE2B 0059009c82869365d8ad9bd1266dbd048b97c3e24bad5d47e9598ae1f90a348395089faa27ae52982525dbd02a6ad3c48961c8b66eba9077a09ffde6f1a8eaf9 SHA512 6eb897ab0df42c6ecb1b5559eea22eccaca63cfa72f350361634b424baa1d7405175968930e57151164d2999e2d2db28e2606576994895259c065ae07d623f1d
diff --git a/media-video/guvcview/files/ffmpeg3.patch b/media-video/guvcview/files/ffmpeg3.patch
deleted file mode 100644
index 5397d68834af..000000000000
--- a/media-video/guvcview/files/ffmpeg3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: guvcview-src-2.0.3/gview_v4l2core/jpeg_decoder.c
-===================================================================
---- guvcview-src-2.0.3.orig/gview_v4l2core/jpeg_decoder.c
-+++ guvcview-src-2.0.3/gview_v4l2core/jpeg_decoder.c
-@@ -1436,7 +1436,7 @@ int jpeg_init_decoder(int width, int hei
- 		exit(-1);
- 	}
- 
--	codec_data->context->pix_fmt = PIX_FMT_YUV422P;
-+	codec_data->context->pix_fmt = AV_PIX_FMT_YUV422P;
- 	codec_data->context->width = width;
- 	codec_data->context->height = height;
- 	//jpeg_ctx->context->dsp_mask = (FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE);
-Index: guvcview-src-2.0.3/gview_v4l2core/uvc_h264.c
-===================================================================
---- guvcview-src-2.0.3.orig/gview_v4l2core/uvc_h264.c
-+++ guvcview-src-2.0.3/gview_v4l2core/uvc_h264.c
-@@ -970,7 +970,7 @@ int h264_init_decoder(int width, int hei
- 	}
- 	
- 	h264_ctx->context->flags2 |= CODEC_FLAG2_FAST;
--	h264_ctx->context->pix_fmt = PIX_FMT_YUV420P;
-+	h264_ctx->context->pix_fmt = AV_PIX_FMT_YUV420P;
- 	h264_ctx->context->width = width;
- 	h264_ctx->context->height = height;
- 	//h264_ctx->context->dsp_mask = (FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE);
diff --git a/media-video/guvcview/guvcview-2.0.3.ebuild b/media-video/guvcview/guvcview-2.0.3.ebuild
deleted file mode 100644
index 434941114598..000000000000
--- a/media-video/guvcview/guvcview-2.0.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="GTK+ UVC Viewer"
-HOMEPAGE="http://guvcview.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gsl libav pulseaudio qt5"
-
-RDEPEND=">=dev-libs/glib-2.10
-	media-libs/libpng:0=
-	media-libs/libsdl2
-	media-libs/libv4l
-	>=media-libs/portaudio-19_pre
-	!libav? ( >=media-video/ffmpeg-2.8:0= )
-	libav? ( media-video/libav:= )
-	virtual/ffmpeg
-	virtual/libusb:1
-	virtual/udev
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
-	gsl? ( >=sci-libs/gsl-1.15 )
-	qt5? ( dev-qt/qtwidgets:5 )
-	!qt5? ( >=x11-libs/gtk+-3.6:3 )
-	!<sys-kernel/linux-headers-3.4-r2" #448260
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/os-headers
-	sys-devel/autoconf-archive
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/ffmpeg3.patch"
-	sed -i '/^docdir/,/^$/d' Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	export MOC="$(qt5_get_bindir)/moc"
-	econf \
-		--disable-debian-menu \
-		$(use_enable gsl) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable qt5) \
-		$(use_enable !qt5 gtk3)
-}
diff --git a/media-video/guvcview/guvcview-2.0.4.ebuild b/media-video/guvcview/guvcview-2.0.6.ebuild
index 7d6a7794823c..bf243272b545 100644
--- a/media-video/guvcview/guvcview-2.0.4.ebuild
+++ b/media-video/guvcview/guvcview-2.0.6.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils flag-o-matic qmake-utils
+EAPI=6
+
+inherit autotools flag-o-matic qmake-utils toolchain-funcs
 
 MY_P=${PN}-src-${PV}
 
-DESCRIPTION="GTK+ UVC Viewer"
+DESCRIPTION="Simple Qt5 or GTK+3 interface for capturing and viewing video from v4l2 devices"
 HOMEPAGE="http://guvcview.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
@@ -15,32 +16,40 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gsl libav pulseaudio qt5"
 
-RDEPEND=">=dev-libs/glib-2.10
+RDEPEND="
+	>=dev-libs/glib-2.10
 	media-libs/libpng:0=
 	media-libs/libsdl2
 	media-libs/libv4l
 	>=media-libs/portaudio-19_pre
-	!libav? ( >=media-video/ffmpeg-2.8:0= )
-	libav? ( media-video/libav:= )
 	virtual/ffmpeg
 	virtual/libusb:1
 	virtual/udev
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
 	gsl? ( >=sci-libs/gsl-1.15 )
-	qt5? ( dev-qt/qtwidgets:5 )
+	!libav? ( >=media-video/ffmpeg-2.8:0= )
+	libav? ( media-video/libav:= )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
 	!qt5? ( >=x11-libs/gtk+-3.6:3 )
-	!<sys-kernel/linux-headers-3.4-r2" #448260
+"
+# linux-headers: bug 448260
 DEPEND="${RDEPEND}
 	dev-util/intltool
+	sys-devel/autoconf-archive
 	sys-devel/gettext
+	>=sys-kernel/linux-headers-3.4-r2
 	virtual/os-headers
-	sys-devel/autoconf-archive
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}/ffmpeg3.patch"
+	default
 	sed -i '/^docdir/,/^$/d' Makefile.am || die
 	eautoreconf
 }
@@ -48,10 +57,21 @@ src_prepare() {
 src_configure() {
 	export MOC="$(qt5_get_bindir)/moc"
 	use qt5 && append-cxxflags -std=c++11
-	econf \
-		--disable-debian-menu \
-		$(use_enable gsl) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable qt5) \
+	# 599030
+	tc-export CC CXX
+
+	local myeconfargs=(
+		--disable-debian-menu
+		--disable-static
+		$(use_enable gsl)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5)
 		$(use_enable !qt5 gtk3)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-video/guvcview/metadata.xml b/media-video/guvcview/metadata.xml
index 6d3ed0b48f08..ea26ca148e61 100644
--- a/media-video/guvcview/metadata.xml
+++ b/media-video/guvcview/metadata.xml
@@ -7,4 +7,7 @@
 	<upstream>
 		<remote-id type="sourceforge">guvcview</remote-id>
 	</upstream>
+	<use>
+		<flag name="qt5">Build with Qt5 interface instead Gtk+</flag>
+	</use>
 </pkgmetadata>