gentoo resync : 20.03.2022

3 files changed, 128 insertions, 0 deletions

diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index 7d478c2cd5ed..223f50f2d531 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1,3 +1,6 @@
+AUX ffmpeg5.patch 1945 BLAKE2B fab79ec994fb30fb04737521a3ded32dab485935c2bb6df275a98ed2d5ae2a5704c36e5865975162f48fb4da574593d501750dc7a1334c1a5a588e418899d60d SHA512 6756b34e9025250323f6aad22395ce5dd5155f9ccf3a8012d74af0e52065f89dff5b130b39f0b0d0c25b82d6ababe77f738ffe0e3075c915a4e3ac63e8b12f75
 DIST guvcview-src-2.0.6.tar.gz 1131013 BLAKE2B ec8d7a82344e26890fe184d0edf77d0e415aa708bdf3cf55f96c555aaef479b1b7441a0425db035d10a6dc31f90282c169afff2d13684599ab1c005a5ea50ab1 SHA512 f73ba0a013f5afadb45c9bf60f723058ee31e99e204c951c49335a8ef9902a2caa752d6d51f6dd20ae960217cc25155e70efe4c49299a95e6780aaf8034078ec
+DIST guvcview-src-2.0.7.tar.bz2 449392 BLAKE2B 94140845dbe1209802a7109a3f30d3f7aa391ff4f1b67396481138c65ae3a3cc27499c8dc239bf5e17b730c06e1ebe361872f2a1976f0c2802b8e84fb54a3548 SHA512 a3dcabf3fcb90171969fea76c1a05b4e47b640ba886370b048f5736e2f064f8682967c785db44a9461bdd3761b2bf264e8ce579691d37c8b9efa1a1393162ad8
 EBUILD guvcview-2.0.6-r2.ebuild 1561 BLAKE2B de1fd42c887e4f52fdabd6cd2f506957419efe2f9cae0121f78feb235f786737874c5c72fbd57ebb3ee80d2172f80b6ea1498183af0f2350388e4c0a3d075e53 SHA512 b9731b3e7547bf840da9761ff7b3a330403a0ff5341c768cbc2ff6e02da00dd4cebe063a8d2c8e3d01dca566f2cc9b8864c1c1b23b831329493e8e478cbc0f11
+EBUILD guvcview-2.0.7.ebuild 1596 BLAKE2B d5a8772f60daac0ba8844dc18c0d68b228f354f42b6fc9cc246eb3f8910a7e069d8b180cb0684eaeca1e71f70ef846a2ddb20cecec4d1a391c006e95d4d4229f SHA512 e5159005c4de168973b7f9b8c718ace7fa4286e64667d00aef9f2aa73e4c3dc3b6a156279ff1057098666aa95ead3b44b283b00b2f305dc6c1c58c160bf1f3d0
 MISC metadata.xml 381 BLAKE2B d720778a6b2eb8b44e4e14d00129463dfe9d1b00ae8f65df21e91dd5fd9a3a34a17fcd646227b8da5d38291d01b1cbc52050ec3f15e5ea983e6c4bc11268735d SHA512 28c16af3583e468277389a9a80a24b0e2a5b9515fcb5e3840edc399c20d57df669cea911d4f62461f4d75211c7396d5a12ef61d73554eeb0a8ea78ad7e6e7d1f
diff --git a/media-video/guvcview/files/ffmpeg5.patch b/media-video/guvcview/files/ffmpeg5.patch
new file mode 100644
index 000000000000..7e8c71b2bc6f
--- /dev/null
+++ b/media-video/guvcview/files/ffmpeg5.patch
@@ -0,0 +1,47 @@
+Index: work/gview_encoder/encoder.c
+===================================================================
+--- work.orig/gview_encoder/encoder.c
++++ work/gview_encoder/encoder.c
+@@ -446,10 +446,6 @@ static encoder_video_context_t *encoder_
+ 
+ 	video_codec_data->codec_context = avcodec_alloc_context3(video_codec_data->codec);
+ 
+-	avcodec_get_context_defaults3 (
+-			video_codec_data->codec_context,
+-			video_codec_data->codec);
+-
+ 	if(video_codec_data->codec_context == NULL)
+ 	{
+ 		fprintf(stderr, "ENCODER: FATAL memory allocation failure (encoder_video_init): %s\n", strerror(errno));
+@@ -712,7 +708,6 @@ static encoder_audio_context_t *encoder_
+ 	}
+ 
+ 	audio_codec_data->codec_context = avcodec_alloc_context3(audio_codec_data->codec);
+-	avcodec_get_context_defaults3 (audio_codec_data->codec_context, audio_codec_data->codec);
+ 
+ 	if(audio_codec_data->codec_context == NULL)
+ 	{
+Index: work/gview_v4l2core/jpeg_decoder.c
+===================================================================
+--- work.orig/gview_v4l2core/jpeg_decoder.c
++++ work/gview_v4l2core/jpeg_decoder.c
+@@ -1409,7 +1409,6 @@ int jpeg_init_decoder(int width, int hei
+ 
+ #if LIBAVCODEC_VER_AT_LEAST(53,6)
+ 	codec_data->context = avcodec_alloc_context3(codec_data->codec);
+-	avcodec_get_context_defaults3 (codec_data->context, codec_data->codec);
+ #else
+ 	codec_data->context = avcodec_alloc_context();
+ 	avcodec_get_context_defaults(codec_data->context);
+Index: work/gview_v4l2core/uvc_h264.c
+===================================================================
+--- work.orig/gview_v4l2core/uvc_h264.c
++++ work/gview_v4l2core/uvc_h264.c
+@@ -1004,7 +1004,6 @@ int h264_init_decoder(int width, int hei
+ 
+ #if LIBAVCODEC_VER_AT_LEAST(53,6)
+ 	h264_ctx->context = avcodec_alloc_context3(h264_ctx->codec);
+-	avcodec_get_context_defaults3 (h264_ctx->context, h264_ctx->codec);
+ #else
+ 	h264_ctx->context = avcodec_alloc_context();
+ 	avcodec_get_context_defaults(h264_ctx->context);
diff --git a/media-video/guvcview/guvcview-2.0.7.ebuild b/media-video/guvcview/guvcview-2.0.7.ebuild
new file mode 100644
index 000000000000..7cb8017438fb
--- /dev/null
+++ b/media-video/guvcview/guvcview-2.0.7.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${PN}-src-${PV}
+inherit autotools qmake-utils toolchain-funcs
+
+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.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gsl pulseaudio qt5"
+
+BDEPEND="
+	dev-util/intltool
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/glib-2.10
+	media-libs/libpng:0=
+	media-libs/libsdl2
+	media-libs/libv4l
+	>=media-libs/portaudio-19_pre
+	>=media-video/ffmpeg-2.8:0=
+	virtual/libusb:1
+	virtual/udev
+	gsl? ( >=sci-libs/gsl-1.15:= )
+	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 )
+"
+# linux-headers: bug 448260
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-3.4-r2
+	virtual/os-headers
+"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/ffmpeg5.patch" )
+
+src_prepare() {
+	default
+	sed -i '/^docdir/,/^$/d' Makefile.am || die
+	echo "guvcview/gui_qt5_audioctrls.cpp" >> po/POTFILES.skip || die # bug 630984
+	eautoreconf
+}
+
+src_configure() {
+	export MOC="$(qt5_get_bindir)/moc"
+
+	# 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' -type f -delete || die
+}