[121533] trunk/dports/multimedia

28 Jun 2014

Revision: 121533
          https://trac.macports.org/changeset/121533
Author:   devans@macports.org
Date:     2014-06-28 08:39:04 -0700 (Sat, 28 Jun 2014)
Log Message:
-----------
VLC, VLC-devel: tab uniformly to ease comparison, whitespace only.

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

Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================

--- trunk/dports/multimedia/VLC/Portfile	2014-06-28 13:01:37 UTC (rev 121532)
+++ trunk/dports/multimedia/VLC/Portfile	2014-06-28 15:39:04 UTC (rev 121533)
@@ -24,10 +24,10 @@
 
 # http://git.videolan.org/?p=vlc.git
 # http://git.videolan.org/?p=vlc.git;a=forks
-#fetch.type      git
-#git.url         git://git.videolan.org/vlc/vlc-2.1.git
-#git.url         git://git.videolan.org/vlc.git
-#git.branch      edd88358218f273fddde646a172a2104796d46c2
+#fetch.type          git
+#git.url             git://git.videolan.org/vlc/vlc-2.1.git
+#git.url             git://git.videolan.org/vlc.git
+#git.branch          edd88358218f273fddde646a172a2104796d46c2
 
 master_sites        http://download.videolan.org/pub/videolan/vlc/${version}/
 distname            vlc-${version}
@@ -36,29 +36,29 @@
 checksums           md5     7ed67d22f7425011078772bfc62ac222 \
                     sha1    53896c88947803193a21fb4619f34034bad05920 \
                     rmd160  4934dea1d9399500fc1ba90e8ee9436604791cdc
+                    
+depends_build       port:pkgconfig
 
-depends_build   port:pkgconfig
+depends_lib         port:lame port:a52dec port:libogg port:flac \
+                    port:libdca port:libcddb port:libcdio port:libgcrypt port:libmad \
+                    port:libopus port:libvorbis port:libmatroska port:libid3tag \
+                    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:fluidsynth port:libsamplerate port:libupnp \
+                    port:avahi path:lib/libavcodec.dylib:ffmpeg port:pulseaudio \
+                    port:dirac port:schroedinger \
+                    port:openjpeg15 port:libbluray \
+                    port:libdc1394 port:libmpeg2
 
-depends_lib     port:lame port:a52dec port:libogg port:flac \
-                port:libdca port:libcddb port:libcdio port:libgcrypt port:libmad \
-                port:libopus port:libvorbis port:libmatroska port:libid3tag \
-                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:fluidsynth port:libsamplerate port:libupnp \
-                port:avahi path:lib/libavcodec.dylib:ffmpeg port:pulseaudio \
-                port:dirac port:schroedinger \
-                port:openjpeg15 port:libbluray \
-                port:libdc1394 port:libmpeg2
-
 # TODO: live555 opencv FreeRDP
 
 # VLC-2.1 and later are x86_64-only: https://trac.videolan.org/vlc/ticket/8161
 universal_variant   no
-supported_archs x86_64
+supported_archs     x86_64
 
-compiler.blacklist gcc-4.2 llvm-gcc-4.2 {clang < 300}
+compiler.blacklist  gcc-4.2 llvm-gcc-4.2 {clang < 300}
 
 pre-fetch {
     if {${os.platform} eq "darwin" && ${os.major} < 10} {
@@ -67,14 +67,13 @@
     }
 }
 
