vlc-decklink: 2.2.1-4

7 files changed, 72 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 45e3670d2977..39128497b230 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.1.5
-	pkgrel = 5
+	pkgver = 2.2.1
+	pkgrel = 4
 	url = http://www.videolan.org/vlc/
 	install = vlc.install
 	arch = i686
@@ -15,8 +15,9 @@ pkgbase = vlc-decklink
 	makedepends = kdelibs
 	makedepends = libdc1394
 	makedepends = libavc1394
-	makedepends = lirc-utils
+	makedepends = lirc
 	makedepends = libcaca
+	makedepends = gtk2
 	makedepends = librsvg
 	makedepends = portaudio
 	makedepends = libgme
@@ -60,7 +61,7 @@ pkgbase = vlc-decklink
 	optdepends = libnotify: for notification plugin
 	optdepends = ncurses: for ncurses interface support
 	optdepends = libdvdcss: for decoding encrypted DVDs
-	optdepends = lirc-utils: for lirc plugin
+	optdepends = lirc: for lirc plugin
 	optdepends = libavc1394: for devices using the 1394ta AV/C
 	optdepends = libdc1394: for IEEE 1394 plugin
 	optdepends = kdelibs: KDE Solid hardware integration
@@ -94,14 +95,12 @@ pkgbase = vlc-decklink
 	options = !emptydirs
 	backup = usr/share/vlc/lua/http/.hosts
 	backup = usr/share/vlc/lua/http/dialogs/.hosts
-	source = http://download.videolan.org/vlc/2.1.5/vlc-2.1.5.tar.xz
-	source = vlc-2.0.7-vaapi-compat.patch
-	source = vlc-2.1.5-ffmpeg-2.4.patch
-	source = vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch
-	md5sums = 3941b561f590cc95ca5e795213cba2f2
-	md5sums = 6df10774bb7acf20e09d6139e5c7839e
-	md5sums = 068a1b792064bb1aff0765a3ffa8a27a
-	md5sums = 787a854f3acde37cd6e76a8fa8e6f1d0
+	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 635b98a2d003..82c49b08ee5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 226292 2014-11-15 14:56:22Z bpiotrowski $
+# $Id: PKGBUILD 239466 2015-05-16 16:21:31Z anatolik $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 _pkgname=vlc
 pkgname=vlc-decklink
-pkgver=2.1.5
-pkgrel=5
+pkgver=2.2.1
+pkgrel=4
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player (with decklink module)"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -17,7 +17,7 @@ depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy'
          'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar'
          'libxinerama')
 makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
-             'libdc1394' 'libavc1394' 'lirc-utils' 'libcaca'
+             'libdc1394' 'libavc1394' 'lirc' 'libcaca' 'gtk2'
              'librsvg' 'portaudio' 'libgme' 'xosd' 'projectm'
              'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs'
              'libgoom2' 'vcdimager' 'opus' 'libssh2' 'mesa'
