[101234] trunk/dports/multimedia/VLC-devel
jeremyhu at macports.org
jeremyhu at macports.org
Sun Jan 6 12:26:29 PST 2013
Revision: 101234
https://trac.macports.org/changeset/101234
Author: jeremyhu at macports.org
Date: 2013-01-06 12:26:28 -0800 (Sun, 06 Jan 2013)
Log Message:
-----------
VLC-devel: Update to current git.
Modified Paths:
--------------
trunk/dports/multimedia/VLC-devel/Portfile
Removed Paths:
-------------
trunk/dports/multimedia/VLC-devel/files/0001-Remove-VOUT_WINDOW_TYPE_NATIVE.patch
trunk/dports/multimedia/VLC-devel/files/automake.patch
Modified: trunk/dports/multimedia/VLC-devel/Portfile
===================================================================
--- trunk/dports/multimedia/VLC-devel/Portfile 2013-01-06 19:30:06 UTC (rev 101233)
+++ trunk/dports/multimedia/VLC-devel/Portfile 2013-01-06 20:26:28 UTC (rev 101234)
@@ -5,7 +5,7 @@
name VLC-devel
version 2.0.99
-revision 7
+revision 8
categories multimedia
@@ -26,7 +26,7 @@
# http://git.videolan.org/?p=vlc.git
fetch.type git
git.url git://git.videolan.org/vlc.git
-git.branch 99236d7bc67930c189862ef1de4cc429fd1fee3a
+git.branch 92498ed70e94da04c531a564c6d8d206150b4f03
#master_sites http://download.videolan.org/pub/videolan/vlc/${version}/
#distname vlc-${version}
@@ -62,8 +62,6 @@
}
patchfiles \
- 0001-Remove-VOUT_WINDOW_TYPE_NATIVE.patch \
- automake.patch \
buildfix-package.mak.patch \
configure.ac-no-arch.patch \
PR-34741-no__clang_version__.patch \
@@ -84,6 +82,9 @@
configure.env-append CXXCPP="${configure.cxx} -E"
build.args-append DESTDIR=${worksrcpath}/dest_ignore
+# gl.c:121:3: error: Platform not recognized.
+configure.cppflags-append -D__unix__=1
+
build.target all
destroot.target install
@@ -328,11 +329,11 @@
reinplace "/argv/s/environ/*_NSGetEnviron()/" \
${worksrcpath}/modules/misc/inhibit/xdg.c \
- ${worksrcpath}/modules/misc/inhibit/xscreensaver.c
+ ${worksrcpath}/modules/stream_filter/decomp.c
reinplace "s/extern char \\*\\*environ;/#include <crt_externs.h>/" \
${worksrcpath}/modules/misc/inhibit/xdg.c \
- ${worksrcpath}/modules/misc/inhibit/xscreensaver.c
+ ${worksrcpath}/modules/stream_filter/decomp.c
ln -s ${frameworks_dir}/BGHUDAppKit.framework ${worksrcpath}/contrib/BGHUDAppKit.framework
Deleted: trunk/dports/multimedia/VLC-devel/files/0001-Remove-VOUT_WINDOW_TYPE_NATIVE.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/0001-Remove-VOUT_WINDOW_TYPE_NATIVE.patch 2013-01-06 19:30:06 UTC (rev 101233)
+++ trunk/dports/multimedia/VLC-devel/files/0001-Remove-VOUT_WINDOW_TYPE_NATIVE.patch 2013-01-06 20:26:28 UTC (rev 101234)
@@ -1,57 +0,0 @@
-From 3f58ab29bea334007feee66fa192056573c2a7c2 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at macports.org>
-Date: Sun, 28 Oct 2012 11:20:36 -0700
-Subject: [PATCH] Remove VOUT_WINDOW_TYPE_NATIVE
-
- This is not something we can know at compile time at this level in the API.
- Also, make a note in video_output/gl.c to make it more abstract.
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at macports.org>
----
- include/vlc_vout_window.h | 6 ------
- modules/video_output/gl.c | 12 +++++++++++-
- 2 files changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
-index ad57a77..e794468 100644
---- ./include/vlc_vout_window.h
-+++ ./include/vlc_vout_window.h
-@@ -47,12 +47,6 @@ enum {
- VOUT_WINDOW_TYPE_NSOBJECT,
- };
-
--#if defined (WIN32) || defined (__OS2__)
--# define VOUT_WINDOW_TYPE_NATIVE VOUT_WINDOW_TYPE_HWND
--#elif defined (__unix__)
--# define VOUT_WINDOW_TYPE_NATIVE VOUT_WINDOW_TYPE_XID
--#endif
--
- /**
- * Control query for vout_window_t
- */
-diff --git a/modules/video_output/gl.c b/modules/video_output/gl.c
-index a396bae..38a0a8c 100644
---- ./modules/video_output/gl.c
-+++ ./modules/video_output/gl.c
-@@ -101,7 +101,17 @@ static vout_window_t *MakeWindow (vout_display_t *vd)
- vout_window_cfg_t wnd_cfg;
-
- memset (&wnd_cfg, 0, sizeof (wnd_cfg));
-- wnd_cfg.type = VOUT_WINDOW_TYPE_NATIVE;
-+ /* TODO: gl.c is supposed to be abstract. This choice of type makes a
-+ * determination of our window types based on architecture, but
-+ * a single architecture may support multiple window types.
-+ * eg: Windows can support WIN32 or X11, OS X can support AppKit
-+ * or X11, Linux can support X11 or Wayland, ...
-+ */
-+#if defined (WIN32) || defined (__OS2__)
-+ wnd_cfg.type = VOUT_WINDOW_TYPE_HWND;
-+#else
-+ wnd_cfg.type = VOUT_WINDOW_TYPE_XID;
-+#endif
- wnd_cfg.x = var_InheritInteger (vd, "video-x");
- wnd_cfg.y = var_InheritInteger (vd, "video-y");
- wnd_cfg.width = vd->cfg->display.width;
---
-1.8.0
-
Deleted: trunk/dports/multimedia/VLC-devel/files/automake.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/automake.patch 2013-01-06 19:30:06 UTC (rev 101233)
+++ trunk/dports/multimedia/VLC-devel/files/automake.patch 2013-01-06 20:26:28 UTC (rev 101234)
@@ -1,25 +0,0 @@
-From 6b2595e68890e5db1b7334098b6f722e2f41a6d8 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
-Date: Tue, 1 Jan 2013 12:06:16 +0200
-Subject: [PATCH] configure: replace obsolete AM_CONFIG_HEADERS (fixes #7975)
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index a5453a9..4c927c8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,7 +25,7 @@ AC_CANONICAL_HOST
- AC_PRESERVE_HELP_ORDER
-
- AM_INIT_AUTOMAKE(tar-ustar color-tests foreign)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
-
- # Disable with "./configure --disable-silent-rules" or "make V=1"
- AM_SILENT_RULES([yes])
---
-1.7.10.4
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130106/446650f6/attachment.html>
More information about the macports-changes
mailing list