2.2.1-7

3 files changed, 3 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 39128497b230..815e8ee1f369 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vlc-decklink
 	pkgdesc = A multi-platform MPEG, VCD/DVD, and DivX player (with decklink module)
 	pkgver = 2.2.1
-	pkgrel = 4
+	pkgrel = 7
 	url = http://www.videolan.org/vlc/
 	install = vlc.install
 	arch = i686
@@ -96,10 +96,8 @@ pkgbase = vlc-decklink
 	backup = usr/share/vlc/lua/http/.hosts
 	backup = usr/share/vlc/lua/http/dialogs/.hosts
 	source = http://download.videolan.org/vlc/2.2.1/vlc-2.2.1.tar.xz
-	source = vlc-gcc5-sse-target-workaround.patch
 	source = lua53_compat.patch
 	md5sums = 42273945758b521c408fabc7fd6d9946
-	md5sums = cf5b92e290da2f1b0b4d0cd0eda6b32b
 	md5sums = 96d3b346d9149ffb1b430066dfb6249a
 
 pkgname = vlc-decklink
diff --git a/PKGBUILD b/PKGBUILD
index 82c49b08ee5d..866d29e1936c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 239466 2015-05-16 16:21:31Z anatolik $
+# $Id: PKGBUILD 246539 2015-09-17 21:02:31Z foutrelis $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
@@ -6,7 +6,7 @@
 _pkgname=vlc
 pkgname=vlc-decklink
 pkgver=2.2.1
-pkgrel=4
+pkgrel=7
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player (with decklink module)"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -61,10 +61,8 @@ backup=('usr/share/vlc/lua/http/.hosts'
 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() {
@@ -73,11 +71,6 @@ prepare() {
   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"
 
   # dirty hack because of VLC's configure
diff --git a/vlc-gcc5-sse-target-workaround.patch b/vlc-gcc5-sse-target-workaround.patch
deleted file mode 100644
index 507fb2ca24da..000000000000
--- a/vlc-gcc5-sse-target-workaround.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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