Ticket #41725: patch-vlc-2.1.2_2013Dec10_01.diff

File patch-vlc-2.1.2_2013Dec10_01.diff, 13.8 KB (added by ctreleaven (Craig Treleaven), 11 years ago)
  • Portfile

    diff -urN -x .DS_Store /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/multimedia/VLC/Portfile ./Portfile
    old new  
    55PortGroup           compiler_blacklist_versions 1.0
    66
    77name                VLC
    8 version             2.1.0
    9 revision            3
     8version             2.1.2
    109categories          multimedia
    1110
    1211maintainers         jeremyhu openmaintainer
     
    3433distname            vlc-${version}
    3534use_xz              yes
    3635
    37 checksums           md5     8c77bda671821f5b9ede96b6816e2ade \
    38                     sha1    f6bdf3971f764a9a192f44e4b6363ac482919dc2 \
    39                     rmd160  b8f3240eb6941d3eb4b2fc21c8b279b80f4cd026
     36checksums           md5     fb6787ad749aadcfaeab3471939b3426 \
     37                    sha1    2b0ef3a3767c56d64a2815c772c8b3f865018e70 \
     38                    rmd160  8e952218c2be5cb3ed0333ba776bd87477468a63
    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
     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
     
    7481    class_struct.patch \
    7582    qtkit.patch \
    7683    static_assert.patch \
    77     no-sparkle.patch \
    78     patch-freetype-2.5.1.diff
     84    no-sparkle.patch
    7985
    8086post-patch {
    8187    reinplace "s:librsvg-2/librsvg:librsvg:" \
     
    104110configure.args-append \
    105111    --with-contrib=${worksrcpath}/contrib \
    106112    --disable-debug --disable-update-check --enable-gnutls \
    107     --disable-notify --disable-telepathy --disable-dbus \
     113    --disable-notify --disable-dbus \
    108114    --disable-gnomevfs --disable-growl --disable-macosx-vlc-app \
    109     --enable-libproxy --enable-lua
     115    --enable-lua
    110116
    111117# Input Plugins
    112118# build fails when FreeRDP is installed
    113119# build fails when opencv is installed
    114120configure.args-append \
    115     --enable-dvdnav --enable-dvdread --disable-smb --disable-vcdx \
     121    --enable-dvdnav --enable-dvdread --disable-smbclient --disable-vcdx \
    116122    --disable-macosx-qtkit --disable-macosx-eyetv --disable-realrtsp \
    117123    --disable-libfreerdp --disable-opencv \
    118124    --enable-sftp
     
    120126# Mux/Demux Plugins
    121127configure.args-append \
    122128    --disable-dvbpsi --enable-ogg --enable-mux_ogg \
    123     --enable-mkv --disable-mod --disable-mpc --disable-shout
     129    --enable-mkv --enable-mod --enable-mpc --disable-shout
    124130
    125131# Codec Plugins
    126132configure.args-append \
    127133    --enable-a52 --enable-faad --enable-flac --disable-live555 \
    128     --enable-opus --enable-vorbis --enable-ogg --enable-mad --disable-libass \
     134    --enable-opus --enable-vorbis --enable-ogg --enable-mad --enable-libass \
    129135    --enable-dca --enable-png --disable-quicktime --enable-twolame \
    130136    --disable-speex --enable-theora --enable-x264 --enable-postproc \
    131137    --enable-avcodec --enable-avformat --enable-swscale \
    132     --enable-fluidsynth
     138    --disable-fluidsynth --enable-dirac --enable-schroedinger --enable-speex
    133139
    134140# Video Plugins
    135141configure.args-append \
    136     --disable-caca --disable-sdl --disable-macosx-vout \
     142    --disable-caca --enable-sdl --enable-sdl-image --disable-macosx-vout \
    137143    --without-x --disable-xcb --disable-xvideo --disable-glx \
    138     --disable-fontconfig --disable-freetype --disable-fribidi \
     144    --enable-freetype --enable-fontconfig --enable-fribidi \
    139145    --disable-svg
    140146
    141147# Audio Plugins
     
    145151# Interface Plugins
    146152configure.args-append \
    147153    --disable-macosx --disable-macosx-dialog-provider \
    148     --disable-qt4 --enable-ncurses --disable-skins2
     154    --disable-qt --enable-ncurses --disable-skins2
    149155
    150156# Visualisations and Video Filter Plugins
    151157configure.args-append \
     
    155161configure.args-append \
    156162    --enable-bonjour --enable-upnp
    157163
    158 variant jack description {Enable jack plugin for audio output} {
    159     depends_lib-append      port:jack
    160     configure.args-delete   --disable-jack
    161     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
    162168}
    163169
    164170variant qtkit description {Enable qtcapture and qtaudio} {
     
    171177    configure.args-append --enable-macosx-eyetv
    172178}
    173179
    174 variant speex description {Enable Speex decoder support} {
    175     depends_lib-append      path:lib/libspeex.dylib:speex
    176     configure.args-delete   --disable-speex
    177     configure.args-append   --enable-speex
    178 }
    179 
    180180variant svg description {Enable SVG support} {
    181181    depends_lib-append      port:librsvg
    182182    configure.args-delete   --disable-svg
     
    195195    configure.args-append   --enable-vcdx
    196196}
    197197
    198 variant mod description {Enable MOD demuxer support} {
    199     depends_lib-append      port:libmodplug
    200     configure.args-delete   --disable-mod
    201     configure.args-append   --enable-mod
    202 }
    203 
    204 variant mpc description {enable Musepack Decoder library support} {
    205     depends_lib-append      port:libmpcdec
    206     configure.args-delete   --disable-mpc
    207     configure.args-append   --enable-mpc
    208 }
    209 
    210198variant dvb description {enable DVB Program Specific Information support} {
    211199    depends_lib-append      port:libdvbpsi
    212200    configure.args-delete   --disable-dvbpsi
    213201    configure.args-append   --enable-dvbpsi
    214202}
    215203
    216 variant osd description {Enable onscreen display and TrueType font support} {
    217     depends_lib-append      port:fontconfig port:freetype
    218     configure.args-delete   --disable-freetype --disable-fontconfig
    219     configure.args-append   --enable-freetype --enable-fontconfig
    220 }
    221 
    222 variant fribidi requires osd description {Enable FriBidi Unicode support} {
    223     depends_lib-append      port:fribidi
    224     configure.args-delete   --disable-fribidi
    225     configure.args-append   --enable-fribidi
    226 }
    227 
    228 variant sdl description {Enable SDL/SDL-Image support} {
    229     depends_lib-append      port:libsdl port:libsdl_image
    230     configure.args-delete   --disable-sdl
    231     configure.args-append   --enable-sdl
    232 }
    233 
    234204variant smb description {Enable Samba 3 support} {
    235205    depends_lib-append      port:samba3
    236     configure.args-delete   --disable-smb
    237     configure.args-append   --enable-smb
     206    configure.args-delete   --disable-smbclient
     207    configure.args-append   --enable-smbclient
    238208    configure.ldflags-append    -L${prefix}/lib/samba3
    239209}
    240210
     
    253223}
    254224
    255225variant qt4 description {Build using QT4 UI.  This will use qt4-mac} {
    256     configure.args-delete   --disable-qt4
    257     configure.args-append   --enable-qt4
     226    configure.args-delete   --disable-qt
     227    configure.args-append   --enable-qt
    258228
    259229    PortGroup qt4 1.0
    260230
     
    271241    configure.args-append   --enable-macosx --enable-macosx-dialog-provider
    272242}
    273243
    274 default_variants +mod +mpc +osd +quartz
    275 
    276244variant huge \
    277     requires dvb eyetv fribidi jack mod mpc osd sdl shout speex svg vcd \
     245    requires dvb eyetv jack shout svg vcd \
    278246    description {Enable all variants except quartz, qt4, smb, and x11} {}
    279247
    280248variant full \
     
    282250    description {Enable all variants} {}
    283251
    284252platform macosx {
    285     default_variants-append +qtkit
     253    default_variants-append +quartz +qtkit
    286254
    287255    configure.args-delete \
    288256        --disable-macosx-vout --disable-macosx-audio \
    289257
    290258    configure.args-append \
    291         --enable-macosx-vout --enable-macosx-audio \
    292         --with-macosx-sdk=/
     259        --enable-macosx-vout --enable-macosx-audio
    293260
    294261    if {[variant_isset qt4] || [variant_isset quartz]} {
    295262        configure.args-delete --disable-macosx-vlc-app
     
    326293        eval file delete [glob ${destroot}${prefix}/lib/vlc/plugins/*/*.la]
    327294
    328295        if {[variant_isset qt4] || [variant_isset quartz]} {
    329             file rename ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app
    330 
    331             # These are already in ${prefix}, so we don't need to bundle them as well
    332             file delete -force ${destroot}${applications_dir}/VLC.app/Contents/Frameworks
    333             file delete -force ${destroot}${applications_dir}/VLC.app/Contents/lib
    334 
    335             # There's no need to install these into the bundle and the prefix
    336             file delete -force ${destroot}${applications_dir}/VLC.app/Contents/MacOS/include
    337             file delete -force ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
    338             file delete -force ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
    339 
    340             # http://trac.macports.org/ticket/35131
    341             ln -s ${prefix}/lib ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
    342             ln -s ${prefix}/lib/vlc/plugins ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
     296            file copy ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app
     297            file copy ${worksrcpath}/modules/plugins.dat \
     298                 ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins/plugins.dat
    343299        }
    344300    }
    345301}
  • files/no-sparkle.patch

    diff -urN -x .DS_Store /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/multimedia/VLC/files/no-sparkle.patch ./files/no-sparkle.patch
    old new  
    9595 #pragma mark Media Key support
    9696 
    9797 -(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event
    98 diff --git modules/gui/macosx/simple_prefs.m modules/gui/macosx/simple_prefs.m
    99 index a91fe3a..4407d25 100644
    100 --- modules/gui/macosx/simple_prefs.m
    101 +++ modules/gui/macosx/simple_prefs.m
     98diff -u modules/gui/macosx/simple_prefs.m.orig modules/gui/macosx/simple_prefs.m
     99--- modules/gui/macosx/simple_prefs.m.orig      2013-12-11 08:20:00.000000000 -0500
     100+++ modules/gui/macosx/simple_prefs.m   2013-12-11 08:21:56.000000000 -0500
    102101@@ -38,8 +38,6 @@
    103102 #import "AppleRemote.h"
    104103 #import "CoreInteraction.h"
    105104 
    106105-#import <Sparkle/Sparkle.h>                        //for o_intf_last_update_lbl
    107106-
    108  static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier";
    109  static NSString* VLCIntfSettingToolbarIdentifier = @"Intf Settings Item Identifier";
    110  static NSString* VLCAudioSettingToolbarIdentifier = @"Audio Settings Item Identifier";
    111 @@ -235,7 +233,6 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc
     107 static const char *const ppsz_language[] =
     108 {
     109     "auto",
     110@@ -365,7 +363,6 @@
    112111     [o_intf_appleremote_sysvol_ckb setTitle: _NS("Control system volume with the Apple Remote")];
    113112     [o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")];
    114113     [o_intf_update_ckb setTitle: _NS("Automatically check for updates")];
     
    116115     [o_intf_enableGrowl_ckb setTitle: _NS("Enable Growl notifications (on playlist item change)")];
    117116     [o_intf_autoresize_ckb setTitle: _NS("Resize interface to the native video size")];
    118117     [o_intf_pauseminimized_ckb setTitle: _NS("Pause the video playback when minimized")];
    119 @@ -440,10 +437,6 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
     118@@ -585,10 +582,6 @@
    120119     [self setupButton: o_intf_appleremote_sysvol_ckb forBoolValue: "macosx-appleremote-sysvol"];
    121120 
    122121     [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
  • files/patch-freetype-2.5.1.diff

    diff -urN -x .DS_Store /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/multimedia/VLC/files/patch-freetype-2.5.1.diff ./files/patch-freetype-2.5.1.diff
    old new  
    1 From c5b2b0a284ba6b544646f3a205aa1a2e1117d431 Mon Sep 17 00:00:00 2001
    2 From: Jean-Baptiste Kempf <jb@videolan.org>
    3 Date: Mon, 2 Dec 2013 17:32:07 +0100
    4 Subject: [PATCH 1/1] Freetype: fix compilation with 2.5.1
    5 
    6 Close #10019
    7 ---
    8  modules/text_renderer/freetype.c |    3 ++-
    9  1 file changed, 2 insertions(+), 1 deletion(-)
    10 
    11 diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
    12 index bd78c0d..baeeb96 100644
    13 --- modules/text_renderer/freetype.c
    14 +++ modules/text_renderer/freetype.c
    15 @@ -88,10 +88,11 @@
    16  #endif
    17  
    18  /* Freetype */
    19 -#include <freetype/ftsynth.h>
    20 +#include <ft2build.h>
    21  #include FT_FREETYPE_H
    22  #include FT_GLYPH_H
    23  #include FT_STROKER_H
    24 +#include FT_SYNTHESIS_H
    25  
    26  #define FT_FLOOR(X)     ((X & -64) >> 6)
    27  #define FT_CEIL(X)      (((X + 63) & -64) >> 6)
    28 --
    29 1.7.10.4
    30