[117529] trunk/dports/multimedia/VLC-devel

[jeremyhu at macports.org]

Revision: 117529
          https://trac.macports.org/changeset/117529
Author:   jeremyhu at macports.org
Date:     2014-03-02 20:01:25 -0800 (Sun, 02 Mar 2014)
Log Message:
-----------
VLC-devel: Add vcd support

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

Added Paths:
-----------
    trunk/dports/multimedia/VLC-devel/files/vcdx.patch

Modified: trunk/dports/multimedia/VLC-devel/Portfile
===================================================================
--- trunk/dports/multimedia/VLC-devel/Portfile	2014-03-03 02:18:27 UTC (rev 117528)
+++ trunk/dports/multimedia/VLC-devel/Portfile	2014-03-03 04:01:25 UTC (rev 117529)
@@ -6,7 +6,7 @@
 
 name                VLC-devel
 version             2.1.99
-revision            9
+revision            10
 
 categories          multimedia
 
@@ -47,7 +47,7 @@
                 port:ncurses port:lua port:libpng port:jpeg port:tiff port:libebml \
                 port:gnutls port:taglib port:libxml2 port:faad2 \
                 port:x264 port:libtheora port:twolame port:libssh2 \
-                port:libdvdnav port:libdvdread port:libproxy \
+                port:libdvdnav port:libdvdread port:vcdimager port:libproxy \
                 port:fluidsynth port:libsamplerate port:libupnp \
                 port:avahi path:lib/libavcodec.dylib:ffmpeg \
                 port:openjpeg15 port:libbluray port:FreeRDP port:live555 \
@@ -82,7 +82,8 @@
     class_struct.patch \
     static_assert.patch \
     no-sparkle.patch \
-    rdp.patch
+    rdp.patch \
+    vcdx.patch
 
 post-patch {
     reinplace "s:librsvg-2/librsvg:librsvg:" \
@@ -138,7 +139,7 @@
 # Input Plugins
 # build fails when opencv is installed
 configure.args-append \
-    --enable-dvdnav --enable-dvdread --disable-smbclient --disable-vcdx \
+    --enable-dvdnav --enable-dvdread --disable-smbclient --enable-vcdx \
     --disable-macosx-qtkit --disable-macosx-eyetv --disable-realrtsp \
     --enable-freerdp --disable-opencv \
     --enable-sftp
@@ -204,24 +205,6 @@
     configure.args-append   --enable-shout
 }
 
-# TODO: libvcdx_plugin.la fails to link, eg:
-#   "_cdio_log_set_handler", referenced from:
-#      _VCDOpen in libvcdx_plugin_la-access.o
-#  "_cdio_read_mode2_sector", referenced from:
-#      _vcdplayer_read in libvcdx_plugin_la-vcdplayer.o
-#  "_vcd_log_set_handler", referenced from:
-#      _VCDOpen in libvcdx_plugin_la-access.o
-#  "_vcdinf_get_bsn", referenced from:
-#      _vcdplayer_read in libvcdx_plugin_la-vcdplayer.o
-#  "_vcdinf_get_loop_count", referenced from:
-#      _vcdplayer_read in libvcdx_plugin_la-vcdplayer.o
-#      _VCDMetaInfo in libvcdx_plugin_la-info.o
-#variant vcd description {Enable VCD support} {
-#    depends_lib-append      port:vcdimager
-#    configure.args-delete   --disable-vcdx
-#    configure.args-append   --enable-vcdx
-#}
-
 variant smb description {Enable Samba 3 input support} {
     depends_lib-append      port:samba3
     configure.args-delete   --disable-smbclient

Added: trunk/dports/multimedia/VLC-devel/files/vcdx.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/vcdx.patch	                        (rev 0)
+++ trunk/dports/multimedia/VLC-devel/files/vcdx.patch	2014-03-03 04:01:25 UTC (rev 117529)
@@ -0,0 +1,14 @@
+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/20140302/7907b7cb/attachment.html>