public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-video/guvcview/, media-video/guvcview/files/
@ 2016-02-24 14:07 Alexis Ballier
  0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2016-02-24 14:07 UTC (permalink / raw
  To: gentoo-commits

commit:     c8c405ad77d6dfa0b77463218032affafce846ce
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 14:07:43 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 14:07:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8c405ad

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 <AT> gentoo.org>

 media-video/guvcview/Manifest              |  1 +
 media-video/guvcview/files/ffmpeg3.patch   | 26 ++++++++++++++
 media-video/guvcview/guvcview-2.0.3.ebuild | 56 ++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+)

diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index ee9a0dc..25d4cf1 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 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/guvcview-2.0.3.ebuild b/media-video/guvcview/guvcview-2.0.3.ebuild
new file mode 100644
index 0000000..dd5fb8a
--- /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)
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/guvcview/, media-video/guvcview/files/
@ 2019-01-14 16:04 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-01-14 16:04 UTC (permalink / raw
  To: gentoo-commits

commit:     4dffbdff7a8ac762599ba5b8b33c19eadc63921b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 14 14:37:35 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 14 16:03:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dffbdff

media-video/guvcview: Drop 2.0.5

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-video/guvcview/Manifest              |   1 -
 media-video/guvcview/files/ffmpeg4.patch   | 195 -----------------------------
 media-video/guvcview/guvcview-2.0.5.ebuild |  59 ---------
 3 files changed, 255 deletions(-)

diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index 6c49a0fc76d..5b2772755ce 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1,2 +1 @@
-DIST guvcview-src-2.0.5.tar.gz 1134237 BLAKE2B 6165349005a07e3e9ea555a7b4aa731ec218f8073dfce8ac5036dd3ccbe4228aeb3b29491c8ad545d5b5ab193045704a60bfcd48459bfc56ad923b583c08f5be SHA512 b4a1216ab2effbd0022d5ba0ce266ac06a781e453d3dbedfe29b654864d3a26fe1e8b68245d76eff854281d42f1871a8a82b06f783b5115e94ec1c111aac05eb
 DIST guvcview-src-2.0.6.tar.gz 1131013 BLAKE2B ec8d7a82344e26890fe184d0edf77d0e415aa708bdf3cf55f96c555aaef479b1b7441a0425db035d10a6dc31f90282c169afff2d13684599ab1c005a5ea50ab1 SHA512 f73ba0a013f5afadb45c9bf60f723058ee31e99e204c951c49335a8ef9902a2caa752d6d51f6dd20ae960217cc25155e70efe4c49299a95e6780aaf8034078ec

diff --git a/media-video/guvcview/files/ffmpeg4.patch b/media-video/guvcview/files/ffmpeg4.patch
deleted file mode 100644
index e6421834b5b..00000000000
--- a/media-video/guvcview/files/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-Index: guvcview-src-2.0.5/guvcview/gui_qt5_callbacks.cpp
-===================================================================
---- guvcview-src-2.0.5.orig/guvcview/gui_qt5_callbacks.cpp
-+++ guvcview-src-2.0.5/guvcview/gui_qt5_callbacks.cpp
-@@ -1590,10 +1590,8 @@ void MainWindow::video_codec_properties(
- 	framerefs->setValue(defaults->framerefs);
- 	form.addRow(_("framerefs:   "), framerefs);
- 	/*me method*/
--	QSpinBox *me_method = new QSpinBox(&dialog);
--	me_method->setRange(1, 10);
--	me_method->setSingleStep(1);						
--	me_method->setValue(defaults->me_method);
-+	QLabel *me_method = new QLabel(&dialog);
-+	me_method->setText(defaults->me_method);
- 	form.addRow(_("me method:   "), me_method);
- 	/*mb decision*/
- 	QSpinBox *mb_decision = new QSpinBox(&dialog);
-@@ -1645,7 +1643,7 @@ void MainWindow::video_codec_properties(
- 		defaults->qblur = qblur->value();
- 		defaults->subq = subq->value();
- 		defaults->framerefs = framerefs->value();
--		defaults->me_method = me_method->value();
-+		defaults->me_method = me_method->text().toLatin1().data();
- 		defaults->mb_decision = mb_decision->value();
- 		defaults->max_b_frames = max_b_frames->value();
- 		defaults->num_threads = num_threads->value();
-Index: guvcview-src-2.0.5/gview_encoder/encoder.c
-===================================================================
---- guvcview-src-2.0.5.orig/gview_encoder/encoder.c
-+++ guvcview-src-2.0.5/gview_encoder/encoder.c
-@@ -445,10 +445,8 @@ static encoder_video_context_t *encoder_
- #if !LIBAVCODEC_VER_AT_LEAST(56,60)
- 	video_codec_data->codec_context->me_method = video_defaults->me_method;
- #else
--	if( video_defaults->codec_id == AV_CODEC_ID_H264 && video_defaults->me_method > 4)
--		video_defaults->me_method = X264_ME_HEX;
--
--	av_dict_set_int(&video_codec_data->private_options, "motion-est", video_defaults->me_method, 0);
-+	if(video_defaults->me_method)
-+		av_dict_set(&video_codec_data->private_options, "motion-est", video_defaults->me_method, 0);
- #endif
- 
- #if !LIBAVCODEC_VER_AT_LEAST(57,00)
-Index: guvcview-src-2.0.5/gview_encoder/gviewencoder.h
-===================================================================
---- guvcview-src-2.0.5.orig/gview_encoder/gviewencoder.h
-+++ guvcview-src-2.0.5/gview_encoder/gviewencoder.h
-@@ -104,7 +104,7 @@ typedef struct _video_codec_t
- 	char codec_name[20];      //lavc codec_name
- 	int mb_decision;          //lavc mb_decision
- 	int trellis;              //lavc trellis quantization
--	int me_method;            //lavc motion estimation method
-+	const char* me_method;            //lavc motion estimation method
- 	int mpeg_quant;           //lavc mpeg quantization
- 	int max_b_frames;         //lavc max b frames
- 	int num_threads;          //lavc num threads
-Index: guvcview-src-2.0.5/gview_encoder/video_codecs.c
-===================================================================
---- guvcview-src-2.0.5.orig/gview_encoder/video_codecs.c
-+++ guvcview-src-2.0.5/gview_encoder/video_codecs.c
-@@ -97,7 +97,7 @@ static video_codec_t listSupCodecs[] =
- 		.codec_name   = "none",
- 		.mb_decision  = 0,
- 		.trellis      = 0,
--		.me_method    = 0,
-+		.me_method    = NULL,
- 		.mpeg_quant   = 0,
- 		.max_b_frames = 0,
- 		.num_threads  = 0,
-@@ -133,7 +133,7 @@ static video_codec_t listSupCodecs[] =
- 		.codec_name   = "mjpeg",
- 		.mb_decision  = 0,
- 		.trellis      = 0,
--		.me_method    = ME_EPZS,
-+		.me_method    = "epsz",
- 		.mpeg_quant   = 0,
- 		.max_b_frames = 0,
- 		.num_threads  = 0,
-@@ -169,7 +169,7 @@ static video_codec_t listSupCodecs[] =
- 		.codec_name   = "mpeg1video",
- 		.mb_decision  = FF_MB_DECISION_RD,
- 		.trellis      = 1,
--		.me_method    = ME_EPZS,
-+		.me_method    = "epsz",
- 		.mpeg_quant   = 0,
- 		.max_b_frames = 0,
- 		.num_threads  = 1,
-@@ -205,11 +205,11 @@ static video_codec_t listSupCodecs[] =
- 		.codec_name   = "flv",
- 		.mb_decision  = FF_MB_DECISION_RD,
- 		.trellis      = 1,
--		.me_method    = ME_EPZS,
-+		.me_method    = "epsz",
- 		.mpeg_quant   = 0,
- 		.max_b_frames = 0,
- 		.num_threads  = 1,
--		.flags        = CODEC_FLAG_4MV
-+		.flags        = AV_CODEC_FLAG_4MV
- 	},
- 	{
- 		.valid        = 1,
-@@ -241,7 +241,7 @@ static video_codec_t listSupCodecs[] =
- 		.codec_name   = "wmv1",
- 		.mb_decision  = FF_MB_DECISION_RD,
- 		.trellis      = 1,
--		.me_method    = ME_EPZS,
-+		.me_method    = "epsz",
- 		.mpeg_quant   = 0,
- 		.max_b_frames = 0,
- 		.num_threads  = 1,
-@@ -277,7 +277,7 @@ static video_codec_t listSupCodecs[] =
- 		.codec_name   = "mpeg2video",
- 		.mb_decision  = FF_MB_DECISION_RD,
- 		.trellis      = 1,
--		.me_method    = ME_EPZS,
-+		.me_method    = "epsz",
- 		.mpeg_quant   = 0,
- 		.max_b_frames = 0,
- 		.num_threads  = 1,
-@@ -313,7 +313,7 @@ static video_codec_t listSupCodecs[] =
- 		.codec_name   = "msmpeg4v3",
- 		.mb_decision  = FF_MB_DECISION_RD,
- 		.trellis      = 1,
--		.me_method    = ME_EPZS,
-+		.me_method    = "epsz",
- 		.mpeg_quant   = 0,
- 		.max_b_frames = 0,
- 		.num_threads  = 1,
-@@ -349,7 +349,7 @@ static video_codec_t listSupCodecs[] =
- 		.codec_name   = "mpeg4",
- 		.mb_decision  = FF_MB_DECISION_RD,
- 		.trellis      = 1,
--		.me_method    = ME_EPZS,
-+		.me_method    = "epsz",
- 		.mpeg_quant   = 1,
- 		.max_b_frames = 0,
- 		.num_threads  = 1,
-@@ -385,7 +385,7 @@ static video_codec_t listSupCodecs[] =
- 		.codec_name   = "libx264",
- 		.mb_decision  = FF_MB_DECISION_RD,
- 		.trellis      = 0,
--		.me_method    = X264_ME_HEX,
-+		.me_method    = "hex",
- 		.mpeg_quant   = 1,
- 		.max_b_frames = 16,
- 		.num_threads  = 4,
-@@ -426,7 +426,7 @@ static video_codec_t listSupCodecs[] =
- 		.codec_name   = "libx265",
- 		.mb_decision  = FF_MB_DECISION_RD,
- 		.trellis      = 0,
--		.me_method    = ME_HEX,
-+		.me_method    = "hex",
- 		.mpeg_quant   = 1,
- 		.max_b_frames = 16,
- 		.num_threads  = 4,
-@@ -463,7 +463,7 @@ static video_codec_t listSupCodecs[] =
- 		.codec_name   = "libvpx_vp8",
- 		.mb_decision  = FF_MB_DECISION_RD,
- 		.trellis      = 0,
--		.me_method    = ME_HEX,
-+		.me_method    = "hex",
- 		.mpeg_quant   = 1,
- 		.max_b_frames = 0,
- 		.num_threads  = 4,
-@@ -500,7 +500,7 @@ static video_codec_t listSupCodecs[] =
- 		.codec_name   = "libvpx_vp9",
- 		.mb_decision  = FF_MB_DECISION_RD,
- 		.trellis      = 0,
--		.me_method    = ME_HEX,
-+		.me_method    = "hex",
- 		.mpeg_quant   = 1,
- 		.max_b_frames = 16,
- 		.num_threads  = 4,
-@@ -537,7 +537,7 @@ static video_codec_t listSupCodecs[] =
- 		.codec_name   = "libtheora",
- 		.mb_decision  = FF_MB_DECISION_RD,
- 		.trellis      = 0,
--		.me_method    = ME_HEX,
-+		.me_method    = "hex",
- 		.mpeg_quant   = 1,
- 		.max_b_frames = 0,
- 		.num_threads  = 4,
-Index: guvcview-src-2.0.5/gview_v4l2core/uvc_h264.c
-===================================================================
---- guvcview-src-2.0.5.orig/gview_v4l2core/uvc_h264.c
-+++ guvcview-src-2.0.5/gview_v4l2core/uvc_h264.c
-@@ -1039,7 +1039,7 @@ int h264_init_decoder(int width, int hei
- 		exit(-1);
- 	}
- 	
--	h264_ctx->context->flags2 |= CODEC_FLAG2_FAST;
-+	h264_ctx->context->flags2 |= AV_CODEC_FLAG2_FAST;
- 	h264_ctx->context->pix_fmt = AV_PIX_FMT_YUV420P;
- 	h264_ctx->context->width = width;
- 	h264_ctx->context->height = height;

diff --git a/media-video/guvcview/guvcview-2.0.5.ebuild b/media-video/guvcview/guvcview-2.0.5.ebuild
deleted file mode 100644
index 80229e7311d..00000000000
--- a/media-video/guvcview/guvcview-2.0.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic qmake-utils toolchain-funcs
-
-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() {
-	sed -i '/^docdir/,/^$/d' Makefile.am || die
-	has_version '>=media-video/ffmpeg-4' && epatch "${FILESDIR}/ffmpeg4.patch"
-	eautoreconf
-}
-
-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) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable qt5) \
-		$(use_enable !qt5 gtk3)
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/guvcview/, media-video/guvcview/files/
@ 2025-01-07 22:34 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-01-07 22:34 UTC (permalink / raw
  To: gentoo-commits

commit:     d0f3eb577bb530fc580df5fe7e806c162735d1e0
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Sat Jan  4 05:39:21 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan  7 22:33:56 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0f3eb57

media-video/guvcview: add 2.2.1

autoconf -> cmake

qt5 -> qt6

useflags :
* add qt6. !qt6 for gtk3 (by default)
* add local sfml for SFML render X11-engine. !sfml for sdl (by default)

Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Closes: https://github.com/gentoo/gentoo/pull/39970
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-video/guvcview/Manifest                      |  1 +
 ...guvcview-2.2.1-fix-desktop-file-for-cmake.patch | 86 ++++++++++++++++++++++
 .../files/guvcview-2.2.1-set-metainfo-dir.patch    | 11 +++
 media-video/guvcview/guvcview-2.2.1.ebuild         | 72 ++++++++++++++++++
 media-video/guvcview/metadata.xml                  |  2 +
 5 files changed, 172 insertions(+)

diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index 3d2dc38d7690..9b9a1e18220a 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1 +1,2 @@
 DIST guvcview-src-2.1.0.tar.bz2 775670 BLAKE2B e6f0fe87b1c44e00265228195b93bb5863170487fd1c3b9741667dc32295406bd920f44150efaecb42ab9396ec67897d3bef517e29ee788c2a6a8a6a95692f81 SHA512 f449e1b1623bb2a96847fc88c4e334ff5bde91f0f9779e37ccbd5777fb96ea4106c3df2c9c30f5d6cacf99e4da04815fc3b739387c2a8fb496c3080b1f99ab70
+DIST guvcview-src-2.2.1.tar.bz2 355747 BLAKE2B 57b1ea3a38ce4dbd68220b3a5caacf2f0b3e4b8cd880667988ea13bf50f495cb761249df2fc7ddf24fcdea19b6b4317b5ec1fc63202987bc7820d6095913233f SHA512 3757ff41306c6c02b3a0fcb7f9a4499e90271e47a2dd97f75a2a809caf32a0a0ceaf28c2475bf707017009f8bf9aa7fcef36cb4386b08311998b51d7122cefea

diff --git a/media-video/guvcview/files/guvcview-2.2.1-fix-desktop-file-for-cmake.patch b/media-video/guvcview/files/guvcview-2.2.1-fix-desktop-file-for-cmake.patch
new file mode 100644
index 000000000000..4748def9a922
--- /dev/null
+++ b/media-video/guvcview/files/guvcview-2.2.1-fix-desktop-file-for-cmake.patch
@@ -0,0 +1,86 @@
+https://sourceforge.net/p/guvcview/git-master/ci/39f76eda4d66ef7b2303ce795e701e43fafadff2
+From 39f76eda4d66ef7b2303ce795e701e43fafadff2 Mon Sep 17 00:00:00 2001
+From: Paulo Assis <pj.assis@gmail.com>
+Date: Mon, 2 Dec 2024 14:19:01 +0000
+Subject: [PATCH] Fix desktop file for cmake
+
+---
+ data/guvcview.desktop.in | 64 +++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 60 insertions(+), 4 deletions(-)
+
+diff --git a/data/guvcview.desktop.in b/data/guvcview.desktop.in
+index c086c21..ca02856 100644
+--- a/data/guvcview.desktop.in
++++ b/data/guvcview.desktop.in
+@@ -1,8 +1,64 @@
+ [Desktop Entry]
+-_Name=guvcview
+-_GenericName=GTK UVC video viewer
+-_X-GNOME-FullName=GTK UVC video viewer
+-_Comment=A video viewer and capturer for the linux uvc driver
++Name=guvcview
++Name[cs]=guvcview
++Name[de]=GUVCView
++Name[en_AU]=guvcview
++Name[es]=guvcview
++Name[fr]=guvcview
++Name[it]=guvcview
++Name[lv]=guvcview
++Name[nl]=guvcview
++Name[pt]=guvcview
++Name[pt_BR]=guvcview
++Name[ru]=guvcview
++Name[si]=guvcview
++Name[sr]=Камерица
++Name[tr]=guvcview
++GenericName=GTK UVC video viewer
++GenericName[cs]=Prohlížeč videa GTK UVC
++GenericName[de]=UVC-Video-Betrachter in GTK
++GenericName[en_AU]=GTK UVC video viewer
++GenericName[es]=Visualizador GTK de vídeo UVC
++GenericName[fr]=Logiciel GTK de visualisation de vidéo UVC
++GenericName[it]=GTK UVC visualizzatore video
++GenericName[lv]=GTK UVC video skatītājs
++GenericName[nl]=GTK UVC videokijker
++GenericName[pt]=Visualizador de vídeo GTK UVC
++GenericName[pt_BR]=Visualizador de vídeo GTK UVC
++GenericName[ru]=GTK UVC видео обозреватель
++GenericName[si]=GTK UVC වීඩියෝ දකින්නා
++GenericName[sr]=ГТК УВЦ видео приказивач
++GenericName[tr]=GTK UVC video görüntüleyici
++X-GNOME-FullName=GTK UVC video viewer
++X-GNOME-FullName[cs]=Prohlížeč videa GTK UVC
++X-GNOME-FullName[de]=UVC-Video-Betrachter in GTK
++X-GNOME-FullName[en_AU]=GTK UVC video viewer
++X-GNOME-FullName[es]=Visualizador GTK de vídeo UVC
++X-GNOME-FullName[fr]=Logiciel GTK de visualisation de vidéo UVC
++X-GNOME-FullName[it]=GTK UVC visualizzatore video
++X-GNOME-FullName[lv]=GTK UVC video skatītājs
++X-GNOME-FullName[nl]=GTK UVC videokijker
++X-GNOME-FullName[pt]=Visualizador de vídeo GTK UVC
++X-GNOME-FullName[pt_BR]=Visualizador de vídeo GTK UVC
++X-GNOME-FullName[ru]=GTK UVC видео обозреватель
++X-GNOME-FullName[si]=GTK UVC වීඩියෝ දකින්නා
++X-GNOME-FullName[sr]=ГТК УВЦ видео приказивач
++X-GNOME-FullName[tr]=GTK UVC video görüntüleyici
++Comment=A video viewer and capturer for the linux uvc driver
++Comment[cs]=Prohlížení a zachytávání videa z linuxových uvc ovladačů
++Comment[de]=Ein Video-Betrachter und Aufnahmewerkzeug für den Linux-UVC-Treiber
++Comment[en_AU]=A video viewer and capturer for the linux uvc driver
++Comment[es]=Un visualizador y capturador de vídeo para el controlador UVC de Linux
++Comment[fr]=Logiciel de visualisation et de capture vidéo pour le pilote uvc Linux
++Comment[it]=Un visualizzatore e catturatore video per il driver uvc di linux
++Comment[lv]=Video skatītājs un uzņēmējs Linux UVC draiverim
++Comment[nl]=Een programma voor het bekijken en opnemen van video, voor het Linuxstuurprogramma uvc
++Comment[pt]=Um visualizador e capturador de de vídeo para o controlador linux uvc
++Comment[pt_BR]=Um visualizador e capturador de de vídeo para o controlador linux uvc
++Comment[ru]=Программа просмотра и записи видео для драйвера Linux UVC
++Comment[si]=ලිනක්ස් uvc ඩ්‍රයිවරය සඳහා වීඩියෝ පෙන්වන්නා සහ ග්‍රහණය කරන්නා
++Comment[sr]=Приказивач и снимач видеа за линуксов увц управљачки програм
++Comment[tr]=Linux uvc sürücüsü için video görüntüleyici ve yakalayıcı
+ TryExec=guvcview
+ Exec=guvcview
+ Icon=@DATADIR@/pixmaps/guvcview.png
+-- 
+2.45.2
+

diff --git a/media-video/guvcview/files/guvcview-2.2.1-set-metainfo-dir.patch b/media-video/guvcview/files/guvcview-2.2.1-set-metainfo-dir.patch
new file mode 100644
index 000000000000..dc0285fa7afa
--- /dev/null
+++ b/media-video/guvcview/files/guvcview-2.2.1-set-metainfo-dir.patch
@@ -0,0 +1,11 @@
+--- a/data/CMakeLists.txt
++++ b/data/CMakeLists.txt
+@@ -16,7 +16,7 @@
+   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/guvcview DESTINATION ${DATADIR}/menu)
+ endif()
+ 
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/guvcview.appdata.xml DESTINATION ${DATADIR}/appdata)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/guvcview.appdata.xml DESTINATION ${DATADIR}/metainfo)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/guvcview.desktop DESTINATION ${DATADIR}/applications)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/guvcview.1.gz DESTINATION ${DATADIR}/man/man1)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/guvcview.png DESTINATION ${DATADIR}/pixmaps)

