[125484] trunk/dports/multimedia/VLC

devans at macports.org devans at macports.org
Thu Sep 18 08:08:20 PDT 2014


Revision: 125484
          https://trac.macports.org/changeset/125484
Author:   devans at macports.org
Date:     2014-09-18 08:08:20 -0700 (Thu, 18 Sep 2014)
Log Message:
-----------
VLC: update to version 2.1.5, dependencies, configuration, variants.

Modified Paths:
--------------
    trunk/dports/multimedia/VLC/Portfile
    trunk/dports/multimedia/VLC/files/qtkit.patch

Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile	2014-09-18 14:34:29 UTC (rev 125483)
+++ trunk/dports/multimedia/VLC/Portfile	2014-09-18 15:08:20 UTC (rev 125484)
@@ -5,8 +5,7 @@
 PortGroup           compiler_blacklist_versions 1.0
 
 name                VLC
-version             2.1.4
-revision            1
+version             2.1.5
 categories          multimedia
 
 maintainers         nomaintainer
@@ -34,54 +33,25 @@
 distname            vlc-${version}
 use_xz              yes
 
-checksums           md5     7ed67d22f7425011078772bfc62ac222 \
-                    sha1    53896c88947803193a21fb4619f34034bad05920 \
-                    rmd160  4934dea1d9399500fc1ba90e8ee9436604791cdc
-                    
+checksums           md5     3941b561f590cc95ca5e795213cba2f2 \
+                    sha1    7f1cb6324a04cf393896bbb5976ca9febd7b3efc \
+                    rmd160  4a18210f0f01ac8dfaf166926ab10eea6d97fbae
+
 depends_build       port:pkgconfig
 
 depends_lib         \
-                    port:a52dec \
-                    port:avahi \
-                    port:dirac \
-                    port:faad2 \
-                    path:lib/libavcodec.dylib:ffmpeg \
-                    port:flac \
-                    port:fluidsynth \
-                    port:gnutls \
                     port:jpeg \
                     port:lame \
-                    port:libbluray \
-                    port:libcddb \
                     port:libcdio \
-                    port:libdc1394 \
-                    port:libdca \
-                    port:libdvdnav \
-                    port:libdvdread \
                     port:libebml \
                     port:libgcrypt \
                     port:libid3tag \
-                    port:libmad \
                     port:libmatroska \
                     port:libmpeg2 \
-                    port:libogg \
-                    port:libopus \
-                    port:libpng \
-                    port:libsamplerate \
-                    port:libssh2 \
-                    port:libtheora \
-                    port:libupnp \
-                    port:libvorbis \
                     port:libxml2 \
-                    port:lua \
-                    port:ncurses \
                     port:openjpeg15 \
-                    port:pulseaudio \
-                    port:schroedinger \
                     port:taglib \
                     port:tiff \
-                    port:twolame \
-                    port:x264
 
 # TODO: live555 opencv FreeRDP
 
@@ -136,105 +106,213 @@
 livecheck.regex     <a href=\"(\\d\[\\d|\.|\\w\]+).*/\">
 
 # Other
+
+depends_lib-append  port:gnutls \
+                    port:lua
+
 configure.args-append \
                     --with-contrib=${worksrcpath}/contrib \
-                    --disable-debug --disable-update-check --enable-gnutls \
-                    --disable-notify --disable-dbus \
-                    --disable-gnomevfs --disable-growl --disable-macosx-vlc-app \
+                    --disable-debug \
+                    --disable-update-check \
+                    --disable-dbus \
+                    --disable-growl \
+                    --disable-macosx-vlc-app \
+                    --disable-notify \
+                    --enable-gnutls \
                     --enable-lua
 
 # Input Plugins
 # build fails when FreeRDP is installed
 # build fails when opencv is installed
+
+depends_lib-append  \
+                    port:libbluray \
+                    port:libcddb \
+                    port:libdc1394 \
+                    port:libdvdnav \
+                    port:libdvdread \
+                    port:libssh2
+
 configure.args-append \
