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

[Aric Belsito]

commit:     d0333d6e0530ce97129d1abd83012aa2d73285db
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sun Nov 27 00:08:21 2016 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Nov 27 00:08:21 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=d0333d6e

media-video/guvcview: Add most recent version.

Issue with musl is missing locale.h, and using __BEGIN/__END_DECLS from cdefs.h

 media-video/guvcview/Manifest                      |   5 +
 media-video/guvcview/files/ffmpeg3.patch           |  26 +++++
 .../guvcview/files/guvcview-2.0.4-musl.patch       | 108 +++++++++++++++++++++
 media-video/guvcview/guvcview-2.0.4.ebuild         |  62 ++++++++++++
 media-video/guvcview/metadata.xml                  |  36 +++++++
 5 files changed, 237 insertions(+)

diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
new file mode 100644
index 0000000..b44104b
--- /dev/null
+++ b/media-video/guvcview/Manifest
@@ -0,0 +1,5 @@
+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 1346 SHA256 7eb2fbd9406adbb6737e70b6c0c834cabcb3dadb2c2ec7c0fcb6873cf8645b6f SHA512 a249f4187af93c938256a3c58d0411e75bb54f34c990d598e78b4b986bf76236c043f7a05d6833f9fd74a4a688cb20d0455c206962e133186d0780b626593d98 WHIRLPOOL 6972d43aeb00ffe28fc6e9d3f9e1eb92d31acb84d710d0571b5067de5339238824c52f7bd1bd309ddfe242c625e6a4b09e64b904330b501bda66a665ef0c4124

diff --git a/media-video/guvcview/files/ffmpeg3.patch b/media-video/guvcview/files/ffmpeg3.patch
new file mode 100644
index 0000000..5397d68
--- /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/files/guvcview-2.0.4-musl.patch b/media-video/guvcview/files/guvcview-2.0.4-musl.patch
new file mode 100644
index 0000000..1160de7
--- /dev/null
+++ b/media-video/guvcview/files/guvcview-2.0.4-musl.patch
@@ -0,0 +1,108 @@
+diff -Naur guvcview-src-2.0.4.orig/guvcview/guvcview.c guvcview-src-2.0.4/guvcview/guvcview.c
+--- guvcview-src-2.0.4.orig/guvcview/guvcview.c	2016-04-25 08:58:04.000000000 -0700
++++ guvcview-src-2.0.4/guvcview/guvcview.c	2016-08-29 21:38:12.423067646 -0700
+@@ -24,6 +24,7 @@
+ #include <string.h>
+ #include <signal.h>
+ #include <unistd.h>
++#include <locale.h>
+ #include <sys/syscall.h>
+ #include <sys/stat.h>
+ #include <sys/resource.h>
+diff -Naur guvcview-src-2.0.4.orig/gview_audio/gviewaudio.h guvcview-src-2.0.4/gview_audio/gviewaudio.h
+--- guvcview-src-2.0.4.orig/gview_audio/gviewaudio.h	2016-04-25 08:58:03.000000000 -0700
++++ guvcview-src-2.0.4/gview_audio/gviewaudio.h	2016-08-29 21:38:12.424067647 -0700
+@@ -39,7 +39,9 @@
+ #include <pthread.h>
+ 
+ /*make sure we support c++*/
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ /*Audio API*/
+ #define AUDIO_NONE          (0)
+@@ -375,6 +377,8 @@
+  */
+ void audio_close(audio_context_t *audio_ctx);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif
+diff -Naur guvcview-src-2.0.4.orig/gview_encoder/gviewencoder.h guvcview-src-2.0.4/gview_encoder/gviewencoder.h
+--- guvcview-src-2.0.4.orig/gview_encoder/gviewencoder.h	2016-04-25 08:58:06.000000000 -0700
++++ guvcview-src-2.0.4/gview_encoder/gviewencoder.h	2016-08-29 21:38:12.424067647 -0700
+@@ -38,7 +38,9 @@
+ #include <sys/types.h>
+ 
+ /*make sure we support c++*/
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ /*encoder modes*/
+ #define ENCODER_MODE_NONE   (0)
+@@ -717,6 +719,8 @@
+  */
+ int encoder_disk_supervisor(int treshold, const char *path);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif
+diff -Naur guvcview-src-2.0.4.orig/gview_render/gviewrender.h guvcview-src-2.0.4/gview_render/gviewrender.h
+--- guvcview-src-2.0.4.orig/gview_render/gviewrender.h	2016-04-25 08:58:06.000000000 -0700
++++ guvcview-src-2.0.4/gview_render/gviewrender.h	2016-08-29 21:38:12.425067649 -0700
+@@ -38,7 +38,9 @@
+ #include <sys/types.h>
+ 
+ /*make sure we support c++*/
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ #define RENDER_NONE     (0)
+ #define RENDER_SDL      (1)
+@@ -313,6 +315,8 @@
+  */
+ void render_close();
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif
+diff -Naur guvcview-src-2.0.4.orig/gview_v4l2core/gviewv4l2core.h guvcview-src-2.0.4/gview_v4l2core/gviewv4l2core.h
+--- guvcview-src-2.0.4.orig/gview_v4l2core/gviewv4l2core.h	2016-04-25 08:58:06.000000000 -0700
++++ guvcview-src-2.0.4/gview_v4l2core/gviewv4l2core.h	2016-08-29 21:38:12.425067649 -0700
+@@ -33,7 +33,9 @@
+ #include <sys/types.h>
+ 
+ /*make sure we support c++*/
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ /*
+  * LOGITECH Dynamic controls defs
+@@ -1423,7 +1425,9 @@
+  */
+ uint64_t v4l2core_time_get_timestamp();
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif
+ 

diff --git a/media-video/guvcview/guvcview-2.0.4.ebuild b/media-video/guvcview/guvcview-2.0.4.ebuild
new file mode 100644
index 0000000..35f9508
--- /dev/null
+++ b/media-video/guvcview/guvcview-2.0.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic 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"
+
+	# Fix for MUSL
+	epatch "${FILESDIR}/${PN}-2.0.4-musl.patch"
+
+	sed -i '/^docdir/,/^$/d' Makefile.am || die
+	eautoreconf
+}
+
+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) \
+		$(use_enable !qt5 gtk3)
+}

diff --git a/media-video/guvcview/metadata.xml b/media-video/guvcview/metadata.xml
new file mode 100644
index 0000000..21e3aff
--- /dev/null
+++ b/media-video/guvcview/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The media-video category contains video-related applications.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie media-video enthält Applikationen rund um das Thema Video.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría media-video contiene aplicaciones para video.
+	</longdescription>
+	<longdescription lang="ja">
+		media-videoカテゴリーにはビデオ関連のアプリケーションが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De media-video categorie bevat video-applicaties.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm media-video chứa các ứng dụng liên quan đến phim ảnh.
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória media-video obsahuje aplikácie pre prácu s videomateriálom.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria media-video contiene applicazioni video.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria media-video contém aplicações de vídeo.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria media-video zawiera pakiety związane z odtwarzaniem i
+		przetwarzaniem filmów.
+	</longdescription>
+</catmetadata>
+