[138808] trunk/dports/multimedia

devans at macports.org devans at macports.org
Mon Jul 20 11:35:19 PDT 2015


Revision: 138808
          https://trac.macports.org/changeset/138808
Author:   devans at macports.org
Date:     2015-07-20 11:35:18 -0700 (Mon, 20 Jul 2015)
Log Message:
-----------
ffmpeg, ffmpeg-devel: reformat for more consistent indentation, white space only.

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

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2015-07-20 18:25:44 UTC (rev 138807)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2015-07-20 18:35:18 UTC (rev 138808)
@@ -1,93 +1,92 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem      1.0
-PortGroup       xcodeversion 1.0
-PortGroup       muniversal 1.0
-PortGroup       compiler_blacklist_versions 1.0
-PortGroup       active_variants 1.1
+PortSystem          1.0
+PortGroup           xcodeversion 1.0
+PortGroup           muniversal 1.0
+PortGroup           compiler_blacklist_versions 1.0
+PortGroup           active_variants 1.1
 
-name            ffmpeg
-conflicts       ffmpeg-devel
-epoch           1
-version         2.7.1
-revision        2
-license         LGPL-2.1+
-categories      multimedia
-maintainers     devans jeremyhu openmaintainer
+name                ffmpeg
+conflicts           ffmpeg-devel
+epoch               1
+version             2.7.1
+revision            2
+license             LGPL-2.1+
+categories          multimedia
+maintainers         devans jeremyhu openmaintainer
 
-description     FFmpeg is a complete solution to play, record, convert and \
-                stream audio and video.
+description         FFmpeg is a complete solution to play, record, convert and \
+                    stream audio and video.
 
-long_description        FFmpeg is a complete solution to record, convert and \
-                        stream audio and video. It includes libavcodec, the \
-                        leading audio/video codec library. \
-                        \
-                        The project is made of several components: \
-                        \
-                        ffmpeg is a command line tool to convert one video \
-                        file format to another. It also supports grabbing and \
-                        encoding in real time from a TV card. \
-                        \
-                        ffserver is an HTTP (RTSP is being developed) \
-                        multimedia streaming server for live broadcasts. Time \
-                        shifting of live broadcast is also supported. \
-                        \
-                        ffplay is a simple media player based on SDL and on \
-                        the ffmpeg libraries. \
-                        \
-                        ffprobe gathers information from multimedia streams and \
-                        prints it in human- and machine-readable fashion. \
-                        \
-                        libavcodec is a library containing all the ffmpeg \
-                        audio/video encoders and decoders. Most codecs were \
-                        developed from scratch to ensure best performance \
-                        and high code reusability. \
-                        \
-                        libavformat is a library containing parsers and \
-                        generators for all common audio/video formats.
+long_description    FFmpeg is a complete solution to record, convert and \
+                    stream audio and video. It includes libavcodec, the \
+                    leading audio/video codec library. \
+                    \
+                    The project is made of several components: \
+                    \
+                    ffmpeg is a command line tool to convert one video \
+                    file format to another. It also supports grabbing and \
+                    encoding in real time from a TV card. \
+                    \
+                    ffserver is an HTTP (RTSP is being developed) \
+                    multimedia streaming server for live broadcasts. Time \
+                    shifting of live broadcast is also supported. \
+                    \
+                    ffplay is a simple media player based on SDL and on \
+                    the ffmpeg libraries. \
+                    \
+                    ffprobe gathers information from multimedia streams and \
+                    prints it in human- and machine-readable fashion. \
+                    \
+                    libavcodec is a library containing all the ffmpeg \
+                    audio/video encoders and decoders. Most codecs were \
+                    developed from scratch to ensure best performance \
+                    and high code reusability. \
+                    \
+                    libavformat is a library containing parsers and \
+                    generators for all common audio/video formats.
+platforms           darwin
+homepage            http://www.ffmpeg.org/
+master_sites        http://www.ffmpeg.org/releases/
 
-platforms       darwin
-homepage        http://www.ffmpeg.org/
-master_sites    http://www.ffmpeg.org/releases/
+use_bzip2           yes
 
-use_bzip2       yes
+checksums           rmd160  ee27091f9be74786a53344f3d3c6988ed03ec460 \
+                    sha256  7e07b97d2415feeae9c9b5595e35e7b7aab33207e81bf9f8c0d1eece43f7f720
 