-                    --enable-dvdnav --enable-dvdread --disable-smbclient --disable-vcdx \
-                    --disable-macosx-qtkit --disable-macosx-eyetv --disable-realrtsp \
-                    --disable-libfreerdp --enable-dc1394 --disable-dv1394 --disable-opencv \
-                    --enable-sftp --disable-libvnc --disable-decklink
+                    --disable-decklink \
+                    --disable-dv1394 \
+                    --disable-gnomevfs \
+                    --disable-libfreerdp \
+                    --disable-libvnc \
+                    --disable-linsys \
+                    --disable-macosx-eyetv \
+                    --disable-macosx-qtkit \
+                    --disable-macosx-avfoundation \
+                    --disable-opencv \
+                    --disable-realrtsp \
+                    --disable-smbclient \
+                    --disable-v4l2 \
+                    --disable-vcdx \
+                    --enable-bluray \
+                    --enable-dc1394 \
+                    --enable-dvdnav \
+                    --enable-dvdread \
+                    --enable-libcddb \
+                    --enable-sftp \
+                    --enable-vcd
 
 # Mux/Demux Plugins
+depends_lib-append \
+                    port:libogg
+
 configure.args-append \
-                    --disable-dvbpsi --enable-ogg --enable-mux_ogg \
-                    --enable-mkv --disable-mod --disable-mpc \
-                    --disable-sid --disable-shout
+                    --disable-dvbpsi \
+                    --disable-gme \
+                    --disable-mod \
+                    --disable-mpc \
+                    --disable-sid \
+                    --disable-shout \
+                    --enable-mkv \
+                    --enable-mux_ogg \
+                    --enable-ogg
 
 # Codec Plugins
+
+depends_lib-append  \
+                    port:a52dec \
+                    path:lib/libavcodec.dylib:ffmpeg \
+                    port:libdca \
+                    port:dirac \
+                    port:faad2 \
+                    port:flac \
+                    port:fluidsynth \
+                    port:libmad \
+                    port:libopus \
+                    port:libpng \
+                    port:schroedinger \
+                    port:libtheora \
+                    port:twolame \
+                    port:libvorbis \
+                    port:x264
+
+
 configure.args-append \
-                    --enable-a52 --enable-faad --enable-flac --disable-live555 \
-                    --enable-opus --enable-vorbis --enable-ogg --enable-mad --disable-libass \
-                    --enable-dca --enable-png --disable-quicktime --enable-twolame \
-                    --disable-speex --enable-theora --enable-x264 --enable-postproc \
-                    --enable-avcodec --enable-avformat --enable-swscale \
-                    --enable-fluidsynth --disable-kate --disable-libva \
-                    --disable-quicksync --disable-zvbi --disable-tiger --enable-telx \
-                    --enable-dirac --enable-schroedinger
+                    --disable-crystalhd \
+                    --disable-dxva2 \
+                    --disable-fdkaac \
+                    --disable-kate \
+                    --disable-libass \
+                    --disable-libva \
+                    --disable-live555 \
+                    --disable-omxil \
+                    --disable-omxil-vout \
+                    --disable-quicksync \
+                    --disable-quicktime \
+                    --disable-rpi-omxil \
+                    --disable-speex \
+                    --disable-tiger \
+                    --disable-wma-fixed \
+                    --disable-shine \
+                    --disable-zvbi \
+                    --enable-a52 \
+                    --enable-avcodec \
+                    --enable-avformat \
+                    --enable-dca \
+                    --enable-dirac \
+                    --enable-faad \
+                    --enable-flac \
+                    --enable-fluidsynth \
+                    --enable-mad \
+                    --enable-opus \
+                    --enable-png \
+                    --enable-postproc \
+                    --enable-schroedinger \
+                    --enable-swscale \
+                    --enable-telx \
+                    --enable-theora \
+                    --enable-twolame \
+                    --enable-vorbis \
+                    --enable-x264
 
 # Video Plugins
+
 configure.args-append \
-                    --disable-caca --disable-sdl --disable-macosx-vout \
-                    --without-x --disable-xcb --disable-xvideo --disable-glx \
-                    --disable-fontconfig --disable-freetype --disable-fribidi \
-                    --disable-svg
+                    --without-x \
+                    --disable-aa \
+                    --disable-caca \
+                    --disable-egl \
+                    --disable-fontconfig \
+                    --disable-freetype \
+                    --disable-fribidi \
+                    --disable-gles1 \
+                    --disable-gles2 \
+                    --disable-glx \
+                    --disable-macosx-vout \
+                    --disable-sdl \
+                    --disable-sdl-image \
+                    --disable-svg \
+                    --disable-vdpau \
+                    --disable-xcb \
+                    --disable-xvideo
 
 # Audio Plugins
