Ticket #47313: vlc-devel.diff

multimedia/VLC-devel/Portfile

@@ -5 +5 @@
 PortGroup           compiler_blacklist_versions 1.0
 
 name                VLC-devel
-set commit_date     20150427
-version             2.2.2-${commit_date}
+#version             3.0.0-150330-g7491a5ff
+version             3.0.0-150503-g7385062d
 
 categories          multimedia devel
 
@@ -39 +39 @@
 
 
 fetch.type          git
-git.url             git://git.videolan.org/vlc/vlc-2.2.git
-git.branch          25028749dc5f86c04a67ae47fccc7d6ad672ee8a
+if {[file exists ${filespath}/vlc-git/.git]} {
+    git.url         file://${filespath}/vlc-git
+} else {
+    git.url         git://git.videolan.org/vlc/vlc.git
+}
+git.branch          7385062d
 
 depends_build       port:pkgconfig
 
@@ -131 +135 @@
                     configure.ac-no-arch.patch \
                     PR-34741-no__clang_version__.patch \
                     static_assert.patch \
-                    no-sparkle.patch \
-                    dispatch_queue_serial.patch
+                    no-sparkle.patch
 
 post-patch {
     reinplace "s:librsvg-2/librsvg:librsvg:" \
@@ -199 +202 @@
 # claiming the headers and libs are somewhere they're not.
 configure.args-append \
                     --disable-caca --enable-sdl --enable-sdl-image \
-                    --without-x --disable-xcb --disable-xvideo \
+                    --without-x --disable-xcb --disable-xvideo --disable-glx \
                     --x-includes=${destroot} --x-libraries=${destroot} \
                     --enable-freetype --enable-fontconfig --enable-fribidi \
                     --disable-svg
 
 # Audio Plugins
 configure.args-append \
-                    --disable-jack --enable-samplerate
+                    --disable-jack --enable-samplerate --disable-pulse
 
 # Interface Plugins
 configure.args-append \
@@ -349 +352 @@
     configure.args-delete --enable-freerdp
     configure.args-append --disable-freerdp
     depends_lib-delete port:FreeRDP
-    # same goes for pulseaudio
-    configure.args-append --disable-pulse
-    depends_lib-delete port:pulseaudio
 }
 
 platform macosx {
@@ -394 +394 @@
         file mkdir "${worksrcpath}/contrib/lib"
     }
 
+    post-configure {
+        # modules/demux/mkv/util.cpp fails to build in C++11 mode, but there appears to be no
+        # finer-grained way to cancel C++11 mode than for all modules.
+        reinplace "s|-std=c++11||g" ${worksrcpath}/modules/Makefile
+    }
+
     post-destroot {
         eval file delete [glob ${destroot}${prefix}/lib/vlc/plugins/*/*.la]