-checksums       rmd160  ee27091f9be74786a53344f3d3c6988ed03ec460 \
-                sha256  7e07b97d2415feeae9c9b5595e35e7b7aab33207e81bf9f8c0d1eece43f7f720
+depends_build       port:pkgconfig \
+                    port:gmake \
+                    port:texinfo
 
-depends_build   port:pkgconfig \
-                port:gmake \
-                port:texinfo
-
 # libvpx is static only so can be considered a build dependency (#47934)
 
 depends_build-append \
-                port:libvpx
+                    port:libvpx
 
-depends_lib     port:lame \
-                port:libiconv \
-                port:libvorbis \
-                port:libopus \
-                port:libogg \
-                port:libtheora \
-                port:libmodplug \
-                port:schroedinger \
-                port:libass \
-                port:libbluray \
-                port:gnutls \
-                port:openjpeg15 \
-                port:fontconfig \
-                port:freetype \
-                port:fribidi \
-                path:lib/libspeex.dylib:speex \
-                port:libsdl \
-                port:bzip2 \
-                port:xz \
-                port:zlib
+depends_lib         port:lame \
+                    port:libiconv \
+                    port:libvorbis \
+                    port:libopus \
+                    port:libogg \
+                    port:libtheora \
+                    port:libmodplug \
+                    port:schroedinger \
+                    port:libass \
+                    port:libbluray \
+                    port:gnutls \
+                    port:openjpeg15 \
+                    port:fontconfig \
+                    port:freetype \
+                    port:fribidi \
+                    path:lib/libspeex.dylib:speex \
+                    port:libsdl \
+                    port:bzip2 \
+                    port:xz \
+                    port:zlib
 
-build.cmd       ${prefix}/bin/gmake
-build.env-append V=1
+build.cmd           ${prefix}/bin/gmake
+build.env-append    V=1
 
 #
 # enable auto configure of asm optimizations
@@ -105,36 +104,35 @@
 # Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
 default_variants-append +gpl2
 
-configure.cflags-append    -DHAVE_LRINTF ${configure.cppflags}
-configure.args \
-        --enable-swscale \
-        --enable-avfilter \
-        --enable-avresample \
-        --enable-libmp3lame \
-        --enable-libvorbis \
-        --enable-libopus \
-        --enable-libtheora \
-        --enable-libschroedinger \
-        --enable-libopenjpeg \
-        --enable-libmodplug \
-        --enable-libvpx \
-        --enable-libspeex \
-        --enable-libass \
-        --enable-libbluray \
-        --enable-lzma \
-        --enable-gnutls \
-        --enable-fontconfig \
-        --enable-libfreetype \
-        --enable-libfribidi \
-        --disable-libxcb \
-        --disable-libxcb-shm \
-        --disable-libxcb-xfixes \
-        --disable-indev=jack \
-        --disable-outdev=xv \
-        --disable-vda \
-        --mandir=${prefix}/share/man \
-        --enable-shared --enable-pthreads \
-        --cc=${configure.cc}
+configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
+configure.args      --enable-swscale \
+                    --enable-avfilter \
+                    --enable-avresample \
+                    --enable-libmp3lame \
+                    --enable-libvorbis \
+                    --enable-libopus \
+                    --enable-libtheora \
+                    --enable-libschroedinger \
+                    --enable-libopenjpeg \
+                    --enable-libmodplug \
+                    --enable-libvpx \
+                    --enable-libspeex \
+                    --enable-libass \
+                    --enable-libbluray \
+                    --enable-lzma \
+                    --enable-gnutls \
+                    --enable-fontconfig \
+                    --enable-libfreetype \
+                    --enable-libfribidi \
+                    --disable-libxcb \
+                    --disable-libxcb-shm \
+                    --disable-libxcb-xfixes \
+                    --disable-indev=jack \
+                    --disable-outdev=xv \
+                    --disable-vda \
+                    --mandir=${prefix}/share/man \
+                    --enable-shared --enable-pthreads \
+                    --cc=${configure.cc}
 
 # disable asm on Tiger
 # libblueray doesn't build on Tiger so disable for now (#39442)
@@ -159,7 +157,7 @@
     }
 }
 
-test.run        yes
+test.run            yes
 
 #
 # configure isn't autoconf and they do use a dep cache
