summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Frilling2016-03-24 22:04:35 +0100
committerTobias Frilling2016-03-24 22:04:35 +0100
commit6793d604ec9c541778d8603bcaa44b05edeaf66e (patch)
tree005882dcd319e3264942726dfb6fb36e89590485
parentbb48199a6f29a98061395f5028c334eb8f1079af (diff)
downloadaur-6793d604ec9c541778d8603bcaa44b05edeaf66e.tar.gz
Fix build
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD12
-rw-r--r--pix_fmt.patch24
-rw-r--r--v4l2_core.patch11
4 files changed, 37 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4ae4f8a6fb8..4eb156f5f9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# 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.1.r43.g8f6cc14
+ pkgver = v2.0.3.r32.gaa07ea1
pkgrel = 1
url = http://guvcview.sourceforge.net/
arch = i686
@@ -17,9 +19,9 @@ pkgbase = guvcview-git
provides = guvcview
conflicts = guvcview
source = guvcview-git::git://git.code.sf.net/p/guvcview/git-master
- source = v4l2_core.patch
+ source = pix_fmt.patch
sha1sums = SKIP
- sha1sums = b92920fc6545209045fe8203ee23678549ad749b
+ sha1sums = 6e1f8b0dbf9f4a301e3024f7d30010609bb2de89
pkgname = guvcview-git
diff --git a/PKGBUILD b/PKGBUILD
index d107299773a..f811de9b75e 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.1.r43.g8f6cc14
+pkgver=v2.0.3.r32.gaa07ea1
pkgrel=1
pkgdesc="A video viewer and capturer for the linux uvc driver"
arch=('i686' 'x86_64')
@@ -13,20 +13,24 @@ optdepends=('pulseaudio: for PulseAudio support')
provides=('guvcview')
conflicts=('guvcview')
source=("$pkgname::git://git.code.sf.net/p/guvcview/git-master"
- "v4l2_core.patch")
+ "pix_fmt.patch")
sha1sums=('SKIP'
- 'b92920fc6545209045fe8203ee23678549ad749b')
+ '6e1f8b0dbf9f4a301e3024f7d30010609bb2de89')
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 "
./bootstrap.sh --prefix=/usr
- patch -p1 -i $startdir/v4l2_core.patch
make
}
diff --git a/pix_fmt.patch b/pix_fmt.patch
new file mode 100644
index 00000000000..9f410ea7031
--- /dev/null
+++ b/pix_fmt.patch
@@ -0,0 +1,24 @@
+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);
diff --git a/v4l2_core.patch b/v4l2_core.patch
deleted file mode 100644
index 852719f54f5..00000000000
--- a/v4l2_core.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- guvcview-git/gview_v4l2core/v4l2_core.c_old 2015-04-04 00:42:28.770072098 +0200
-+++ guvcview-git/gview_v4l2core/v4l2_core.c 2015-04-04 00:42:52.879798677 +0200
-@@ -915,7 +915,7 @@
- if(vd->streaming == STRM_OK)
- {
- fprintf(stderr, "V4L2_CORE: (stream already started) stream_status = STRM_OK\n");
-- return;
-+ return 0;
- }
-
- int type = V4L2_BUF_TYPE_VIDEO_CAPTURE;