Revision: 99151 http://trac.macports.org//changeset/99151 Author: jeremyhu@macports.org Date: 2012-10-28 11:35:16 -0700 (Sun, 28 Oct 2012) Log Message: ----------- VLC-devel: Bump to recent git Modified Paths: -------------- trunk/dports/multimedia/VLC-devel/Portfile trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch Added Paths: ----------- trunk/dports/multimedia/VLC-devel/files/0001-Remove-VOUT_WINDOW_TYPE_NATIVE.patch Modified: trunk/dports/multimedia/VLC-devel/Portfile =================================================================== --- trunk/dports/multimedia/VLC-devel/Portfile 2012-10-28 18:02:37 UTC (rev 99150) +++ trunk/dports/multimedia/VLC-devel/Portfile 2012-10-28 18:35:16 UTC (rev 99151) @@ -5,7 +5,7 @@ name VLC-devel version 2.0.99 -revision 3 +revision 4 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 ac2ccb3a7f28b4771758b0169ac0c6367eab327d +git.branch 99236d7bc67930c189862ef1de4cc429fd1fee3a #master_sites http://download.videolan.org/pub/videolan/vlc/${version}/ #distname vlc-${version} @@ -43,7 +43,7 @@ port:libopus port:libvorbis port:libmatroska port:libid3tag \ port:ncurses port:lua port:libpng port:jpeg \ port:gnutls port:taglib port:libxml2 port:faad2 \ - port:x264 port:libtheora port:twolame \ + port:x264 port:libtheora port:twolame port:libssh2 \ port:libdvdnav port:libdvdread port:libproxy \ port:fluidsynth port:libsamplerate port:libupnp \ port:avahi path:lib/libavcodec.dylib:ffmpeg @@ -62,6 +62,7 @@ } patchfiles \ + 0001-Remove-VOUT_WINDOW_TYPE_NATIVE.patch \ buildfix-package.mak.patch \ configure.ac-no-arch.patch \ PR-34741-no__clang_version__.patch \ Added: 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 (rev 0) +++ trunk/dports/multimedia/VLC-devel/files/0001-Remove-VOUT_WINDOW_TYPE_NATIVE.patch 2012-10-28 18:35:16 UTC (rev 99151) @@ -0,0 +1,57 @@ +From 3f58ab29bea334007feee66fa192056573c2a7c2 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@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@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 + Modified: trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch =================================================================== --- trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch 2012-10-28 18:02:37 UTC (rev 99150) +++ trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch 2012-10-28 18:35:16 UTC (rev 99151) @@ -1,5 +1,5 @@ ---- configure.ac.orig 2012-09-12 15:42:02.000000000 -0700 -+++ configure.ac 2012-09-12 15:48:28.000000000 -0700 +--- configure.ac.orig 2012-10-28 03:16:42.000000000 -0700 ++++ configure.ac 2012-10-28 03:19:38.000000000 -0700 @@ -126,35 +126,11 @@ case "${host_os}" in SYS=dragonfly ;; @@ -37,6 +37,6 @@ + CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS" + OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99" + LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names" - VLC_ADD_LIBS([motion], [-Wl,-framework,IOKit,-framework,CoreFoundation]) - VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,Appkit]) + VLC_ADD_LIBS([motion rotate], [-Wl,-framework,IOKit,-framework,CoreFoundation]) + VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit]) VLC_ADD_LIBS([avcodec access_avio swscale postproc i420_rgb_mmx x264 x26410b],[-Wl,-read_only_relocs,suppress])