+depends_lib-append  \
+                    port:libsamplerate \
+                    port:pulseaudio
+
 configure.args-append \
-                    --disable-macosx-audio --disable-jack --enable-samplerate \
-                    --disable-chromaprint
+                    --disable-chromaprint \
+                    --disable-jack \
+                    --disable-macosx-audio \
+                    --enable-pulse \
+                    --enable-samplerate
 
 # Interface Plugins
+depends_lib-append  \
+                    port:ncurses
+
 configure.args-append \
-                    --disable-macosx --disable-macosx-dialog-provider \
-                    --disable-qt --enable-ncurses --disable-skins2
+                    --disable-macosx \
+                    --disable-macosx-dialog-provider \
+                    --disable-qt \
+                    --disable-skins2 \
+                    --enable-ncurses
 
 # Visualisations and Video Filter Plugins
 configure.args-append \
-                    --disable-goom --disable-projectm --disable-vsxu
+                    --disable-goom \
+                    --disable-projectm \
+                    --disable-vsxu
 
 # Service Discovery Plugins
+depends_lib-append  \
+                    port:avahi \
+                    port:libupnp
+
 configure.args-append \
-                    --enable-bonjour --enable-upnp \
-                    --disable-udev --disable-mtp
+                    --disable-mtp \
+                    --disable-udev \
+                    --enable-bonjour \
+                    --enable-upnp
 
-variant jack description {Enable jack plugin for audio output} {
-    depends_lib-append      port:jack
-    configure.args-delete   --disable-jack
-    configure.args-append   --enable-jack
-}
-
-variant qtkit description {Enable qtcapture and qtaudio} {
-    configure.args-delete   --disable-macosx-qtkit
-    configure.args-append   --enable-macosx-qtkit
-}
-
 variant eyetv description {Enable eyetv plugin} {
     configure.args-delete --disable-macosx-eyetv
     configure.args-append --enable-macosx-eyetv
 }
 
