avidemux-2.5.6-15.parabola1: libvpx 1.6.0 rebuild

2 files changed, 72 insertions, 4 deletions

diff --git a/libre/avidemux/PKGBUILD b/libre/avidemux/PKGBUILD
index 79cad6920..0595d695b 100644
--- a/libre/avidemux/PKGBUILD
+++ b/libre/avidemux/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 253042 2015-12-06 22:14:55Z bpiotrowski $
+# $Id: PKGBUILD 273049 2016-08-04 20:59:53Z bpiotrowski $
 # Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
 pkgver=2.5.6
-pkgrel=14.parabola1
+pkgrel=15.parabola1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://fixounet.free.fr/avidemux/"
@@ -14,9 +14,11 @@ makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv'
              'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva')
 options=('!makeflags' '!emptydirs')
 source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz
-        mangled-variables-used-attribute.patch)
+        mangled-variables-used-attribute.patch
+        buildfix.patch)
 sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5'
-          'da66b69593da62373f2309f88a284145fbfd99ac')
+          'da66b69593da62373f2309f88a284145fbfd99ac'
+          '8b4b45627a8ed4409e32ac2ece361a0cf935e9d4')
 
 prepare() {
   cd ${pkgbase}_${pkgver}
@@ -24,6 +26,9 @@ prepare() {
   # Fix build on i686 when using GCC 5.1
   # https://bugs.archlinux.org/task/45361
   patch -Np1 -i ../mangled-variables-used-attribute.patch
+
+  # Fix build with gcc 6.1 and libvpx 1.6.0
+  patch -Np1 -i ../buildfix.patch
 }
 
 build() {
diff --git a/libre/avidemux/buildfix.patch b/libre/avidemux/buildfix.patch
new file mode 100644
index 000000000..585e67a04
--- /dev/null
+++ b/libre/avidemux/buildfix.patch
@@ -0,0 +1,63 @@
+diff --git a/avidemux/ADM_inputs/ADM_h263/ADM_mp4.cpp b/avidemux/ADM_inputs/ADM_h263/ADM_mp4.cpp
+index 9d11e5d..8f6ac7f 100644
+--- a/avidemux/ADM_inputs/ADM_h263/ADM_mp4.cpp
++++ b/avidemux/ADM_inputs/ADM_h263/ADM_mp4.cpp
+@@ -70,8 +70,8 @@ cb cb_decode[]={
+ 
+ };
+ 
+-#define ONEOPT(x) {if(parser->read1bit()) printf("\t"x"\n");			}
+-#define NOT_ONEOPT(x) {if(!parser->read1bit()) printf("\t"x"\n");			}
++#define ONEOPT(x) {if(parser->read1bit()) printf("\t" x "\n");			}
++#define NOT_ONEOPT(x) {if(!parser->read1bit()) printf("\t" x "\n");			}
+ #define TWOPT(x,y) {if(parser->read1bit()) printf(x);	else printf(y);		}
+ 
+ //_________________________________
+diff --git a/avidemux/ADM_inputs/ADM_ogm/ADM_ogmAudio.cpp b/avidemux/ADM_inputs/ADM_ogm/ADM_ogmAudio.cpp
+index 944d0bf..3763dd0 100644
+--- a/avidemux/ADM_inputs/ADM_ogm/ADM_ogmAudio.cpp
++++ b/avidemux/ADM_inputs/ADM_ogm/ADM_ogmAudio.cpp
+@@ -402,7 +402,7 @@ static WAVHeader hdr;
+ 			// Now we forward till the next header is > value
+ 			while(_demuxer->readHeaderOfType(_currentTrack->audioTrack,&cursize,&flags,&f))
+ 			{
+-				if(f>val || abs(f-val)<CLOSE_ENOUGH)
++				if(f>val || abs(static_cast<int64_t>(f-val))<CLOSE_ENOUGH)
+ 				{
+ 					aprintf("Wanted %llu",val);
+ 					aprintf(" got %llu\n",f);					
+diff --git a/plugins/ADM_videoEncoder/ADM_vidEnc_mpeg2enc/mpeg2enc/find_best_one_pel.cc b/plugins/ADM_videoEncoder/ADM_vidEnc_mpeg2enc/mpeg2enc/find_best_one_pel.cc
+index 43d40cc..e855d4f 100644
+--- a/plugins/ADM_videoEncoder/ADM_vidEnc_mpeg2enc/mpeg2enc/find_best_one_pel.cc
++++ b/plugins/ADM_videoEncoder/ADM_vidEnc_mpeg2enc/mpeg2enc/find_best_one_pel.cc
+@@ -30,7 +30,7 @@ void find_best_one_pel_mmxe( me_result_set *sub22set,
+                 int x;

+ 		matchrec = sub22set->mests[k];

+ 		orgblk = org + (i0+matchrec.x)+rowstride*(j0+matchrec.y);

+-		penalty = (abs(matchrec.x) + abs(matchrec.y))<<3;

++		penalty = (abs(static_cast<int32_t>(matchrec.x)) + abs(static_cast<int32_t>(matchrec.y)))<<3;

+ 		

+ 		/* Get SAD for macroblocks: 	orgblk,orgblk(+1,0),

+ 		   orgblk(0,+1), and orgblk(+1,+1)

+diff --git a/plugins/ADM_videoFilters/Telecide/ADM_vidDecTelecide.cpp b/plugins/ADM_videoFilters/Telecide/ADM_vidDecTelecide.cpp
+index c0cabbe..3a8f699 100644
+--- a/plugins/ADM_videoFilters/Telecide/ADM_vidDecTelecide.cpp
++++ b/plugins/ADM_videoFilters/Telecide/ADM_vidDecTelecide.cpp
+@@ -690,7 +690,7 @@ uint8_t *finalpU,*finalpV;
+                         {
+                                 // The chosen frame doesn't match the prediction.
+                                 if (predicted_metric == 0) mismatch = 0.0;
+-                                else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric;
++                                else mismatch = (100.0*abs(static_cast<int>(predicted_metric - lowest)))/predicted_metric;
+                                 if (mismatch < gthresh)
+                                 {
+                                         // It's close enough, so use the predicted one.
+@@ -732,7 +732,7 @@ uint8_t *finalpU,*finalpV;
+                                         {
+                                                 // The chosen frame doesn't match the prediction.
+                                                 if (predicted_metric == 0) mismatch = 0.0;
+-                                                else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric;
++                                                else mismatch = (100.0*abs(static_cast<int>(predicted_metric - lowest)))/predicted_metric;
+                                                 if ((int) mismatch <= gthresh)
+                                                 {
+                                                         // It's close enough, so use the predicted one.