[gentoo-commits] repo/gentoo:master commit in: media-video/webcamoid/files/, media-video/webcamoid/

[Andreas Sturmlechner]

commit:     f830d5261fdcf57d1b3437d21c9072550dd94209
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 01:37:14 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 09:29:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f830d526

media-video/webcamoid: Drop 8.1.0-r1

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

 media-video/webcamoid/Manifest                     |   1 -
 .../webcamoid/files/webcamoid-8.1.0-ffmpeg-4.patch | 169 ---------------------
 media-video/webcamoid/webcamoid-8.1.0-r1.ebuild    |  99 ------------
 3 files changed, 269 deletions(-)

diff --git a/media-video/webcamoid/Manifest b/media-video/webcamoid/Manifest
index fbfc6eadc45..e7fd9d46106 100644
--- a/media-video/webcamoid/Manifest
+++ b/media-video/webcamoid/Manifest
@@ -1,2 +1 @@
-DIST webcamoid-8.1.0.tar.gz 10062681 BLAKE2B e9501ace9ba42abdae4be4e9e689329b02796198fe2610ef3a404535d389a6aa7a7e540148548dd63ea6ba78c9b650b30f5497396e49b37d7ab06ca8708ad056 SHA512 6db53ed29288889c05955967d961b53fa0e4171aeed12cd1557829c26bb2e2031804319fcead4c5b888a695cfd84f531a27f992be56c38366076ff2945ec2dbb
 DIST webcamoid-8.7.1.tar.gz 8900338 BLAKE2B f379811cf9e44e67caa80c301c2774f13c686fa4721b5adc85dcd803ea97edb07073e53575c7dae8dab4ebfa0a9ee4f3691511cc7ddd6b55f84ae2cc77cd3c52 SHA512 b9a4b1dd4c863ab126e304eabce47c025ec0e3eb85a5b42035d26caa004399bde733913c0a5598ada3deb01673bd42ea54c9d2b06d300608582e63dda75d9bf6