-variant speex description {Enable Speex decoder support} {
-    depends_lib-append      path:lib/libspeex.dylib:speex
-    configure.args-delete   --disable-speex
-    configure.args-append   --enable-speex
+variant dvb description {enable DVB Program Specific Information support} {
+    depends_lib-append      port:libdvbpsi
+    configure.args-delete   --disable-dvbpsi
+    configure.args-append   --enable-dvbpsi
 }
 
-variant svg description {Enable SVG support} {
-    depends_lib-append      port:librsvg
-    configure.args-delete   --disable-svg
-    configure.args-append   --enable-svg
+variant fribidi requires osd description {Enable FriBidi Unicode support} {
+    depends_lib-append      port:fribidi
+    configure.args-delete   --disable-fribidi
+    configure.args-append   --enable-fribidi
 }
 
-variant shout description {Enable Shoutcast support} {
-    depends_lib-append      port:libshout2
-    configure.args-delete   --disable-shout
-    configure.args-append   --enable-shout
+variant jack description {Enable jack plugin for audio output} {
+    depends_lib-append      port:jack
+    configure.args-delete   --disable-jack
+    configure.args-append   --enable-jack
 }
 
-variant vcd description {Enable VCD support} {
-    depends_lib-append      port:vcdimager
-    configure.args-delete   --disable-vcdx
-    configure.args-append   --enable-vcdx
-}
-
 variant mod description {Enable MOD demuxer support} {
     depends_lib-append      port:libmodplug
     configure.args-delete   --disable-mod
@@ -247,22 +325,15 @@
     configure.args-append   --enable-mpc
 }
 
-variant dvb description {enable DVB Program Specific Information support} {
-    depends_lib-append      port:libdvbpsi
-    configure.args-delete   --disable-dvbpsi
-    configure.args-append   --enable-dvbpsi
-}
-
 variant osd description {Enable onscreen display and TrueType font support} {
     depends_lib-append      port:fontconfig port:freetype
     configure.args-delete   --disable-freetype --disable-fontconfig
     configure.args-append   --enable-freetype --enable-fontconfig
 }
 
-variant fribidi requires osd description {Enable FriBidi Unicode support} {
-    depends_lib-append      port:fribidi
-    configure.args-delete   --disable-fribidi
-    configure.args-append   --enable-fribidi
+variant qtkit description {Enable qtcapture and qtaudio} {
+    configure.args-delete   --disable-macosx-qtkit
+    configure.args-append   --enable-macosx-qtkit
 }
 
 variant sdl description {Enable SDL/SDL-Image support} {
@@ -271,6 +342,12 @@
     configure.args-append   --enable-sdl
 }
 
+variant shout description {Enable Shoutcast support} {
+    depends_lib-append      port:libshout2
+    configure.args-delete   --disable-shout
+    configure.args-append   --enable-shout
+}
+
 variant smb description {Enable Samba 3 support} {
     depends_lib-append      port:samba3
     configure.args-delete   --disable-smbclient
@@ -278,6 +355,24 @@
     configure.ldflags-append    -L${prefix}/lib/samba3
 }
 
+variant speex description {Enable Speex decoder support} {
+    depends_lib-append      path:lib/libspeex.dylib:speex
+    configure.args-delete   --disable-speex
+    configure.args-append   --enable-speex
+}
+
+variant svg description {Enable SVG support} {
+    depends_lib-append      port:librsvg
+    configure.args-delete   --disable-svg
+    configure.args-append   --enable-svg
+}
+
+variant vcd description {Enable VCD support} {
+    depends_lib-append      port:vcdimager
+    configure.args-delete   --disable-vcdx
+    configure.args-append   --enable-vcdx
+}
+
 variant x11 {
     depends_lib-append \
         port:mesa \
@@ -287,9 +382,16 @@
         port:xorg-xcb-util \
         port:xorg-xcb-util-keysyms
 
-    configure.args-delete   --without-x --disable-xvideo --disable-glx --disable-xcb
-    configure.args-append   --with-x --x-include=${prefix}/include --x-lib=${prefix}/lib \
-                            --enable-xvideo --enable-glx --enable-xcb
+    configure.args-delete   --without-x \
+                            --disable-glx \
+                            --disable-xcb \
+                            --disable-xvideo
+    configure.args-append   --with-x \
+                            --x-include=${prefix}/include \
+                            --x-lib=${prefix}/lib \
+                            --enable-glx \
+                            --enable-xcb \
+                            --enable-xvideo
 }
 
 variant qt4 description {Build using QT4 UI.  This will use qt4-mac} {
@@ -307,8 +409,13 @@
 
 variant quartz {
     depends_lib-append      port:BGHUDAppKit
-    configure.args-delete   --disable-macosx --disable-macosx-dialog-provider
-    configure.args-append   --enable-macosx --enable-macosx-dialog-provider
+    configure.args-delete   --disable-macosx \
+                            --disable-macosx-avfoundation \
+                            --disable-macosx-dialog-provider \
+                            
+    configure.args-append   --enable-macosx \
+                            --enable-macosx-avfoundation \
+                            --enable-macosx-dialog-provider
 }
 
 default_variants +mod +mpc +osd +quartz

Modified: trunk/dports/multimedia/VLC/files/qtkit.patch
===================================================================
--- trunk/dports/multimedia/VLC/files/qtkit.patch	2014-09-18 14:34:29 UTC (rev 125483)
+++ trunk/dports/multimedia/VLC/files/qtkit.patch	2014-09-18 15:08:20 UTC (rev 125484)
@@ -6,14 +6,3 @@
  SUBDIRS = rtp
  noinst_LTLIBRARIES =
  
---- modules/access/qtsound.m
-+++ modules/access/qtsound.m
-@@ -40,7 +40,7 @@
- #include <vlc_dialog.h>
- 
- //#define QTKIT_VERSION_MIN_REQUIRED 70603
--#define QTKIT_VERSION_MAX_ALLOWED 70700
-+//#define QTKIT_VERSION_MAX_ALLOWED 70700
- 
- #import <QTKit/QTKit.h>
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140918/d726f01c/attachment-0001.html>


More information about the macports-changes mailing list