diff --git a/media-video/guvcview/guvcview-2.2.1.ebuild b/media-video/guvcview/guvcview-2.2.1.ebuild
new file mode 100644
index 000000000000..3894905e46a1
--- /dev/null
+++ b/media-video/guvcview/guvcview-2.2.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Simple Qt6 or GTK+3 interface for capturing and viewing video from v4l2 devices"
+HOMEPAGE="https://guvcview.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/${PN}/source/${PN}-src-${PV}.tar.bz2"
+S="${WORKDIR}/${PN}-src-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gsl pulseaudio qt6 sfml"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	media-libs/libpng:=
+	media-libs/libv4l
+	media-libs/portaudio
+	media-video/ffmpeg:=
+	virtual/libusb:1
+	virtual/udev
+	gsl? ( sci-libs/gsl:= )
+	pulseaudio? ( media-libs/libpulse )
+	qt6? ( dev-qt/qtbase:6[gui,widgets]	)
+	!qt6? (
+		dev-libs/glib:2
+		x11-libs/gtk+:3
+	)
+	sfml? (
+		media-libs/libglvnd
+		media-libs/libsfml:=
+	)
+	!sfml? ( media-libs/libsdl2 )
+"
+# linux-headers: bug 448260
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+	!qt6? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-fix-desktop-file-for-cmake.patch
+	"${FILESDIR}"/${PN}-2.2.1-set-metainfo-dir.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_DEVKIT=ON
+		-DUSE_DEBIANMENU=OFF
+		-DUSE_PULSE=$(usex pulseaudio)
+		-DUSE_GTK3=$(usex !qt6)
+		-DUSE_QT6=$(usex qt6)
+		-DUSE_SDL2=$(usex !sfml)
+		-DUSE_SFML=$(usex sfml)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	gunzip "${ED}"/usr/share/man/man1/guvcview.1.gz || die
+}

diff --git a/media-video/guvcview/metadata.xml b/media-video/guvcview/metadata.xml
index b0fc701d591b..cd4de82a9cb8 100644
--- a/media-video/guvcview/metadata.xml
+++ b/media-video/guvcview/metadata.xml
@@ -9,5 +9,7 @@
 	</upstream>
 	<use>
 		<flag name="qt5">Build with Qt5 interface instead Gtk+</flag>
+		<flag name="qt6">Build with Qt6 interface instead Gtk+</flag>
+		<flag name="sfml">Build with SFML X11-engine instead of sdl</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2025-01-07 22:34 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-14 16:04 [gentoo-commits] repo/gentoo:master commit in: media-video/guvcview/, media-video/guvcview/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2025-01-07 22:34 Andreas Sturmlechner
2016-02-24 14:07 Alexis Ballier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox