[packages/guvcview] - fix building with ffmpeg 3 - rel 2

[baggins]

commit 330879bf550baf07797e5d7eafc5bc5c36d9edb4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Mar 31 20:38:11 2016 +0900

    - fix building with ffmpeg 3
    - rel 2

 ffmpeg3.patch | 22 ++++++++++++++++++++++
 guvcview.spec |  7 +++++--
 2 files changed, 27 insertions(+), 2 deletions(-)
---
diff --git a/guvcview.spec b/guvcview.spec
index 04d435d..4fb8fcb 100644
--- a/guvcview.spec
+++ b/guvcview.spec
@@ -1,13 +1,14 @@
 Summary:	GTK+ base UVC Viewer
 Name:		guvcview
 Version:	2.0.2
-Release:	1
+Release:	2
 License:	GPL v3
 Group:		Applications/Multimedia
 Source0:	http://downloads.sourceforge.net/guvcview/%{name}-src-%{version}.tar.gz
 # Source0-md5:	d88a1bcf80c0d989ffcb19d71bdd8c1e
 URL:		http://guvcview.sourceforge.net/
 Patch0:		link.patch
+Patch1:		ffmpeg3.patch
 BuildRequires:	SDL2-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -29,10 +30,12 @@ from devices supported by the Linux UVC driver.
 %prep
 %setup -q -n %{name}-src-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
-%{__automake}
+%{__aclocal}
 %{__autoconf}
+%{__automake}
 %configure \
 	--disable-debian-menu
 %{__make}
diff --git a/ffmpeg3.patch b/ffmpeg3.patch
new file mode 100644
index 0000000..27d10c3
--- /dev/null
+++ b/ffmpeg3.patch
@@ -0,0 +1,22 @@
+--- guvcview-src-2.0.2/gview_v4l2core/uvc_h264.c~	2015-07-27 23:26:48.000000000 +0900
++++ guvcview-src-2.0.2/gview_v4l2core/uvc_h264.c	2016-03-31 20:35:23.109698271 +0900
+@@ -970,7 +970,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);
+--- guvcview-src-2.0.2/gview_v4l2core/jpeg_decoder.c~	2015-07-27 23:26:48.000000000 +0900
++++ guvcview-src-2.0.2/gview_v4l2core/jpeg_decoder.c	2016-03-31 20:35:56.186940070 +0900
+@@ -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);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/guvcview.git/commitdiff/330879bf550baf07797e5d7eafc5bc5c36d9edb4