[gentoo-commits] proj/musl:master commit in: media-video/guvcview/, media-video/guvcview/files/

["Aric Belsito" <lluixhi@gmail.com>]

commit:     397094a26e1ecfbb9512dcef16379a1be4c214c0
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Feb  9 17:31:22 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Feb  9 17:31:22 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=397094a2

media-video/guvcview: version bump to 2.0.5

 media-video/guvcview/Manifest                      |  6 +----
 media-video/guvcview/files/ffmpeg3.patch           | 26 ----------------------
 ...guvcview-2.0.4.ebuild => guvcview-2.0.5.ebuild} |  8 +++----
 3 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index 836a7f1..4a2be29 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1,5 +1 @@
-AUX ffmpeg3.patch 1159 SHA256 cdbae0161e8396a4b7dbfc6c15cb18b972c0e90dd3198ae625f5c902baa38055 SHA512 0707e6ff0fa2098b02c58001014d9ddf09b3b9dc9f211d74143c893b0a3cb1bc12cfbb05a05cacf7599689441934a63294d7fbed1a4b4e273aea0058dc41a6ee WHIRLPOOL 2e92cc8f171b755f5a2d7ef21af2cc71d7259cbbe99cef94bac8af747a79be46e5875e86208375b762c3a9b17cbd499ea0b85cbbd47e5897cdaf208086fa7a68
-AUX guvcview-2.0.4-musl.patch 2818 SHA256 393245a83a40e884aa97e6fa1bfb62a780b3148db5d8b39379db486784afcac5 SHA512 de8679382bbd5a98c90ea6291c320d51dd8be8165ead79588ff2bbbd5871721adfdf8a7c2c73af7a6864ebc91d5ea01993e1b33eb9ddbf35688f5d36aed24b6b WHIRLPOOL 2b9fb99ed33518a103d1269ae7a56febaec7e968b53eeac46b20e933f1f2e1a505f02190d88f76b82f0dfa034c2329126a43e906bff43f1c13d931e27f481dfd
-DIST guvcview-src-2.0.4.tar.gz 1120666 SHA256 670ef45168a9b58d36ac42f09c498db5e56b76b0be25b0a6dc97528569334fa2 SHA512 9339e9cf7dc5224f1b87bb21e0ad711d9c27f4197d5f758c70edf465eb01c8c9c51542c75d686f0439f9e843a1c14c2f76835e8529b87b35a737fc5ccb01fe0a WHIRLPOOL ff168a9c785f4f165891a4e9f4541bcd1774fbd7b3c98d2259f10b1fe02689f4c1f91b0cdd966ea82905a9a23ad8af40081a80df9389b01640bbfca32f4734df
-EBUILD guvcview-2.0.4.ebuild 1390 SHA256 e67d2776188c35c33ba0e07f5209b020994171f8ce28ddac44be764ce8f1574f SHA512 4f16e2fdd446db66c9163c6cd4f241e040f13c326bd8bc1b18be58a8d082e986b599d596ef0ed8c264d14c4659b6b5112f9583e7baa155370f4b16d66a9cc3c7 WHIRLPOOL 48ee0ba2017e180a3b856a55ee737d22a023765242a08380c57e8c50cf37239e7f8636e8775a6d4510d658a2a3cca68c8e5a972d0b823d7c54b14054c635eb37
-MISC metadata.xml 301 SHA256 e412a1f077895ca3045da354e5bfbdc07604e58bccc13dc4583efd747193e9cb SHA512 c4c12767b33b64b58f02905235bebe4337c18d5a7e33dbb02c50c29effa9d236bc137b41ff8b0948aaeab36deb6f282c57d1770d7594cc087caeac7dc1036b8c WHIRLPOOL d25f76a9302b9b4d6aae95da5ca33da573efe7860ce57ea73ccfe09d0b4e6422fbd84c312ba503b8dc177bd8b05079b0302fa1af16dc4c13549ffefc2cbe977a
+DIST guvcview-src-2.0.5.tar.gz 1134237 SHA256 a86beb5993a8449ed3cbcc6ec2a238ef0b90138b6cbe2afab4456d37f44c41a0 SHA512 b4a1216ab2effbd0022d5ba0ce266ac06a781e453d3dbedfe29b654864d3a26fe1e8b68245d76eff854281d42f1871a8a82b06f783b5115e94ec1c111aac05eb WHIRLPOOL 404f6f2afb57b0ac21326e996ab4c21e533a73c1617d3110550cf109c23555a9f2124fb77ac888dc0434844d1b7b5c728265c41bcbeaec6a85bdb4fdf21585b5

diff --git a/media-video/guvcview/files/ffmpeg3.patch b/media-video/guvcview/files/ffmpeg3.patch
deleted file mode 100644
index 5397d68..0000000
--- 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.4.ebuild b/media-video/guvcview/guvcview-2.0.5.ebuild
similarity index 90%
rename from media-video/guvcview/guvcview-2.0.4.ebuild
rename to media-video/guvcview/guvcview-2.0.5.ebuild
index 35f9508..f11d6c7 100644
--- a/media-video/guvcview/guvcview-2.0.4.ebuild
+++ b/media-video/guvcview/guvcview-2.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-inherit autotools eutils flag-o-matic qmake-utils
+inherit autotools eutils flag-o-matic qmake-utils toolchain-funcs
 
 MY_P=${PN}-src-${PV}
 
@@ -41,8 +41,6 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}/ffmpeg3.patch"
-
 	# Fix for MUSL
 	epatch "${FILESDIR}/${PN}-2.0.4-musl.patch"
 
@@ -53,6 +51,8 @@ src_prepare() {
 src_configure() {
 	export MOC="$(qt5_get_bindir)/moc"
 	use qt5 && append-cxxflags -std=c++11
+	# 599030
+	tc-export CC CXX
 	econf \
 		--disable-debian-menu \
 		$(use_enable gsl) \