avidemux 2.5.6-12.parabola1: fix libx264 depends (close FS#45788 -> https://bugs.archlinux.org/task/45788)

3 files changed, 30 insertions, 8 deletions

diff --git a/libre/avidemux/PKGBUILD b/libre/avidemux/PKGBUILD
index b5de7c520..93e2b1b46 100644
--- a/libre/avidemux/PKGBUILD
+++ b/libre/avidemux/PKGBUILD
@@ -1,20 +1,30 @@
-# $Id: PKGBUILD 237817 2015-04-21 00:26:23Z foutrelis $
+# $Id: PKGBUILD 243055 2015-08-06 01:32:56Z eric $
 # 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=11.parabola1
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=12.parabola1
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://fixounet.free.fr/avidemux/"
 makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv'
-             'alsa-lib' 'lame' 'xvidcore' 'faad2' 'x264-dev' 'libsamplerate'
+             'alsa-lib' 'lame' 'xvidcore' 'faad2' 'libx264' 'libsamplerate'
              'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva')
 options=('!makeflags' '!emptydirs')
-source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
-sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5')
+source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz
+        mangled-variables-used-attribute.patch)
+sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5'
+          'da66b69593da62373f2309f88a284145fbfd99ac')
+
+prepare() {
+  cd ${pkgbase}_${pkgver}
+
+  # Fix build on i686 when using GCC 5.1
+  # https://bugs.archlinux.org/task/45361
+  patch -Np1 -i ../mangled-variables-used-attribute.patch
+}
 
 build() {
   cd ${pkgbase}_${pkgver}
@@ -48,7 +58,7 @@ package_avidemux-cli() {
               'jack: for the corresponding audio device plugin'
               'libpulse: for the corresponding audio device plugin'
               'sdl: for the corresponding audio device plugin'
-              'x264: for the corresponding video encoder plugin'
+              'libx264: for the corresponding video encoder plugin'
               'xvidcore: for the corresponding video encoder plugin')
   provides=('avidemux')
   conflicts=('avidemux' 'avidemux-libre-cli' 'avidemux-cli-parabola')
diff --git a/libre/avidemux/PKGBUILD.WIP b/libre/avidemux/PKGBUILD.WIP
index 9044c7a06..e56dca7ff 100644
--- a/libre/avidemux/PKGBUILD.WIP
+++ b/libre/avidemux/PKGBUILD.WIP
@@ -6,7 +6,7 @@ pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
 pkgver=2.6.8
 pkgrel=1.parabola1
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://fixounet.free.fr/avidemux/"
 makedepends=('cmake' 'libxslt' 'gtk3' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \
diff --git a/libre/avidemux/mangled-variables-used-attribute.patch b/libre/avidemux/mangled-variables-used-attribute.patch
new file mode 100644
index 000000000..53bc05fc1
--- /dev/null
+++ b/libre/avidemux/mangled-variables-used-attribute.patch
@@ -0,0 +1,12 @@
+diff -uprw avidemux_2.5.6.orig/avidemux/ADM_core/include/ADM_mangle.h avidemux_2.5.6/avidemux/ADM_core/include/ADM_mangle.h
+--- avidemux_2.5.6.orig/avidemux/ADM_core/include/ADM_mangle.h	2011-12-29 02:32:37.000000000 +0200
++++ avidemux_2.5.6/avidemux/ADM_core/include/ADM_mangle.h	2015-06-19 07:35:59.554911423 +0300
+@@ -35,7 +35,7 @@
+ #        define FUNNY_MANGLE_ARRAY(x, y) __attribute__((used)) x[y] asm(#x)
+ #    else
+ #        define MANGLE(a) #a
+-#        define FUNNY_MANGLE(x) x asm(MANGLE(x))
++#        define FUNNY_MANGLE(x) __attribute__((used)) x asm(MANGLE(x))
+ #        define FUNNY_MANGLE_ARRAY(x, y) x[y] asm(MANGLE(x))
+ #    endif
+ #endif