media-video/guvcview: bump to 2.0.3, add qt5 useflag and fix build with ffmpeg3.

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier@gentoo.org>

3 files changed, 83 insertions, 0 deletions

diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index ee9a0dcc4c78..25d4cf1f81b2 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -3,3 +3,4 @@ DIST guvcview-src-1.7.1.tar.gz 464478 SHA256 1809f784210b295c0ba35297977e3416d6f
 DIST guvcview-src-1.7.2.tar.gz 508179 SHA256 4bedf9ce57edf60e761e7de9563a39a3ae43e4076cf9b3b8887218ec63754696 SHA512 e8bd3d9fe465486971d1d94bc73a31eb704194ce21c1482fd0d13c2cd6e256828bd99b20f5a3d7e97eb8b80c2faa5cacd4394f979c87b84b5b184d84670d8f77 WHIRLPOOL 4a5bef8dd92a8435290fec34dd8fea80f77ea1fe15e13d6e33a45f01482fd6dbce68a1ef374a8558ecb07c974c21f582c02bc5f16aff1a92efb5747e9adb0293
 DIST guvcview-src-1.7.3.tar.gz 761780 SHA256 d98612fa7bb6a5a408b26755bcefdee9c5d505e5dc0e2a45a7f316652d96da99 SHA512 36ec97e127043d9548bed2f915cd45611ba751cee3c38119382911d0c037944b0fb0abd2486155eade39c9b14c7ef3657c9b4bde1cc62666004fbf77de58db91 WHIRLPOOL 225eaad1fd40356b4699e51de1b14d6f367809d8f7bf0288392083ace20b433a770d4cba666f4edb7c636089ac3b9bf144830507d1dee13088ca44b872104483
 DIST guvcview-src-2.0.1.tar.gz 960661 SHA256 dffb86c01bd2e25216d9fbc0c246342246818036d9f63e0488111d757d9b018d SHA512 b3877f00f4caf224eac2010f62e1c3d575b94f84cd0a8da7a5f1df6c851384c7a9e356de905ce27e143dc9761137ae1cce146bb4f6c0aa6d270dd53551bce67a WHIRLPOOL 9cbf94219f5816e5fb0b98f3a7b7ad618bf3162dcd5a7b6dc9162a842470c2643f4503f6d15fc0c1c00de4901ecde5bf188680bacac279f4721bda02a7efecf5
+DIST guvcview-src-2.0.3.tar.gz 1062788 SHA256 1f2c79f2dccbf512a0aa1c397ce8e5d37fb0a48008ef72a0d3f10f9dc0758bce SHA512 976e62ffe26bd9c815ff754337a42512c6fcc9d55285e79e0505f6211a7ca2407546e433fc0e8439ea541ef51a23101b0badda2f9fcc9d197d3a2ab27983b704 WHIRLPOOL 8d94d9e669bee2f551745af03efba22d956d37927edf9b1a8b901ac943dc8c0d4e59a0aeada904b7c45e4ce693f9b49ef6e383485b827323fea066e28de0f220
diff --git a/media-video/guvcview/files/ffmpeg3.patch b/media-video/guvcview/files/ffmpeg3.patch
new file mode 100644
index 000000000000..5397d68834af
--- /dev/null
+++ b/media-video/guvcview/files/ffmpeg3.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000000..dd5fb8ac86e4
--- /dev/null
+++ b/media-video/guvcview/guvcview-2.0.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	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)
+}