summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonzalo Exequiel Pedone2019-01-22 11:04:30 -0300
committerGonzalo Exequiel Pedone2019-01-22 11:04:30 -0300
commitd9019b32432c00517ca6b645a69820d8cd36a8bc (patch)
treeead0a9eb9d48cea54f6cbfe34078381b223f5d19
parent634749128b48ba81a1d45c8f43305256be436d5e (diff)
downloadaur-d9019b32432c00517ca6b645a69820d8cd36a8bc.tar.gz
Released Webcamoid 8.5.0.
-rw-r--r--.SRCINFO22
-rw-r--r--0001-Adapt-to-FFmpeg-4.0-API.patch132
-rw-r--r--PKGBUILD34
-rw-r--r--webcamoid.install13
4 files changed, 40 insertions, 161 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f1ae30afa6b..dd222faf019 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# mar may 22 22:38:45 UTC 2018
+# mar ene 22 14:03:52 UTC 2019
pkgbase = webcamoid
pkgdesc = Webcamoid is a full featured webcam capture application.
- pkgver = 8.1.0
- pkgrel = 3
+ pkgver = 8.5.0
+ pkgrel = 1
url = https://webcamoid.github.io/
install = webcamoid.install
arch = i686
@@ -12,14 +12,18 @@ pkgbase = webcamoid
license = GPL
makedepends = v4l-utils
makedepends = qt5-tools
+ makedepends = qt5-multimedia
makedepends = ffmpeg
makedepends = gst-plugins-base-libs
makedepends = libpulse
makedepends = alsa-lib
makedepends = jack
+ makedepends = libuvc
depends = qt5-quickcontrols
+ depends = qt5-quickcontrols2
depends = qt5-svg
optdepends = v4l-utils: Extra formats support for webcams
+ optdepends = akvcam-dkms: Virtual camera support (Recommended)
optdepends = v4l2loopback-dkms: Virtual camera support
optdepends = ffmpeg: Video playing/recording/conversion (Recommended)
optdepends = gst-plugins-base: Video playing/recording/conversion
@@ -29,14 +33,16 @@ pkgbase = webcamoid
optdepends = libpulse: Audio playback (Recommended)
optdepends = alsa-lib: Audio playback
optdepends = jack: Audio playback
- optdepends = kde-cli-tools: Root privileges for virtual camera module (Recommended)
+ optdepends = qt5-multimedia: Audio playback
+ optdepends = libuvc: Camera capture
+ optdepends = polkit: Root privileges for virtual camera module (Recommended)
+ optdepends = kde-cli-tools: Root privileges for virtual camera module
optdepends = gksu: Root privileges for virtual camera module
+ optdepends = kdesudo: Root privileges for virtual camera module
provides = webcamoid
conflicts = webcamoid-git
- source = https://github.com/webcamoid/webcamoid/archive/8.1.0.tar.gz
- source = 0001-Adapt-to-FFmpeg-4.0-API.patch
- sha256sums = 2e51731c36a86a4b3e323c11000a04b7ce06b5d228519676f4070e44e2a62947
- sha256sums = bd9ca4471af67ab5ed99f492de33cf26a4858b260654d252c6b3fd89a696864f
+ source = https://github.com/webcamoid/webcamoid/archive/8.5.0.tar.gz
+ sha256sums = b45ac278cd7e487031052fe4fd61a2de23a2d7ee10a76c80459be127abdcaec2
pkgname = webcamoid
diff --git a/0001-Adapt-to-FFmpeg-4.0-API.patch b/0001-Adapt-to-FFmpeg-4.0-API.patch
deleted file mode 100644
index 62dc9a7c2bd..00000000000
--- a/0001-Adapt-to-FFmpeg-4.0-API.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/libAvKys/Plugins/MultiSink/src/ffmpeg/src/abstractstream.cpp b/libAvKys/Plugins/MultiSink/src/ffmpeg/src/abstractstream.cpp
-index f550fb6..d6f4b98 100644
---- a/libAvKys/Plugins/MultiSink/src/ffmpeg/src/abstractstream.cpp
-+++ b/libAvKys/Plugins/MultiSink/src/ffmpeg/src/abstractstream.cpp
-@@ -62,7 +62,7 @@ AbstractStream::AbstractStream(const AVFormatContext *formatContext,
-
- // 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;
-
-diff --git a/libAvKys/Plugins/MultiSink/src/ffmpeg/src/audiostream.cpp b/libAvKys/Plugins/MultiSink/src/ffmpeg/src/audiostream.cpp
-index f4d10ba..3fba003 100644
---- a/libAvKys/Plugins/MultiSink/src/ffmpeg/src/audiostream.cpp
-+++ b/libAvKys/Plugins/MultiSink/src/ffmpeg/src/audiostream.cpp
-@@ -267,7 +267,7 @@ void AudioStream::convertPacket(const AkPacket &packet)
- 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 *frame)
- 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;
-diff --git a/libAvKys/Plugins/MultiSink/src/ffmpeg/src/mediawriterffmpeg.cpp b/libAvKys/Plugins/MultiSink/src/ffmpeg/src/mediawriterffmpeg.cpp
-index 224ff5c..db09b8c 100644
---- a/libAvKys/Plugins/MultiSink/src/ffmpeg/src/mediawriterffmpeg.cpp
-+++ b/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/libAvKys/Plugins/MultiSink/src/ffmpeg/src/videostream.cpp b/libAvKys/Plugins/MultiSink/src/ffmpeg/src/videostream.cpp
-index b0187fd..83fffc2 100644
---- a/libAvKys/Plugins/MultiSink/src/ffmpeg/src/videostream.cpp
-+++ b/libAvKys/Plugins/MultiSink/src/ffmpeg/src/videostream.cpp
-@@ -273,8 +273,10 @@ int VideoStream::encodeData(AVFrame *frame)
- {
- 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 *frame)
-
- 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 *frame)
-
- return 0;
- }
-+#endif
-
- // encode the image
- #ifdef HAVE_SENDRECV
-diff --git a/libAvKys/Plugins/MultiSrc/src/ffmpeg/src/abstractstream.cpp b/libAvKys/Plugins/MultiSrc/src/ffmpeg/src/abstractstream.cpp
-index d67a060..76f2989 100644
---- a/libAvKys/Plugins/MultiSrc/src/ffmpeg/src/abstractstream.cpp
-+++ b/libAvKys/Plugins/MultiSrc/src/ffmpeg/src/abstractstream.cpp
-@@ -96,8 +96,10 @@ AbstractStream::AbstractStream(const AVFormatContext *formatContext,
- 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);
- }
-diff --git a/libAvKys/Plugins/VideoCapture/src/ffmpeg/src/convertvideoffmpeg.cpp b/libAvKys/Plugins/VideoCapture/src/ffmpeg/src/convertvideoffmpeg.cpp
-index 30bab74..c129a6e 100644
---- a/libAvKys/Plugins/VideoCapture/src/ffmpeg/src/convertvideoffmpeg.cpp
-+++ b/libAvKys/Plugins/VideoCapture/src/ffmpeg/src/convertvideoffmpeg.cpp
-@@ -219,11 +219,13 @@ bool ConvertVideoFFmpeg::init(const AkCaps &caps)
- 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();
diff --git a/PKGBUILD b/PKGBUILD
index 5b6c2129be5..b744f04af21 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,17 @@
# Maintainer: Gonzalo Exequiel Pedone <hipersayan DOT x AT gmail DOT com>
pkgname=webcamoid
-pkgver=8.1.0
-pkgrel=3
+pkgver=8.5.0
+pkgrel=1
pkgdesc="Webcamoid is a full featured webcam capture application."
url='https://webcamoid.github.io/'
license=('GPL')
arch=('i686' 'x86_64' 'armv6h')
depends=('qt5-quickcontrols'
+ 'qt5-quickcontrols2'
'qt5-svg')
optdepends=('v4l-utils: Extra formats support for webcams'
+ 'akvcam-dkms: Virtual camera support (Recommended)'
'v4l2loopback-dkms: Virtual camera support'
'ffmpeg: Video playing/recording/conversion (Recommended)'
'gst-plugins-base: Video playing/recording/conversion'
@@ -19,32 +21,26 @@ optdepends=('v4l-utils: Extra formats support for webcams'
'libpulse: Audio playback (Recommended)'
'alsa-lib: Audio playback'
'jack: Audio playback'
- 'kde-cli-tools: Root privileges for virtual camera module (Recommended)'
- 'gksu: Root privileges for virtual camera module')
+ 'qt5-multimedia: Audio playback'
+ 'libuvc: Camera capture'
+ 'polkit: Root privileges for virtual camera module (Recommended)'
+ 'kde-cli-tools: Root privileges for virtual camera module'
+ 'gksu: Root privileges for virtual camera module'
+ 'kdesudo: Root privileges for virtual camera module')
makedepends=('v4l-utils'
'qt5-tools'
+ 'qt5-multimedia'
'ffmpeg'
'gst-plugins-base-libs'
'libpulse'
'alsa-lib'
- 'jack')
+ 'jack'
+ 'libuvc')
provides=('webcamoid')
conflicts=('webcamoid-git')
install="${pkgname}.install"
-source=("https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz"
- "0001-Adapt-to-FFmpeg-4.0-API.patch")
-sha256sums=('2e51731c36a86a4b3e323c11000a04b7ce06b5d228519676f4070e44e2a62947'
- 'bd9ca4471af67ab5ed99f492de33cf26a4858b260654d252c6b3fd89a696864f')
-
-prepare() {
- cd "$srcdir/${pkgname}-${pkgver}"
-
- # Backported changes from:
- #
- # https://github.com/webcamoid/webcamoid/pull/119
- # https://github.com/webcamoid/webcamoid/pull/120
- patch -Np1 -i "../0001-Adapt-to-FFmpeg-4.0-API.patch"
-}
+source=("https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz")
+sha256sums=('b45ac278cd7e487031052fe4fd61a2de23a2d7ee10a76c80459be127abdcaec2')
build() {
cd "$srcdir/${pkgname}-${pkgver}"
diff --git a/webcamoid.install b/webcamoid.install
index 4f8d0f654ff..021e5ffd611 100644
--- a/webcamoid.install
+++ b/webcamoid.install
@@ -6,7 +6,8 @@ following groups to be installed for fully functioning.
Capture backend:
- - v4l-utils
+ - v4l-utils (RECOMMENDED)
+ - libuvc
Codec frameworks:
@@ -18,11 +19,19 @@ Audio playback:
- libpulse (RECOMMENDED)
- alsa-lib
- jack
+ - qt5-multimedia
+
+Virtual camera driver:
+
+ - akvcam-dkms (RECOMMENDED)
+ - v4l2loopback-dkms
Virtual camera management:
- - kde-cli-tools (RECOMMENDED)
+ - polkit (RECOMMENDED)
+ - kde-cli-tools
- gksu
+ - kdesudo
EOF
}