@@ -362,6 +360,6 @@
 "
 }
 
-livecheck.type  regex
-livecheck.url   ${master_sites}
-livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
+livecheck.type      regex
+livecheck.url       ${master_sites}
+livecheck.regex     "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2015-07-20 18:25:44 UTC (rev 138807)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2015-07-20 18:35:18 UTC (rev 138808)
@@ -1,88 +1,88 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem      1.0
-PortGroup       xcodeversion 1.0
-PortGroup       muniversal 1.0
-PortGroup       compiler_blacklist_versions 1.0
-PortGroup       active_variants 1.1
-PortGroup       github 1.0
+PortSystem          1.0
+PortGroup           xcodeversion 1.0
+PortGroup           muniversal 1.0
+PortGroup           compiler_blacklist_versions 1.0
+PortGroup           active_variants 1.1
+PortGroup           github 1.0
 
-github.setup    FFmpeg FFmpeg f8db81074a
-name            ffmpeg-devel
-conflicts       ffmpeg
-version         20150711
-revision        1
-license         LGPL-2.1+
-categories      multimedia
-maintainers     devans jeremyhu openmaintainer
+github.setup        FFmpeg FFmpeg f8db81074a
+name                ffmpeg-devel
+conflicts           ffmpeg
+version             20150711
+revision            1
+license             LGPL-2.1+
+categories          multimedia
+maintainers         devans jeremyhu openmaintainer
 
-description     FFmpeg is a complete solution to play, record, convert and \
-                stream audio and video.
+description         FFmpeg is a complete solution to play, record, convert and \
+                    stream audio and video.
 
-long_description        FFmpeg is a complete solution to record, convert and \
-                        stream audio and video. It includes libavcodec, the \
-                        leading audio/video codec library. \
-                        \
-                        The project is made of several components: \
-                        \
-                        ffmpeg is a command line tool to convert one video \
-                        file format to another. It also supports grabbing and \
-                        encoding in real time from a TV card. \
-                        \
-                        ffserver is an HTTP (RTSP is being developed) \
-                        multimedia streaming server for live broadcasts. Time \
-                        shifting of live broadcast is also supported. \
-                        \
-                        ffplay is a simple media player based on SDL and on \
-                        the ffmpeg libraries. \
-                        \
-                        ffprobe gathers information from multimedia streams and \
-                        prints it in human- and machine-readable fashion. \
-                        \
-                        libavcodec is a library containing all the ffmpeg \
-                        audio/video encoders and decoders. Most codecs were \
-                        developed from scratch to ensure best performance \
-                        and high code reusability. \
-                        \
-                        libavformat is a library containing parsers and \
-                        generators for all common audio/video formats.
+long_description    FFmpeg is a complete solution to record, convert and \
+                    stream audio and video. It includes libavcodec, the \
+                    leading audio/video codec library. \
+                    \
+                    The project is made of several components: \
+                    \
+                    ffmpeg is a command line tool to convert one video \
+                    file format to another. It also supports grabbing and \
+                    encoding in real time from a TV card. \
+                    \
+                    ffserver is an HTTP (RTSP is being developed) \
+                    multimedia streaming server for live broadcasts. Time \
+                    shifting of live broadcast is also supported. \
+                    \
+                    ffplay is a simple media player based on SDL and on \
+                    the ffmpeg libraries. \
+                    \
+                    ffprobe gathers information from multimedia streams and \
+                    prints it in human- and machine-readable fashion. \
+                    \
+                    libavcodec is a library containing all the ffmpeg \
+                    audio/video encoders and decoders. Most codecs were \
+                    developed from scratch to ensure best performance \
+                    and high code reusability. \
+                    \
+                    libavformat is a library containing parsers and \
+                    generators for all common audio/video formats.
 
-platforms       darwin
-homepage        http://www.ffmpeg.org/
+platforms           darwin
+homepage            http://www.ffmpeg.org/
 
-checksums       rmd160  4c2d11ca4c7dc14396859bdbb578adaf0f0f2013 \
-                sha256  627f1d4faedc371e93cec5cbfe5237ae282c06cf42979ffedc1661ca9d10697c
+checksums           rmd160  4c2d11ca4c7dc14396859bdbb578adaf0f0f2013 \
+                    sha256  627f1d4faedc371e93cec5cbfe5237ae282c06cf42979ffedc1661ca9d10697c
 
