[arch-commits] Commit in guvcview/trunk (PKGBUILD guvcview-ffmpeg3.patch)

[Antonio Rojas]

    Date: Tuesday, February 16, 2016 @ 08:37:16
  Author: arojas
Revision: 161813

Update to 2.0.3, add Debian patch to fix build against ffmpeg 3.0

Added:
  guvcview/trunk/guvcview-ffmpeg3.patch
Modified:
  guvcview/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   13 ++++++++++---
 guvcview-ffmpeg3.patch |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-16 06:32:45 UTC (rev 161812)
+++ PKGBUILD	2016-02-16 07:37:16 UTC (rev 161813)
@@ -3,7 +3,7 @@
 # Contributor: Maxwell Pray a.k.a. Synthead <synthead at gmail.com>
 
 pkgname=guvcview
-pkgver=2.0.1
+pkgver=2.0.3
 pkgrel=1
 pkgdesc="A video viewer and capturer for the linux uvc driver"
 arch=('i686' 'x86_64')
@@ -13,9 +13,16 @@
 makedepends=('pkg-config' 'intltool')
 optdepends=('pulseaudio: for PulseAudio support')
 options=('!docs' '!buildflags')
-source=("http://downloads.sourceforge.net/project/${pkgname}/source/${pkgname}-src-${pkgver}.tar.gz")
-md5sums=('54e608b8a2c13d96f546197117d758f4')
+source=("http://downloads.sourceforge.net/project/${pkgname}/source/${pkgname}-src-${pkgver}.tar.gz" guvcview-ffmpeg3.patch)
+md5sums=('994d1d08a013356de516771818774947'
+         '9db64a64ddca977cd89ddfb551ff2e8b')
 
+prepare() {
+  cd $pkgname-src-$pkgver
+# Fix build against ffmpeg 3.0
+  patch -p1 -i ../guvcview-ffmpeg3.patch
+}
+
 build() {
   cd "${srcdir}/${pkgname}-src-${pkgver}"
 

Added: guvcview-ffmpeg3.patch
===================================================================
--- guvcview-ffmpeg3.patch	                        (rev 0)
+++ guvcview-ffmpeg3.patch	2016-02-16 07:37:16 UTC (rev 161813)
@@ -0,0 +1,37 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
+Last-Update: <2015-11-02>
+
+--- a/gview_encoder/encoder.c
++++ b/gview_encoder/encoder.c
+@@ -1434,7 +1434,7 @@
+ 		/*convert default yuyv to y420p (libav input format)*/		
+ 		switch(video_codec_data->codec_context->pix_fmt)
+ 		{
+-			case PIX_FMT_YUVJ420P:
++			case AV_PIX_FMT_YUVJ420P:
+ 				yuv422to420p(encoder_ctx, input_frame);
+ 				break;
+ 			default:
+--- a/gview_v4l2core/jpeg_decoder.c
++++ b/gview_v4l2core/jpeg_decoder.c
+@@ -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);
+--- a/gview_v4l2core/uvc_h264.c
++++ b/gview_v4l2core/uvc_h264.c
+@@ -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);