[arch-commits] Commit in avidemux/trunk (2 files)

[Evangelos Foutras]

    Date: Friday, June 19, 2015 @ 06:44:31
  Author: foutrelis
Revision: 241029

Fix build on i686 when using GCC 5.1 (FS#45361)

Added:
  avidemux/trunk/mangled-variables-used-attribute.patch
Modified:
  avidemux/trunk/PKGBUILD

----------------------------------------+
 PKGBUILD                               |   14 ++++++++++++--
 mangled-variables-used-attribute.patch |   12 ++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-19 03:24:53 UTC (rev 241028)
+++ PKGBUILD	2015-06-19 04:44:31 UTC (rev 241029)
@@ -12,9 +12,19 @@
              'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264-dev' '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}
   mkdir build

Added: mangled-variables-used-attribute.patch
===================================================================
--- mangled-variables-used-attribute.patch	                        (rev 0)
+++ mangled-variables-used-attribute.patch	2015-06-19 04:44:31 UTC (rev 241029)
@@ -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