Ticket #41725: patch-vlc-2.1.3_2014Feb21_01.diff

File patch-vlc-2.1.3_2014Feb21_01.diff, 13.5 KB (added by ctreleaven (Craig Treleaven), 11 years ago)

replaces previous patch

  • Portfile

    old new  
    11# -*- coding: utf-8; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
    2 # $Id: Portfile 116083 2014-01-17 21:01:09Z devans@macports.org $
     2# $Id: Portfile 114384 2013-12-06 23:14:44Z devans@macports.org $
    33
    44PortSystem          1.0
    55PortGroup           compiler_blacklist_versions 1.0
    66
    77name                VLC
    8 version             2.1.2
    9 revision            1
     8version             2.1.3
    109categories          multimedia
    1110
    1211maintainers         jeremyhu openmaintainer
    13 description         VLC is a cross-platform media player and streaming server
     12description         media player and streaming server
    1413long_description    VLC media player is a highly portable multimedia player for \
    1514                    various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, \
    1615                    mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols. \
    … …  
    3433distname            vlc-${version}
    3534use_xz              yes
    3635
    37 checksums           md5     fb6787ad749aadcfaeab3471939b3426 \
    38                     sha1    2b0ef3a3767c56d64a2815c772c8b3f865018e70 \
    39                     rmd160  8e952218c2be5cb3ed0333ba776bd87477468a63
     36checksums           md5     56a489d093ffef9aa29809116985adba \
     37                    sha1    de3e0b027bbb2dc2451992c428f2bed824128039 \
     38                    rmd160  187337e0149cf9d86b6a4266128cbf0bc5bcf777
    4039
    4140depends_build   port:pkgconfig
    4241
    … …  
    4645                port:ncurses port:lua port:libpng port:jpeg port:tiff port:libebml \
    4746                port:gnutls port:taglib port:libxml2 port:faad2 \
    4847                port:x264 port:libtheora port:twolame port:libssh2 \
    49                 port:libdvdnav port:libdvdread port:libproxy \
    50                 port:fluidsynth port:libsamplerate port:libupnp \
    51                 port:avahi path:lib/libavcodec.dylib:ffmpeg \
    52                 port:openjpeg15 port:libbluray \
    53                 port:libdc1394 port:libmpeg2
     48                port:libdvdnav port:libdvdread port:libsamplerate port:libupnp \
     49                port:avahi path:lib/libavcodec.dylib:ffmpeg port:openjpeg15 port:libbluray \
     50                port:libdc1394 port:libmpeg2 port:dirac port:libass port:libsdl \
     51                port:libsdl_image port:schroedinger port:speex port:libmodplug \
     52                port:libmpcdec port:fontconfig port:freetype port:fribidi port:libdvbpsi
     53
     54# extra deps found by port-depcheck.sh
     55depends_lib-append \
     56                port:XviD port:bzip2 port:gettext port:glib2 port:gmp \
     57                port:libgpg-error port:libiconv port:libidn port:libsndfile \
     58                port:libusb port:nettle port:openssl port:orc port:p11-kit \
     59                port:readline port:xorg-libX11 port:xorg-libXau port:xorg-libXdmcp \
     60                port:xorg-libXext port:xorg-libXrandr port:xorg-libxcb port:xrender
    5461
    5562# TODO: live555 opencv FreeRDP
    5663
    … …  
    7986post-patch {
    8087    reinplace "s:librsvg-2/librsvg:librsvg:" \
    8188        ${worksrcpath}/modules/text_renderer/svg.c
    82 
    83     set cxxstdlib {}
    84 
    85     if {[info exists configure.cxx_stdlib] &&
    86         ${configure.cxx_stdlib} ne {} &&
    87         [string match *clang* ${configure.cxx}]} {
    88         set cxxstdlib ${configure.cxx_stdlib}
    89     } elseif {[string match *clang* ${configure.cxx}] &&
    90               ${os.major} >= 13} {
    91         set cxxstdlib libc++
    92     } else {
    93         set cxxstdlib libstdc++
    94     }
    95 
    96     if {${cxxstdlib} == "libc++"} {
    97         reinplace "s:-lstdc\+\+:-lc++:" \
    98             ${worksrcpath}/configure.ac \
    99             ${worksrcpath}/modules/access/Makefile.am
    100     }
    10189}
    10290
    10391use_autoreconf      yes
    … …  
    10795depends_build-append port:libtool port:autoconf port:automake
    10896
    10997configure.env-append CXXCPP="${configure.cxx} -E"
    110 build.args-append    DESTDIR=${worksrcpath}/dest_ignore V=1
     98build.args-append    DESTDIR=${worksrcpath}/dest_ignore
    11199
    112100# gl.c:121:3: error: Platform not recognized.
    113101configure.cppflags-append -D__unix__=1
    … …  
    122110configure.args-append \
    123111    --with-contrib=${worksrcpath}/contrib \
    124112    --disable-debug --disable-update-check --enable-gnutls \
    125     --disable-notify --disable-telepathy --disable-dbus \
     113    --disable-notify --disable-dbus \
    126114    --disable-gnomevfs --disable-growl --disable-macosx-vlc-app \
    127     --enable-libproxy --enable-lua
     115    --enable-lua
    128116
    129117# Input Plugins
    130118# build fails when FreeRDP is installed
    131119# build fails when opencv is installed
    132120configure.args-append \
    133     --enable-dvdnav --enable-dvdread --disable-smb --disable-vcdx \
     121    --enable-dvdnav --enable-dvdread --disable-smbclient --disable-vcdx \
    134122    --disable-macosx-qtkit --disable-macosx-eyetv --disable-realrtsp \
    135123    --disable-libfreerdp --disable-opencv \
    136124    --enable-sftp
    137125
    138126# Mux/Demux Plugins
    139127configure.args-append \
    140     --disable-dvbpsi --enable-ogg --enable-mux_ogg \
    141     --enable-mkv --disable-mod --disable-mpc --disable-shout
     128    --enable-dvbpsi --enable-ogg --enable-mux_ogg \
     129    --enable-mkv --enable-mod --enable-mpc --disable-shout
    142130
    143131# Codec Plugins
    144132configure.args-append \
    145133    --enable-a52 --enable-faad --enable-flac --disable-live555 \
    146     --enable-opus --enable-vorbis --enable-ogg --enable-mad --disable-libass \
     134    --enable-opus --enable-vorbis --enable-ogg --enable-mad --enable-libass \
    147135    --enable-dca --enable-png --disable-quicktime --enable-twolame \
    148136    --disable-speex --enable-theora --enable-x264 --enable-postproc \
    149137    --enable-avcodec --enable-avformat --enable-swscale \
    150     --enable-fluidsynth
     138    --disable-fluidsynth --enable-dirac --enable-schroedinger --enable-speex
    151139
    152140# Video Plugins
    153141configure.args-append \
    154     --disable-caca --disable-sdl --disable-macosx-vout \
     142    --disable-caca --enable-sdl --enable-sdl-image --disable-macosx-vout \
    155143    --without-x --disable-xcb --disable-xvideo --disable-glx \
    156     --disable-fontconfig --disable-freetype --disable-fribidi \
     144    --enable-freetype --enable-fontconfig --enable-fribidi \
    157145    --disable-svg
    158146
    159147# Audio Plugins
    … …  
    163151# Interface Plugins
    164152configure.args-append \
    165153    --disable-macosx --disable-macosx-dialog-provider \
    166     --disable-qt4 --enable-ncurses --disable-skins2
     154    --disable-qt --enable-ncurses --disable-skins2
    167155
    168156# Visualisations and Video Filter Plugins
    169157configure.args-append \
    … …  
    173161configure.args-append \
    174162    --enable-bonjour --enable-upnp
    175163
    176 variant jack description {Enable jack plugin for audio output} {
    177     depends_lib-append      port:jack
    178     configure.args-delete   --disable-jack
    179     configure.args-append   --enable-jack
     164variant jack description {Enable jack and fluidsynth plugins for audio output} {
     165    depends_lib-append      port:jack port:fluidsynth port:portaudio
     166    configure.args-delete   --disable-jack --disable-fluidsynth
     167    configure.args-append   --enable-jack --enable-fluidsynth
    180168}
    181169
    182170variant qtkit description {Enable qtcapture and qtaudio} {
    … …  
    184172    configure.args-append   --enable-macosx-qtkit
    185173}
    186174
    187 variant eyetv description {Enable eyetv plugin} {
    188     configure.args-delete --disable-macosx-eyetv
    189     configure.args-append --enable-macosx-eyetv
    190 }
    191 
    192 variant speex description {Enable Speex decoder support} {
    193     depends_lib-append      path:lib/libspeex.dylib:speex
    194     configure.args-delete   --disable-speex
    195     configure.args-append   --enable-speex
    196 }
    197 
    198175variant svg description {Enable SVG support} {
    199176    depends_lib-append      port:librsvg
    200177    configure.args-delete   --disable-svg
    201178    configure.args-append   --enable-svg
    202179}
    203180
    204 variant shout description {Enable Shoutcast support} {
     181variant shout description {Enable Shoutcast/Icecast streaming output support} {
    205182    depends_lib-append      port:libshout2
    206183    configure.args-delete   --disable-shout
    207184    configure.args-append   --enable-shout
    208185}
    209186
    210 variant vcd description {Enable VCD support} {
     187variant vcd description {Enable support for playing Video CD} {
    211188    depends_lib-append      port:vcdimager
    212189    configure.args-delete   --disable-vcdx
    213190    configure.args-append   --enable-vcdx
    214191}
    215192
    216 variant mod description {Enable MOD demuxer support} {
    217     depends_lib-append      port:libmodplug
    218     configure.args-delete   --disable-mod
    219     configure.args-append   --enable-mod
    220 }
    221 
    222 variant mpc description {enable Musepack Decoder library support} {
    223     depends_lib-append      port:libmpcdec
    224     configure.args-delete   --disable-mpc
    225     configure.args-append   --enable-mpc
    226 }
    227 
    228 variant dvb description {enable DVB Program Specific Information support} {
    229     depends_lib-append      port:libdvbpsi
    230     configure.args-delete   --disable-dvbpsi
    231     configure.args-append   --enable-dvbpsi
    232 }
    233 
    234 variant osd description {Enable onscreen display and TrueType font support} {
    235     depends_lib-append      port:fontconfig port:freetype
    236     configure.args-delete   --disable-freetype --disable-fontconfig
    237     configure.args-append   --enable-freetype --enable-fontconfig
    238 }
    239 
    240 variant fribidi requires osd description {Enable FriBidi Unicode support} {
    241     depends_lib-append      port:fribidi
    242     configure.args-delete   --disable-fribidi
    243     configure.args-append   --enable-fribidi
    244 }
    245 
    246 variant sdl description {Enable SDL/SDL-Image support} {
    247     depends_lib-append      port:libsdl port:libsdl_image
    248     configure.args-delete   --disable-sdl
    249     configure.args-append   --enable-sdl
    250 }
    251 
    252 variant smb description {Enable Samba 3 support} {
     193variant smb description {Enable Samba 3 input support} {
    253194    depends_lib-append      port:samba3
    254     configure.args-delete   --disable-smb
    255     configure.args-append   --enable-smb
     195    configure.args-delete   --disable-smbclient
     196    configure.args-append   --enable-smbclient
    256197    configure.ldflags-append    -L${prefix}/lib/samba3
    257198}
    258199
    259 variant x11 {
     200variant x11 description {Build using X11 UI. Use at own risk} {
    260201    depends_lib-append \
    261202        port:mesa \
    262203        port:xorg-libXinerama \
    … …  
    270211                            --enable-xvideo --enable-glx --enable-xcb
    271212}
    272213
    273 variant qt4 description {Build using QT4 UI.  This will use qt4-mac} {
    274     configure.args-delete   --disable-qt4
    275     configure.args-append   --enable-qt4
     214variant qt4 description {Build using QT4 UI.  This will use qt4-mac. Experimental} {
     215    configure.args-delete   --disable-qt
     216    configure.args-append   --enable-qt
    276217
    277218    PortGroup qt4 1.0
    278219
    … …  
    289230    configure.args-append   --enable-macosx --enable-macosx-dialog-provider
    290231}
    291232
    292 default_variants +mod +mpc +osd +quartz
    293 
    294233variant huge \
    295     requires dvb eyetv fribidi jack mod mpc osd sdl shout speex svg vcd \
     234    requires jack shout svg vcd \
    296235    description {Enable all variants except quartz, qt4, smb, and x11} {}
    297236
    298237variant full \
    … …  
    300239    description {Enable all variants} {}
    301240
    302241platform macosx {
    303     default_variants-append +qtkit
     242    default_variants-append +quartz +qtkit
    304243
    305244    configure.args-delete \
    306         --disable-macosx-vout --disable-macosx-audio \
     245        --disable-macosx-vout --disable-macosx-audio --disable-macosx-eyetv \
    307246
    308247    configure.args-append \
    309         --enable-macosx-vout --enable-macosx-audio \
    310         --with-macosx-sdk=/
     248        --enable-macosx-vout --enable-macosx-audio --enable-macosx-eyetv
    311249
    312250    if {[variant_isset qt4] || [variant_isset quartz]} {
    313251        configure.args-delete --disable-macosx-vlc-app
    … …  
    317255    post-patch {
    318256        reinplace "s/Appkit/AppKit/" ${worksrcpath}/configure.ac
    319257        reinplace "/Sparkle.framework/d" \
    320             ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj 
     258            ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
    321259        reinplace "/SDKROOT/d" \
    322             ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj 
     260            ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
    323261        reinplace "/Growl.framework/d" \
    324262            ${worksrcpath}/extras/package/macosx/package.mak
    325263
    326264        reinplace "s:LD_LIBRARY_PATH:DYLD_LIBRARY_PATH:g" \
    327             ${worksrcpath}/Makefile.am 
     265            ${worksrcpath}/Makefile.am
    328266
    329267        reinplace "/argv/s/environ/*_NSGetEnviron()/" \
    330268            ${worksrcpath}/modules/misc/inhibit/xdg.c \
    … …  
    344282        eval file delete [glob ${destroot}${prefix}/lib/vlc/plugins/*/*.la]
    345283
    346284        if {[variant_isset qt4] || [variant_isset quartz]} {
    347             file rename ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app
    348 
    349             # These are already in ${prefix}, so we don't need to bundle them as well
    350             file delete -force ${destroot}${applications_dir}/VLC.app/Contents/Frameworks
    351             file delete -force ${destroot}${applications_dir}/VLC.app/Contents/lib
    352 
    353             # There's no need to install these into the bundle and the prefix
    354             file delete -force ${destroot}${applications_dir}/VLC.app/Contents/MacOS/include
    355             file delete -force ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
    356             file delete -force ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
    357 
    358             # http://trac.macports.org/ticket/35131
    359             ln -s ${prefix}/lib ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
    360             ln -s ${prefix}/lib/vlc/plugins ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
     285            file copy ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app
     286            file copy ${worksrcpath}/modules/plugins.dat \
     287                 ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins/plugins.dat
    361288        }
    362289    }
    363290}