9:39 p.m.
commit aa67dc0b734c4f4bcc0d606082984e2a29a64f60
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Thu Jun 30 23:57:20 2016 +0200
Updated to 2.0.4
- Fixed build with ffmpeg-3.0.x using a patch from Gentoo
.gitignore | 1 +
ffmpeg3.patch | 26 ++++++++++++++++++++++++++
guvcview.spec | 16 +++++++++++-----
sources | 2 +-
4 files changed, 39 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a277549..f479d91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
guvcview-src-2.0.1.tar.gz
+guvcview-src-2.0.4.tar.gz
diff --git a/ffmpeg3.patch b/ffmpeg3.patch
new file mode 100644
index 0000000..5397d68
--- /dev/null
+++ b/ffmpeg3.patch
@@ -0,0 +1,26 @@
+Index: guvcview-src-2.0.3/gview_v4l2core/jpeg_decoder.c
+===================================================================
+--- guvcview-src-2.0.3.orig/gview_v4l2core/jpeg_decoder.c
++++ guvcview-src-2.0.3/gview_v4l2core/jpeg_decoder.c
+@@ -1436,7 +1436,7 @@ int jpeg_init_decoder(int width, int hei
+ 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);
+Index: guvcview-src-2.0.3/gview_v4l2core/uvc_h264.c
+===================================================================
+--- guvcview-src-2.0.3.orig/gview_v4l2core/uvc_h264.c
++++ guvcview-src-2.0.3/gview_v4l2core/uvc_h264.c
+@@ -970,7 +970,7 @@ int h264_init_decoder(int width, int hei
+ }
+
+ 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/guvcview.spec b/guvcview.spec
index 314b2be..b1ae100 100644
--- a/guvcview.spec
+++ b/guvcview.spec
@@ -1,5 +1,5 @@
Name: guvcview
-Version: 2.0.1
+Version: 2.0.4
Release: 1%{?dist}
Summary: GTK+ UVC Viewer and Capturer
Group: Amusements/Graphics
@@ -8,6 +8,7 @@ Group: Amusements/Graphics
License: GPLv3+
URL: http://guvcview.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
+Patch0: ffmpeg3.patch
BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.0
BuildRequires: pkgconfig(glib-2.0) >= 2.10.0
BuildRequires: pkgconfig(portaudio-2.0)
@@ -51,6 +52,7 @@ This package contains development files for %{name}.
%prep
%setup -q -n %{name}-src-%{version}
+%patch0 -p1 -b .ffmpeg3
find . \( -name '*.h' -o -name '*.c' \) -exec chmod -x {} \;
@@ -88,10 +90,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%files -f %{name}.lang
%doc _doc/*
%{_bindir}/%{name}
-%{_libdir}/libgviewaudio-1.0.so.*
-%{_libdir}/libgviewencoder-1.0.so.*
-%{_libdir}/libgviewrender-1.0.so.*
-%{_libdir}/libgviewv4l2core-1.0.so.*
+%{_libdir}/libgviewaudio-2.0.so.*
+%{_libdir}/libgviewencoder-2.0.so.*
+%{_libdir}/libgviewrender-2.0.so.*
+%{_libdir}/libgviewv4l2core-2.0.so.*
%{_mandir}/man1/%{name}.1*
%{_datadir}/pixmaps/%{name}
%{_datadir}/applications/%{name}.desktop
@@ -111,6 +113,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%changelog
+* Thu Jun 30 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.0.4-1
+- Updated to 2.0.4
+- Fixed build with ffmpeg-3.0.x using a patch from Gentoo
+
* Fri Jun 26 2015 Thomas Moschny <thomas.moschny(a)gmx.de> - 2.0.1-1
- Update to 2.0.1.
- Update build requirements.
diff --git a/sources b/sources
index 778e6a2..f2d9621 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-54e608b8a2c13d96f546197117d758f4 guvcview-src-2.0.1.tar.gz
+a6d900166ac2bba251a2c09cb602f1fe guvcview-src-2.0.4.tar.gz