diff --git a/media-video/webcamoid/files/webcamoid-8.1.0-ffmpeg-4.patch b/media-video/webcamoid/files/webcamoid-8.1.0-ffmpeg-4.patch
deleted file mode 100644
index 005d45255d3..00000000000
--- a/media-video/webcamoid/files/webcamoid-8.1.0-ffmpeg-4.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-Description: Patch to build with FFmpeg 4.0
-             https://github.com/webcamoid/webcamoid/pull/119/
-             commits/52fbf8376085aded2d87397be58cda6e209d3bb7
-Author: https://github.com/webcamoid/webcamoid/commits?author=jbeich
-Reviewed-By: Herbert Parentes Fortes Neto <hpfn@××××××.org>
-Last-Update: 2018-07-21
-Index: webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/abstractstream.cpp
-===================================================================
---- webcamoid.orig/libAvKys/Plugins/MultiSink/src/ffmpeg/src/abstractstream.cpp
-+++ webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/abstractstream.cpp
-@@ -62,7 +62,7 @@ AbstractStream::AbstractStream(const AVF
- 
-     // Some formats want stream headers to be separate.
-     if (formatContext->oformat->flags & AVFMT_GLOBALHEADER)
--        this->m_codecContext->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+        this->m_codecContext->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 
-     this->m_codecContext->strict_std_compliance = CODEC_COMPLIANCE;
- 
-Index: webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/abstractstream.h
-===================================================================
---- webcamoid.orig/libAvKys/Plugins/MultiSink/src/ffmpeg/src/abstractstream.h
-+++ webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/abstractstream.h
-@@ -29,6 +29,15 @@ extern "C"
- {
-     #include <libavformat/avformat.h>
-     #include <libavcodec/avcodec.h>
-+    #ifndef AV_CODEC_CAP_EXPERIMENTAL
-+    #define AV_CODEC_CAP_EXPERIMENTAL CODEC_CAP_EXPERIMENTAL
-+    #endif
-+    #ifndef AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-+    #define AV_CODEC_CAP_VARIABLE_FRAME_SIZE CODEC_CAP_VARIABLE_FRAME_SIZE
-+    #endif
-+    #ifndef AV_CODEC_FLAG_GLOBAL_HEADER
-+    #define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
-+    #endif
- }
- 
- #define CODEC_COMPLIANCE FF_COMPLIANCE_VERY_STRICT
-Index: webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/audiostream.cpp
-===================================================================
---- webcamoid.orig/libAvKys/Plugins/MultiSink/src/ffmpeg/src/audiostream.cpp
-+++ webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/audiostream.cpp
-@@ -267,7 +267,7 @@ void AudioStream::convertPacket(const Ak
-     this->deleteFrame(&this->m_frame);
-     this->m_frame = oFrame;
- 
--    if (codecContext->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE
-+    if (codecContext->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-         || oFrame->nb_samples >= codecContext->frame_size) {
-         this->m_frameReady.wakeAll();
-     }
-@@ -280,7 +280,7 @@ int AudioStream::encodeData(AVFrame *fra
-     auto codecContext = this->codecContext();
- 
-     if (!frame
--        && codecContext->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)
-+        && codecContext->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)
-         return AVERROR_EOF;
- 
-     if (frame) {
-@@ -366,7 +366,7 @@ AVFrame *AudioStream::dequeueFrame()
-     this->m_frameMutex.lock();
- 
-     if (!this->m_frame
--        || (!(codecContext->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)
-+        || (!(codecContext->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)
-             && this->m_frame->nb_samples < codecContext->frame_size)) {
-         if (!this->m_frameReady.wait(&this->m_frameMutex, THREAD_WAIT_LIMIT)) {
-             this->m_frameMutex.unlock();
-@@ -377,7 +377,7 @@ AVFrame *AudioStream::dequeueFrame()
- 
-     AVFrame *oFrame = nullptr;
- 
--    if (codecContext->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE
-+    if (codecContext->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-         || this->m_frame->nb_samples == codecContext->frame_size) {
-         oFrame = this->m_frame;
-         this->m_frame = nullptr;
-Index: webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/videostream.cpp
-===================================================================
---- webcamoid.orig/libAvKys/Plugins/MultiSink/src/ffmpeg/src/videostream.cpp
-+++ webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/videostream.cpp
-@@ -273,8 +273,10 @@ int VideoStream::encodeData(AVFrame *fra
- {
-     auto formatContext = this->formatContext();
- 
-+#ifdef AVFMT_RAWPICTURE
-     if (!frame && formatContext->oformat->flags & AVFMT_RAWPICTURE)
-         return AVERROR_EOF;
-+#endif
- 
-     auto codecContext = this->codecContext();
- 
-@@ -300,6 +302,7 @@ int VideoStream::encodeData(AVFrame *fra
- 
-     auto stream = this->stream();
- 
-+#ifdef AVFMT_RAWPICTURE
-     if (formatContext->oformat->flags & AVFMT_RAWPICTURE) {
-         // Raw video case - directly store the picture in the packet
-         AVPacket pkt;
-@@ -315,6 +318,7 @@ int VideoStream::encodeData(AVFrame *fra
- 
-         return 0;
-     }
-+#endif
- 
-     // encode the image
- #ifdef HAVE_SENDRECV
-Index: webcamoid/libAvKys/Plugins/MultiSrc/src/ffmpeg/src/abstractstream.cpp
-===================================================================
---- webcamoid.orig/libAvKys/Plugins/MultiSrc/src/ffmpeg/src/abstractstream.cpp
-+++ webcamoid/libAvKys/Plugins/MultiSrc/src/ffmpeg/src/abstractstream.cpp
-@@ -96,8 +96,10 @@ AbstractStream::AbstractStream(const AVF
-         this->m_codecContext->idct_algo = FF_IDCT_AUTO;
-         this->m_codecContext->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
- 
-+#ifdef CODEC_FLAG_EMU_EDGE
-         if (this->m_codec->capabilities & CODEC_CAP_DR1)
-             this->m_codecContext->flags |= CODEC_FLAG_EMU_EDGE;
-+#endif
- 
-         av_dict_set(&this->m_codecOptions, "refcounted_frames", "0", 0);
-     }
-Index: webcamoid/libAvKys/Plugins/VideoCapture/src/ffmpeg/src/convertvideoffmpeg.cpp
-===================================================================
---- webcamoid.orig/libAvKys/Plugins/VideoCapture/src/ffmpeg/src/convertvideoffmpeg.cpp
-+++ webcamoid/libAvKys/Plugins/VideoCapture/src/ffmpeg/src/convertvideoffmpeg.cpp
-@@ -19,6 +19,10 @@
- 
- #include <QMetaEnum>
- 
-+#ifndef AV_CODEC_FLAG_TRUNCATED
-+#define AV_CODEC_FLAG_TRUNCATED CODEC_FLAG_TRUNCATED
-+#endif
-+
- #include "convertvideoffmpeg.h"
- 
- #define THREAD_WAIT_LIMIT 500
-@@ -219,11 +223,13 @@ bool ConvertVideoFFmpeg::init(const AkCa
-     if (!this->m_codecContext)
-         return false;
- 
--    if (codec->capabilities & CODEC_CAP_TRUNCATED)
--        this->m_codecContext->flags |= CODEC_FLAG_TRUNCATED;
-+    if (codec->capabilities & AV_CODEC_CAP_TRUNCATED)
-+        this->m_codecContext->flags |= AV_CODEC_FLAG_TRUNCATED;
- 
-+#ifdef CODEC_FLAG_EMU_EDGE
-     if (codec->capabilities & CODEC_CAP_DR1)
-         this->m_codecContext->flags |= CODEC_FLAG_EMU_EDGE;
-+#endif
- 
-     this->m_codecContext->pix_fmt = rawToFF->value(fourcc, AV_PIX_FMT_NONE);
-     this->m_codecContext->width = caps.property("width").toInt();
-Index: webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/mediawriterffmpeg.cpp
-===================================================================
---- webcamoid.orig/libAvKys/Plugins/MultiSink/src/ffmpeg/src/mediawriterffmpeg.cpp
-+++ webcamoid/libAvKys/Plugins/MultiSink/src/ffmpeg/src/mediawriterffmpeg.cpp
-@@ -251,7 +251,7 @@ class MediaWriterFFmpegGlobal
-                 AVCodec *codec = nullptr;
- 
-                 while ((codec = av_codec_next(codec))) {
--                    if (codec->capabilities & CODEC_CAP_EXPERIMENTAL
-+                    if (codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL
-                         && CODEC_COMPLIANCE > FF_COMPLIANCE_EXPERIMENTAL)
-                         continue;
- 

diff --git a/media-video/webcamoid/webcamoid-8.1.0-r1.ebuild b/media-video/webcamoid/webcamoid-8.1.0-r1.ebuild
deleted file mode 100644
index 27a60e4ee26..00000000000
--- a/media-video/webcamoid/webcamoid-8.1.0-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="ca de el es et fr gl it ja kab ko nl pt ru uk zh_CN zh_TW"
-inherit l10n qmake-utils
-
-DESCRIPTION="A full featured webcam capture application"
-HOMEPAGE="https://webcamoid.github.io"
-SRC_URI="https://github.com/webcamoid/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE_AVKYS=( alsa coreaudio ffmpeg gstreamer jack libuvc oss pulseaudio qtaudio v4lutils videoeffects )
-IUSE="${IUSE_AVKYS[@]} debug headers v4l"
-
-REQUIRED_USE="v4lutils? ( v4l )"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	ffmpeg?	( media-video/ffmpeg:= )
-	gstreamer? ( >=media-libs/gstreamer-1.6.0 )
-	jack? ( virtual/jack )
-	libuvc? ( media-libs/libuvc )
-	pulseaudio? ( media-sound/pulseaudio )
-	qtaudio? ( dev-qt/qtmultimedia:5 )
-	v4l? ( media-libs/libv4l )
-"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-3.6
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${P}-ffmpeg-4.patch" )
-
-src_prepare() {
-	local tsdir="${S}/StandAlone/share/ts"
-	local mylrelease="$(qt5_get_bindir)"/lrelease
-
-	prepare_locale() {
-		"${mylrelease}" "${tsdir}/${1}.ts" || die "preparing ${1} locale failed"
-	}
-
-	rm_locale() {
-		sed -i \
-			-e '/.*share\/ts\/'${1}'\.qm.*/d' \
-			StandAlone/translations.qrc || die
-	}
-
-	rm ${tsdir}/*.qm
-
-	l10n_find_plocales_changes "${tsdir}" "" '.ts'
-	l10n_for_each_locale_do prepare_locale
-	l10n_for_each_disabled_locale_do rm_locale
-
-	default
-}
-
-src_configure() {
-	local myqmakeargs=(
-		"CONFIG+=debug"
-		"PREFIX=/usr"
-		"BUILDDOCS=0"
-		"INSTALLDEVHEADERS=$(usex headers 1 0)"
-		"INSTALLQMLDIR=$(qt5_get_libdir)/qt5/qml"
-		"LIBDIR=/usr/$(get_libdir)"
-		"NOAVFOUNDATION=1"
-		"NODSHOW=1"
-		"NOVCAMWIN=1"
-		"NOWASAPI=1"
-	)
-
-	use v4l || myqmakeargs+=( "NOV4L2=1" )
-
-	for x in ${IUSE_AVKYS[@]}; do
-		use ${x} || myqmakeargs+=( "NO${x^^}=1" )
-	done
-
-	eqmake5 ${myqmakeargs[@]}
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}