[143186] trunk/dports/multimedia/VLC

[devans at macports.org]

Revision: 143186
          https://trac.macports.org/changeset/143186
Author:   devans at macports.org
Date:     2015-12-06 14:59:35 -0800 (Sun, 06 Dec 2015)
Log Message:
-----------
VLC: various build fixes, openmaintainer.
  * upstream lua 5.3 compatibility patch (#49405)
  * patch to disable use of Xcode 7.0 C11 native atomics in bluray module
    in favor of VLC's fall back code used with Xcode 6.4 and earlier (#49178)
  * increment revision to remove binary references to libenca in libass module (#49908)

Modified Paths:
--------------
    trunk/dports/multimedia/VLC/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/VLC/files/patch-bluray-no-atomics.diff
    trunk/dports/multimedia/VLC/files/patch-lua-5.3.diff

Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile	2015-12-06 17:37:16 UTC (rev 143185)
+++ trunk/dports/multimedia/VLC/Portfile	2015-12-06 22:59:35 UTC (rev 143186)
@@ -6,7 +6,7 @@
 
 name                VLC
 version             2.1.5
-revision            6
+revision            7
 categories          multimedia
 
 maintainers         gmail.com:rjvbertin openmaintainer
@@ -79,6 +79,16 @@
                     no-sparkle.patch \
                     patch-ffmpeg-2.4.diff
 
+# upgrade of lua from 5.2 to 5.3 introduced API deprecations that broke build
+# apply upstream 5.3 compatibility patch (#49405)
+
+patchfiles-append   patch-lua-5.3.diff
+
+# Xcode 7.0+ introduces C11 native atomics that break the bluray module
+# patch to disable native atomics for this module and fall back to VLC's backup implementation (#49178)
+
+patchfiles-append   patch-bluray-no-atomics.diff
+
 post-patch {
     reinplace "s:librsvg-2/librsvg:librsvg:" \
         ${worksrcpath}/modules/text_renderer/svg.c

Added: trunk/dports/multimedia/VLC/files/patch-bluray-no-atomics.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-bluray-no-atomics.diff	                        (rev 0)
+++ trunk/dports/multimedia/VLC/files/patch-bluray-no-atomics.diff	2015-12-06 22:59:35 UTC (rev 143186)
@@ -0,0 +1,14 @@
+--- modules/access/bluray.c.orig	2015-12-06 06:41:52.000000000 -0800
++++ modules/access/bluray.c	2015-12-06 06:43:19.000000000 -0800
+@@ -43,6 +43,11 @@
+ #include <vlc_plugin.h>
+ #include <vlc_demux.h>                      /* demux_t */
+ #include <vlc_input.h>                      /* Seekpoints, chapters */
++
++#ifndef __STDC_NO_ATOMICS__
++#define __STDC_NO_ATOMICS__ 1
++#endif
++
+ #include <vlc_atomic.h>
+ #include <vlc_dialog.h>                     /* BD+/AACS warnings */
+ #include <vlc_vout.h>                       /* vout_PutSubpicture / subpicture_t */

Added: trunk/dports/multimedia/VLC/files/patch-lua-5.3.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-lua-5.3.diff	                        (rev 0)
+++ trunk/dports/multimedia/VLC/files/patch-lua-5.3.diff	2015-12-06 22:59:35 UTC (rev 143186)
@@ -0,0 +1,39 @@
+From 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23 Mon Sep 17 00:00:00 2001
+From: Vinson Lee <vlee at freedesktop.org>
+Date: Thu, 5 Feb 2015 14:48:53 -0800
+Subject: [PATCH] lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0
+ compatibility.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+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 at freedesktop.org>
+Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+---
+ modules/lua/vlc.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
+index efd94f1..85c7fc1 100644
+--- modules/lua/vlc.h
++++ 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 */
+-- 
+1.7.10.4
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/7e56e566/attachment.html>