-patchfiles \
-    buildfix-package.mak.patch \
-    configure.ac-no-arch.patch \
-    PR-34741-no__clang_version__.patch \
-    class_struct.patch \
-    qtkit.patch \
-    static_assert.patch \
-    no-sparkle.patch
+patchfiles          buildfix-package.mak.patch \
+                    configure.ac-no-arch.patch \
+                    PR-34741-no__clang_version__.patch \
+                    class_struct.patch \
+                    qtkit.patch \
+                    static_assert.patch \
+                    no-sparkle.patch
 
 post-patch {
     reinplace "s:librsvg-2/librsvg:librsvg:" \
@@ -99,71 +98,71 @@
 # gl.c:121:3: error: Platform not recognized.
 configure.cppflags-append -D__unix__=1
 
-build.target    all
-destroot.target install
+build.target        all
+destroot.target     install
 
-livecheck.url   http://download.videolan.org/pub/videolan/vlc/
-livecheck.regex <a href=\"(\\d\[\\d|\.|\\w\]+).*/\">
+livecheck.url       http://download.videolan.org/pub/videolan/vlc/
+livecheck.regex     <a href=\"(\\d\[\\d|\.|\\w\]+).*/\">
 
 # Other
 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 \
-    --enable-lua
+                    --with-contrib=${worksrcpath}/contrib \
+                    --disable-debug --disable-update-check --enable-gnutls \
+                    --disable-notify --disable-dbus \
+                    --disable-gnomevfs --disable-growl --disable-macosx-vlc-app \
+                    --enable-lua
 
 # Input Plugins
 # build fails when FreeRDP is installed
 # build fails when opencv is installed
 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
+                    --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
 
 # Mux/Demux Plugins
 configure.args-append \
-    --disable-dvbpsi --enable-ogg --enable-mux_ogg \
-    --enable-mkv --disable-mod --disable-mpc \
-    --disable-sid --disable-shout
+                    --disable-dvbpsi --enable-ogg --enable-mux_ogg \
+                    --enable-mkv --disable-mod --disable-mpc \
+                    --disable-sid --disable-shout
 
 # Codec Plugins
 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
+                    --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
 
 # 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
+                    --disable-caca --disable-sdl --disable-macosx-vout \
+                    --without-x --disable-xcb --disable-xvideo --disable-glx \
+                    --disable-fontconfig --disable-freetype --disable-fribidi \
+                    --disable-svg
 
 # Audio Plugins
 configure.args-append \
-    --disable-macosx-audio --disable-jack --enable-samplerate \
-    --disable-chromaprint
+                    --disable-macosx-audio --disable-jack --enable-samplerate \
+                    --disable-chromaprint
 
 # Interface Plugins
 configure.args-append \
-    --disable-macosx --disable-macosx-dialog-provider \
-    --disable-qt --enable-ncurses --disable-skins2
+                    --disable-macosx --disable-macosx-dialog-provider \
+                    --disable-qt --enable-ncurses --disable-skins2
 
 # Visualisations and Video Filter Plugins
 configure.args-append \
-    --disable-goom --disable-projectm --disable-vsxu
+                    --disable-goom --disable-projectm --disable-vsxu
 
 # Service Discovery Plugins
 configure.args-append \
-    --enable-bonjour --enable-upnp \
-    --disable-udev --disable-mtp
+                    --enable-bonjour --enable-upnp \
+                    --disable-udev --disable-mtp
 
 variant jack description {Enable jack plugin for audio output} {
     depends_lib-append      port:jack

Modified: trunk/dports/multimedia/VLC-devel/Portfile
===================================================================
--- trunk/dports/multimedia/VLC-devel/Portfile	2014-06-28 13:01:37 UTC (rev 121532)
+++ trunk/dports/multimedia/VLC-devel/Portfile	2014-06-28 15:39:04 UTC (rev 121533)
@@ -26,10 +26,10 @@
 
 # http://git.videolan.org/?p=vlc.git
 # http://git.videolan.org/?p=vlc.git;a=forks
-fetch.type      git
-#git.url         git://git.videolan.org/vlc/vlc-2.1.git
-git.url         git://git.videolan.org/vlc.git
-git.branch      4c156e1054ce76bf305ae103646ce92ed6295e7b
+fetch.type          git
+#git.url             git://git.videolan.org/vlc/vlc-2.1.git
+git.url             git://git.videolan.org/vlc.git
+git.branch          4c156e1054ce76bf305ae103646ce92ed6295e7b
 
 #master_sites        http://download.videolan.org/pub/videolan/vlc/${version}/
 #distname            vlc-${version}
@@ -39,32 +39,32 @@
 #                    sha1    40d0ed360dd3fa7dc3ff4fbc9c319553ebb22538 \
 #                    rmd160  9d932e1be72b65cf47057191d9e84deeedea282c
 
-depends_build   port:pkgconfig
+depends_build       port:pkgconfig
 
-depends_lib     port:lame port:a52dec port:libogg port:flac \
-                port:libdca port:libcddb port:libcdio port:libgcrypt port:libmad \
-                port:libopus port:libvorbis port:libmatroska port:libid3tag \
-                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:vcdimager port:libproxy \
-                port:fluidsynth port:libsamplerate port:libupnp port:opencv \
-                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 \
-                port:libmpcdec port:fontconfig port:freetype port:fribidi port:libdvbpsi \
-                port:XviD port:bzip2 port:gettext path:lib/pkgconfig/glib-2.0.pc:glib2 port:gmp \
-                port:libgpg-error port:libiconv port:libidn port:libsndfile \
-                port:libusb port:nettle port:openssl port:orc port:p11-kit \
-                port:readline port:xorg-libX11 port:xorg-libXau port:xorg-libXdmcp \
-                port:xorg-libXext port:xorg-libXrandr port:xorg-libxcb port:xrender
+depends_lib         port:lame port:a52dec port:libogg port:flac \
+                    port:libdca port:libcddb port:libcdio port:libgcrypt port:libmad \
+                    port:libopus port:libvorbis port:libmatroska port:libid3tag \
+                    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:vcdimager port:libproxy \
+                    port:fluidsynth port:libsamplerate port:libupnp port:opencv \
+                    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 \
+                    port:libmpcdec port:fontconfig port:freetype port:fribidi port:libdvbpsi \
+                    port:XviD port:bzip2 port:gettext path:lib/pkgconfig/glib-2.0.pc:glib2 port:gmp \
+                    port:libgpg-error port:libiconv port:libidn port:libsndfile \
+                    port:libusb port:nettle port:openssl port:orc port:p11-kit \
+                    port:readline port:xorg-libX11 port:xorg-libXau port:xorg-libXdmcp \
+                    port:xorg-libXext port:xorg-libXrandr port:xorg-libxcb port:xrender
 
 # VLC-2.1 and later are x86_64-only: https://trac.videolan.org/vlc/ticket/8161
 universal_variant   no
-supported_archs x86_64
+supported_archs     x86_64
 
-compiler.blacklist gcc-4.2 llvm-gcc-4.2 {clang < 300}
+compiler.blacklist  gcc-4.2 llvm-gcc-4.2 {clang < 300}
 
 pre-fetch {
     if {${os.platform} eq "darwin" && ${os.major} < 10} {
@@ -73,13 +73,12 @@
     }
 }
 
-patchfiles \
-    buildfix-package.mak.patch \
-    configure.ac-no-arch.patch \
-    PR-34741-no__clang_version__.patch \
-    class_struct.patch \
-    static_assert.patch \
-    no-sparkle.patch
+patchfiles          buildfix-package.mak.patch \
+                    configure.ac-no-arch.patch \
+                    PR-34741-no__clang_version__.patch \
+                    class_struct.patch \
+                    static_assert.patch \
+                    no-sparkle.patch
 
 post-patch {
     reinplace "s:librsvg-2/librsvg:librsvg:" \
@@ -110,61 +109,61 @@
 # live555 is installed to a weird location
 configure.cppflags-append -I${prefix}/lib/live/liveMedia/include
 
-build.target    all
-destroot.target install
+build.target        all
+destroot.target     install
 
-livecheck.type  none
+livecheck.type      none
 
 # Other
 configure.args-append \
-    --with-contrib=${worksrcpath}/contrib \
-    --disable-debug --disable-update-check --enable-gnutls \
-    --disable-notify --disable-dbus --enable-lua \
-    --disable-gnomevfs --disable-growl --disable-macosx-vlc-app
+                    --with-contrib=${worksrcpath}/contrib \
+                    --disable-debug --disable-update-check --enable-gnutls \
+                    --disable-notify --disable-dbus --enable-lua \
+                    --disable-gnomevfs --disable-growl --disable-macosx-vlc-app
 
 # Input Plugins
 configure.args-append \
-    --enable-dvdnav --enable-dvdread --disable-smbclient --enable-vcdx \
-    --disable-macosx-qtkit --disable-macosx-eyetv --disable-realrtsp \
-    --enable-freerdp --enable-opencv --enable-sftp
+                    --enable-dvdnav --enable-dvdread --disable-smbclient --enable-vcdx \
+                    --disable-macosx-qtkit --disable-macosx-eyetv --disable-realrtsp \
+                    --enable-freerdp --enable-opencv --enable-sftp
 
 # Mux/Demux Plugins
 configure.args-append \
-    --enable-dvbpsi --enable-ogg --enable-mux_ogg \
-    --enable-mkv --enable-mod --enable-mpc --disable-shout
+                    --enable-dvbpsi --enable-ogg --enable-mux_ogg \
+                    --enable-mkv --enable-mod --enable-mpc --disable-shout
 
 # Codec Plugins
 configure.args-append \
-    --enable-a52 --enable-faad --enable-flac --enable-live555 \
-    --enable-opus --enable-vorbis --enable-ogg --enable-mad --enable-libass \
-    --enable-dca --enable-png --disable-quicktime --enable-twolame \
-    --enable-speex --enable-theora --enable-x264 --enable-postproc \
-    --enable-avcodec --enable-avformat --enable-swscale \
-    --disable-fluidsynth --enable-schroedinger
+                    --enable-a52 --enable-faad --enable-flac --enable-live555 \
+                    --enable-opus --enable-vorbis --enable-ogg --enable-mad --enable-libass \
+                    --enable-dca --enable-png --disable-quicktime --enable-twolame \
+                    --enable-speex --enable-theora --enable-x264 --enable-postproc \
+                    --enable-avcodec --enable-avformat --enable-swscale \
+                    --disable-fluidsynth --enable-schroedinger
 
 # Video Plugins
 configure.args-append \
-    --disable-caca --enable-sdl --enable-sdl-image --disable-macosx-vout \
-    --without-x --disable-xcb --disable-xvideo --disable-glx \
-    --enable-freetype --enable-fontconfig --enable-fribidi \
-    --disable-svg
+                    --disable-caca --enable-sdl --enable-sdl-image --disable-macosx-vout \
+                    --without-x --disable-xcb --disable-xvideo --disable-glx \
+                    --enable-freetype --enable-fontconfig --enable-fribidi \
+                    --disable-svg
 
 # Audio Plugins
 configure.args-append \
-    --disable-macosx-audio --disable-jack --enable-samplerate
+                    --disable-macosx-audio --disable-jack --enable-samplerate
 
 # Interface Plugins
 configure.args-append \
-    --disable-macosx --disable-macosx-dialog-provider \
-    --disable-qt --enable-ncurses --disable-skins2
+                    --disable-macosx --disable-macosx-dialog-provider \
+                    --disable-qt --enable-ncurses --disable-skins2
 
 # Visualisations and Video Filter Plugins
 configure.args-append \
-    --disable-goom
+                    --disable-goom
 
 # Service Discovery Plugins
 configure.args-append \
-    --enable-bonjour --enable-upnp
+                    --enable-bonjour --enable-upnp
 
 variant jack description {Enable jack and fluidsynth plugins for audio output} {
     depends_lib-append      port:jack port:fluidsynth port:portaudio

    

devans＠macports.org

tags

participants (1)