[117999] trunk/dports/multimedia/VLC-devel
jeremyhu at macports.org
jeremyhu at macports.org
Tue Mar 18 12:29:55 PDT 2014
Revision: 117999
https://trac.macports.org/changeset/117999
Author: jeremyhu at macports.org
Date: 2014-03-18 12:29:55 -0700 (Tue, 18 Mar 2014)
Log Message:
-----------
VLC-devel: Add missing pulseaudio dependency and bump to latest git
Modified Paths:
--------------
trunk/dports/multimedia/VLC-devel/Portfile
Removed Paths:
-------------
trunk/dports/multimedia/VLC-devel/files/rdp.patch
trunk/dports/multimedia/VLC-devel/files/vcdx.patch
Modified: trunk/dports/multimedia/VLC-devel/Portfile
===================================================================
--- trunk/dports/multimedia/VLC-devel/Portfile 2014-03-18 18:32:52 UTC (rev 117998)
+++ trunk/dports/multimedia/VLC-devel/Portfile 2014-03-18 19:29:55 UTC (rev 117999)
@@ -6,7 +6,7 @@
name VLC-devel
version 2.1.99
-revision 12
+revision 13
categories multimedia
@@ -29,7 +29,7 @@
fetch.type git
#git.url git://git.videolan.org/vlc/vlc-2.1.git
git.url git://git.videolan.org/vlc.git
-git.branch 508d92f2f8168ac9def51eea59f133af50352d07
+git.branch 4c156e1054ce76bf305ae103646ce92ed6295e7b
#master_sites http://download.videolan.org/pub/videolan/vlc/${version}/
#distname vlc-${version}
@@ -49,7 +49,7 @@
port:x264 port:libtheora port:twolame port:libssh2 \
port:libdvdnav port:libdvdread port:vcdimager port:libproxy \
port:fluidsynth port:libsamplerate port:libupnp port:opencv \
- port:avahi path:lib/libavcodec.dylib:ffmpeg \
+ port:avahi path:lib/libavcodec.dylib:ffmpeg port:pulseaudio \
port:openjpeg15 port:libbluray port:FreeRDP port:live555 \
port:libdc1394 port:libmpeg2 port:libass port:libsdl \
port:libsdl_image port:schroedinger port:speex port:libmodplug \
@@ -79,9 +79,7 @@
PR-34741-no__clang_version__.patch \
class_struct.patch \
static_assert.patch \
- no-sparkle.patch \
- rdp.patch \
- vcdx.patch
+ no-sparkle.patch
post-patch {
reinplace "s:librsvg-2/librsvg:librsvg:" \
@@ -119,6 +117,9 @@
# gl.c:121:3: error: Platform not recognized.
configure.cppflags-append -D__unix__=1
+# access/rdp.c:45:11: fatal error: 'freerdp/version.h' file not found
+configure.cppflags-append -DFREERDP_INTERFACE_VERSION -DFREERDP_VERSION_MAJOR=1 -DFREERDP_VERSION_MINOR=1
+
# live555 is installed to a weird location
configure.cppflags-append -I${prefix}/lib/live/liveMedia/include
Deleted: trunk/dports/multimedia/VLC-devel/files/rdp.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/rdp.patch 2014-03-18 18:32:52 UTC (rev 117998)
+++ trunk/dports/multimedia/VLC-devel/files/rdp.patch 2014-03-18 19:29:55 UTC (rev 117999)
@@ -1,50 +0,0 @@
---- modules/access/rdp.c.orig
-+++ modules/access/rdp.c
-@@ -198,17 +198,17 @@
- demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys;
-
- /* Configure connexion */
-- p_instance->settings->sw_gdi = true; /* render in buffer */
-- p_instance->settings->fullscreen = true;
-- p_instance->settings->hostname = strdup( p_sys->psz_hostname );
-- p_instance->settings->username =
-+ p_instance->settings->SoftwareGdi = true; /* render in buffer */
-+ p_instance->settings->Fullscreen = true;
-+ p_instance->settings->ServerHostname = strdup( p_sys->psz_hostname );
-+ p_instance->settings->Username =
- var_InheritString( p_vlccontext->p_demux, CFG_PREFIX "user" );
-- p_instance->settings->password =
-+ p_instance->settings->Password =
- var_InheritString( p_vlccontext->p_demux, CFG_PREFIX "password" );
-- p_instance->settings->port = p_sys->i_port;
-- p_instance->settings->encryption =
-+ p_instance->settings->ServerPort = p_sys->i_port;
-+ p_instance->settings->EncryptionMethods =
- var_InheritBool( p_vlccontext->p_demux, CFG_PREFIX "encrypt" );
--
-+
- return true;
- }
-
-@@ -217,9 +217,9 @@
- vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context;
-
- msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)",
-- p_instance->settings->width,
-- p_instance->settings->height,
-- p_instance->settings->color_depth );
-+ p_instance->settings->DesktopWidth,
-+ p_instance->settings->DesktopHeight,
-+ p_instance->settings->ColorDepth );
-
- p_instance->update->DesktopResize = desktopResizeHandler;
- p_instance->update->BeginPaint = beginPaintHandler;
-@@ -415,7 +415,7 @@
- p_sys->p_instance->Authenticate = authenticateHandler;
-
- /* Set up context handlers and let it be allocated */
-- p_sys->p_instance->context_size = sizeof( vlcrdp_context_t );
-+ p_sys->p_instance->ContextSize = sizeof( vlcrdp_context_t );
- freerdp_context_new( p_sys->p_instance );
-
- vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_sys->p_instance->context;
Deleted: trunk/dports/multimedia/VLC-devel/files/vcdx.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/vcdx.patch 2014-03-18 18:32:52 UTC (rev 117998)
+++ trunk/dports/multimedia/VLC-devel/files/vcdx.patch 2014-03-18 19:29:55 UTC (rev 117999)
@@ -1,14 +0,0 @@
-https://trac.videolan.org/vlc/ticket/10834
---- modules/access/Makefile.am
-+++ modules/access/Makefile.am
-@@ -244,8 +244,9 @@ libvcdx_plugin_la_SOURCES = \
- access/vcdx/vcdplayer.h access/vcdx/vcdplayer.c \
- access/vcdx/info.c access/vcdx/info.h
- libvcdx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-+libvcdx_plugin_la_LIBADD = $(VCDX_LIBS)
- if HAVE_WIN32
--libvcdx_plugin_la_LIBADD = -lwinmm
-+libvcdx_plugin_la_LIBADD += -lwinmm
- endif
- libvcdx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
- if HAVE_DARWIN
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140318/aaafa20b/attachment.html>
More information about the macports-changes
mailing list