@@ -26,7 +26,7 @@ optdepends=('avahi: for service discovery using bonjour protocol'
             'libnotify: for notification plugin'
             'ncurses: for ncurses interface support'
             'libdvdcss: for decoding encrypted DVDs'
-            'lirc-utils: for lirc plugin'
+            'lirc: for lirc plugin'
             'libavc1394: for devices using the 1394ta AV/C'
             'libdc1394: for IEEE 1394 plugin'
             'kdelibs: KDE Solid hardware integration'
@@ -61,28 +61,28 @@ backup=('usr/share/vlc/lua/http/.hosts'
 options=('!emptydirs')
 install=vlc.install
 source=("http://download.videolan.org/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.xz"
-        'vlc-2.0.7-vaapi-compat.patch'
-        'vlc-2.1.5-ffmpeg-2.4.patch'
-        'vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch')
-md5sums=('3941b561f590cc95ca5e795213cba2f2'
-         '6df10774bb7acf20e09d6139e5c7839e'
-         '068a1b792064bb1aff0765a3ffa8a27a'
-         '787a854f3acde37cd6e76a8fa8e6f1d0')
+        "vlc-gcc5-sse-target-workaround.patch"
+        "lua53_compat.patch")
+md5sums=('42273945758b521c408fabc7fd6d9946'
+         'cf5b92e290da2f1b0b4d0cd0eda6b32b'
+         '96d3b346d9149ffb1b430066dfb6249a')
 
 prepare() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
 
-  patch -p1 -i "${srcdir}/vlc-2.0.7-vaapi-compat.patch"
-  patch -p1 -i "${srcdir}/vlc-2.1.5-ffmpeg-2.4.patch"
-  patch -p1 -i "${srcdir}/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch"
-  autoreconf -fi
+  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
   [ -d decklink-sdk ] || mkdir decklink-sdk
   ln -sf /usr/src/decklink-sdk decklink-sdk/include
-
-  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
 }
 
 build() {
diff --git a/lua53_compat.patch b/lua53_compat.patch
new file mode 100644
index 000000000000..aeff7b2fd778
--- /dev/null
+++ b/lua53_compat.patch
@@ -0,0 +1,30 @@
+commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23
+Author: Vinson Lee <vlee@freedesktop.org>
+Date:   Thu Feb 5 14:48:53 2015 -0800
+
+    lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0 compatibility.
+    
+    In Lua 5.3.0, luaL_checkint was deprecated.
+    
+    This patch fixes this build error with Lua 5.3.0.
+    
+    lua/demux.c: In function ‘vlclua_demux_peek’:
+    lua/demux.c:55:5: error: implicit declaration of function ‘luaL_checkint’ [-Werror=implicit-function-declaration]
+         int n = luaL_checkint( L, 1 );
+         ^
+    
+    Signed-off-by: Vinson Lee <vlee@freedesktop.org>
+    Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
+
+diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
+index efd94f1..85c7fc1 100644
+--- a/modules/lua/vlc.h
++++ b/modules/lua/vlc.h
+@@ -38,6 +38,7 @@
+ #include <vlc_stream.h>
+ #include <vlc_demux.h>
+ 
++#define LUA_COMPAT_APIINTCASTS
+ #define LUA_COMPAT_MODULE
+ #include <lua.h>        /* Low level lua C API */
+ #include <lauxlib.h>    /* Higher level C API */
diff --git a/vlc-2.0.7-vaapi-compat.patch b/vlc-2.0.7-vaapi-compat.patch
deleted file mode 100644
index 4fd29710b798..000000000000
--- a/vlc-2.0.7-vaapi-compat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rupN a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
---- a/modules/codec/avcodec/vaapi.c	2013-01-22 09:51:40.000000000 +0000
-+++ b/modules/codec/avcodec/vaapi.c	2013-07-27 17:23:37.965202118 +0000
-@@ -47,6 +47,7 @@
- 
- #include <X11/Xlib.h>
- #include <va/va_x11.h>
-+#include <va/va_compat.h>
- 
- typedef struct
- {
diff --git a/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch b/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch
deleted file mode 100644
index f15de1268a7b..000000000000
--- a/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1e31a5a18bb0087f9e625919a805d64a2af40bbe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Wed, 30 Jul 2014 19:05:43 +0300
-Subject: [PATCH] avformat: initialize probe data (fixes #11851)
-
-(cherry picked from commit 49bd1c657d960ba107d9db8752f716139a938eee)
----
- modules/demux/avformat/demux.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
-index bdd77fd..7349db2 100644
---- a/modules/demux/avformat/demux.c
-+++ b/modules/demux/avformat/demux.c
-@@ -157,7 +157,7 @@ int OpenDemux( vlc_object_t *p_this )
- {
-     demux_t       *p_demux = (demux_t*)p_this;
-     demux_sys_t   *p_sys;
--    AVProbeData   pd;
-+    AVProbeData   pd = { };
-     AVInputFormat *fmt = NULL;
-     unsigned int  i;
-     int64_t       i_start_time = -1;
--- 
-2.1.0
-
diff --git a/vlc-2.1.5-ffmpeg-2.4.patch b/vlc-2.1.5-ffmpeg-2.4.patch
deleted file mode 100644
index 2bd0949ecf10..000000000000
--- a/vlc-2.1.5-ffmpeg-2.4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a684338..053713a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2242,8 +2242,8 @@ AC_ARG_ENABLE(avcodec,
- [  --enable-avcodec        libavcodec codec (default enabled)])
- AS_IF([test "${enable_avcodec}" != "no"], [
-   PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
--    PKG_CHECK_EXISTS([libavcodec < 56],, [
--      AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.])
-+    PKG_CHECK_EXISTS([libavcodec < 57],, [
-+      AC_MSG_ERROR([libavcodec versions 57 and later are not supported yet.])
-     ])
-     VLC_SAVE_FLAGS
-     CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
diff --git a/vlc-gcc5-sse-target-workaround.patch b/vlc-gcc5-sse-target-workaround.patch
new file mode 100644
index 000000000000..507fb2ca24da
--- /dev/null
+++ b/vlc-gcc5-sse-target-workaround.patch
@@ -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