[arch-commits] Commit in vlc/trunk (PKGBUILD vlc-gcc5-sse-target-workaround.patch)

[Evangelos Foutras]

    Date: Tuesday, May 12, 2015 @ 01:52:06
  Author: foutrelis
Revision: 238953

upgpkg: vlc 2.2.1-4

Lua 5.3 rebuild.

Added:
  vlc/trunk/vlc-gcc5-sse-target-workaround.patch
Modified:
  vlc/trunk/PKGBUILD

--------------------------------------+
 PKGBUILD                             |    9 ++++++++-
 vlc-gcc5-sse-target-workaround.patch |   12 ++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-11 16:48:14 UTC (rev 238952)
+++ PKGBUILD	2015-05-11 23:52:06 UTC (rev 238953)
@@ -5,7 +5,7 @@
 
 pkgname=vlc
 pkgver=2.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -58,8 +58,10 @@
 options=('!emptydirs')
 install=vlc.install
 source=("http://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+        "vlc-gcc5-sse-target-workaround.patch"
         "lua53_compat.patch")
 md5sums=('42273945758b521c408fabc7fd6d9946'
+         'cf5b92e290da2f1b0b4d0cd0eda6b32b'
          '96d3b346d9149ffb1b430066dfb6249a')
 
 prepare() {
@@ -68,6 +70,11 @@
   sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
   sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
 
+  # Fix build with GCC 5 on i686
+  # GCC PR URL: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66047
+  # Workaround: https://bugzilla.redhat.com/show_bug.cgi?id=1215630#c11
+  patch -p1 < "${srcdir}/vlc-gcc5-sse-target-workaround.patch"
+
   patch -p1 < "${srcdir}/lua53_compat.patch"
 }
 

Added: vlc-gcc5-sse-target-workaround.patch
===================================================================
--- vlc-gcc5-sse-target-workaround.patch	                        (rev 0)
+++ vlc-gcc5-sse-target-workaround.patch	2015-05-11 23:52:06 UTC (rev 238953)
@@ -0,0 +1,12 @@
+diff -upr vlc-2.2.1.orig/include/vlc_cpu.h vlc-2.2.1/include/vlc_cpu.h
+--- vlc-2.2.1.orig/include/vlc_cpu.h	2014-06-14 18:14:12.000000000 +0300
++++ vlc-2.2.1/include/vlc_cpu.h	2015-05-12 02:31:29.843264593 +0300
+@@ -65,7 +65,7 @@ VLC_API unsigned vlc_CPU(void);
+ #  define vlc_CPU_MMXEXT() ((vlc_CPU() & VLC_CPU_MMXEXT) != 0)
+ #  define vlc_CPU_SSE() ((vlc_CPU() & VLC_CPU_SSE) != 0)
+ #  if VLC_GCC_VERSION(4, 4) || defined(__clang__)
+-#   define VLC_SSE __attribute__ ((__target__ ("sse")))
++#   define VLC_SSE __attribute__ ((used)) __attribute__ ((__target__ ("sse")))
+ #  else
+ #   define VLC_SSE VLC_SSE_is_not_implemented_on_this_compiler
+ #  endif