[patch] webcamoid-ebuild

webcamoid-8.7.1.patch (text/plain), 10.20 KB, created by Gino McCarty on 2020-06-21 19:48:51 UTC

diff --git a/usr/portage/media-video/webcamoid/Manifest b/./Manifest
index a674100..5f86ef4 100644
--- a/usr/portage/media-video/webcamoid/Manifest
+++ b/./Manifest
@@ -1 +1,3 @@
-DIST webcamoid-8.1.0.tar.gz 10062681 BLAKE2B e9501ace9ba42abdae4be4e9e689329b02796198fe2610ef3a404535d389a6aa7a7e540148548dd63ea6ba78c9b650b30f5497396e49b37d7ab06ca8708ad056 SHA512 6db53ed29288889c05955967d961b53fa0e4171aeed12cd1557829c26bb2e2031804319fcead4c5b888a695cfd84f531a27f992be56c38366076ff2945ec2dbb
+DIST webcamoid-8.7.1.tar.gz 8900338 BLAKE2B f379811cf9e44e67caa80c301c2774f13c686fa4721b5adc85dcd803ea97edb07073e53575c7dae8dab4ebfa0a9ee4f3691511cc7ddd6b55f84ae2cc77cd3c52 SHA512 b9a4b1dd4c863ab126e304eabce47c025ec0e3eb85a5b42035d26caa004399bde733913c0a5598ada3deb01673bd42ea54c9d2b06d300608582e63dda75d9bf6
+EBUILD webcamoid-8.7.1.ebuild 2139 BLAKE2B bea2e2eb90cd3ad9f7ea39fc74f250c10cfcd03b68ca8dad52129954975585927d445eaf843781b54d0240639a3291055dfa407f7fbe3f33a03789cc1684c40b SHA512 1962424ff9c00a9e658fece9d13ddab3a8122e777997711115087005c9b5b8632b30bc17a272cc0941f379c9dc1444f93d44bb453ab7e3ae9a906080f1411901
+MISC metadata.xml 784 BLAKE2B ce617d4a9bcbf3f8e4ce651fd673bf3c0015e13bc8814d4b4e97eaa4a6c5428553d4a314054315fd3dc8a6b1362b4a322a4af78745f3c3d2378e2e731bdc9ef9 SHA512 6518965213e9deffdb6163243865c9e37ec0a14b6e83558761ff27ad7984003be1b6c6518d455631cd2af29f663b6e91f60dd061151e63b3a4f5ad73e35df5cf
diff --git a/usr/portage/media-video/webcamoid/files/webcamoid-8.1.0-ffmpeg-4.patch b/usr/portage/media-video/webcamoid/files/webcamoid-8.1.0-ffmpeg-4.patch
deleted file mode 100644
index 005d452..0000000
--- a/usr/portage/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 <[e-mail]>
-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/usr/portage/media-video/webcamoid/webcamoid-8.1.0.ebuild b/./webcamoid-8.7.1.ebuild
similarity index 93%
rename from /usr/portage/media-video/webcamoid/webcamoid-8.1.0.ebuild
rename to ./webcamoid-8.7.1.ebuild
index 6a7fccc..e69b691 100644
--- a/usr/portage/media-video/webcamoid/webcamoid-8.1.0.ebuild
+++ b/./webcamoid-8.7.1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-PLOCALES="ca de el es et fr gl it ja kab ko nl pt ru uk zh_CN zh_TW"
+EAPI=7
 
+PLOCALES="ca de el es et fr gl he it ja kab ko nb_NO nl pl pt pt_BR ru tr uk zh_CN zh_TW"
 inherit l10n qmake-utils
 
 DESCRIPTION="A full featured webcam capture application"
@@ -46,8 +45,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/${P}-ffmpeg-4.patch" )
-
 src_prepare() {
 	local tsdir="${S}/StandAlone/share/ts"
 	local mylrelease="$(qt5_get_bindir)"/lrelease
@@ -78,6 +75,7 @@ src_configure() {
 		"BUILDDOCS=0"
 		"INSTALLDEVHEADERS=$(usex headers 1 0)"
 		"LIBDIR=/usr/$(get_libdir)"
+		"INSTALLQMLDIR=/usr/$(get_libdir)/qt5/qml"
 		"NOAVFOUNDATION=1"
 		"NODSHOW=1"
 		"NOVCAMWIN=1"