Ticket #41725: patch-vlc-devel-2.1.3_2014Feb25_01.diff
File patch-vlc-devel-2.1.3_2014Feb25_01.diff, 20.9 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-devel/Portfile ./Portfile
old new 5 5 PortGroup compiler_blacklist_versions 1.0 6 6 7 7 name VLC-devel 8 version 2.1.99 9 revision 5 10 8 version 2.1.3 11 9 categories multimedia 12 10 13 11 maintainers jeremyhu openmaintainer 14 description VLC is a cross-platform media player and streaming server12 description media player and streaming server, development version 15 13 long_description VLC media player is a highly portable multimedia player for \ 16 14 various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, \ 17 15 mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols. \ … … 26 24 27 25 # http://git.videolan.org/?p=vlc.git 28 26 # http://git.videolan.org/?p=vlc.git;a=forks 29 fetch.type git27 #fetch.type git 30 28 #git.url git://git.videolan.org/vlc/vlc-2.1.git 31 git.url git://git.videolan.org/vlc.git32 git.branch 050a16328dac1d3573326c43d47376d08210604d 29 #git.url git://git.videolan.org/vlc.git 30 #git.branch edd88358218f273fddde646a172a2104796d46c2 33 31 34 #master_sites http://download.videolan.org/pub/videolan/vlc/${version}/35 #distname vlc-${version}36 #use_xz yes37 # 38 #checksums md5 5ad114755670e4881a2b35354e2f79bc\39 # sha1 40d0ed360dd3fa7dc3ff4fbc9c319553ebb22538\40 # rmd160 9d932e1be72b65cf47057191d9e84deeedea282c 32 master_sites http://download.videolan.org/pub/videolan/vlc/${version}/ 33 distname vlc-${version} 34 use_xz yes 35 36 checksums md5 56a489d093ffef9aa29809116985adba \ 37 sha1 de3e0b027bbb2dc2451992c428f2bed824128039 \ 38 rmd160 187337e0149cf9d86b6a4266128cbf0bc5bcf777 41 39 42 40 depends_build port:pkgconfig 43 41 … … 47 45 port:ncurses port:lua port:libpng port:jpeg port:tiff port:libebml \ 48 46 port:gnutls port:taglib port:libxml2 port:faad2 \ 49 47 port:x264 port:libtheora port:twolame port:libssh2 \ 50 port:libdvdnav port:libdvdread port:libproxy \ 51 port:fluidsynth port:libsamplerate port:libupnp \ 52 port:avahi path:lib/libavcodec.dylib:ffmpeg \ 53 port:openjpeg15 port:libbluray \ 54 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 port:XviD port:bzip2 port:gettext port:glib2 port:gmp \ 54 port:libgpg-error port:libiconv port:libidn port:libsndfile \ 55 port:libusb port:nettle port:openssl port:orc port:p11-kit \ 56 port:readline port:xorg-libX11 port:xorg-libXau port:xorg-libXdmcp \ 57 port:xorg-libXext port:xorg-libXrandr port:xorg-libxcb port:xrender 55 58 56 59 # TODO: live555 opencv FreeRDP 57 60 … … 73 76 configure.ac-no-arch.patch \ 74 77 PR-34741-no__clang_version__.patch \ 75 78 class_struct.patch \ 79 qtkit.patch \ 76 80 static_assert.patch \ 77 81 no-sparkle.patch 78 82 79 83 post-patch { 80 84 reinplace "s:librsvg-2/librsvg:librsvg:" \ 81 85 ${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.am100 }101 86 } 102 87 103 88 use_autoreconf yes … … 121 106 configure.args-append \ 122 107 --with-contrib=${worksrcpath}/contrib \ 123 108 --disable-debug --disable-update-check --enable-gnutls \ 124 --disable-notify --disable- telepathy --disable-dbus \109 --disable-notify --disable-dbus \ 125 110 --disable-gnomevfs --disable-growl --disable-macosx-vlc-app \ 126 --enable-l ibproxy --enable-lua111 --enable-lua 127 112 128 113 # Input Plugins 129 114 # build fails when FreeRDP is installed 130 115 # build fails when opencv is installed 131 116 configure.args-append \ 132 --enable-dvdnav --enable-dvdread --disable-smb --disable-vcdx \117 --enable-dvdnav --enable-dvdread --disable-smbclient --disable-vcdx \ 133 118 --disable-macosx-qtkit --disable-macosx-eyetv --disable-realrtsp \ 134 --disable- freerdp --disable-opencv \119 --disable-libfreerdp --disable-opencv \ 135 120 --enable-sftp 136 121 137 122 # Mux/Demux Plugins 138 123 configure.args-append \ 139 -- disable-dvbpsi --enable-ogg --enable-mux_ogg \140 --enable-mkv -- disable-mod --disable-mpc --disable-shout124 --enable-dvbpsi --enable-ogg --enable-mux_ogg \ 125 --enable-mkv --enable-mod --enable-mpc --disable-shout 141 126 142 127 # Codec Plugins 143 128 configure.args-append \ 144 129 --enable-a52 --enable-faad --enable-flac --disable-live555 \ 145 --enable-opus --enable-vorbis --enable-ogg --enable-mad -- disable-libass \130 --enable-opus --enable-vorbis --enable-ogg --enable-mad --enable-libass \ 146 131 --enable-dca --enable-png --disable-quicktime --enable-twolame \ 147 -- disable-speex --enable-theora --enable-x264 --enable-postproc \132 --enable-speex --enable-theora --enable-x264 --enable-postproc \ 148 133 --enable-avcodec --enable-avformat --enable-swscale \ 149 -- enable-fluidsynth134 --disable-fluidsynth --enable-dirac --enable-schroedinger 150 135 151 136 # Video Plugins 152 137 configure.args-append \ 153 --disable-caca -- disable-sdl--disable-macosx-vout \138 --disable-caca --enable-sdl --enable-sdl-image --disable-macosx-vout \ 154 139 --without-x --disable-xcb --disable-xvideo --disable-glx \ 155 -- disable-fontconfig --disable-freetype --disable-fribidi \140 --enable-freetype --enable-fontconfig --enable-fribidi \ 156 141 --disable-svg 157 142 158 143 # Audio Plugins … … 162 147 # Interface Plugins 163 148 configure.args-append \ 164 149 --disable-macosx --disable-macosx-dialog-provider \ 165 --disable-qt 4--enable-ncurses --disable-skins2150 --disable-qt --enable-ncurses --disable-skins2 166 151 167 152 # Visualisations and Video Filter Plugins 168 153 configure.args-append \ 169 --disable-goom --disable-glspectrum154 --disable-goom 170 155 171 156 # Service Discovery Plugins 172 157 configure.args-append \ 173 158 --enable-bonjour --enable-upnp 174 159 175 variant jack description {Enable jack pluginfor audio output} {176 depends_lib-append port:jack 177 configure.args-delete --disable-jack 178 configure.args-append --enable-jack 160 variant jack description {Enable jack and fluidsynth plugins for audio output} { 161 depends_lib-append port:jack port:fluidsynth port:portaudio 162 configure.args-delete --disable-jack --disable-fluidsynth 163 configure.args-append --enable-jack --enable-fluidsynth 179 164 } 180 165 181 166 variant qtkit description {Enable qtcapture and qtaudio} { … … 183 168 configure.args-append --enable-macosx-qtkit 184 169 } 185 170 186 variant eyetv description {Enable eyetv plugin} {187 configure.args-delete --disable-macosx-eyetv188 configure.args-append --enable-macosx-eyetv189 }190 191 variant speex description {Enable Speex decoder support} {192 depends_lib-append path:lib/libspeex.dylib:speex193 configure.args-delete --disable-speex194 configure.args-append --enable-speex195 }196 197 171 variant svg description {Enable SVG support} { 198 172 depends_lib-append port:librsvg 199 173 configure.args-delete --disable-svg 200 174 configure.args-append --enable-svg 201 175 } 202 176 203 variant shout description {Enable Shoutcast support} {177 variant shout description {Enable Shoutcast/Icecast streaming output support} { 204 178 depends_lib-append port:libshout2 205 179 configure.args-delete --disable-shout 206 180 configure.args-append --enable-shout 207 181 } 208 182 209 # TODO: libvcdx_plugin.la fails to link, eg: 210 # "_cdio_log_set_handler", referenced from: 211 # _VCDOpen in libvcdx_plugin_la-access.o 212 # "_cdio_read_mode2_sector", referenced from: 213 # _vcdplayer_read in libvcdx_plugin_la-vcdplayer.o 214 # "_vcd_log_set_handler", referenced from: 215 # _VCDOpen in libvcdx_plugin_la-access.o 216 # "_vcdinf_get_bsn", referenced from: 217 # _vcdplayer_read in libvcdx_plugin_la-vcdplayer.o 218 # "_vcdinf_get_loop_count", referenced from: 219 # _vcdplayer_read in libvcdx_plugin_la-vcdplayer.o 220 # _VCDMetaInfo in libvcdx_plugin_la-info.o 221 #variant vcd description {Enable VCD support} { 222 # depends_lib-append port:vcdimager 223 # configure.args-delete --disable-vcdx 224 # configure.args-append --enable-vcdx 225 #} 226 227 variant mod description {Enable MOD demuxer support} { 228 depends_lib-append port:libmodplug 229 configure.args-delete --disable-mod 230 configure.args-append --enable-mod 231 } 232 233 variant mpc description {enable Musepack Decoder library support} { 234 depends_lib-append port:libmpcdec 235 configure.args-delete --disable-mpc 236 configure.args-append --enable-mpc 237 } 238 239 variant dvb description {enable DVB Program Specific Information support} { 240 depends_lib-append port:libdvbpsi 241 configure.args-delete --disable-dvbpsi 242 configure.args-append --enable-dvbpsi 243 } 244 245 variant osd description {Enable onscreen display and TrueType font support} { 246 depends_lib-append port:fontconfig port:freetype 247 configure.args-delete --disable-freetype --disable-fontconfig 248 configure.args-append --enable-freetype --enable-fontconfig 249 } 250 251 variant fribidi requires osd description {Enable FriBidi Unicode support} { 252 depends_lib-append port:fribidi 253 configure.args-delete --disable-fribidi 254 configure.args-append --enable-fribidi 255 } 256 257 variant sdl description {Enable SDL/SDL-Image support} { 258 depends_lib-append port:libsdl port:libsdl_image 259 configure.args-delete --disable-sdl 260 configure.args-append --enable-sdl 183 variant vcd description {Enable support for playing Video CD} { 184 depends_lib-append port:vcdimager 185 configure.args-delete --disable-vcdx 186 configure.args-append --enable-vcdx 261 187 } 262 188 263 variant smb description {Enable Samba 3 support} {189 variant smb description {Enable Samba 3 input support} { 264 190 depends_lib-append port:samba3 265 configure.args-delete --disable-smb 266 configure.args-append --enable-smb 191 configure.args-delete --disable-smbclient 192 configure.args-append --enable-smbclient 267 193 configure.ldflags-append -L${prefix}/lib/samba3 268 194 } 269 195 270 variant x11 {196 variant x11 description {Build using X11 UI. Use at own risk} { 271 197 depends_lib-append \ 272 198 port:mesa \ 273 199 port:xorg-libXinerama \ … … 276 202 port:xorg-xcb-util \ 277 203 port:xorg-xcb-util-keysyms 278 204 279 configure.args-delete --without-x --disable-xvideo --disable-glx --disable- glspectrum --disable-xcb205 configure.args-delete --without-x --disable-xvideo --disable-glx --disable-xcb 280 206 configure.args-append --with-x --x-include=${prefix}/include --x-lib=${prefix}/lib \ 281 --enable-xvideo --enable-glx --enable- glspectrum --enable-xcb207 --enable-xvideo --enable-glx --enable-xcb 282 208 } 283 209 284 variant qt4 description {Build using QT4 UI. This will use qt4-mac } {285 configure.args-delete --disable-qt 4286 configure.args-append --enable-qt 4210 variant qt4 description {Build using QT4 UI. This will use qt4-mac. Experimental} { 211 configure.args-delete --disable-qt 212 configure.args-append --enable-qt 287 213 288 214 PortGroup qt4 1.0 289 215 … … 300 226 configure.args-append --enable-macosx --enable-macosx-dialog-provider 301 227 } 302 228 303 default_variants +mod +mpc +osd +quartz304 305 229 variant huge \ 306 requires dvb eyetv fribidi jack mod mpc osd sdl shout speexsvg vcd \230 requires jack shout svg vcd \ 307 231 description {Enable all variants except quartz, qt4, smb, and x11} {} 308 232 309 233 variant full \ … … 311 235 description {Enable all variants} {} 312 236 313 237 platform macosx { 314 default_variants-append +q tkit238 default_variants-append +quartz +qtkit 315 239 316 240 configure.args-delete \ 317 --disable-macosx-vout --disable-macosx-audio \241 --disable-macosx-vout --disable-macosx-audio --disable-macosx-eyetv 318 242 319 243 configure.args-append \ 320 --enable-macosx-vout --enable-macosx-audio \ 321 --with-macosx-sdk=/ 244 --enable-macosx-vout --enable-macosx-audio --enable-macosx-eyetv 322 245 323 246 if {[variant_isset qt4] || [variant_isset quartz]} { 324 247 configure.args-delete --disable-macosx-vlc-app … … 328 251 post-patch { 329 252 reinplace "s/Appkit/AppKit/" ${worksrcpath}/configure.ac 330 253 reinplace "/Sparkle.framework/d" \ 331 ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj 254 ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj 332 255 reinplace "/SDKROOT/d" \ 333 ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj 256 ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj 334 257 reinplace "/Growl.framework/d" \ 335 258 ${worksrcpath}/extras/package/macosx/package.mak 336 259 337 260 reinplace "s:LD_LIBRARY_PATH:DYLD_LIBRARY_PATH:g" \ 338 ${worksrcpath}/Makefile.am 261 ${worksrcpath}/Makefile.am 339 262 340 263 reinplace "/argv/s/environ/*_NSGetEnviron()/" \ 341 264 ${worksrcpath}/modules/misc/inhibit/xdg.c \ … … 355 278 eval file delete [glob ${destroot}${prefix}/lib/vlc/plugins/*/*.la] 356 279 357 280 if {[variant_isset qt4] || [variant_isset quartz]} { 358 file rename ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app 359 360 # These are already in ${prefix}, so we don't need to bundle them as well 361 file delete -force ${destroot}${applications_dir}/VLC.app/Contents/Frameworks 362 file delete -force ${destroot}${applications_dir}/VLC.app/Contents/lib 363 364 # There's no need to install these into the bundle and the prefix 365 file delete -force ${destroot}${applications_dir}/VLC.app/Contents/MacOS/include 366 file delete -force ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib 367 file delete -force ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins 368 369 # http://trac.macports.org/ticket/35131 370 ln -s ${prefix}/lib ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib 371 ln -s ${prefix}/lib/vlc/plugins ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins 281 file copy ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app 282 file copy ${worksrcpath}/modules/plugins.dat \ 283 ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins/plugins.dat 372 284 } 373 285 } 374 286 } -
files/configure.ac-no-arch.patch
diff -urN -x .DS_Store /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/multimedia/VLC-devel/files/configure.ac-no-arch.patch ./files/configure.ac-no-arch.patch
old new 1 --- configure.ac.orig 2013-12-31 23:26:06.000000000 -0800 2 +++ configure.ac 2013-12-31 23:35:58.000000000 -0800 3 @@ -138,22 +138,11 @@ case "${host_os}" in 4 SYS=dragonfly 1 --- configure.ac.orig 2013-03-31 16:51:03.000000000 -0700 2 +++ configure.ac 2013-03-31 16:51:47.000000000 -0700 3 @@ -127,33 +127,12 @@ case "${host_os}" in 5 4 ;; 6 5 darwin*) 7 - 6 8 7 - dnl Force gcc "-arch" flag 9 8 - ARCH_flag="" 10 11 9 - case "${host}" in 10 - i?86*) 12 11 - ARCH_flag="-arch i386" 13 YASMFLAGS="-f macho32" 14 ;; 12 - ;; 15 13 - ppc64*) 16 14 - ARCH_flag="-arch ppc64" 17 15 - ;; 18 16 - ppc*) 19 17 - ARCH_flag="-arch ppc" 20 18 - ;; 21 19 - x86_64*) 22 20 - ARCH_flag="-arch x86_64" 23 YASMFLAGS="-f macho64" 24 ;; 25 arm*) 26 @@ -163,11 +152,10 @@ case "${host_os}" in 27 esac 28 21 - ;; 22 - arm*) 23 - ac_cv_c_bigendian="no" 24 - ac_cv_c_attribute_packed="no" 25 - ;; 26 - esac 27 - 29 28 SYS=darwin 30 29 - CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}" 31 30 - CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}" … … 34 33 - LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}" 35 34 + CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS" 36 35 + CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS" 36 + CPPFLAGS="${CPPFLAGS}" 37 37 + OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99" 38 38 + LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names" 39 VLC_ADD_LIBS([motion rotate], [-Wl,-framework,IOKit,-framework,CoreFoundation]) 39 40 VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit]) 40 VLC_ADD_LIBS([avcodec access_avio swscale postproc i420_rgb_mmx x262 x264 x26410b],[-Wl,-read_only_relocs,suppress]) 41 VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,CoreServices]) 41 VLC_ADD_LIBS([avcodec access_avio swscale postproc i420_rgb_mmx x264 x26410b],[-Wl,-read_only_relocs,suppress]) -
files/no-sparkle.patch
diff -urN -x .DS_Store /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/multimedia/VLC-devel/files/no-sparkle.patch ./files/no-sparkle.patch
old new 70 70 index c5fced6..da7d001 100644 71 71 --- modules/gui/macosx/intf.m 72 72 +++ modules/gui/macosx/intf.m 73 @@ -69,8 +69,6 @@ 74 #import "VideoEffects.h" 73 @@ -69,7 +69,6 @@ 75 74 #import "AudioEffects.h" 76 75 76 #import <AddressBook/AddressBook.h> /* for crashlog send mechanism */ 77 77 -#import <Sparkle/Sparkle.h> /* we're the update delegate */ 78 - 78 79 79 #import "iTunes.h" 80 80 81 /*****************************************************************************82 81 @@ -916,16 +915,6 @@ static VLCMain *_o_sharedMainInstance = nil; 83 82 } 84 83 … … 96 95 #pragma mark Media Key support 97 96 98 97 -(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event 99 diff --git modules/gui/macosx/simple_prefs.m modules/gui/macosx/simple_prefs.m 100 index a91fe3a..4407d25 100644 101 --- modules/gui/macosx/simple_prefs.m 102 +++ modules/gui/macosx/simple_prefs.m 98 diff -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 103 101 @@ -38,8 +38,6 @@ 104 102 #import "AppleRemote.h" 105 103 #import "CoreInteraction.h" … … 109 107 static const char *const ppsz_language[] = 110 108 { 111 109 "auto", 112 @@ -365,7 +363,6 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc110 @@ -365,7 +363,6 @@ 113 111 [o_intf_appleremote_sysvol_ckb setTitle: _NS("Control system volume with the Apple Remote")]; 114 112 [o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")]; 115 113 [o_intf_update_ckb setTitle: _NS("Automatically check for updates")]; … … 117 115 [o_intf_enableGrowl_ckb setTitle: _NS("Enable Growl notifications (on playlist item change)")]; 118 116 [o_intf_autoresize_ckb setTitle: _NS("Resize interface to the native video size")]; 119 117 [o_intf_pauseminimized_ckb setTitle: _NS("Pause the video playback when minimized")]; 120 @@ -585,10 +582,6 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam118 @@ -585,10 +582,6 @@ 121 119 [self setupButton: o_intf_appleremote_sysvol_ckb forBoolValue: "macosx-appleremote-sysvol"]; 122 120 123 121 [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"]; -
files/qtkit.patch
diff -urN -x .DS_Store /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/multimedia/VLC-devel/files/qtkit.patch ./files/qtkit.patch
old new 1 --- modules/access/Modules.am 2 +++ modules/access/Modules.am 3 @@ -1,3 +1,5 @@ 4 +AM_LIBTOOLFLAGS=--tag=CC 5 + 6 SUBDIRS = rtp 7 noinst_LTLIBRARIES = 8 9 --- modules/access/qtsound.m 10 +++ modules/access/qtsound.m 11 @@ -40,7 +40,7 @@ 12 #include <vlc_dialog.h> 13 14 //#define QTKIT_VERSION_MIN_REQUIRED 70603 15 -#define QTKIT_VERSION_MAX_ALLOWED 70700 16 +//#define QTKIT_VERSION_MAX_ALLOWED 70700 17 18 #import <QTKit/QTKit.h> 19