-depends_build   port:pkgconfig \
-                port:gmake \
-                port:texinfo
+depends_build       port:pkgconfig \
+                    port:gmake \
+                    port:texinfo
 
 # libvpx is static only so can be considered a build dependency (#47934)
 
 depends_build-append \
-                port:libvpx
+                    port:libvpx
 
-depends_lib     port:lame \
-                port:libiconv \
-                port:libvorbis \
-                port:libopus \
-                port:libogg \
-                port:libtheora \
-                port:libmodplug \
-                port:schroedinger \
-                port:libass \
-                port:libbluray \
-                port:gnutls \
-                port:openjpeg15 \
-                port:fontconfig \
-                port:freetype \
-                port:fribidi \
-                path:lib/libspeex.dylib:speex \
-                port:libsdl \
-                port:bzip2 \
-                port:xz \
-                port:zlib
+depends_lib         port:lame \
+                    port:libiconv \
+                    port:libvorbis \
+                    port:libopus \
+                    port:libogg \
+                    port:libtheora \
+                    port:libmodplug \
+                    port:schroedinger \
+                    port:libass \
+                    port:libbluray \
+                    port:gnutls \
+                    port:openjpeg15 \
+                    port:fontconfig \
+                    port:freetype \
+                    port:fribidi \
+                    path:lib/libspeex.dylib:speex \
+                    port:libsdl \
+                    port:bzip2 \
+                    port:xz \
+                    port:zlib
 
 #
 # enable auto configure of asm optimizations
@@ -100,36 +100,35 @@
 # Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
 default_variants-append +gpl2
 
-configure.cflags-append    -DHAVE_LRINTF ${configure.cppflags}
-configure.args \
-        --enable-swscale \
-        --enable-avfilter \
-        --enable-avresample \
-        --enable-libmp3lame \
-        --enable-libvorbis \
-        --enable-libopus \
-        --enable-libtheora \
-        --enable-libschroedinger \
-        --enable-libopenjpeg \
-        --enable-libmodplug \
-        --enable-libvpx \
-        --enable-libspeex \
-        --enable-libass \
-        --enable-libbluray \
-        --enable-lzma \
-        --enable-gnutls \
-        --enable-fontconfig \
-        --enable-libfreetype \
-        --enable-libfribidi \
-        --disable-libxcb \
-        --disable-libxcb-shm \
-        --disable-libxcb-xfixes \
-        --disable-indev=jack \
-        --disable-outdev=xv \
-        --disable-vda \
-        --mandir=${prefix}/share/man \
-        --enable-shared --enable-pthreads \
-        --cc=${configure.cc}
+configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
+configure.args      --enable-swscale \
+                    --enable-avfilter \
+                    --enable-avresample \
+                    --enable-libmp3lame \
+                    --enable-libvorbis \
+                    --enable-libopus \
+                    --enable-libtheora \
+                    --enable-libschroedinger \
+                    --enable-libopenjpeg \
+                    --enable-libmodplug \
+                    --enable-libvpx \
+                    --enable-libspeex \
+                    --enable-libass \
+                    --enable-libbluray \
+                    --enable-lzma \
+                    --enable-gnutls \
+                    --enable-fontconfig \
+                    --enable-libfreetype \
+                    --enable-libfribidi \
+                    --disable-libxcb \
+                    --disable-libxcb-shm \
+                    --disable-libxcb-xfixes \
+                    --disable-indev=jack \
+                    --disable-outdev=xv \
+                    --disable-vda \
+                    --mandir=${prefix}/share/man \
+                    --enable-shared --enable-pthreads \
+                    --cc=${configure.cc}
 
 # disable asm on Tiger
 # libblueray doesn't build on Tiger so disable for now (#39442)
@@ -154,10 +153,10 @@
     }
 }
 
-build.cmd       ${prefix}/bin/gmake
-build.env-append V=1
+build.cmd           ${prefix}/bin/gmake
+build.env-append    V=1
 
-test.run        yes
+test.run            yes
 
 destroot.env-append V=1
 
@@ -366,4 +365,4 @@
 #disable livecheck
 #
 
-livecheck.type  none
+livecheck.type      none
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150720/bf9ad4c7/attachment.html>


More information about the macports-changes mailing list