summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD13
-rw-r--r--pix_fmt.patch24
3 files changed, 4 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4eb156f5f9f..0867c63fda2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Thu Mar 24 21:04:08 UTC 2016
pkgbase = guvcview-git
pkgdesc = A video viewer and capturer for the linux uvc driver
- pkgver = v2.0.3.r32.gaa07ea1
+ pkgver = v2.0.6.r4.g73dacab
pkgrel = 1
url = http://guvcview.sourceforge.net/
arch = i686
@@ -19,9 +17,7 @@ pkgbase = guvcview-git
provides = guvcview
conflicts = guvcview
source = guvcview-git::git://git.code.sf.net/p/guvcview/git-master
- source = pix_fmt.patch
sha1sums = SKIP
- sha1sums = 6e1f8b0dbf9f4a301e3024f7d30010609bb2de89
pkgname = guvcview-git
diff --git a/PKGBUILD b/PKGBUILD
index f811de9b75e..9ae1a355a97 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Tobias Frilling <tobias@frilling-online.de>
pkgname=guvcview-git
_gitname=guvcview-git-master
-pkgver=v2.0.3.r32.gaa07ea1
+pkgver=v2.0.6.r4.g73dacab
pkgrel=1
pkgdesc="A video viewer and capturer for the linux uvc driver"
arch=('i686' 'x86_64')
@@ -12,21 +12,14 @@ makedepends=('git' 'intltool')
optdepends=('pulseaudio: for PulseAudio support')
provides=('guvcview')
conflicts=('guvcview')
-source=("$pkgname::git://git.code.sf.net/p/guvcview/git-master"
- "pix_fmt.patch")
-sha1sums=('SKIP'
- '6e1f8b0dbf9f4a301e3024f7d30010609bb2de89')
+source=("$pkgname::git://git.code.sf.net/p/guvcview/git-master")
+sha1sums=('SKIP')
pkgver() {
cd "$srcdir/$pkgname"
git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
}
-prepare() {
- cd $srcdir
- patch -p1 -i pix_fmt.patch
-}
-
build() {
cd "$srcdir/$pkgname"
export CPPFLAGS+=" -O2 "
diff --git a/pix_fmt.patch b/pix_fmt.patch
deleted file mode 100644
index 9f410ea7031..00000000000
--- a/pix_fmt.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur a/guvcview-git/g/gview_v4l2core/jpeg_decoder.c b/guvcview-git/src/guvcview-git/gview_v4l2core/jpeg_decoder.c
---- a/guvcview-git/gview_v4l2core/jpeg_decoder.c 2016-03-24 21:47:40.897890639 +0100
-+++ b/guvcview-git/gview_v4l2core/jpeg_decoder.c 2016-03-24 21:48:48.891091999 +0100
-@@ -1436,7 +1436,7 @@
- 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);
-diff -Nur a/guvcview-git/g/gview_v4l2core/uvc_h264.c b/guvcview-git/src/guvcview-git/gview_v4l2core/uvc_h264.c
---- a/guvcview-git/gview_v4l2core/uvc_h264.c 2016-03-24 21:47:40.897890639 +0100
-+++ b/guvcview-git/gview_v4l2core/uvc_h264.c 2016-03-24 21:48:36.757782203 +0100
-@@ -1035,7 +1035,7 @@
- }
-
- 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);