diff options
| author | wiz <wiz@pkgsrc.org> | 2015-10-25 11:00:18 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2015-10-25 11:00:18 +0000 |
| commit | 645eab1ad53a446f76c57edd327d65087a250b86 (patch) | |
| tree | b47f39359112e3e608feb08da753244086553d22 /multimedia | |
| parent | 8bcc5f86894d00210cb87585a9e1672f3ef7edba (diff) | |
| download | pkgsrc-645eab1ad53a446f76c57edd327d65087a250b86.tar.gz | |
Update vlc to 2.2.1.
Based on the wip version by Ian D. Leroux and Tobias Nygren.
2.2.1 Highlights
VLC 2.2.1 "Terry Pratchett" is a fixed version of 2.2.0 "WeatherWax"
It fixes numerous crashes (FLAC, SPC), codec issues (VP9, Atrac3,
AAC), regressions and several issues (Resume, MP4 chapters, MKV
over network) and security issues.
2.2.0 Highlights
VLC 2.2.0 auto-rotates the videos taken from phones, to fight
Vertical Video Syndrome!
VLC now resumes where you left off in all versions
Improves support for new HD codecs, VP9, opus and H.265/HEVC, for
decoding and for encoding.
Extensions are now downloadable from within the application.
VLSub extension can download subtitles from the application.
2.2.x Features
Core
Auto-rotation of phone movies, to fight Vertical Video Syndrome
Resume playback where you left off
Extensions API and repository to download extensions directly from the application
GPU 0-copy support for decoding and displaying using hardware
Improved support for UltraHD codecs, notably H.265 and VP9
Subtitles download from the web, using OpenSubtitles
Audio core upgrade, notably to support short samples
Formats
Support for BD-Java menus and overlay in Blu-Ray
Acceleration of VP9 and H.265/HEVC decoders
Rewritten support for WMV, Ogg, MP4 and AVI, notably for seeking
Support for encoding in H.265, Opus and VP9
Support for WebVTT, Ogg/VP8, Opus/MKV, CAF
Support for THP, Renderware and Escape Replay videogames files
Support for SRT language detection
Acceleration
GPU 0-copy decoding-rendering for Android using MediaCodec
GPU accelerated auto-rotation, in OpenGL, Direct3D and Mediacodec
GPU 0-copy decoding-rendering for Linux using VDPAU
Support for HLSL shaders in Direct3D video output
Media Foundation Transform audio and video decoder for Windows Vista/7
GPU 0-copy decoding-rendering for RaspberryPi using MMAL
OpenMAX IL improvements for Android, Linux and rPi
Support GStreamer codecs on Linux
Codecs / Protocols
Support for MMS split streams for audio selection (European Parliament)
Support FTPS (FTP/TLS) protocol
New decoder for VP8 and VP9 using libvpx for Linux distributions without avcodec
Improvements on Teletext, Subrip, and Tx3g subtitles
Support for MSN audio, Atrac3+, VP7, Bink, TAK, On2 AVC, DK3, DK4
Support for IMC, Vivo g723.1, Smacker, FIC, Auravision, Canopus Lossless
Support x264 and FFv1 codecs RGB modes
Fixes for DVD, Audio-CD, M2TS LPCM audio, Speex
Professional
Support for Digital Cinema Packages and encrypted DCP with KDM
HEVC encoding and muxing in MP4 and TS
Support VP8 encoding inside Ogg
Improvements of audio bar graph, for speed and resiliance
Support MPEG-2 video encoding through x262
Large improvements of teletext rendering, for speed and alignments
Platform integration
Port of the interface to Yosemite
Support drag'n drop in the skins2 interface
New TLS module on OS X and iOS, using the central store
Signature of the Windows binaries
Improvement of audio device detections on OS X and Windows
Support of audio ducking in various audio outputs
Mobile Versions
VLC for iOS 2.5.0 release is out
VLC for Windows Phone 1.2.0 public beta is out
VLC for WinRT 1.2.0, x86 and ARM
VLC for Android TV 1.2.6
VLC for Android 1.2.6
For developers
Add equalizer API for libVLC
Add functions for scrambling detection
Experimental new C++11 libVLC library: libvlcpp
New Android buildsystem and Java SDK
New WinRT library component for libVLC: libVLCX
Improvements for iOS/OSX VLCKit: Swift support and ARC
Android
Complete switch to Material design, including black theme
Support for Audio playlists and modtracker files
Support for AC-3 Passthrough and 5.1/7.1 audio
Support switch to background video playback
Large improvements on the first Android TV release
Support chapter selections
iOS
Support for iCloud, box.com and OneDrive
Support 10-band equalizer
Support sharing media between devices
Support Chapters and Title selections
New player design
Add media information dialog and timer for playback
Diffstat (limited to 'multimedia')
47 files changed, 962 insertions, 1203 deletions
diff --git a/multimedia/vlc/DESCR b/multimedia/vlc/DESCR index 97fa896a91f..6ea7f1224c6 100644 --- a/multimedia/vlc/DESCR +++ b/multimedia/vlc/DESCR @@ -8,6 +8,3 @@ and display it. It can also be used to display video read locally on the computer : DVDs, VCDs, MPEG and DivX files and from a satellite card. It is multi-plaform : Linux, Windows, Mac OS X, BeOS, BSD, Solaris, QNX, iPaq... The VideoLAN Client and Server now have a full IPv6 support. - -This version is apparently no longer maintained upstream and should -probably not be used. diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 1fd8198a082..517dc132eb4 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.184 2015/08/23 14:30:39 wiz Exp $ +# $NetBSD: Makefile,v 1.185 2015/10/25 11:00:18 wiz Exp $ DISTNAME= vlc-${VLC_VERSION} -PKGREVISION= 54 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \ http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/ -EXTRACT_SUFX= .tar.bz2 +EXTRACT_SUFX= .tar.xz -VLC_VERSION= 1.1.13 +VLC_VERSION= 2.2.1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.videolan.org/ @@ -17,19 +16,14 @@ LICENSE= gnu-gpl-v2 CONFLICTS= vlc07-[0-9]* vlc08-[0-9]* USE_LIBTOOL= yes -USE_TOOLS+= gmake perl pkg-config \ - autoconf automake autoreconf -# for autopoint -BUILD_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools +USE_TOOLS+= gmake perl pkg-config + USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-kde-solid=${PREFIX}/share/kde/apps/solid/actions PTHREAD_OPTS+= require USE_LANGUAGES= c99 c++ -PLIST_VARS+= x86simd altivec v4l2 - -# Incompatible with current versions -CONFIGURE_ARGS+= --disable-live555 +PLIST_VARS+= x86simd altivec v4l2 oss .include "../../mk/bsd.prefs.mk" .include "options.mk" @@ -37,16 +31,49 @@ CONFIGURE_ARGS+= --disable-live555 BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0 BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 -CONFIGURE_ARGS+= --disable-speex # needs unstable 1.1.x branch [1.2 in pkgsrc] -CONFIGURE_ARGS+= --disable-smb - -CONFIGURE_ARGS+= --enable-dvdread \ - --enable-flac \ - --enable-live555 \ - --enable-theora \ - --enable-lua=no +CONFIGURE_ARGS+= --enable-dvdread +CONFIGURE_ARGS+= --enable-flac +CONFIGURE_ARGS+= --enable-theora +CONFIGURE_ARGS+= --disable-bluray +CONFIGURE_ARGS+= --disable-bonjour +CONFIGURE_ARGS+= --disable-caca +CONFIGURE_ARGS+= --disable-chromaprint +CONFIGURE_ARGS+= --disable-dc1394 +CONFIGURE_ARGS+= --disable-decklink +CONFIGURE_ARGS+= --disable-dv1394 +CONFIGURE_ARGS+= --disable-freerdp +CONFIGURE_ARGS+= --disable-goom +CONFIGURE_ARGS+= --disable-gst-decode +CONFIGURE_ARGS+= --disable-lua +CONFIGURE_ARGS+= --disable-mfx +CONFIGURE_ARGS+= --disable-mmal-codec +CONFIGURE_ARGS+= --disable-notify +CONFIGURE_ARGS+= --disable-opencv +CONFIGURE_ARGS+= --disable-projectm +CONFIGURE_ARGS+= --disable-samplerate +CONFIGURE_ARGS+= --disable-sftp +CONFIGURE_ARGS+= --disable-shine +CONFIGURE_ARGS+= --disable-sid +CONFIGURE_ARGS+= --disable-smbclient +CONFIGURE_ARGS+= --disable-twolame +CONFIGURE_ARGS+= --disable-udev +CONFIGURE_ARGS+= --disable-vnc +CONFIGURE_ARGS+= --disable-vsxu +CONFIGURE_ARGS+= --disable-zvbi + + +CFLAGS+= -fPIC +CXXFLAGS+= -fPIC + +# which platforms support OSSv4? +.if ${MACHINE_PLATFORM:MNetBSD-[789]*-*} +PLIST.oss= yes +.include "../../mk/oss.buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-oss +.endif -# Build optimalized modules +# Build optimized modules .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" PLIST.x86simd= yes CONFIGURE_ARGS+= --enable-mmx \ @@ -78,17 +105,16 @@ INSTALLATION_DIRS+= share/vlc/http/dialogs share/vlc/http/images \ share/vlc/osdmenu/dvd/selection \ share/vlc/skins2/fonts \ ${PKGMANDIR}/man1 -pre-configure: - cd ${WRKSRC} && autoreconf -fi post-install: ${INSTALL_DATA} ${WRKSRC}/doc/vlc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_DATA} ${WRKSRC}/doc/vlc-config.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 # Let's use dejavu-ttf as it has nice unicode support # ORIGFNT= /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf +ORIGMONOFNT= /usr/share/fonts/truetype/freefont/FreeMono.ttf DEFAULT_FONT?= ${PREFIX}/share/fonts/X11/TTF/DejaVuSans.ttf +DEFAULT_MONO_FONT?= ${PREFIX}/share/fonts/X11/TTF/DejaVuSansMono.ttf DEPENDS+= dejavu-ttf>=2.26:../../fonts/dejavu-ttf SUBST_CLASSES+= oss @@ -102,27 +128,36 @@ SUBST_MESSAGE.oss= Fixing hardcoded audio device. SUBST_CLASSES+= fnt SUBST_STAGE.fnt= pre-configure SUBST_SED.fnt= -e "s,${ORIGFNT},${DEFAULT_FONT}," -SUBST_FILES.fnt= modules/misc/freetype.c -SUBST_MESSAGE.fnt= Fixing hardcoded paths. - -REPLACE_SH+= vlc-config.in.in +SUBST_SED.fnt+= -e "s,${ORIGMONOFNT},${DEFAULT_MONO_FONT}," +SUBST_FILES.fnt= modules/text_renderer/platform_fonts.h +SUBST_MESSAGE.fnt= Fixing hardcoded font paths. # VLC embeds the build environment info to help debuging. CHECK_WRKREF_SKIP= lib/libvlccore.a \ lib/libvlccore.so* -.include "../../audio/musepack/buildlink3.mk" +.include "../../audio/fluidsynth/buildlink3.mk" .include "../../audio/flac/buildlink3.mk" +.include "../../multimedia/libkate/buildlink3.mk" .include "../../audio/libmad/buildlink3.mk" +.include "../../audio/libmodplug/buildlink3.mk" +.include "../../audio/libopus/buildlink3.mk" +.include "../../audio/libshout/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../audio/liba52/buildlink3.mk" .include "../../audio/libcddb/buildlink3.mk" .include "../../audio/libid3tag/buildlink3.mk" +.include "../../audio/musepack/buildlink3.mk" +.include "../../audio/speexdsp/buildlink3.mk" .include "../../audio/taglib/buildlink3.mk" .include "../../audio/libcddb/buildlink3.mk" +.include "../../devel/libmtp/buildlink3.mk" .include "../../misc/libcdio/buildlink3.mk" +.include "../../multimedia/libass/buildlink3.mk" +.include "../../graphics/librsvg/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../converters/fribidi/buildlink3.mk" .include "../../devel/libebml/buildlink3.mk" @@ -133,25 +168,28 @@ CHECK_WRKREF_SKIP= lib/libvlccore.a \ .include "../../security/libgcrypt/buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" -.include "../../multimedia/ffmpeg010/buildlink3.mk" +.include "../../multimedia/ffmpeg2/buildlink3.mk" .include "../../multimedia/libdvdplay/buildlink3.mk" .include "../../multimedia/libdvbpsi0/buildlink3.mk" -BUILDLINK_API_DEPENDS.libdvdnav+= libdvdnav>=5.0 .include "../../multimedia/libdvdnav/buildlink3.mk" .include "../../multimedia/libdvdread/buildlink3.mk" .include "../../multimedia/libmatroska/buildlink3.mk" .include "../../multimedia/libmpeg2/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" .include "../../multimedia/libtheora/buildlink3.mk" +.include "../../multimedia/schroedinger/buildlink3.mk" # libX11 should be built with xcb enabled BUILDLINK_API_DEPENDS.libX11+= libX11>=1.3.5 .include "../../x11/libX11/buildlink3.mk" # needs x264_encoder_delayed_frames BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20100201 .include "../../multimedia/x264-devel/buildlink3.mk" +#.include "../../lang/lua/buildlink3.mk" +.include "../../net/libupnp/buildlink3.mk" -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../mk/oss.buildlink3.mk" +.if "${OPSYS}" == "Linux" +. include "../../audio/alsa-lib/buildlink3.mk" +.endif .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST index 54c0247c8f6..75586d19197 100644 --- a/multimedia/vlc/PLIST +++ b/multimedia/vlc/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.55 2015/03/22 20:06:32 joerg Exp $ +@comment $NetBSD: PLIST,v 1.56 2015/10/25 11:00:18 wiz Exp $ bin/cvlc ${PLIST.x11}bin/qvlc bin/rvlc -${PLIST.skins}bin/svlc +${PLIST.vlc-skins}bin/svlc bin/vlc bin/vlc-wrapper include/vlc/deprecated.h @@ -17,12 +17,13 @@ include/vlc/libvlc_media_player.h include/vlc/libvlc_structures.h include/vlc/libvlc_version.h include/vlc/libvlc_vlm.h +include/vlc/plugins/vlc_about.h include/vlc/plugins/vlc_access.h -include/vlc/plugins/vlc_acl.h +include/vlc/plugins/vlc_addons.h include/vlc/plugins/vlc_aout.h -include/vlc/plugins/vlc_aout_mixer.h +include/vlc/plugins/vlc_aout_volume.h include/vlc/plugins/vlc_arrays.h -include/vlc/plugins/vlc_art_finder.h +include/vlc/plugins/vlc_atomic.h include/vlc/plugins/vlc_avcodec.h include/vlc/plugins/vlc_bits.h include/vlc/plugins/vlc_block.h @@ -41,6 +42,7 @@ include/vlc/plugins/vlc_es.h include/vlc/plugins/vlc_es_out.h include/vlc/plugins/vlc_events.h include/vlc/plugins/vlc_filter.h +include/vlc/plugins/vlc_fingerprinter.h include/vlc/plugins/vlc_fourcc.h include/vlc/plugins/vlc_fs.h include/vlc/plugins/vlc_gcrypt.h @@ -50,14 +52,20 @@ include/vlc/plugins/vlc_image.h include/vlc/plugins/vlc_inhibit.h include/vlc/plugins/vlc_input.h include/vlc/plugins/vlc_input_item.h +include/vlc/plugins/vlc_keys.h include/vlc/plugins/vlc_main.h include/vlc/plugins/vlc_md5.h +include/vlc/plugins/vlc_media_library.h include/vlc/plugins/vlc_messages.h include/vlc/plugins/vlc_meta.h +include/vlc/plugins/vlc_meta_fetcher.h +include/vlc/plugins/vlc_mime.h include/vlc/plugins/vlc_modules.h include/vlc/plugins/vlc_mouse.h include/vlc/plugins/vlc_mtime.h +include/vlc/plugins/vlc_network.h include/vlc/plugins/vlc_objects.h +include/vlc/plugins/vlc_opengl.h include/vlc/plugins/vlc_picture.h include/vlc/plugins/vlc_picture_fifo.h include/vlc/plugins/vlc_picture_pool.h @@ -67,18 +75,20 @@ include/vlc/plugins/vlc_probe.h include/vlc/plugins/vlc_rand.h include/vlc/plugins/vlc_services_discovery.h include/vlc/plugins/vlc_sout.h -include/vlc/plugins/vlc_sql.h +include/vlc/plugins/vlc_spu.h include/vlc/plugins/vlc_stream.h include/vlc/plugins/vlc_strings.h include/vlc/plugins/vlc_subpicture.h +include/vlc/plugins/vlc_text_style.h include/vlc/plugins/vlc_threads.h +include/vlc/plugins/vlc_tls.h include/vlc/plugins/vlc_url.h include/vlc/plugins/vlc_variables.h include/vlc/plugins/vlc_video_splitter.h include/vlc/plugins/vlc_vlm.h include/vlc/plugins/vlc_vout.h include/vlc/plugins/vlc_vout_display.h -include/vlc/plugins/vlc_vout_opengl.h +include/vlc/plugins/vlc_vout_osd.h include/vlc/plugins/vlc_vout_window.h include/vlc/plugins/vlc_xlib.h include/vlc/plugins/vlc_xml.h @@ -87,58 +97,73 @@ lib/libvlc.la lib/libvlccore.la lib/pkgconfig/libvlc.pc lib/pkgconfig/vlc-plugin.pc -${PLIST.x86simd}lib/vlc/plugins/3dnow/libmemcpy3dn_plugin.la -lib/vlc/plugins/access/libaccess_attachment_plugin.la -lib/vlc/plugins/access/libaccess_avio_plugin.la lib/vlc/plugins/access/libaccess_bd_plugin.la -lib/vlc/plugins/access/libaccess_fake_plugin.la -lib/vlc/plugins/access/libaccess_ftp_plugin.la -${PLIST.gnome}lib/vlc/plugins/access/libaccess_gnomevfs_plugin.la -lib/vlc/plugins/access/libaccess_http_plugin.la -lib/vlc/plugins/access/libaccess_imem_plugin.la -lib/vlc/plugins/access/libaccess_mmap_plugin.la +${PLIST.jack}lib/vlc/plugins/access/libaccess_jack_plugin.la lib/vlc/plugins/access/libaccess_mms_plugin.la -lib/vlc/plugins/access/libaccess_oss_plugin.la -lib/vlc/plugins/access/libaccess_tcp_plugin.la -lib/vlc/plugins/access/libaccess_udp_plugin.la +lib/vlc/plugins/access/libaccess_mtp_plugin.la +${PLIST.oss}lib/vlc/plugins/access/libaccess_oss_plugin.la +lib/vlc/plugins/access/libattachment_plugin.la +lib/vlc/plugins/access/libavio_plugin.la lib/vlc/plugins/access/libcdda_plugin.la lib/vlc/plugins/access/libdvdnav_plugin.la lib/vlc/plugins/access/libdvdread_plugin.la lib/vlc/plugins/access/libfilesystem_plugin.la +lib/vlc/plugins/access/libftp_plugin.la +${PLIST.gnome}lib/vlc/plugins/access/libgnomevfs_plugin.la +lib/vlc/plugins/access/libhttp_plugin.la +lib/vlc/plugins/access/libidummy_plugin.la +lib/vlc/plugins/access/libimem_plugin.la +${PLIST.live}lib/vlc/plugins/access/liblive555_plugin.la +${PLIST.pulseaudio}lib/vlc/plugins/access/libpulsesrc_plugin.la +lib/vlc/plugins/access/librar_plugin.la lib/vlc/plugins/access/librtp_plugin.la +lib/vlc/plugins/access/libsdp_plugin.la +lib/vlc/plugins/access/libshm_plugin.la +lib/vlc/plugins/access/libtcp_plugin.la +lib/vlc/plugins/access/libtimecode_plugin.la +lib/vlc/plugins/access/libudp_plugin.la lib/vlc/plugins/access/libvcd_plugin.la +lib/vlc/plugins/access/libvdr_plugin.la ${PLIST.x11}lib/vlc/plugins/access/libxcb_screen_plugin.la lib/vlc/plugins/access/libzip_plugin.la lib/vlc/plugins/access_output/libaccess_output_dummy_plugin.la lib/vlc/plugins/access_output/libaccess_output_file_plugin.la lib/vlc/plugins/access_output/libaccess_output_http_plugin.la +lib/vlc/plugins/access_output/libaccess_output_livehttp_plugin.la +lib/vlc/plugins/access_output/libaccess_output_shout_plugin.la lib/vlc/plugins/access_output/libaccess_output_udp_plugin.la lib/vlc/plugins/audio_filter/liba52tofloat32_plugin.la lib/vlc/plugins/audio_filter/liba52tospdif_plugin.la lib/vlc/plugins/audio_filter/libaudio_format_plugin.la lib/vlc/plugins/audio_filter/libaudiobargraph_a_plugin.la lib/vlc/plugins/audio_filter/libchorus_flanger_plugin.la -lib/vlc/plugins/audio_filter/libconverter_fixed_plugin.la +lib/vlc/plugins/audio_filter/libcompressor_plugin.la lib/vlc/plugins/audio_filter/libdolby_surround_decoder_plugin.la ${PLIST.dts}lib/vlc/plugins/audio_filter/libdtstofloat32_plugin.la lib/vlc/plugins/audio_filter/libdtstospdif_plugin.la lib/vlc/plugins/audio_filter/libequalizer_plugin.la +lib/vlc/plugins/audio_filter/libgain_plugin.la lib/vlc/plugins/audio_filter/libheadphone_channel_mixer_plugin.la +lib/vlc/plugins/audio_filter/libkaraoke_plugin.la lib/vlc/plugins/audio_filter/libmono_plugin.la lib/vlc/plugins/audio_filter/libmpgatofixed32_plugin.la lib/vlc/plugins/audio_filter/libnormvol_plugin.la lib/vlc/plugins/audio_filter/libparam_eq_plugin.la +lib/vlc/plugins/audio_filter/libremap_plugin.la lib/vlc/plugins/audio_filter/libscaletempo_plugin.la lib/vlc/plugins/audio_filter/libsimple_channel_mixer_plugin.la lib/vlc/plugins/audio_filter/libspatializer_plugin.la +lib/vlc/plugins/audio_filter/libspeex_resampler_plugin.la +lib/vlc/plugins/audio_filter/libstereo_widen_plugin.la lib/vlc/plugins/audio_filter/libtrivial_channel_mixer_plugin.la lib/vlc/plugins/audio_filter/libugly_resampler_plugin.la -lib/vlc/plugins/audio_mixer/libfloat32_mixer_plugin.la -lib/vlc/plugins/audio_mixer/libspdif_mixer_plugin.la -lib/vlc/plugins/audio_mixer/libtrivial_mixer_plugin.la -lib/vlc/plugins/audio_output/libaout_file_plugin.la -${PLIST.sdl}lib/vlc/plugins/audio_output/libaout_sdl_plugin.la -lib/vlc/plugins/audio_output/liboss_plugin.la +lib/vlc/plugins/audio_mixer/libfloat_mixer_plugin.la +lib/vlc/plugins/audio_mixer/libinteger_mixer_plugin.la +lib/vlc/plugins/audio_output/libadummy_plugin.la +lib/vlc/plugins/audio_output/libafile_plugin.la +lib/vlc/plugins/audio_output/libamem_plugin.la +${PLIST.jack}lib/vlc/plugins/audio_output/libjack_plugin.la +${PLIST.oss}lib/vlc/plugins/audio_output/liboss_plugin.la ${PLIST.pulseaudio}lib/vlc/plugins/audio_output/libpulse_plugin.la lib/vlc/plugins/codec/liba52_plugin.la lib/vlc/plugins/codec/libadpcm_plugin.la @@ -148,51 +173,69 @@ lib/vlc/plugins/codec/libavcodec_plugin.la lib/vlc/plugins/codec/libcc_plugin.la lib/vlc/plugins/codec/libcdg_plugin.la lib/vlc/plugins/codec/libcvdsub_plugin.la +lib/vlc/plugins/codec/libddummy_plugin.la lib/vlc/plugins/codec/libdts_plugin.la lib/vlc/plugins/codec/libdvbsub_plugin.la +lib/vlc/plugins/codec/libedummy_plugin.la ${PLIST.faad}lib/vlc/plugins/codec/libfaad_plugin.la -lib/vlc/plugins/codec/libfake_plugin.la lib/vlc/plugins/codec/libflac_plugin.la -lib/vlc/plugins/codec/libinvmem_plugin.la +lib/vlc/plugins/codec/libfluidsynth_plugin.la +lib/vlc/plugins/codec/libg711_plugin.la +lib/vlc/plugins/codec/libjpeg_plugin.la +lib/vlc/plugins/codec/libkate_plugin.la +lib/vlc/plugins/codec/liblibass_plugin.la lib/vlc/plugins/codec/liblibmpeg2_plugin.la lib/vlc/plugins/codec/liblpcm_plugin.la lib/vlc/plugins/codec/libmpeg_audio_plugin.la +lib/vlc/plugins/codec/libopus_plugin.la lib/vlc/plugins/codec/libpng_plugin.la lib/vlc/plugins/codec/librawvideo_plugin.la +lib/vlc/plugins/codec/libschroedinger_plugin.la +lib/vlc/plugins/codec/libscte27_plugin.la ${PLIST.sdl}lib/vlc/plugins/codec/libsdl_image_plugin.la +lib/vlc/plugins/codec/libspeex_plugin.la lib/vlc/plugins/codec/libspudec_plugin.la +lib/vlc/plugins/codec/libstl_plugin.la lib/vlc/plugins/codec/libsubsdec_plugin.la +lib/vlc/plugins/codec/libsubstx3g_plugin.la lib/vlc/plugins/codec/libsubsusf_plugin.la lib/vlc/plugins/codec/libsvcdsub_plugin.la +lib/vlc/plugins/codec/libsvgdec_plugin.la lib/vlc/plugins/codec/libt140_plugin.la lib/vlc/plugins/codec/libtelx_plugin.la lib/vlc/plugins/codec/libtheora_plugin.la +lib/vlc/plugins/codec/libuleaddvaudio_plugin.la lib/vlc/plugins/codec/libvorbis_plugin.la +lib/vlc/plugins/codec/libvpx_plugin.la lib/vlc/plugins/codec/libx264_plugin.la +${PLIST.x11}lib/vlc/plugins/codec/libxwd_plugin.la ${PLIST.dbus}lib/vlc/plugins/control/libdbus_plugin.la +lib/vlc/plugins/control/libdummy_plugin.la lib/vlc/plugins/control/libgestures_plugin.la -${PLIST.x11}lib/vlc/plugins/control/libglobalhotkeys_plugin.la lib/vlc/plugins/control/libhotkeys_plugin.la ${PLIST.lirc}lib/vlc/plugins/control/liblirc_plugin.la lib/vlc/plugins/control/libmotion_plugin.la lib/vlc/plugins/control/libnetsync_plugin.la -lib/vlc/plugins/control/liboldhttp_plugin.la lib/vlc/plugins/control/liboldrc_plugin.la -lib/vlc/plugins/control/liboldtelnet_plugin.la -lib/vlc/plugins/control/libsignals_plugin.la +${PLIST.x11}lib/vlc/plugins/control/libxcb_hotkeys_plugin.la lib/vlc/plugins/demux/libaiff_plugin.la lib/vlc/plugins/demux/libasf_plugin.la lib/vlc/plugins/demux/libau_plugin.la lib/vlc/plugins/demux/libavformat_plugin.la lib/vlc/plugins/demux/libavi_plugin.la +lib/vlc/plugins/demux/libcaf_plugin.la lib/vlc/plugins/demux/libdemux_cdg_plugin.la +lib/vlc/plugins/demux/libdemux_stl_plugin.la lib/vlc/plugins/demux/libdemuxdump_plugin.la -lib/vlc/plugins/demux/libdirac_plugin.la +lib/vlc/plugins/demux/libdiracsys_plugin.la lib/vlc/plugins/demux/libes_plugin.la lib/vlc/plugins/demux/libflacsys_plugin.la lib/vlc/plugins/demux/libh264_plugin.la +lib/vlc/plugins/demux/libhevc_plugin.la +lib/vlc/plugins/demux/libimage_plugin.la lib/vlc/plugins/demux/libmjpeg_plugin.la lib/vlc/plugins/demux/libmkv_plugin.la +lib/vlc/plugins/demux/libmod_plugin.la lib/vlc/plugins/demux/libmp4_plugin.la lib/vlc/plugins/demux/libmpc_plugin.la lib/vlc/plugins/demux/libmpgv_plugin.la @@ -218,30 +261,21 @@ lib/vlc/plugins/demux/libvoc_plugin.la lib/vlc/plugins/demux/libwav_plugin.la lib/vlc/plugins/demux/libxa_plugin.la ${PLIST.x11}lib/vlc/plugins/gui/libqt4_plugin.la -${PLIST.skins}lib/vlc/plugins/gui/libskins2_plugin.la +${PLIST.vlc-skins}lib/vlc/plugins/gui/libskins2_plugin.la lib/vlc/plugins/meta_engine/libfolder_plugin.la lib/vlc/plugins/meta_engine/libtaglib_plugin.la +lib/vlc/plugins/misc/libaddonsfsstorage_plugin.la +lib/vlc/plugins/misc/libaddonsvorepository_plugin.la lib/vlc/plugins/misc/libaudioscrobbler_plugin.la -lib/vlc/plugins/misc/libdummy_plugin.la +${PLIST.dbus}lib/vlc/plugins/misc/libdbus_screensaver_plugin.la lib/vlc/plugins/misc/libexport_plugin.la -${PLIST.x11}lib/vlc/plugins/misc/libfreetype_plugin.la +lib/vlc/plugins/misc/libfingerprinter_plugin.la lib/vlc/plugins/misc/libgnutls_plugin.la -${PLIST.dbus}lib/vlc/plugins/misc/libinhibit_plugin.la lib/vlc/plugins/misc/liblogger_plugin.la -${PLIST.dbus}lib/vlc/plugins/misc/libnotify_plugin.la -lib/vlc/plugins/misc/libosd_parser_plugin.la lib/vlc/plugins/misc/libstats_plugin.la -${PLIST.dbus}lib/vlc/plugins/misc/libtelepathy_plugin.la lib/vlc/plugins/misc/libvod_rtsp_plugin.la ${PLIST.x11}lib/vlc/plugins/misc/libxdg_screensaver_plugin.la lib/vlc/plugins/misc/libxml_plugin.la -${PLIST.x11}lib/vlc/plugins/misc/libxscreensaver_plugin.la -lib/vlc/plugins/misc/libxtag_plugin.la -${PLIST.x86simd}lib/vlc/plugins/mmx/libi420_rgb_mmx_plugin.la -${PLIST.x86simd}lib/vlc/plugins/mmx/libi420_yuy2_mmx_plugin.la -${PLIST.x86simd}lib/vlc/plugins/mmx/libi422_yuy2_mmx_plugin.la -${PLIST.x86simd}lib/vlc/plugins/mmx/libmemcpymmx_plugin.la -${PLIST.x86simd}lib/vlc/plugins/mmxext/libmemcpymmxext_plugin.la lib/vlc/plugins/mux/libmux_asf_plugin.la lib/vlc/plugins/mux/libmux_avi_plugin.la lib/vlc/plugins/mux/libmux_dummy_plugin.la @@ -251,67 +285,90 @@ lib/vlc/plugins/mux/libmux_ogg_plugin.la lib/vlc/plugins/mux/libmux_ps_plugin.la lib/vlc/plugins/mux/libmux_ts_plugin.la lib/vlc/plugins/mux/libmux_wav_plugin.la +lib/vlc/plugins/packetizer/libpacketizer_avparser_plugin.la lib/vlc/plugins/packetizer/libpacketizer_copy_plugin.la lib/vlc/plugins/packetizer/libpacketizer_dirac_plugin.la lib/vlc/plugins/packetizer/libpacketizer_flac_plugin.la lib/vlc/plugins/packetizer/libpacketizer_h264_plugin.la +lib/vlc/plugins/packetizer/libpacketizer_hevc_plugin.la lib/vlc/plugins/packetizer/libpacketizer_mlp_plugin.la lib/vlc/plugins/packetizer/libpacketizer_mpeg4audio_plugin.la lib/vlc/plugins/packetizer/libpacketizer_mpeg4video_plugin.la lib/vlc/plugins/packetizer/libpacketizer_mpegvideo_plugin.la lib/vlc/plugins/packetizer/libpacketizer_vc1_plugin.la +lib/vlc/plugins/plugins.dat lib/vlc/plugins/services_discovery/libmediadirs_plugin.la +lib/vlc/plugins/services_discovery/libmtp_plugin.la lib/vlc/plugins/services_discovery/libpodcast_plugin.la +${PLIST.pulseaudio}lib/vlc/plugins/services_discovery/libpulselist_plugin.la lib/vlc/plugins/services_discovery/libsap_plugin.la +lib/vlc/plugins/services_discovery/libupnp_plugin.la ${PLIST.x11}lib/vlc/plugins/services_discovery/libxcb_apps_plugin.la -${PLIST.x86simd}lib/vlc/plugins/sse2/libi420_rgb_sse2_plugin.la -${PLIST.x86simd}lib/vlc/plugins/sse2/libi420_yuy2_sse2_plugin.la -${PLIST.x86simd}lib/vlc/plugins/sse2/libi422_yuy2_sse2_plugin.la +lib/vlc/plugins/stream_filter/libdash_plugin.la lib/vlc/plugins/stream_filter/libdecomp_plugin.la -lib/vlc/plugins/stream_filter/libstream_filter_rar_plugin.la -lib/vlc/plugins/stream_filter/libstream_filter_record_plugin.la +lib/vlc/plugins/stream_filter/libhttplive_plugin.la +lib/vlc/plugins/stream_filter/librecord_plugin.la +lib/vlc/plugins/stream_filter/libsmooth_plugin.la lib/vlc/plugins/stream_out/libstream_out_autodel_plugin.la lib/vlc/plugins/stream_out/libstream_out_bridge_plugin.la +lib/vlc/plugins/stream_out/libstream_out_delay_plugin.la lib/vlc/plugins/stream_out/libstream_out_description_plugin.la lib/vlc/plugins/stream_out/libstream_out_display_plugin.la lib/vlc/plugins/stream_out/libstream_out_dummy_plugin.la lib/vlc/plugins/stream_out/libstream_out_duplicate_plugin.la lib/vlc/plugins/stream_out/libstream_out_es_plugin.la lib/vlc/plugins/stream_out/libstream_out_gather_plugin.la +lib/vlc/plugins/stream_out/libstream_out_langfromtelx_plugin.la lib/vlc/plugins/stream_out/libstream_out_mosaic_bridge_plugin.la lib/vlc/plugins/stream_out/libstream_out_raop_plugin.la lib/vlc/plugins/stream_out/libstream_out_record_plugin.la lib/vlc/plugins/stream_out/libstream_out_rtp_plugin.la +lib/vlc/plugins/stream_out/libstream_out_setid_plugin.la lib/vlc/plugins/stream_out/libstream_out_smem_plugin.la lib/vlc/plugins/stream_out/libstream_out_standard_plugin.la +lib/vlc/plugins/stream_out/libstream_out_stats_plugin.la lib/vlc/plugins/stream_out/libstream_out_transcode_plugin.la +${PLIST.x11}lib/vlc/plugins/text_renderer/libfreetype_plugin.la +lib/vlc/plugins/text_renderer/libtdummy_plugin.la +lib/vlc/plugins/text_renderer/libsvg_plugin.la +lib/vlc/plugins/video_chroma/libchain_plugin.la lib/vlc/plugins/video_chroma/libgrey_yuv_plugin.la +lib/vlc/plugins/video_chroma/libi420_rgb_mmx_plugin.la lib/vlc/plugins/video_chroma/libi420_rgb_plugin.la +lib/vlc/plugins/video_chroma/libi420_rgb_sse2_plugin.la +lib/vlc/plugins/video_chroma/libi420_yuy2_mmx_plugin.la lib/vlc/plugins/video_chroma/libi420_yuy2_plugin.la +lib/vlc/plugins/video_chroma/libi420_yuy2_sse2_plugin.la lib/vlc/plugins/video_chroma/libi422_i420_plugin.la +lib/vlc/plugins/video_chroma/libi422_yuy2_mmx_plugin.la lib/vlc/plugins/video_chroma/libi422_yuy2_plugin.la +lib/vlc/plugins/video_chroma/libi422_yuy2_sse2_plugin.la +lib/vlc/plugins/video_chroma/librv32_plugin.la +lib/vlc/plugins/video_chroma/libswscale_plugin.la lib/vlc/plugins/video_chroma/libyuy2_i420_plugin.la lib/vlc/plugins/video_chroma/libyuy2_i422_plugin.la lib/vlc/plugins/video_filter/libadjust_plugin.la lib/vlc/plugins/video_filter/libalphamask_plugin.la +lib/vlc/plugins/video_filter/libanaglyph_plugin.la +lib/vlc/plugins/video_filter/libantiflicker_plugin.la lib/vlc/plugins/video_filter/libaudiobargraph_v_plugin.la lib/vlc/plugins/video_filter/libball_plugin.la lib/vlc/plugins/video_filter/libblend_plugin.la lib/vlc/plugins/video_filter/libblendbench_plugin.la lib/vlc/plugins/video_filter/libbluescreen_plugin.la lib/vlc/plugins/video_filter/libcanvas_plugin.la -lib/vlc/plugins/video_filter/libchain_plugin.la -lib/vlc/plugins/video_filter/libclone_plugin.la lib/vlc/plugins/video_filter/libcolorthres_plugin.la -lib/vlc/plugins/video_filter/libcrop_plugin.la lib/vlc/plugins/video_filter/libcroppadd_plugin.la lib/vlc/plugins/video_filter/libdeinterlace_plugin.la lib/vlc/plugins/video_filter/libdynamicoverlay_plugin.la lib/vlc/plugins/video_filter/liberase_plugin.la lib/vlc/plugins/video_filter/libextract_plugin.la +lib/vlc/plugins/video_filter/libfreeze_plugin.la lib/vlc/plugins/video_filter/libgaussianblur_plugin.la +lib/vlc/plugins/video_filter/libgradfun_plugin.la lib/vlc/plugins/video_filter/libgradient_plugin.la lib/vlc/plugins/video_filter/libgrain_plugin.la +lib/vlc/plugins/video_filter/libhqdn3d_plugin.la lib/vlc/plugins/video_filter/libinvert_plugin.la lib/vlc/plugins/video_filter/liblogo_plugin.la lib/vlc/plugins/video_filter/libmagnify_plugin.la @@ -320,9 +377,8 @@ lib/vlc/plugins/video_filter/libmirror_plugin.la lib/vlc/plugins/video_filter/libmosaic_plugin.la lib/vlc/plugins/video_filter/libmotionblur_plugin.la lib/vlc/plugins/video_filter/libmotiondetect_plugin.la -lib/vlc/plugins/video_filter/libnoise_plugin.la -lib/vlc/plugins/video_filter/libosdmenu_plugin.la -${PLIST.x11}lib/vlc/plugins/video_filter/libpanoramix_plugin.la +lib/vlc/plugins/video_filter/liboldmovie_plugin.la +lib/vlc/plugins/video_filter/libposterize_plugin.la lib/vlc/plugins/video_filter/libpostproc_plugin.la lib/vlc/plugins/video_filter/libpsychedelic_plugin.la lib/vlc/plugins/video_filter/libpuzzle_plugin.la @@ -330,67 +386,86 @@ lib/vlc/plugins/video_filter/libremoteosd_plugin.la lib/vlc/plugins/video_filter/libripple_plugin.la lib/vlc/plugins/video_filter/librotate_plugin.la lib/vlc/plugins/video_filter/librss_plugin.la -lib/vlc/plugins/video_filter/librv32_plugin.la lib/vlc/plugins/video_filter/libscale_plugin.la lib/vlc/plugins/video_filter/libscene_plugin.la +lib/vlc/plugins/video_filter/libsepia_plugin.la lib/vlc/plugins/video_filter/libsharpen_plugin.la -lib/vlc/plugins/video_filter/libswscale_plugin.la +lib/vlc/plugins/video_filter/libsubsdelay_plugin.la lib/vlc/plugins/video_filter/libtransform_plugin.la -lib/vlc/plugins/video_filter/libvideo_filter_wrapper_plugin.la -lib/vlc/plugins/video_filter/libwall_plugin.la +lib/vlc/plugins/video_filter/libvhs_plugin.la lib/vlc/plugins/video_filter/libwave_plugin.la lib/vlc/plugins/video_filter/libyuvp_plugin.la -${PLIST.sdl}lib/vlc/plugins/video_output/libvout_sdl_plugin.la -${PLIST.x11}lib/vlc/plugins/video_output/libsnapshot_plugin.la +${PLIST.egl}lib/vlc/plugins/video_output/libegl_x11_plugin.la +lib/vlc/plugins/video_output/libgl_plugin.la +${PLIST.x11}lib/vlc/plugins/video_output/libglx_plugin.la +lib/vlc/plugins/video_output/libvdummy_plugin.la lib/vlc/plugins/video_output/libvmem_plugin.la ${PLIST.sdl}lib/vlc/plugins/video_output/libvout_sdl_plugin.la -lib/vlc/plugins/video_output/libvout_wrapper_plugin.la ${PLIST.x11}lib/vlc/plugins/video_output/libxcb_glx_plugin.la ${PLIST.x11}lib/vlc/plugins/video_output/libxcb_window_plugin.la ${PLIST.x11}lib/vlc/plugins/video_output/libxcb_x11_plugin.la ${PLIST.x11}lib/vlc/plugins/video_output/libxcb_xv_plugin.la lib/vlc/plugins/video_output/libyuv_plugin.la +lib/vlc/plugins/video_splitter/libclone_plugin.la +${PLIST.x11}lib/vlc/plugins/video_splitter/libpanoramix_plugin.la +lib/vlc/plugins/video_splitter/libwall_plugin.la +lib/vlc/plugins/visualization/libglspectrum_plugin.la lib/vlc/plugins/visualization/libvisual_plugin.la lib/vlc/vlc-cache-gen -man/man1/vlc-config.1 man/man1/vlc-wrapper.1 man/man1/vlc.1 share/applications/vlc.desktop share/doc/vlc/bugreport-howto.txt share/doc/vlc/fortunes.txt share/doc/vlc/intf-vcd.txt -share/icons/hicolor/128x128/apps/vlc-christmas.png +share/doc/vlc/libvlc/QtPlayer/LICENSE +share/doc/vlc/libvlc/QtPlayer/QtVLC.pro +share/doc/vlc/libvlc/QtPlayer/main.cpp +share/doc/vlc/libvlc/QtPlayer/player.cpp +share/doc/vlc/libvlc/QtPlayer/player.h +share/doc/vlc/libvlc/gtk_player.c +share/doc/vlc/libvlc/libvlc_DVD_ripper.c +share/doc/vlc/libvlc/vlc-thumb.c +share/doc/vlc/libvlc/wx_player.cpp +share/icons/hicolor/128x128/apps/vlc-xmas.png share/icons/hicolor/128x128/apps/vlc.png share/icons/hicolor/16x16/apps/vlc.png share/icons/hicolor/16x16/apps/vlc.xpm share/icons/hicolor/256x256/apps/vlc.png -share/icons/hicolor/32x32/apps/vlc-christmas.xpm +share/icons/hicolor/32x32/apps/vlc-xmas.xpm share/icons/hicolor/32x32/apps/vlc.png share/icons/hicolor/32x32/apps/vlc.xpm -share/icons/hicolor/48x48/apps/vlc-christmas.png +share/icons/hicolor/48x48/apps/vlc-xmas.png share/icons/hicolor/48x48/apps/vlc.png +share/kde/apps/solid/actions/vlc-openbd.desktop share/kde/apps/solid/actions/vlc-opencda.desktop share/kde/apps/solid/actions/vlc-opendvd.desktop share/kde/apps/solid/actions/vlc-openvcd.desktop share/locale/ach/LC_MESSAGES/vlc.mo share/locale/af/LC_MESSAGES/vlc.mo share/locale/am/LC_MESSAGES/vlc.mo +share/locale/an/LC_MESSAGES/vlc.mo share/locale/ar/LC_MESSAGES/vlc.mo share/locale/ast/LC_MESSAGES/vlc.mo +share/locale/az/LC_MESSAGES/vlc.mo share/locale/be/LC_MESSAGES/vlc.mo share/locale/bg/LC_MESSAGES/vlc.mo share/locale/bn/LC_MESSAGES/vlc.mo +share/locale/bn_IN/LC_MESSAGES/vlc.mo share/locale/br/LC_MESSAGES/vlc.mo +share/locale/bs/LC_MESSAGES/vlc.mo share/locale/ca/LC_MESSAGES/vlc.mo share/locale/cgg/LC_MESSAGES/vlc.mo share/locale/ckb/LC_MESSAGES/vlc.mo share/locale/co/LC_MESSAGES/vlc.mo share/locale/cs/LC_MESSAGES/vlc.mo +share/locale/cy/LC_MESSAGES/vlc.mo share/locale/da/LC_MESSAGES/vlc.mo share/locale/de/LC_MESSAGES/vlc.mo share/locale/el/LC_MESSAGES/vlc.mo share/locale/en_GB/LC_MESSAGES/vlc.mo share/locale/es/LC_MESSAGES/vlc.mo +share/locale/es_MX/LC_MESSAGES/vlc.mo share/locale/et/LC_MESSAGES/vlc.mo share/locale/eu/LC_MESSAGES/vlc.mo share/locale/fa/LC_MESSAGES/vlc.mo @@ -399,12 +474,15 @@ share/locale/fi/LC_MESSAGES/vlc.mo share/locale/fr/LC_MESSAGES/vlc.mo share/locale/fur/LC_MESSAGES/vlc.mo share/locale/ga/LC_MESSAGES/vlc.mo +share/locale/gd/LC_MESSAGES/vlc.mo share/locale/gl/LC_MESSAGES/vlc.mo +share/locale/gu/LC_MESSAGES/vlc.mo share/locale/he/LC_MESSAGES/vlc.mo share/locale/hi/LC_MESSAGES/vlc.mo share/locale/hr/LC_MESSAGES/vlc.mo share/locale/hu/LC_MESSAGES/vlc.mo share/locale/hy/LC_MESSAGES/vlc.mo +share/locale/ia/LC_MESSAGES/vlc.mo share/locale/id/LC_MESSAGES/vlc.mo share/locale/is/LC_MESSAGES/vlc.mo share/locale/it/LC_MESSAGES/vlc.mo @@ -412,13 +490,16 @@ share/locale/ja/LC_MESSAGES/vlc.mo share/locale/ka/LC_MESSAGES/vlc.mo share/locale/kk/LC_MESSAGES/vlc.mo share/locale/km/LC_MESSAGES/vlc.mo +share/locale/kn/LC_MESSAGES/vlc.mo share/locale/ko/LC_MESSAGES/vlc.mo +share/locale/ky/LC_MESSAGES/vlc.mo share/locale/lg/LC_MESSAGES/vlc.mo share/locale/lt/LC_MESSAGES/vlc.mo share/locale/lv/LC_MESSAGES/vlc.mo share/locale/mk/LC_MESSAGES/vlc.mo share/locale/ml/LC_MESSAGES/vlc.mo share/locale/mn/LC_MESSAGES/vlc.mo +share/locale/mr/LC_MESSAGES/vlc.mo share/locale/ms/LC_MESSAGES/vlc.mo share/locale/my/LC_MESSAGES/vlc.mo share/locale/nb/LC_MESSAGES/vlc.mo @@ -426,6 +507,7 @@ share/locale/ne/LC_MESSAGES/vlc.mo share/locale/nl/LC_MESSAGES/vlc.mo share/locale/nn/LC_MESSAGES/vlc.mo share/locale/oc/LC_MESSAGES/vlc.mo +share/locale/or/LC_MESSAGES/vlc.mo share/locale/pa/LC_MESSAGES/vlc.mo share/locale/pl/LC_MESSAGES/vlc.mo share/locale/ps/LC_MESSAGES/vlc.mo @@ -440,114 +522,24 @@ share/locale/sq/LC_MESSAGES/vlc.mo share/locale/sr/LC_MESSAGES/vlc.mo share/locale/sv/LC_MESSAGES/vlc.mo share/locale/ta/LC_MESSAGES/vlc.mo +share/locale/te/LC_MESSAGES/vlc.mo share/locale/tet/LC_MESSAGES/vlc.mo share/locale/th/LC_MESSAGES/vlc.mo share/locale/tl/LC_MESSAGES/vlc.mo share/locale/tr/LC_MESSAGES/vlc.mo share/locale/uk/LC_MESSAGES/vlc.mo +share/locale/uz/LC_MESSAGES/vlc.mo share/locale/vi/LC_MESSAGES/vlc.mo share/locale/wa/LC_MESSAGES/vlc.mo share/locale/zh_CN/LC_MESSAGES/vlc.mo share/locale/zh_TW/LC_MESSAGES/vlc.mo share/locale/zu/LC_MESSAGES/vlc.mo -share/vlc/http/.hosts -share/vlc/http/dialogs/.hosts -share/vlc/http/dialogs/browse -share/vlc/http/dialogs/footer -share/vlc/http/dialogs/input -share/vlc/http/dialogs/main -share/vlc/http/dialogs/mosaic -share/vlc/http/dialogs/playlist -share/vlc/http/dialogs/sout -share/vlc/http/dialogs/vlm -share/vlc/http/favicon.ico -share/vlc/http/flash.html -share/vlc/http/iehacks.css -share/vlc/http/images/delete.png -share/vlc/http/images/delete_small.png -share/vlc/http/images/eject.png -share/vlc/http/images/empty.png -share/vlc/http/images/fullscreen.png -share/vlc/http/images/help.png -share/vlc/http/images/info.png -share/vlc/http/images/loop.png -share/vlc/http/images/minus.png -share/vlc/http/images/next.png -share/vlc/http/images/pause.png -share/vlc/http/images/play.png -share/vlc/http/images/playlist.png -share/vlc/http/images/playlist_small.png -share/vlc/http/images/plus.png -share/vlc/http/images/prev.png -share/vlc/http/images/refresh.png -share/vlc/http/images/repeat.png -share/vlc/http/images/sd.png -share/vlc/http/images/shuffle.png -share/vlc/http/images/slider_bar.png -share/vlc/http/images/slider_left.png -share/vlc/http/images/slider_point.png -share/vlc/http/images/slider_right.png -share/vlc/http/images/slow.png -share/vlc/http/images/snapshot.png -share/vlc/http/images/sort.png -share/vlc/http/images/sout.png -share/vlc/http/images/speaker.png -share/vlc/http/images/speaker_mute.png -share/vlc/http/images/stop.png -share/vlc/http/images/vlc16x16.png -share/vlc/http/images/volume_down.png -share/vlc/http/images/volume_up.png -share/vlc/http/images/white.png -share/vlc/http/images/white_cross_small.png -share/vlc/http/index.html -share/vlc/http/js/functions.js -share/vlc/http/js/mosaic.js -share/vlc/http/js/vlm.js -share/vlc/http/mosaic.html -share/vlc/http/requests/browse.xml -share/vlc/http/requests/playlist.xml -share/vlc/http/requests/readme -share/vlc/http/requests/status.xml -share/vlc/http/requests/vlm.xml -share/vlc/http/requests/vlm_cmd.xml -share/vlc/http/style.css -share/vlc/http/vlm.html -share/vlc/http/vlm_export.html -share/vlc/osdmenu/default.cfg -share/vlc/osdmenu/default/selected/bw.png -share/vlc/osdmenu/default/selected/esc.png -share/vlc/osdmenu/default/selected/fw.png -share/vlc/osdmenu/default/selected/next.png -share/vlc/osdmenu/default/selected/play_pause.png -share/vlc/osdmenu/default/selected/previous.png -share/vlc/osdmenu/default/selected/stop.png -share/vlc/osdmenu/default/selected/volume.png -share/vlc/osdmenu/default/selection/bw.png -share/vlc/osdmenu/default/selection/esc.png -share/vlc/osdmenu/default/selection/fw.png -share/vlc/osdmenu/default/selection/next.png -share/vlc/osdmenu/default/selection/play_pause.png -share/vlc/osdmenu/default/selection/previous.png -share/vlc/osdmenu/default/selection/stop.png -share/vlc/osdmenu/default/selection/volume.png -share/vlc/osdmenu/default/unselected.png -share/vlc/osdmenu/default/volume/volume_00.png -share/vlc/osdmenu/default/volume/volume_01.png -share/vlc/osdmenu/default/volume/volume_02.png -share/vlc/osdmenu/default/volume/volume_03.png -share/vlc/osdmenu/default/volume/volume_04.png -share/vlc/osdmenu/default/volume/volume_05.png -share/vlc/osdmenu/default/volume/volume_06.png -share/vlc/osdmenu/default/volume/volume_07.png -share/vlc/osdmenu/default/volume/volume_08.png -share/vlc/osdmenu/default/volume/volume_09.png -share/vlc/osdmenu/default/volume/volume_10.png -${PLIST.skins}share/vlc/skins2/default.vlt -${PLIST.skins}share/vlc/skins2/fonts/FreeSans.ttf -${PLIST.skins}share/vlc/skins2/fonts/FreeSansBold.ttf -${PLIST.skins}share/vlc/skins2/skin.catalog -${PLIST.skins}share/vlc/skins2/skin.dtd -${PLIST.skins}share/vlc/skins2/winamp2.xml +${PLIST.vlc-skins}share/vlc/skins2/default.vlt +${PLIST.vlc-skins}share/vlc/skins2/fonts/FreeSans.ttf +${PLIST.vlc-skins}share/vlc/skins2/fonts/FreeSansBold.ttf +${PLIST.vlc-skins}share/vlc/skins2/skin.catalog +${PLIST.vlc-skins}share/vlc/skins2/skin.dtd +${PLIST.vlc-skins}share/vlc/skins2/winamp2.xml share/vlc/utils/audio-vlc-default.sh share/vlc/utils/gnome-vlc-default.sh share/vlc/utils/video-vlc-default.sh @@ -557,5 +549,11 @@ share/vlc/vlc.ico @pkgdir share/vlc/osdmenu/dvd/unselect @pkgdir share/vlc/osdmenu/dvd/selection @pkgdir share/vlc/osdmenu/dvd/selected +@pkgdir share/vlc/http/requests @pkgdir share/vlc/http/old/vlm @pkgdir share/vlc/http/old/admin +@pkgdir share/vlc/http/js +@pkgdir share/vlc/http/images +@pkgdir share/vlc/http/dialogs +@pkgdir lib/vlc/plugins/notify +@pkgdir lib/vlc/plugins/media_library diff --git a/multimedia/vlc/PLIST.Linux b/multimedia/vlc/PLIST.Linux index 68d81017efc..5e52a0bb42e 100644 --- a/multimedia/vlc/PLIST.Linux +++ b/multimedia/vlc/PLIST.Linux @@ -1,5 +1,8 @@ -@comment $NetBSD: PLIST.Linux,v 1.1 2012/05/14 02:59:56 sbd Exp $ -lib/vlc/plugins/access/libdvb_plugin.la -lib/vlc/plugins/access/libv4l2_plugin.la +@comment $NetBSD: PLIST.Linux,v 1.2 2015/10/25 11:00:18 wiz Exp $ +lib/vlc/plugins/access/libaccess_alsa_plugin.la +lib/vlc/plugins/access/libdtv_plugin.la +lib/vlc/plugins/access/liblinsys_hdsdi_plugin.la +${PLIST.v4l2}lib/vlc/plugins/access/libv4l2_plugin.la +lib/vlc/plugins/audio_output/libalsa_plugin.la lib/vlc/plugins/video_filter/libatmo_plugin.la lib/vlc/plugins/video_output/libfb_plugin.la diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo index 84c13e9b18d..1ef2b1ae45d 100644 --- a/multimedia/vlc/distinfo +++ b/multimedia/vlc/distinfo @@ -1,29 +1,27 @@ -$NetBSD: distinfo,v 1.65 2015/03/22 20:06:32 joerg Exp $ +$NetBSD: distinfo,v 1.66 2015/10/25 11:00:18 wiz Exp $ -SHA1 (vlc-1.1.13.tar.bz2) = 05bbc7ff427f3b919b29a45ce014caff9ba92648 -RMD160 (vlc-1.1.13.tar.bz2) = c5aa438a9085ddbf28e849df442b75475693290d -Size (vlc-1.1.13.tar.bz2) = 26226587 bytes -SHA1 (patch-SA1302) = 9c654eca6f4e689ce2d5c563c6f19dc7705e418b -SHA1 (patch-aa) = 684f7ad6a20ed6b9b8a8be2fc61836e6b471b686 -SHA1 (patch-ab) = bf5aaf7c201d0c28796956f58ebeb769a15d454e -SHA1 (patch-ac) = d00c4037f29b84730156355e5635b485d996d3c6 -SHA1 (patch-ad) = 2fb479bfa88f6c93b135b38fe2d41fb7bb92d94a -SHA1 (patch-ae) = b20e8e41dfa2c77c99584640d85f853fb1098750 -SHA1 (patch-af) = f5aec21c08a09bbfadad398bd57d3627164d1b6f -SHA1 (patch-ag) = 5e23bac844429632c0dee0dea4ecbdfb5f8ba2fd -SHA1 (patch-ah) = 6d5d5c0e17bd845fad757e75a9e68db698510374 -SHA1 (patch-ai) = 328bd66ef6c11275894c74012e7d6fec8fcbd5d3 -SHA1 (patch-ar) = 153164870e9dc50ad32106d9f8ebd25b35ed3dd3 -SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086 -SHA1 (patch-at) = d4fe7ba15a64c28f97a2800fe0bcae304ce0fa2d -SHA1 (patch-au) = 7e1d1e7f2734051fffb988cc4ea01a1a7b264b78 -SHA1 (patch-configure.ac) = 14eed94268866b39672bbdd28cac978f91e2e43b -SHA1 (patch-include_vlc__fixups.h) = b6001b92238e365ccd8e5daf3683f919e472b61d -SHA1 (patch-modules_audio__output_pulse.c) = 994389b214f3e2b7b8b7ccaf3bb535a94523f81b -SHA1 (patch-modules_codec_flac.c) = 962783164f505a8b9e5c1be18e162dfdc7917cb3 -SHA1 (patch-modules_misc_freetype.c) = c362cdb0c1223398b14dd1a08525140c646668a7 -SHA1 (patch-modules_misc_rtsp.c) = 586e0228cf21ca2f976451e61e4390278afb6fee -SHA1 (patch-modules_visualization_projectm.cpp) = 8e3c6ec0d9588f432c5baa75e36c1c2248780b6b -SHA1 (patch-src_config_file.c) = dfec35d5655722e624ed524fc27adc9e72f60552 -SHA1 (patch-src_misc_messages.c) = 855e82349ec80f7d68404da6b40f367776a74327 -SHA1 (patch-src_text_charset.c) = b8dfc376f23655565f671849971293d8527f5e3e +SHA1 (vlc-2.2.1.tar.xz) = ee8535c5966217bc2069a74c1d4e8c32609656e9 +RMD160 (vlc-2.2.1.tar.xz) = 3b199e3555e8aa52a760a9ed7b89874c782e0dff +Size (vlc-2.2.1.tar.xz) = 20940288 bytes +SHA1 (patch-bin_override.c) = 0190b65ec29ccdb7ef89d7c6af74a6bfdfc17076 +SHA1 (patch-compat_Makefile.am) = 983e9e29380702326d114274db99af72b5bdb3dd +SHA1 (patch-compat_Makefile.in) = 809b1b00f14a5d85a17cd81b0385529ae24f39ee +SHA1 (patch-include_vlc__common.h) = 26ab2c96230e3fbe26dd4bce60db7c5331eb3f6c +SHA1 (patch-include_vlc__fixups.h) = 277cc7985f66fe3e8e94c75003e25aabd2f1bbfc +SHA1 (patch-modules_access_directory.c) = 95bc95cb7eb0bf44684c04d2cecc2c4e8339f0f7 +SHA1 (patch-modules_access_file.c) = 22eb568aa5a1fea765e65a770432282024baaaf1 +SHA1 (patch-modules_access_rtp_Makefile.am) = cd2c1bcbde8fc04c15f4030ff8708e32b800dd53 +SHA1 (patch-modules_gui_qt4_components_controller.cpp) = 5822f018f910d1b0e441782ffeff193ebc35b6d2 +SHA1 (patch-modules_gui_qt4_components_extended__panels.cpp) = eaa7a4732fa5a462d5769fc71e097366e5bc2f70 +SHA1 (patch-modules_gui_qt4_components_interface__widgets.cpp) = b630de531ec90afd1f2aecc769f34952780b6ddb +SHA1 (patch-modules_gui_qt4_components_interface__widgets.hpp) = 9ac2782bcb1a306123662fd3e4f44b82149c111a +SHA1 (patch-modules_gui_qt4_input__manager.cpp) = 81c09ba0d042f0a0684092255f322b6aeaad08be +SHA1 (patch-modules_gui_qt4_input__manager.hpp) = ccc5f5fd53942f168e95d472731ee3f6a4d8ddb0 +SHA1 (patch-modules_gui_qt4_main__interface.cpp) = 11b9600a6e3c11268afc7c38859c5b62a1e8ee0d +SHA1 (patch-modules_gui_qt4_main__interface.hpp) = 1c3028519662d99c023375c5ee74e9f490c16f3c +SHA1 (patch-modules_gui_qt4_util_input__slider.cpp) = 17aa058d6a7fd5b006b063bdf78cee3302733811 +SHA1 (patch-modules_gui_qt4_util_input__slider.hpp) = 146f2a2e5a9fc70b7aaefefd859a59cb39555e6a +SHA1 (patch-modules_gui_skins2_src_theme__loader.cpp) = cbf1dfa33aa89bbb9382b789d77f6eea69d85b04 +SHA1 (patch-modules_misc_inhibit_xdg.c) = f84a8d629c8cd98c30b0acf41d87d55c7dc90d30 +SHA1 (patch-modules_video__output_sdl.c) = fcb5daacd5fe0627dcf1eaad79c8e2a27d6c948a +SHA1 (patch-src_config_file.c) = 87c53b6d3a2d1fa9cf5b7e8e672ab2a08cafe3bb diff --git a/multimedia/vlc/hacks.mk b/multimedia/vlc/hacks.mk new file mode 100644 index 00000000000..f4c628f1db8 --- /dev/null +++ b/multimedia/vlc/hacks.mk @@ -0,0 +1,15 @@ +# $NetBSD: hacks.mk,v 1.3 2015/10/25 11:00:18 wiz Exp $ + +.if !defined(VLC_HACKS_MK) +VLC_HACKS_MK= # empty + +# vlc_atomic.h rightly assumes "uses clang (support for C11)" implies +# "ships stdatomic.h" but for us this is not yet the case. +# This hack should be removed when -current has stdatomic.h. +.if ${OPSYS} == "NetBSD" && \ + exists(/usr/bin/clang) && \ + !exists(/usr/include/stdatomic.h) +CPPFLAGS+= -D__STDC_NO_ATOMICS__ +.endif + +.endif diff --git a/multimedia/vlc/options.mk b/multimedia/vlc/options.mk index ed7298724d0..a37ce88bd7c 100644 --- a/multimedia/vlc/options.mk +++ b/multimedia/vlc/options.mk @@ -1,8 +1,9 @@ -# $NetBSD: options.mk,v 1.29 2013/09/02 11:10:23 jperkin Exp $ +# $NetBSD: options.mk,v 1.30 2015/10/25 11:00:18 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.vlc -PKG_SUPPORTED_OPTIONS= debug faad dbus hal skins sdl pulseaudio x11 gnome dts -PKG_SUGGESTED_OPTIONS= faad x11 +PKG_SUPPORTED_OPTIONS= dbus debug dts faad gnome jack live pulseaudio +PKG_SUPPORTED_OPTIONS+= sdl vlc-skins x11 +PKG_SUGGESTED_OPTIONS= dbus live x11 ### Add VAAPI if it is available .include "../../multimedia/libva/available.mk" @@ -35,6 +36,16 @@ PLIST.pulseaudio= yes CONFIGURE_ARGS+= --disable-pulse .endif +## Jack Audio Connection Kit support + +.if !empty(PKG_OPTIONS:Mjack) +CONFIGURE_ARGS+= --enable-jack +.include "../../audio/jack/buildlink3.mk" +PLIST.jack= yes +.else +CONFIGURE_ARGS+= --disable-jack +.endif + ## SDL backend support .if !empty(PKG_OPTIONS:Msdl) @@ -59,38 +70,13 @@ CONFIGURE_ARGS+= --disable-gnomevfs .endif ## DBUS message bus support -## also libnotify because it uses dbus -## so taking them apart would make no sense. .if !empty(PKG_OPTIONS:Mdbus) CONFIGURE_ARGS+= --enable-dbus .include "../../sysutils/dbus/buildlink3.mk" PLIST.dbus= yes -CONFIGURE_ARGS+= --enable-notify -.include "../../sysutils/libnotify/buildlink3.mk" - -# telepathy needs dbus, but its also gnome-ish -.if !empty(PKG_OPTIONS:Mgnome) -.include "../../chat/libtelepathy/buildlink3.mk" -CONFIGURE_ARGS+= --enable-telepathy -.else -CONFIGURE_ARGS+= --disable-telepathy -.endif - -PLIST.dbus= yes - -## HAL support (requires dbus) -.if !empty(PKG_OPTIONS:Mhal) -CONFIGURE_ARGS+= --enable-hal -.include "../../sysutils/hal/buildlink3.mk" -PLIST.hal= yes -.else -CONFIGURE_ARGS+= --disable-hal -.endif .else CONFIGURE_ARGS+= --disable-dbus -CONFIGURE_ARGS+= --disable-hal -CONFIGURE_ARGS+= --disable-notify .endif ## DEBUG build or release build @@ -98,15 +84,13 @@ CONFIGURE_ARGS+= --disable-notify .if !empty(PKG_OPTIONS:Mdebug) CONFIGURE_ARGS+= --enable-debug CONFIGURE_ARGS+= --disable-optimizations -.else -CONFIGURE_ARGS+= --enable-release .endif ## SKINS frontend -.if !empty(PKG_OPTIONS:Mskins) +.if !empty(PKG_OPTIONS:Mvlc-skins) CONFIGURE_ARGS+= --enable-skins2 -PLIST.skins= yes +PLIST.vlc-skins= yes INSTALLATION_DIRS+= share/vlc/skins2 .else CONFIGURE_ARGS+= --disable-skins2 @@ -114,6 +98,7 @@ CONFIGURE_ARGS+= --disable-skins2 ## X11 dependency and QT4 frontend +PLIST_VARS+= egl .if !empty(PKG_OPTIONS:Mx11) DEPENDS+= dejavu-ttf>=2.0:../../fonts/dejavu-ttf .include "../../graphics/freetype2/buildlink3.mk" @@ -124,22 +109,21 @@ DEPENDS+= dejavu-ttf>=2.0:../../fonts/dejavu-ttf .include "../../x11/libXinerama/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libxcb/buildlink3.mk" -.include "../../x11/xcb-util036/buildlink3.mk" +.include "../../x11/xcb-util-keysyms/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../x11/qt4-libs/buildlink3.mk" -CONFIGURE_ARGS+= --enable-qt4 \ - --with-x \ - --enable-glx \ - --enable-snapshot +CONFIGURE_ARGS+= --enable-qt \ + --with-x PLIST.x11= yes +.if ${X11_TYPE} == "modular" || exists(${X11BASE}/include/EGL/egl.h) +PLIST.egl= yes +.endif .else CONFIGURE_ARGS+= --without-x \ --disable-xcb \ - --disable-qt4 \ - --disable-glx \ - --disable-freetype \ - --disable-snapshot + --disable-qt \ + --disable-freetype .endif .if !empty(PKG_OPTIONS:Mfaad) @@ -160,6 +144,17 @@ PLIST.dts= yes CONFIGURE_ARGS+= --enable-dca=no .endif +## RTSP support + +.if !empty(PKG_OPTIONS:Mlive) +CONFIGURE_ARGS+= --enable-live555 +PLIST.live= yes +BUILDLINK_API_DEPENDS.liblive+= liblive>=20111223 +. include "../../net/liblive/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-live555 +.endif + ## VAAPI support .if !empty(PKG_OPTIONS:Mvaapi) CONFIGURE_ARGS+= --enable-libva diff --git a/multimedia/vlc/patches/patch-SA1302 b/multimedia/vlc/patches/patch-SA1302 deleted file mode 100644 index 010238e2aa8..00000000000 --- a/multimedia/vlc/patches/patch-SA1302 +++ /dev/null @@ -1,160 +0,0 @@ -$NetBSD: patch-SA1302,v 1.1 2013/02/05 18:53:34 drochner Exp $ - -upstream commit 330ba2296cd6841d0e8f0be40ef84966d5540fd3 -(manually adjusted) - ---- modules/demux/asf/asf.c.orig 2011-07-12 18:11:24.000000000 +0000 -+++ modules/demux/asf/asf.c -@@ -384,15 +384,30 @@ static mtime_t GetMoviePTS( demux_sys_t - return i_time; - } - --#define GETVALUE2b( bits, var, def ) \ -- switch( (bits)&0x03 ) \ -- { \ -- case 1: var = p_peek[i_skip]; i_skip++; break; \ -- case 2: var = GetWLE( p_peek + i_skip ); i_skip+= 2; break; \ -- case 3: var = GetDWLE( p_peek + i_skip ); i_skip+= 4; break; \ -- case 0: \ -- default: var = def; break;\ -+static inline int GetValue2b(int *var, const uint8_t *p, int *skip, int left, int bits) -+{ -+ switch(bits&0x03) -+ { -+ case 1: -+ if (left < 1) -+ return -1; -+ *var = p[*skip]; *skip += 1; -+ return 0; -+ case 2: -+ if (left < 2) -+ return -1; -+ *var = GetWLE(&p[*skip]); *skip += 2; -+ return 0; -+ case 3: -+ if (left < 4) -+ return -1; -+ *var = GetDWLE(&p[*skip]); *skip += 4; -+ return 0; -+ case 0: -+ default: -+ return 0; - } -+} - - static int DemuxPacket( demux_t *p_demux ) - { -@@ -406,15 +421,15 @@ static int DemuxPacket( demux_t *p_demux - int i_packet_property; - - int b_packet_multiple_payload; -- int i_packet_length; -- int i_packet_sequence; -- int i_packet_padding_length; -+ int i_packet_length = i_data_packet_min; -+ int i_packet_sequence = 0; -+ int i_packet_padding_length = 0; - - uint32_t i_packet_send_time; -- uint16_t i_packet_duration; - int i_payload; - int i_payload_count; - int i_payload_length_type; -+ int peek_size; - - - if( stream_Peek( p_demux->s, &p_peek,i_data_packet_min)<i_data_packet_min ) -@@ -422,6 +437,7 @@ static int DemuxPacket( demux_t *p_demux - msg_Warn( p_demux, "cannot peek while getting new packet, EOF ?" ); - return 0; - } -+ peek_size = i_data_packet_min; - i_skip = 0; - - /* *** parse error correction if present *** */ -@@ -462,9 +478,12 @@ static int DemuxPacket( demux_t *p_demux - b_packet_multiple_payload = i_packet_flags&0x01; - - /* read some value */ -- GETVALUE2b( i_packet_flags >> 5, i_packet_length, i_data_packet_min ); -- GETVALUE2b( i_packet_flags >> 1, i_packet_sequence, 0 ); -- GETVALUE2b( i_packet_flags >> 3, i_packet_padding_length, 0 ); -+ if (GetValue2b(&i_packet_length, p_peek, &i_skip, peek_size - i_skip, i_packet_flags >> 5) < 0) -+ goto loop_error_recovery; -+ if (GetValue2b(&i_packet_sequence, p_peek, &i_skip, peek_size - i_skip, i_packet_flags >> 1) < 0) -+ goto loop_error_recovery; -+ if (GetValue2b(&i_packet_padding_length, p_peek, &i_skip, peek_size - i_skip, i_packet_flags >> 3) < 0) -+ goto loop_error_recovery; - - if( i_packet_padding_length > i_packet_length ) - { -@@ -473,7 +492,7 @@ static int DemuxPacket( demux_t *p_demux - } - - i_packet_send_time = GetDWLE( p_peek + i_skip ); i_skip += 4; -- i_packet_duration = GetWLE( p_peek + i_skip ); i_skip += 2; -+ /* uint16_t i_packet_duration = GetWLE( p_peek + i_skip ); */ i_skip += 2; - - /* FIXME I have to do that for some file, I don't known why */ - i_packet_size_left = i_data_packet_min /*i_packet_length*/ ; -@@ -496,13 +515,13 @@ static int DemuxPacket( demux_t *p_demux - - int i_packet_keyframe; - int i_stream_number; -- int i_media_object_number; -+ int i_media_object_number = 0; - int i_media_object_offset; -- int i_replicated_data_length; -- int i_payload_data_length; -+ int i_replicated_data_length = 0; -+ int i_payload_data_length = 0; - int i_payload_data_pos; - int i_sub_payload_data_length; -- int i_tmp; -+ int i_tmp = 0; - - mtime_t i_pts; - mtime_t i_pts_delta; -@@ -516,9 +535,12 @@ static int DemuxPacket( demux_t *p_demux - i_packet_keyframe = p_peek[i_skip] >> 7; - i_stream_number = p_peek[i_skip++] & 0x7f; - -- GETVALUE2b( i_packet_property >> 4, i_media_object_number, 0 ); -- GETVALUE2b( i_packet_property >> 2, i_tmp, 0 ); -- GETVALUE2b( i_packet_property, i_replicated_data_length, 0 ); -+ if (GetValue2b(&i_media_object_number, p_peek, &i_skip, peek_size - i_skip, i_packet_property >> 4) < 0) -+ break; -+ if (GetValue2b(&i_tmp, p_peek, &i_skip, peek_size - i_skip, i_packet_property >> 2) < 0) -+ break; -+ if (GetValue2b(&i_replicated_data_length, p_peek, &i_skip, peek_size - i_skip, i_packet_property) < 0) -+ break; - - if( i_replicated_data_length > 1 ) // should be at least 8 bytes - { -@@ -553,7 +575,9 @@ static int DemuxPacket( demux_t *p_demux - i_pts = __MAX( i_pts - p_sys->p_fp->i_preroll * 1000, 0 ); - if( b_packet_multiple_payload ) - { -- GETVALUE2b( i_payload_length_type, i_payload_data_length, 0 ); -+ i_payload_data_length = 0; -+ if (GetValue2b(&i_payload_data_length, p_peek, &i_skip, peek_size - i_skip, i_payload_length_type) < 0) -+ break; - } - else - { -@@ -640,6 +664,7 @@ static int DemuxPacket( demux_t *p_demux - return 0; - } - i_packet_size_left -= i_read; -+ peek_size = 0; - - p_frag->p_buffer += i_skip; - p_frag->i_buffer -= i_skip; -@@ -667,6 +692,7 @@ static int DemuxPacket( demux_t *p_demux - msg_Warn( p_demux, "cannot peek, EOF ?" ); - return 0; - } -+ peek_size = i_packet_size_left; - } - } - } diff --git a/multimedia/vlc/patches/patch-aa b/multimedia/vlc/patches/patch-aa deleted file mode 100644 index 3fd727d5542..00000000000 --- a/multimedia/vlc/patches/patch-aa +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-aa,v 1.14 2011/01/24 18:54:04 drochner Exp $ - ---- modules/access/file.c.orig 2010-07-19 01:21:06.000000000 +0900 -+++ modules/access/file.c 2011-01-04 22:05:25.000000000 +0900 -@@ -52,6 +52,9 @@ - #ifdef HAVE_LINUX_MAGIC_H - # include <sys/vfs.h> - # include <linux/magic.h> -+#elif defined (HAVE_FSTATVFS) -+# include <sys/statvfs.h> -+# include <sys/mount.h> - #endif - - #if defined( WIN32 ) -@@ -90,7 +93,12 @@ - #ifndef WIN32 - static bool IsRemote (int fd) - { --#if defined (HAVE_FSTATVFS) && defined (MNT_LOCAL) -+#if !defined(__linux__) && defined(HAVE_FSTATVFS) && defined (MNT_LOCAL) -+ struct statvfs s; -+ if (fstatvfs(fd, &s)) -+ return false; -+ return !(s.f_flag & MNT_LOCAL); -+#elif defined (HAVE_FSTATFS) - struct statvfs stf; - - if (fstatvfs (fd, &stf)) diff --git a/multimedia/vlc/patches/patch-ad b/multimedia/vlc/patches/patch-ad deleted file mode 100644 index 4ad4fba73d4..00000000000 --- a/multimedia/vlc/patches/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ad,v 1.8 2012/08/30 18:54:42 christos Exp $ - ---- modules/gui/qt4/components/interface_widgets.cpp 2011-07-12 21:11:24.000000000 +0300 -+++ modules/gui/qt4/components/interface_widgets.cpp 2012-08-30 17:46:45.000000000 +0300 -@@ -524,14 +524,14 @@ - + qtr( "Double click to jump to a chosen time position" ) ); - bufTimer->setSingleShot( true ); - -- CONNECT( THEMIM->getIM(), positionUpdated( float, int64_t, int ), -- this, setDisplayPosition( float, int64_t, int ) ); -+ CONNECT( THEMIM->getIM(), positionUpdated( float, putime_t, int ), -+ this, setDisplayPosition( float, putime_t, int ) ); - CONNECT( THEMIM->getIM(), cachingChanged( float ), - this, updateBuffering( float ) ); - CONNECT( bufTimer, timeout(), this, updateBuffering() ); - } - --void TimeLabel::setDisplayPosition( float pos, int64_t t, int length ) -+void TimeLabel::setDisplayPosition( float pos, putime_t t, int length ) - { - showBuffering = false; - bufTimer->stop(); diff --git a/multimedia/vlc/patches/patch-ae b/multimedia/vlc/patches/patch-ae deleted file mode 100644 index 0a25ea20448..00000000000 --- a/multimedia/vlc/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.7 2012/08/30 18:54:42 christos Exp $ - ---- modules/gui/qt4/components/interface_widgets.hpp 2011-07-12 21:11:24.000000000 +0300 -+++ modules/gui/qt4/components/interface_widgets.hpp 2012-08-30 17:46:48.000000000 +0300 -@@ -146,7 +146,7 @@ - signals: - void timeLabelDoubleClicked(); - private slots: -- void setDisplayPosition( float pos, int64_t time, int length ); -+ void setDisplayPosition( float pos, putime_t time, int length ); - void setDisplayPosition( float pos ); - void updateBuffering( float ); - void updateBuffering(); diff --git a/multimedia/vlc/patches/patch-ag b/multimedia/vlc/patches/patch-ag deleted file mode 100644 index 4f963b1f1a6..00000000000 --- a/multimedia/vlc/patches/patch-ag +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ag,v 1.4 2012/08/30 18:54:42 christos Exp $ - ---- modules/gui/qt4/input_manager.hpp 2011-07-12 21:11:24.000000000 +0300 -+++ modules/gui/qt4/input_manager.hpp 2012-08-30 17:45:48.000000000 +0300 -@@ -36,6 +36,7 @@ - #include <QObject> - #include <QEvent> - -+typedef int64_t putime_t; - - enum { - PositionUpdate_Type = QEvent::User + IMEventType + 1, -@@ -200,11 +201,11 @@ - - private slots: - void togglePlayPause(); -- void AtoBLoop( float, int64_t, int ); -+ void AtoBLoop( float, putime_t, int ); - - signals: - /// Send new position, new time and new length -- void positionUpdated( float , int64_t, int ); -+ void positionUpdated( float , putime_t, int ); - void seekRequested( float pos ); - void rateChanged( float ); - void nameChanged( const QString& ); diff --git a/multimedia/vlc/patches/patch-ah b/multimedia/vlc/patches/patch-ah deleted file mode 100644 index d61e3438678..00000000000 --- a/multimedia/vlc/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2012/08/30 18:54:42 christos Exp $ - ---- modules/gui/qt4/util/input_slider.cpp 2011-07-12 21:11:24.000000000 +0300 -+++ modules/gui/qt4/util/input_slider.cpp 2012-08-30 17:47:01.000000000 +0300 -@@ -62,7 +62,7 @@ - CONNECT( timer, timeout(), this, seekTick() ); - } - --void InputSlider::setPosition( float pos, int64_t a, int b ) -+void InputSlider::setPosition( float pos, putime_t a, int b ) - { - if( pos == -1.0 ) - { diff --git a/multimedia/vlc/patches/patch-ai b/multimedia/vlc/patches/patch-ai deleted file mode 100644 index 293f0706cac..00000000000 --- a/multimedia/vlc/patches/patch-ai +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2012/08/30 18:54:42 christos Exp $ - ---- modules/gui/qt4/util/input_slider.hpp 2011-07-12 21:11:24.000000000 +0300 -+++ modules/gui/qt4/util/input_slider.hpp 2012-08-30 17:57:46.000000000 +0300 -@@ -33,6 +33,8 @@ - #include <QWheelEvent> - #include <QTimer> - -+typedef int64_t putime_t; -+ - /* Input Slider derived from QSlider */ - class InputSlider : public QSlider - { -@@ -54,7 +56,7 @@ - QTimer *timer; - - public slots: -- void setPosition( float, int64_t, int ); -+ void setPosition( float, putime_t, int ); - private slots: - void userDrag( int ); - void seekTick(); diff --git a/multimedia/vlc/patches/patch-ar b/multimedia/vlc/patches/patch-ar deleted file mode 100644 index 0b0b1ed1e64..00000000000 --- a/multimedia/vlc/patches/patch-ar +++ /dev/null @@ -1,88 +0,0 @@ -$NetBSD: patch-ar,v 1.3 2012/01/09 17:12:57 drochner Exp $ - ---- modules/misc/inhibit/xdg.c.orig 2011-11-22 20:30:36.000000000 +0000 -+++ modules/misc/inhibit/xdg.c -@@ -27,7 +27,11 @@ - #include <vlc_inhibit.h> - #include <assert.h> - #include <signal.h> -+#ifdef _POSIX_SPAWN -+# if (_POSIX_SPAWN >= 0) - #include <spawn.h> -+# endif -+#endif - #include <sys/wait.h> - - static int Open (vlc_object_t *); -@@ -47,7 +51,11 @@ struct vlc_inhibit_sys - vlc_thread_t thread; - vlc_cond_t update, inactive; - vlc_mutex_t lock; -+#ifdef _POSIX_SPAWN -+# if (_POSIX_SPAWN >= 0) - posix_spawnattr_t attr; -+# endif -+#endif - bool suspend, suspended; - }; - -@@ -67,17 +75,29 @@ static int Open (vlc_object_t *obj) - vlc_mutex_init (&p_sys->lock); - vlc_cond_init (&p_sys->update); - vlc_cond_init (&p_sys->inactive); -+#ifdef _POSIX_SPAWN -+# if (_POSIX_SPAWN >= 0) - posix_spawnattr_init (&p_sys->attr); -+# endif -+#endif - /* Reset signal handlers to default and clear mask in the child process */ - { - sigset_t set; - - sigemptyset (&set); -+#ifdef _POSIX_SPAWN -+# if (_POSIX_SPAWN >= 0) - posix_spawnattr_setsigmask (&p_sys->attr, &set); -+# endif -+#endif - sigaddset (&set, SIGPIPE); -+#ifdef _POSIX_SPAWN -+# if (_POSIX_SPAWN >= 0) - posix_spawnattr_setsigdefault (&p_sys->attr, &set); - posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF - | POSIX_SPAWN_SETSIGMASK); -+# endif -+#endif - } - p_sys->suspend = false; - p_sys->suspended = false; -@@ -106,7 +126,11 @@ static void Close (vlc_object_t *obj) - - vlc_cancel (p_sys->thread); - vlc_join (p_sys->thread, NULL); -+#ifdef _POSIX_SPAWN -+# if (_POSIX_SPAWN >= 0) - posix_spawnattr_destroy (&p_sys->attr); -+# endif -+#endif - vlc_cond_destroy (&p_sys->inactive); - vlc_cond_destroy (&p_sys->update); - vlc_mutex_destroy (&p_sys->lock); -@@ -152,6 +176,8 @@ static void *Thread (void *data) - pid_t pid; - - vlc_mutex_unlock (&p_sys->lock); -+#ifdef _POSIX_SPAWN -+# if (_POSIX_SPAWN >= 0) - if (!posix_spawnp (&pid, "xdg-screensaver", NULL, &p_sys->attr, - argv, environ)) - { -@@ -162,6 +188,8 @@ static void *Thread (void *data) - while (waitpid (pid, &status, 0) == -1); - } - else/* We don't handle the error, but busy looping would be worse :( */ -+# endif -+#endif - msg_Warn (ih, "could not start xdg-screensaver"); - - vlc_mutex_lock (&p_sys->lock); diff --git a/multimedia/vlc/patches/patch-as b/multimedia/vlc/patches/patch-as deleted file mode 100644 index d5c7feb56f1..00000000000 --- a/multimedia/vlc/patches/patch-as +++ /dev/null @@ -1,110 +0,0 @@ -$NetBSD: patch-as,v 1.1 2011/01/24 18:54:04 drochner Exp $ - ---- modules/misc/inhibit/xscreensaver.c~ 2010-04-13 09:22:27.000000000 +0900 -+++ modules/misc/inhibit/xscreensaver.c 2011-01-08 23:03:09.000000000 +0900 -@@ -39,7 +39,9 @@ - #include <sys/wait.h> - #include <fcntl.h> - #include <signal.h> -+#ifdef _POSIX_SPAWN - #include <spawn.h> -+#endif - - /***************************************************************************** - * Local prototypes -@@ -53,12 +55,16 @@ - struct vlc_inhibit_sys - { - vlc_timer_t timer; -+#ifdef _POSIX_SPAWN - posix_spawn_file_actions_t actions; - posix_spawnattr_t attr; - int nullfd; -+#endif - }; - -+#ifdef _POSIX_SPAWN - extern char **environ; -+#endif - - /***************************************************************************** - * Module descriptor -@@ -88,6 +94,7 @@ - } - p_ih->inhibit = Inhibit; - -+#ifdef _POSIX_SPAWN - int fd = vlc_open ("/dev/null", O_WRONLY); - posix_spawn_file_actions_init (&p_sys->actions); - if (fd != -1) -@@ -103,6 +110,7 @@ - sigemptyset (&set); - posix_spawnattr_setsigmask (&p_sys->attr, &set); - -+#endif - return VLC_SUCCESS; - } - -@@ -115,10 +123,12 @@ - vlc_inhibit_sys_t *p_sys = p_ih->p_sys; - - vlc_timer_destroy( p_sys->timer ); -+#ifdef _POSIX_SPAWN - if (p_sys->nullfd != -1) - close (p_sys->nullfd); - posix_spawnattr_destroy (&p_sys->attr); - posix_spawn_file_actions_destroy (&p_sys->actions); -+#endif - free( p_sys ); - } - -@@ -131,15 +141,49 @@ - /***************************************************************************** - * Execute: Spawns a process using execv() - *****************************************************************************/ -+#ifdef _POSIX_SPAWN - static void Execute (vlc_inhibit_t *p_ih, const char *const *argv) -+# else -+static void Execute (vlc_inhibit_t *p_ih, const char *const *ppsz_args) -+#endif - { -+#ifdef _POSIX_SPAWN - vlc_inhibit_sys_t *p_sys = p_ih->p_sys; - pid_t pid; - - if (posix_spawnp (&pid, argv[0], &p_sys->actions, &p_sys->attr, - (char **)argv, environ) == 0) -+#else -+ pid_t pid = fork(); -+ switch ( pid ) -+#endif - { -+#ifdef _POSIX_SPAWN - while (waitpid (pid, NULL, 0) != pid); -+#else -+ case 0: /* we're the child */ -+ { -+ sigset_t set; -+ sigemptyset (&set); -+ pthread_sigmask (SIG_SETMASK, &set, NULL); -+ -+ /* We don't want output */ -+ if( ( freopen( "/dev/null", "w", stdout ) != NULL ) -+ && ( freopen( "/dev/null", "w", stderr ) != NULL ) ) -+ execv( ppsz_args[0] , (char *const *)ppsz_args ); -+ /* If the file we want to execute doesn't exist we exit() */ -+ exit( EXIT_FAILURE ); -+ } -+ case -1: /* we're the error */ -+ msg_Dbg( p_ih, "Couldn't fork() while launching %s", -+ ppsz_args[0] ); -+ break; -+ default: /* we're the parent */ -+ /* Wait for the child to exit. -+ * We will not deadlock because we ran "/bin/sh &" */ -+ while( waitpid( pid, NULL, 0 ) != pid); -+ break; -+#endif - } - } - diff --git a/multimedia/vlc/patches/patch-at b/multimedia/vlc/patches/patch-at deleted file mode 100644 index 231fd356fca..00000000000 --- a/multimedia/vlc/patches/patch-at +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-at,v 1.3 2013/09/08 16:28:27 joerg Exp $ - ---- bin/override.c.orig 2013-05-15 20:23:06.000000000 +0000 -+++ bin/override.c -@@ -27,7 +27,7 @@ - - void vlc_enable_override (void); - --#if defined (__GNUC__) /* typeof and statement-expression */ \ -+#if 0 && defined (__GNUC__) /* typeof and statement-expression */ \ - && (defined (__ELF__) && !defined (__sun__)) - /* Solaris crashes on printf("%s", NULL); which is legal, but annoying. */ - -@@ -120,7 +120,7 @@ static void *getsym (const char *name) - * - * Some evil libraries modify the environment. We currently ignore the calls as - * they could crash the process. This may cause funny behaviour though. */ --int putenv (char *str) -+int putenv (const char *str) - { - if (override) - { -@@ -245,6 +245,7 @@ error: - */ - #include <locale.h> - -+#if 0 - char *setlocale (int cat, const char *locale) - { - if (override && locale != NULL) -@@ -254,6 +255,7 @@ char *setlocale (int cat, const char *lo - } - return CALL(setlocale, cat, locale); - } -+#endif - - - /*** Xlib ****/ diff --git a/multimedia/vlc/patches/patch-bin_override.c b/multimedia/vlc/patches/patch-bin_override.c new file mode 100644 index 00000000000..cee66665d18 --- /dev/null +++ b/multimedia/vlc/patches/patch-bin_override.c @@ -0,0 +1,13 @@ +$NetBSD: patch-bin_override.c,v 1.1 2015/10/25 11:00:18 wiz Exp $ + +--- bin/override.c.orig 2014-06-14 15:14:12.000000000 +0000 ++++ bin/override.c +@@ -27,7 +27,7 @@ + + void vlc_enable_override (void); + +-#if defined (__GNUC__) \ ++#if 0 && defined (__GNUC__) \ + && (defined (__ELF__) && !defined (__sun__)) + /* Solaris crashes on printf("%s", NULL); which is legal, but annoying. */ + diff --git a/multimedia/vlc/patches/patch-compat_Makefile.am b/multimedia/vlc/patches/patch-compat_Makefile.am new file mode 100644 index 00000000000..f014555c5f2 --- /dev/null +++ b/multimedia/vlc/patches/patch-compat_Makefile.am @@ -0,0 +1,25 @@ +$NetBSD: patch-compat_Makefile.am,v 1.1 2015/10/25 11:00:18 wiz Exp $ + +Revert upstream commit 78d45cc159a0cf1c44feef11a2b9800d9398048e by +Rémi Denis-Courmont <remi@remlab.net>. Mail asking for that to +be applied upstream was turned down: + +The goal is and always was to link the compat library statically into the +VLC plugins. If your OS cannot import symbols from a static library into a +dynamic library, then you are screwed and I cannot help you with that. If +it theoretically can, but libtool fails anyway, then I cannot help you with +that either. + + +--- compat/Makefile.am.orig 2014-06-14 15:14:12.000000000 +0000 ++++ compat/Makefile.am +@@ -1,7 +1,7 @@ +-pkglib_LTLIBRARIES = libcompat.la ++noinst_LTLIBRARIES = libcompat.la + libcompat_la_SOURCES = dummy.c + libcompat_la_LIBADD = $(LTLIBOBJS) +-libcompat_la_LDFLAGS = -no-undefined -static ++libcompat_la_LDFLAGS = -no-undefined + + BUILT_SOURCES = dummy.c + CLEANFILES = dummy.c diff --git a/multimedia/vlc/patches/patch-compat_Makefile.in b/multimedia/vlc/patches/patch-compat_Makefile.in new file mode 100644 index 00000000000..5f58587eb67 --- /dev/null +++ b/multimedia/vlc/patches/patch-compat_Makefile.in @@ -0,0 +1,134 @@ +$NetBSD: patch-compat_Makefile.in,v 1.1 2015/10/25 11:00:18 wiz Exp $ + +See comment on patch_compat_Makefile.am. + +--- compat/Makefile.in.orig 2015-04-13 08:16:15.000000000 +0000 ++++ compat/Makefile.in +@@ -135,7 +135,7 @@ am__uninstall_files_from_dir = { \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } + am__installdirs = "$(DESTDIR)$(pkglibdir)" +-LTLIBRARIES = $(pkglib_LTLIBRARIES) ++LTLIBRARIES = $(noinst_LTLIBRARIES) + libcompat_la_DEPENDENCIES = $(LTLIBOBJS) + am_libcompat_la_OBJECTS = dummy.lo + libcompat_la_OBJECTS = $(am_libcompat_la_OBJECTS) +@@ -993,10 +993,10 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + vlcdatadir = @vlcdatadir@ + vlclibdir = @vlclibdir@ +-pkglib_LTLIBRARIES = libcompat.la ++noinst_LTLIBRARIES = libcompat.la + libcompat_la_SOURCES = dummy.c + libcompat_la_LIBADD = $(LTLIBOBJS) +-libcompat_la_LDFLAGS = -no-undefined -static ++libcompat_la_LDFLAGS = -no-undefined + BUILT_SOURCES = dummy.c + CLEANFILES = dummy.c + all: $(BUILT_SOURCES) +@@ -1034,33 +1034,9 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $( + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(am__aclocal_m4_deps): + +-install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) +- @$(NORMAL_INSTALL) +- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ +- list2=; for p in $$list; do \ +- if test -f $$p; then \ +- list2="$$list2 $$p"; \ +- else :; fi; \ +- done; \ +- test -z "$$list2" || { \ +- echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ +- $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ +- } +- +-uninstall-pkglibLTLIBRARIES: +- @$(NORMAL_UNINSTALL) +- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ +- for p in $$list; do \ +- $(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ +- done +- +-clean-pkglibLTLIBRARIES: +- -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) +- @list='$(pkglib_LTLIBRARIES)'; \ ++clean-noinstLTLIBRARIES: ++ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) ++ @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ +@@ -1070,7 +1046,7 @@ clean-pkglibLTLIBRARIES: + } + + libcompat.la: $(libcompat_la_OBJECTS) $(libcompat_la_DEPENDENCIES) $(EXTRA_libcompat_la_DEPENDENCIES) +- $(AM_V_CCLD)$(libcompat_la_LINK) -rpath $(pkglibdir) $(libcompat_la_OBJECTS) $(libcompat_la_LIBADD) $(LIBS) ++ $(AM_V_CCLD)$(libcompat_la_LINK) $(libcompat_la_OBJECTS) $(libcompat_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -1227,9 +1203,6 @@ check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) + installdirs: +- for dir in "$(DESTDIR)$(pkglibdir)"; do \ +- test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +- done + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -1265,7 +1238,7 @@ maintainer-clean-generic: + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + clean: clean-am + +-clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ ++clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + mostlyclean-am + + distclean: distclean-am +@@ -1292,7 +1265,7 @@ install-dvi: install-dvi-am + + install-dvi-am: + +-install-exec-am: install-pkglibLTLIBRARIES ++install-exec-am: + + install-html: install-html-am + +@@ -1332,24 +1305,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-pkglibLTLIBRARIES ++uninstall-am: + + .MAKE: all check install install-am install-strip + + .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ +- clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ ++ clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ +- install-pkglibLTLIBRARIES install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ +- uninstall-pkglibLTLIBRARIES ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-am uninstall uninstall-am + + .PRECIOUS: Makefile + diff --git a/multimedia/vlc/patches/patch-configure.ac b/multimedia/vlc/patches/patch-configure.ac deleted file mode 100644 index 4ef27f221b8..00000000000 --- a/multimedia/vlc/patches/patch-configure.ac +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-configure.ac,v 1.4 2014/11/17 11:38:10 prlw1 Exp $ - -- automake-1.13 compat -- dvdnav-config was replaced by dvdnav.pc - ---- configure.ac.orig 2011-12-20 15:24:09.000000000 +0000 -+++ configure.ac -@@ -24,7 +24,7 @@ AC_CANONICAL_HOST - AC_PRESERVE_HELP_ORDER - - AM_INIT_AUTOMAKE(tar-ustar) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADER(config.h) - - # Disable with "./configure --disable-silent-rules" or "make V=1" - m4_ifdef([AM_SILENT_RULES], [ -@@ -1966,23 +1966,16 @@ then - dnl prepend -ldvdcss on OS that need it - AS_CASE(["${SYS}"], [mingw32|darwin|beos], [VLC_ADD_LIBS([dvdnav], [-ldvdcss])]) - -- DVDNAV_PATH="${PATH}" -- AC_ARG_WITH(dvdnav-config-path, -- [ --with-dvdnav-config-path=PATH dvdnav-config path (default search in \$PATH)], -- [ if test "${with_dvdnav_config_path}" != "no" -- then -- DVDNAV_PATH="${with_dvdnav_config_path}:${PATH}" -- fi ]) -- AC_PATH_PROG(DVDNAV_CONFIG, dvdnav-config, no, ${DVDNAV_PATH}) -- if test "${DVDNAV_CONFIG}" != "no" -- then -- VLC_ADD_PLUGIN([dvdnav]) -- VLC_ADD_CFLAGS([dvdnav],[`${DVDNAV_CONFIG} --cflags`]) -- VLC_ADD_LIBS([dvdnav],[`${DVDNAV_CONFIG} --libs`]) -- AC_CHECK_LIB(dvdnav, dvdnav_get_video_resolution, -- AC_DEFINE(HAVE_DVDNAV_GET_VIDEO_RESOLUTION, 1, [Define if you have dvdnav_get_video_resolution.]), -- [], [${LIBS_dvdnav}]) -- fi -+ PKG_CHECK_MODULES(DVDNAV, dvdnav, -+ [ VLC_ADD_PLUGIN([dvdnav]) -+ VLC_ADD_CFLAGS([dvdnav],[${DVDNAV_CFLAGS}]) -+ VLC_ADD_LIBS([dvdnav],[${DVDNAV_LIBS}]) -+ AC_CHECK_LIB(dvdnav, dvdnav_get_video_resolution, -+ AC_DEFINE(HAVE_DVDNAV_GET_VIDEO_RESOLUTION, 1, [Define if you have dvdnav_get_video_resolution.]), -+ [], [${LIBS_dvdnav}]) -+ ], -+ [AC_MSG_ERROR([Couldn't find dvdnav, install libdvdnav ?])] -+ ) - fi - - dnl diff --git a/multimedia/vlc/patches/patch-include_vlc__common.h b/multimedia/vlc/patches/patch-include_vlc__common.h new file mode 100644 index 00000000000..562a089fcfb --- /dev/null +++ b/multimedia/vlc/patches/patch-include_vlc__common.h @@ -0,0 +1,48 @@ +$NetBSD: patch-include_vlc__common.h,v 1.1 2015/10/25 11:00:18 wiz Exp $ + +--- include/vlc_common.h.orig 2014-11-16 18:57:58.000000000 +0000 ++++ include/vlc_common.h +@@ -47,6 +47,9 @@ + #include <stdio.h> + #include <inttypes.h> + #include <stddef.h> ++#ifdef __NetBSD__ ++#include <sys/param.h> ++#endif + + #ifndef __cplusplus + # include <stdbool.h> +@@ -541,6 +544,8 @@ static inline unsigned ctz (unsigned x) + #endif + } + ++#if !defined(__NetBSD_Version__) || (__NetBSD_Version__ < 599001600) ++ + /** Bit weight */ + VLC_USED + static inline unsigned popcount (unsigned x) +@@ -557,6 +562,7 @@ static inline unsigned popcount (unsigne + return count; + #endif + } ++#endif /* NetBSD < 5.99.16 */ + + VLC_USED + static inline unsigned parity (unsigned x) +@@ -576,6 +582,8 @@ static inline unsigned parity (unsigned + # undef bswap64 + #endif + ++#ifndef __NetBSD__ ++ + /** Byte swap (16 bits) */ + VLC_USED + static inline uint16_t bswap16 (uint16_t x) +@@ -624,6 +632,7 @@ static inline uint64_t bswap64 (uint64_t + #endif + } + ++#endif /* NetBSD */ + + /* Free and set set the variable to NULL */ + #define FREENULL(a) do { free( a ); a = NULL; } while(0) diff --git a/multimedia/vlc/patches/patch-include_vlc__fixups.h b/multimedia/vlc/patches/patch-include_vlc__fixups.h index 1ac97a4df5b..b94ee2d21f6 100644 --- a/multimedia/vlc/patches/patch-include_vlc__fixups.h +++ b/multimedia/vlc/patches/patch-include_vlc__fixups.h @@ -1,31 +1,51 @@ -$NetBSD: patch-include_vlc__fixups.h,v 1.1 2013/09/08 16:28:27 joerg Exp $ +$NetBSD: patch-include_vlc__fixups.h,v 1.2 2015/10/25 11:00:18 wiz Exp $ ---- include/vlc_fixups.h.orig 2013-05-15 20:39:43.000000000 +0000 +on NetBSD-current, just define "uselocale", nothing else +fixes build + +static_assert: a C compiler is used to detect if this symbol +exists in assert.h, but the header file is included by a c++ +compiler too. + +--- include/vlc_fixups.h.orig 2015-02-17 09:07:37.000000000 +0000 +++ include/vlc_fixups.h -@@ -177,25 +177,7 @@ static inline char *getenv (const char * - # define ATTR_ALIGN(align) - #endif +@@ -218,16 +218,28 @@ int posix_memalign (void **, size_t, siz --#ifndef HAVE_USELOCALE --#define LC_NUMERIC_MASK 0 --#define LC_MESSAGES_MASK 0 --typedef void *locale_t; --static inline locale_t uselocale(locale_t loc) --{ -- (void)loc; -- return NULL; --} --static inline void freelocale(locale_t loc) --{ -- (void)loc; --} --static inline locale_t newlocale(int mask, const char * locale, locale_t base) --{ -- (void)mask; (void)locale; (void)base; -- return NULL; --} --#endif + /* locale.h */ + #ifndef HAVE_USELOCALE ++#ifdef __NetBSD__ ++#include <sys/param.h> ++#if __NetBSD_Version__ >= 699002300 ++/* NetBSD-current has locale_t but no uselocale */ ++#define NetBSD_LOCALE_HACK ++#endif ++#endif ++#ifdef NetBSD_LOCALE_HACK +#include <locale.h> ++#else + #define LC_ALL_MASK 0 + #define LC_NUMERIC_MASK 0 + #define LC_MESSAGES_MASK 0 + #define LC_GLOBAL_LOCALE ((locale_t)(uintptr_t)1) + typedef void *locale_t; ++#endif + static inline locale_t uselocale(locale_t loc) + { + (void)loc; + return NULL; + } ++#ifndef NetBSD_LOCALE_HACK + static inline void freelocale(locale_t loc) + { + (void)loc; +@@ -238,8 +250,9 @@ static inline locale_t newlocale(int mas + return NULL; + } + #endif ++#endif - #ifdef WIN32 - # include <dirent.h> +-#if !defined (HAVE_STATIC_ASSERT) ++#if !defined (static_assert) + # define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); })) + # define static_assert _Static_assert + #endif diff --git a/multimedia/vlc/patches/patch-modules_access_directory.c b/multimedia/vlc/patches/patch-modules_access_directory.c new file mode 100644 index 00000000000..1594dbef2f8 --- /dev/null +++ b/multimedia/vlc/patches/patch-modules_access_directory.c @@ -0,0 +1,25 @@ +$NetBSD: patch-modules_access_directory.c,v 1.1 2015/10/25 11:00:18 wiz Exp $ + +Mainly due to lack of bits for new fcntl flags, O_DIRECTORY isn't currently +supported by DragonFly's openat. This patch checks which flags are supported +before passing them to vlc_openat. + +--- modules/access/directory.c.orig 2014-11-16 18:57:58.000000000 +0000 ++++ modules/access/directory.c +@@ -316,8 +316,14 @@ block_t *DirBlock (access_t *p_access) + { + DIR *handle; + #ifdef HAVE_OPENAT +- int fd = vlc_openat (dirfd (current->handle), entry, +- O_RDONLY | O_DIRECTORY); ++ int flags = 0; ++#ifdef O_RDONLY ++ flags |= O_RDONLY; ++#endif ++#ifdef O_DIRECTORY ++ flags |= O_DIRECTORY; ++#endif ++ int fd = vlc_openat (dirfd (current->handle), entry, flags); + if (fd == -1) + { + if (errno == ENOTDIR) diff --git a/multimedia/vlc/patches/patch-modules_access_file.c b/multimedia/vlc/patches/patch-modules_access_file.c new file mode 100644 index 00000000000..c3cd9b6f8f0 --- /dev/null +++ b/multimedia/vlc/patches/patch-modules_access_file.c @@ -0,0 +1,23 @@ +$NetBSD: patch-modules_access_file.c,v 1.1 2015/10/25 11:00:18 wiz Exp $ + +--- modules/access/file.c.orig 2014-11-16 18:57:58.000000000 +0000 ++++ modules/access/file.c +@@ -42,6 +42,9 @@ + #ifdef HAVE_LINUX_MAGIC_H + # include <sys/vfs.h> + # include <linux/magic.h> ++#elif defined (HAVE_FSTATVFS) ++# include <sys/statvfs.h> ++# include <sys/mount.h> + #endif + + #if defined( _WIN32 ) +@@ -75,7 +78,7 @@ struct access_sys_t + #if !defined (_WIN32) && !defined (__OS2__) + static bool IsRemote (int fd) + { +-#if defined (HAVE_FSTATVFS) && defined (MNT_LOCAL) ++#if !defined(__linux__) && defined (HAVE_FSTATVFS) && defined (MNT_LOCAL) + struct statvfs stf; + + if (fstatvfs (fd, &stf)) diff --git a/multimedia/vlc/patches/patch-modules_access_rtp_Makefile.am b/multimedia/vlc/patches/patch-modules_access_rtp_Makefile.am new file mode 100644 index 00000000000..51a3efa70b9 --- /dev/null +++ b/multimedia/vlc/patches/patch-modules_access_rtp_Makefile.am @@ -0,0 +1,13 @@ +$NetBSD: patch-modules_access_rtp_Makefile.am,v 1.1 2015/10/25 11:00:18 wiz Exp $ + +--- modules/access/rtp/Makefile.am.orig 2014-08-14 07:20:03.000000000 +0000 ++++ modules/access/rtp/Makefile.am +@@ -13,7 +13,7 @@ librtp_plugin_la_LIBADD = $(SOCKET_LIBS) + libvlc_srtp_la_SOURCES = access/rtp/srtp.c access/rtp/srtp.h + libvlc_srtp_la_CPPFLAGS = -I$(srcdir)/access/rtp + libvlc_srtp_la_CFLAGS = $(GCRYPT_CFLAGS) +-libvlc_srtp_la_LDFLAGS = -static ++libvlc_srtp_la_LDFLAGS = + libvlc_srtp_la_LIBADD = $(GCRYPT_LIBS) $(LIBPTHREAD) + srtp_test_recv_SOURCES = access/rtp/srtp-test-recv.c + srtp_test_recv_LDADD = libvlc_srtp.la diff --git a/multimedia/vlc/patches/patch-modules_audio__output_pulse.c b/multimedia/vlc/patches/patch-modules_audio__output_pulse.c deleted file mode 100644 index 43cf151a848..00000000000 --- a/multimedia/vlc/patches/patch-modules_audio__output_pulse.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-modules_audio__output_pulse.c,v 1.2 2011/09/12 17:25:28 drochner Exp $ -To enable build against pulse-audio 0.9.21 - seems to work - ---- modules/audio_output/pulse.c.orig 2011-06-06 22:53:14.000000000 +0000 -+++ modules/audio_output/pulse.c -@@ -272,7 +272,7 @@ static int Open(vlc_object_t *obj) - { - aout_instance_t *aout = (aout_instance_t *)obj; - --#if !defined(PA_CHECK_VERSION) || !PA_CHECK_VERSION(0,9,22) -+#if !defined(PA_CHECK_VERSION) || !PA_CHECK_VERSION(0,9,20) - if( !vlc_xlib_init( obj ) ) - return VLC_EGENERIC; - #endif diff --git a/multimedia/vlc/patches/patch-modules_codec_flac.c b/multimedia/vlc/patches/patch-modules_codec_flac.c deleted file mode 100644 index 30e5df7f72f..00000000000 --- a/multimedia/vlc/patches/patch-modules_codec_flac.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-modules_codec_flac.c,v 1.1 2013/06/15 22:59:10 wiz Exp $ - ---- modules/codec/flac.c.orig 2011-07-12 18:11:24.000000000 +0000 -+++ modules/codec/flac.c -@@ -38,8 +38,8 @@ - #include <vlc_codec.h> - #include <vlc_aout.h> - --#include <stream_decoder.h> --#include <stream_encoder.h> -+#include <FLAC/stream_decoder.h> -+#include <FLAC/stream_encoder.h> - - #include <vlc_block_helper.h> - #include <vlc_bits.h> diff --git a/multimedia/vlc/patches/patch-ab b/multimedia/vlc/patches/patch-modules_gui_qt4_components_controller.cpp index 2335ec530b0..e215d51a456 100644 --- a/multimedia/vlc/patches/patch-ab +++ b/multimedia/vlc/patches/patch-modules_gui_qt4_components_controller.cpp @@ -1,9 +1,12 @@ -$NetBSD: patch-ab,v 1.9 2012/08/30 18:54:41 christos Exp $ +$NetBSD: patch-modules_gui_qt4_components_controller.cpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ ---- modules/gui/qt4/components/controller.cpp 2011-07-12 21:11:24.000000000 +0300 -+++ modules/gui/qt4/components/controller.cpp 2012-08-30 17:46:29.000000000 +0300 -@@ -292,8 +292,8 @@ - InputSlider *slider = new InputSlider( Qt::Horizontal, NULL ); +Qt's MOC doesn't handle int64_t, so introduce a meaningful type name +so that slot/signal/connection macros work properly. + +--- modules/gui/qt4/components/controller.cpp.orig 2015-01-28 16:37:58.000000000 +0000 ++++ modules/gui/qt4/components/controller.cpp +@@ -353,8 +353,8 @@ QWidget *AbstractController::createWidge + slider->setChapters( chapters ); /* Update the position when the IM has changed */ - CONNECT( THEMIM->getIM(), positionUpdated( float, int64_t, int ), diff --git a/multimedia/vlc/patches/patch-ac b/multimedia/vlc/patches/patch-modules_gui_qt4_components_extended__panels.cpp index a04864638f3..350ef53876d 100644 --- a/multimedia/vlc/patches/patch-ac +++ b/multimedia/vlc/patches/patch-modules_gui_qt4_components_extended__panels.cpp @@ -1,8 +1,11 @@ -$NetBSD: patch-ac,v 1.6 2012/08/30 18:54:41 christos Exp $ +$NetBSD: patch-modules_gui_qt4_components_extended__panels.cpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ ---- modules/gui/qt4/components/extended_panels.cpp 2011-09-29 23:32:38.000000000 +0300 -+++ modules/gui/qt4/components/extended_panels.cpp 2012-08-30 17:46:39.000000000 +0300 -@@ -1411,7 +1411,7 @@ +Qt's MOC doesn't handle int64_t, so introduce a meaningful type name +so that slot/signal/connection macros work properly. + +--- modules/gui/qt4/components/extended_panels.cpp.orig 2015-04-01 10:47:07.000000000 +0000 ++++ modules/gui/qt4/components/extended_panels.cpp +@@ -1583,7 +1583,7 @@ void SyncControls::update() { b_userAction = false; @@ -11,7 +14,7 @@ $NetBSD: patch-ac,v 1.6 2012/08/30 18:54:41 christos Exp $ if( THEMIM->getInput() ) { i_delay = var_GetTime( THEMIM->getInput(), "audio-delay" ); -@@ -1427,7 +1427,7 @@ +@@ -1600,7 +1600,7 @@ void SyncControls::advanceAudio( double { if( THEMIM->getInput() && b_userAction ) { @@ -20,7 +23,7 @@ $NetBSD: patch-ac,v 1.6 2012/08/30 18:54:41 christos Exp $ var_SetTime( THEMIM->getInput(), "audio-delay", i_delay ); } } -@@ -1436,7 +1436,7 @@ +@@ -1609,7 +1609,7 @@ void SyncControls::advanceSubs( double f { if( THEMIM->getInput() && b_userAction ) { diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_components_interface__widgets.cpp b/multimedia/vlc/patches/patch-modules_gui_qt4_components_interface__widgets.cpp new file mode 100644 index 00000000000..1f0d012fc1c --- /dev/null +++ b/multimedia/vlc/patches/patch-modules_gui_qt4_components_interface__widgets.cpp @@ -0,0 +1,24 @@ +$NetBSD: patch-modules_gui_qt4_components_interface__widgets.cpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ + +Qt's MOC doesn't handle int64_t, so introduce a meaningful type name +so that slot/signal/connection macros work properly. + +--- modules/gui/qt4/components/interface_widgets.cpp.orig 2015-01-22 14:50:00.000000000 +0000 ++++ modules/gui/qt4/components/interface_widgets.cpp +@@ -759,13 +759,13 @@ TimeLabel::TimeLabel( intf_thread_t *_p_ + } + setAlignment( Qt::AlignRight | Qt::AlignVCenter ); + +- CONNECT( THEMIM->getIM(), positionUpdated( float, int64_t, int ), +- this, setDisplayPosition( float, int64_t, int ) ); ++ CONNECT( THEMIM->getIM(), positionUpdated( float, putime_t, int ), ++ this, setDisplayPosition( float, putime_t, int ) ); + + setStyleSheet( "QLabel { padding-left: 4px; padding-right: 4px; }" ); + } + +-void TimeLabel::setDisplayPosition( float pos, int64_t t, int length ) ++void TimeLabel::setDisplayPosition( float pos, putime_t t, int length ) + { + if( pos == -1.f ) + { diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_components_interface__widgets.hpp b/multimedia/vlc/patches/patch-modules_gui_qt4_components_interface__widgets.hpp new file mode 100644 index 00000000000..d583959c488 --- /dev/null +++ b/multimedia/vlc/patches/patch-modules_gui_qt4_components_interface__widgets.hpp @@ -0,0 +1,16 @@ +$NetBSD: patch-modules_gui_qt4_components_interface__widgets.hpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ + +Qt's MOC doesn't handle int64_t, so introduce a meaningful type name +so that slot/signal/connection macros work properly. + +--- modules/gui/qt4/components/interface_widgets.hpp.orig 2014-11-16 18:57:59.000000000 +0000 ++++ modules/gui/qt4/components/interface_widgets.hpp +@@ -206,7 +206,7 @@ private: + char psz_time[MSTRTIME_MAX_SIZE]; + void toggleTimeDisplay(); + private slots: +- void setDisplayPosition( float pos, int64_t time, int length ); ++ void setDisplayPosition( float pos, putime_t time, int length ); + void setDisplayPosition( float pos ); + }; + diff --git a/multimedia/vlc/patches/patch-af b/multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.cpp index 7d4433fe4ab..d271e8d40cd 100644 --- a/multimedia/vlc/patches/patch-af +++ b/multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.cpp @@ -1,17 +1,29 @@ -$NetBSD: patch-af,v 1.1 2012/08/30 18:54:42 christos Exp $ +$NetBSD: patch-modules_gui_qt4_input__manager.cpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ ---- modules/gui/qt4/input_manager.cpp 2011-10-18 18:56:16.000000000 +0300 -+++ modules/gui/qt4/input_manager.cpp 2012-08-30 17:46:07.000000000 +0300 -@@ -397,7 +397,7 @@ +Qt's MOC doesn't handle int64_t, so introduce a meaningful type name +so that slot/signal/connection macros work properly. + +--- modules/gui/qt4/input_manager.cpp.orig 2015-04-12 21:29:20.000000000 +0000 ++++ modules/gui/qt4/input_manager.cpp +@@ -138,7 +138,7 @@ void InputManager::setInput( input_threa + !var_GetFloat( p_input, "start-time" ) && + !var_GetFloat( p_input, "stop-time" ) ) + { +- emit resumePlayback( (int64_t)i_time * 1000 ); ++ emit resumePlayback( (putime_t)i_time * 1000 ); + } + } + +@@ -446,7 +446,7 @@ void InputManager::UpdatePosition() { /* Update position */ int i_length; - int64_t i_time; + putime_t i_time; float f_pos; - i_length = var_GetTime( p_input , "length" ) / 1000000; + i_length = var_GetTime( p_input , "length" ) / CLOCK_FREQ; i_time = var_GetTime( p_input , "time"); -@@ -889,21 +889,21 @@ +@@ -981,21 +981,21 @@ void InputManager::setAtoB() { timeB = var_GetTime( THEMIM->getInput(), "time" ); var_SetTime( THEMIM->getInput(), "time" , timeA ); @@ -36,5 +48,5 @@ $NetBSD: patch-af,v 1.1 2012/08/30 18:54:42 christos Exp $ -void InputManager::AtoBLoop( float, int64_t i_time, int ) +void InputManager::AtoBLoop( float, putime_t i_time, int ) { - if( timeB ) - { + if( timeB && i_time >= timeB ) + var_SetTime( THEMIM->getInput(), "time" , timeA ); diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.hpp b/multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.hpp new file mode 100644 index 00000000000..42800a694d8 --- /dev/null +++ b/multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.hpp @@ -0,0 +1,38 @@ +$NetBSD: patch-modules_gui_qt4_input__manager.hpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ + +Qt's MOC doesn't handle int64_t, so introduce a meaningful type name +so that slot/signal/connection macros work properly. + +--- modules/gui/qt4/input_manager.hpp.orig 2015-01-26 18:50:20.000000000 +0000 ++++ modules/gui/qt4/input_manager.hpp +@@ -37,6 +37,7 @@ + + #include <QObject> + #include <QEvent> ++typedef int64_t putime_t; + class QSignalMapper; + + enum { NORMAL, /* loop: 0, repeat: 0 */ +@@ -212,11 +213,11 @@ public slots: + void setAtoB(); + + private slots: +- void AtoBLoop( float, int64_t, int ); ++ void AtoBLoop( float, putime_t, int ); + + signals: + /// Send new position, new time and new length +- void positionUpdated( float , int64_t, int ); ++ void positionUpdated( float , putime_t, int ); + void seekRequested( float pos ); + void rateChanged( float ); + void nameChanged( const QString& ); +@@ -225,7 +226,7 @@ signals: + void chapterChanged( bool ); + void inputCanSeek( bool ); + /// You can resume playback +- void resumePlayback( int64_t ); ++ void resumePlayback( putime_t ); + /// Statistics are updated + void statisticsUpdated( input_item_t* ); + void infoChanged( input_item_t* ); diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_main__interface.cpp b/multimedia/vlc/patches/patch-modules_gui_qt4_main__interface.cpp new file mode 100644 index 00000000000..7a9c8fa50eb --- /dev/null +++ b/multimedia/vlc/patches/patch-modules_gui_qt4_main__interface.cpp @@ -0,0 +1,23 @@ +$NetBSD: patch-modules_gui_qt4_main__interface.cpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ + +Qt's MOC doesn't handle int64_t, so introduce a meaningful type name +so that slot/signal/connection macros work properly. + +--- modules/gui/qt4/main_interface.cpp.orig 2015-02-26 20:21:25.000000000 +0000 ++++ modules/gui/qt4/main_interface.cpp +@@ -399,13 +399,13 @@ void MainInterface::createResumePanel( Q + + CONNECT( resumeTimer, timeout(), this, hideResumePanel() ); + CONNECT( cancel, clicked(), this, hideResumePanel() ); +- CONNECT( THEMIM->getIM(), resumePlayback(int64_t), this, showResumePanel(int64_t) ); ++ CONNECT( THEMIM->getIM(), resumePlayback(putime_t), this, showResumePanel(putime_t) ); + BUTTONACT( ok, resumePlayback() ); + + w->layout()->addWidget( resumePanel ); + } + +-void MainInterface::showResumePanel( int64_t _time ) { ++void MainInterface::showResumePanel( putime_t _time ) { + int setting = var_InheritInteger( p_intf, "qt-continue" ); + + if( setting == 0 ) diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_main__interface.hpp b/multimedia/vlc/patches/patch-modules_gui_qt4_main__interface.hpp new file mode 100644 index 00000000000..646bd03ee9b --- /dev/null +++ b/multimedia/vlc/patches/patch-modules_gui_qt4_main__interface.hpp @@ -0,0 +1,25 @@ +$NetBSD: patch-modules_gui_qt4_main__interface.hpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ + +Qt's MOC doesn't handle int64_t, so introduce a meaningful type name +so that slot/signal/connection macros work properly. + +--- modules/gui/qt4/main_interface.hpp.orig 2014-12-17 16:53:33.000000000 +0000 ++++ modules/gui/qt4/main_interface.hpp +@@ -36,6 +36,8 @@ + #include <QSystemTrayIcon> + #include <QStackedWidget> + ++typedef int64_t putime_t; ++ + class QSettings; + class QCloseEvent; + class QKeyEvent; +@@ -261,7 +263,7 @@ private slots: + void setBoss(); + void setRaise(); + +- void showResumePanel( int64_t); ++ void showResumePanel( putime_t ); + void hideResumePanel(); + void resumePlayback(); + diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_util_input__slider.cpp b/multimedia/vlc/patches/patch-modules_gui_qt4_util_input__slider.cpp new file mode 100644 index 00000000000..00c01f728fd --- /dev/null +++ b/multimedia/vlc/patches/patch-modules_gui_qt4_util_input__slider.cpp @@ -0,0 +1,16 @@ +$NetBSD: patch-modules_gui_qt4_util_input__slider.cpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ + +Qt's MOC doesn't handle int64_t, so introduce a meaningful type name +so that slot/signal/connection macros work properly. + +--- modules/gui/qt4/util/input_slider.cpp.orig 2015-04-12 15:12:46.000000000 +0000 ++++ modules/gui/qt4/util/input_slider.cpp +@@ -164,7 +164,7 @@ void SeekSlider::setChapters( SeekPoints + * \param time Elapsed time. Unused + * \param legnth Duration time. + ***/ +-void SeekSlider::setPosition( float pos, int64_t time, int length ) ++void SeekSlider::setPosition( float pos, putime_t time, int length ) + { + VLC_UNUSED(time); + if( pos == -1.0 ) diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_util_input__slider.hpp b/multimedia/vlc/patches/patch-modules_gui_qt4_util_input__slider.hpp new file mode 100644 index 00000000000..0750d36376a --- /dev/null +++ b/multimedia/vlc/patches/patch-modules_gui_qt4_util_input__slider.hpp @@ -0,0 +1,25 @@ +$NetBSD: patch-modules_gui_qt4_util_input__slider.hpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ + +Qt's MOC doesn't handle int64_t, so introduce a meaningful type name +so that slot/signal/connection macros work properly. + +--- modules/gui/qt4/util/input_slider.hpp.orig 2014-11-16 18:57:59.000000000 +0000 ++++ modules/gui/qt4/util/input_slider.hpp +@@ -48,6 +48,8 @@ class QPropertyAnimation; + class QStyleOption; + class QCommonStyle; + ++typedef int64_t putime_t; ++ + /* Input Slider derived from QSlider */ + class SeekSlider : public QSlider + { +@@ -107,7 +109,7 @@ private: + QTimer *hideHandleTimer; + + public slots: +- void setPosition( float, int64_t, int ); ++ void setPosition( float, putime_t, int ); + void setSeekable( bool b ) { b_seekable = b ; } + void updateBuffering( float ); + void hideHandle(); diff --git a/multimedia/vlc/patches/patch-modules_gui_skins2_src_theme__loader.cpp b/multimedia/vlc/patches/patch-modules_gui_skins2_src_theme__loader.cpp new file mode 100644 index 00000000000..5eff404651f --- /dev/null +++ b/multimedia/vlc/patches/patch-modules_gui_skins2_src_theme__loader.cpp @@ -0,0 +1,12 @@ +$NetBSD: patch-modules_gui_skins2_src_theme__loader.cpp,v 1.1 2015/10/25 11:00:18 wiz Exp $ + +--- modules/gui/skins2/src/theme_loader.cpp.orig 2014-08-14 07:20:04.000000000 +0000 ++++ modules/gui/skins2/src/theme_loader.cpp +@@ -51,6 +51,7 @@ int gzwrite_frontend( int, const void *, + #if defined( HAVE_LIBTAR_H ) + # include <libtar.h> + #else ++#include <limits.h> /* for PATH_MAX */ + typedef gzFile TAR; + int tar_open ( TAR **t, char *pathname, int oflags ); + int tar_extract_all ( TAR *t, char *prefix ); diff --git a/multimedia/vlc/patches/patch-modules_misc_freetype.c b/multimedia/vlc/patches/patch-modules_misc_freetype.c deleted file mode 100644 index f3fbe931f7e..00000000000 --- a/multimedia/vlc/patches/patch-modules_misc_freetype.c +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-modules_misc_freetype.c,v 1.1 2014/03/25 16:04:12 prlw1 Exp $ - -http://git.videolan.org/?p=vlc.git;a=commit;h=c5b2b0a284ba6b544646f3a205aa1a2e1117d431` - ---- modules/misc/freetype.c.orig 2014-03-25 15:08:15.000000000 +0000 -+++ modules/misc/freetype.c -@@ -60,9 +60,10 @@ - #endif - - /* Freetype */ --#include <freetype/ftsynth.h> -+#include <ft2build.h> - #include FT_FREETYPE_H - #include FT_GLYPH_H -+#include FT_SYNTHESIS_H - #define FT_FLOOR(X) ((X & -64) >> 6) - #define FT_CEIL(X) (((X + 63) & -64) >> 6) - #ifndef FT_MulFix diff --git a/multimedia/vlc/patches/patch-modules_misc_inhibit_xdg.c b/multimedia/vlc/patches/patch-modules_misc_inhibit_xdg.c new file mode 100644 index 00000000000..a79ef33e4c8 --- /dev/null +++ b/multimedia/vlc/patches/patch-modules_misc_inhibit_xdg.c @@ -0,0 +1,78 @@ +$NetBSD: patch-modules_misc_inhibit_xdg.c,v 1.1 2015/10/25 11:00:18 wiz Exp $ + +--- modules/misc/inhibit/xdg.c.orig 2014-08-14 07:20:04.000000000 +0000 ++++ modules/misc/inhibit/xdg.c +@@ -27,7 +27,9 @@ + #include <vlc_inhibit.h> + #include <assert.h> + #include <signal.h> ++#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0) + #include <spawn.h> ++#endif + #include <sys/wait.h> + + static int Open (vlc_object_t *); +@@ -45,7 +47,9 @@ vlc_module_end () + struct vlc_inhibit_sys + { + vlc_timer_t timer; ++#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0) + posix_spawnattr_t attr; ++#endif + }; + + extern char **environ; +@@ -59,8 +63,12 @@ static void Timer (void *data) + }; + pid_t pid; + ++#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0) + int err = posix_spawnp (&pid, "xdg-screensaver", NULL, &sys->attr, + argv, environ); ++#else ++ int err = EINVAL; ++#endif + if (err == 0) + { + int status; +@@ -88,23 +96,31 @@ static int Open (vlc_object_t *obj) + if (p_sys == NULL) + return VLC_ENOMEM; + ++#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0) + posix_spawnattr_init (&p_sys->attr); ++#endif + /* Reset signal handlers to default and clear mask in the child process */ + { + sigset_t set; + + sigemptyset (&set); ++#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0) + posix_spawnattr_setsigmask (&p_sys->attr, &set); ++#endif + sigaddset (&set, SIGPIPE); ++#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0) + posix_spawnattr_setsigdefault (&p_sys->attr, &set); + posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF + | POSIX_SPAWN_SETSIGMASK); ++#endif + } + + ih->p_sys = p_sys; + if (vlc_timer_create (&p_sys->timer, Timer, ih)) + { ++#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0) + posix_spawnattr_destroy (&p_sys->attr); ++#endif + free (p_sys); + return VLC_ENOMEM; + } +@@ -119,6 +135,8 @@ static void Close (vlc_object_t *obj) + vlc_inhibit_sys_t *p_sys = ih->p_sys; + + vlc_timer_destroy (p_sys->timer); ++#if defined(_POSIX_SPAWN) && (_POSIX_SPAWN >= 0) + posix_spawnattr_destroy (&p_sys->attr); ++#endif + free (p_sys); + } diff --git a/multimedia/vlc/patches/patch-modules_misc_rtsp.c b/multimedia/vlc/patches/patch-modules_misc_rtsp.c deleted file mode 100644 index 27fd8d7dc3c..00000000000 --- a/multimedia/vlc/patches/patch-modules_misc_rtsp.c +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-modules_misc_rtsp.c,v 1.1 2013/09/08 16:28:27 joerg Exp $ - ---- modules/misc/rtsp.c.orig 2013-05-15 20:28:04.000000000 +0000 -+++ modules/misc/rtsp.c -@@ -952,22 +952,26 @@ static void RtspClientDel( vod_media_t * - - static float ParseNPT (const char *str) - { -+#ifndef LC_C_LOCALE - locale_t loc = newlocale (LC_NUMERIC_MASK, "C", NULL); - locale_t oldloc = uselocale (loc); -+#endif - unsigned hour, min; - float sec; - -- if (sscanf (str, "%u:%u:%f", &hour, &min, &sec) == 3) -+ if (sscanf_l (str, LC_C_LOCALE, "%u:%u:%f", &hour, &min, &sec) == 3) - sec += ((hour * 60) + min) * 60; - else -- if (sscanf (str, "%f", &sec) != 1) -+ if (sscanf_l (str, LC_C_LOCALE, "%f", &sec) != 1) - sec = 0.; - -+#ifndef LC_C_LOCALE - if (loc != (locale_t)0) - { - uselocale (oldloc); - freelocale (loc); - } -+#endif - return sec; - } - diff --git a/multimedia/vlc/patches/patch-au b/multimedia/vlc/patches/patch-modules_video__output_sdl.c index fd7d66c1c02..5641d03c9cf 100644 --- a/multimedia/vlc/patches/patch-au +++ b/multimedia/vlc/patches/patch-modules_video__output_sdl.c @@ -1,11 +1,11 @@ -$NetBSD: patch-au,v 1.13 2012/01/12 15:54:00 drochner Exp $ +$NetBSD: patch-modules_video__output_sdl.c,v 1.1 2015/10/25 11:00:18 wiz Exp $ ---- modules/video_output/sdl.c.orig 2010-08-08 17:47:49.000000000 +0000 +--- modules/video_output/sdl.c.orig 2014-11-16 18:57:59.000000000 +0000 +++ modules/video_output/sdl.c -@@ -42,10 +42,9 @@ +@@ -41,10 +41,9 @@ #include <SDL.h> - #ifndef WIN32 + #if !defined(_WIN32) && !defined(__OS2__) -# ifdef X_DISPLAY_MISSING -# error Xlib required due to XInitThreads -# endif diff --git a/multimedia/vlc/patches/patch-modules_visualization_projectm.cpp b/multimedia/vlc/patches/patch-modules_visualization_projectm.cpp deleted file mode 100644 index 7bca69ccc73..00000000000 --- a/multimedia/vlc/patches/patch-modules_visualization_projectm.cpp +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-modules_visualization_projectm.cpp,v 1.1 2013/09/08 16:28:27 joerg Exp $ - ---- modules/visualization/projectm.cpp.orig 2013-05-15 20:28:01.000000000 +0000 -+++ modules/visualization/projectm.cpp -@@ -344,8 +344,10 @@ static void *Thread( void *p_data ) - goto error; - } - -+#ifndef LC_C_LOCALE - loc = newlocale (LC_NUMERIC_MASK, "C", NULL); - oldloc = uselocale (loc); -+#endif - /* Create the projectM object */ - #ifndef HAVE_PROJECTM2 - psz_config = var_InheritString( p_filter, "projectm-config" ); -@@ -428,11 +430,13 @@ static void *Thread( void *p_data ) - delete p_projectm; - vout_DeleteDisplay( p_sys->p_vd, NULL ); - vlc_object_release( p_sys->p_vout ); -+#ifndef LC_C_LOCALE - if (loc != (locale_t)0) - { - uselocale (oldloc); - freelocale (loc); - } -+#endif - return NULL; - } - vlc_mutex_unlock( &p_sys->lock ); diff --git a/multimedia/vlc/patches/patch-src_config_file.c b/multimedia/vlc/patches/patch-src_config_file.c index 9448a2eaa15..b96121ce49a 100644 --- a/multimedia/vlc/patches/patch-src_config_file.c +++ b/multimedia/vlc/patches/patch-src_config_file.c @@ -1,81 +1,25 @@ -$NetBSD: patch-src_config_file.c,v 1.2 2015/03/22 20:06:32 joerg Exp $ +$NetBSD: patch-src_config_file.c,v 1.3 2015/10/25 11:00:18 wiz Exp $ ---- src/config/file.c.orig 2010-04-15 16:56:14.000000000 +0000 +Rename strtoi to vlc_strtoi to avoid conflict with NetBSD built-in +function strtoi. + +--- src/config/file.c.orig 2014-08-14 07:20:04.000000000 +0000 +++ src/config/file.c -@@ -135,7 +135,7 @@ static FILE *config_OpenConfigFile( vlc_ +@@ -138,7 +138,7 @@ static FILE *config_OpenConfigFile( vlc_ } --static int strtoi (const char *str) -+static int my_strtoi (const char *str) +-static int64_t strtoi (const char *str) ++static int64_t vlc_strtoi (const char *str) { char *end; - long l; -@@ -187,8 +187,10 @@ int config_LoadConfigFile( vlc_object_t - section[0] = '\0'; - - /* Ensure consistent number formatting... */ -+#ifndef LC_C_LOCALE - locale_t loc = newlocale (LC_NUMERIC_MASK, "C", NULL); - locale_t baseloc = uselocale (loc); -+#endif - - vlc_rwlock_wrlock (&config_lock); - while (fgets (line, 1024, file) != NULL) -@@ -270,7 +272,7 @@ int config_LoadConfigFile( vlc_object_t - case CONFIG_ITEM_BOOL: - case CONFIG_ITEM_INTEGER: - { -- long l = strtoi (psz_option_value); -+ long l = my_strtoi (psz_option_value); - if (errno) - msg_Warn (p_this, "Integer value (%s) for %s: %m", - psz_option_value, psz_option_name); -@@ -282,7 +284,7 @@ int config_LoadConfigFile( vlc_object_t - case CONFIG_ITEM_FLOAT: - if( !*psz_option_value ) - break; /* ignore empty option */ -- p_item->value.f = (float)atof (psz_option_value); -+ p_item->value.f = strtof_l(psz_option_value, NULL, LC_C_LOCALE); - p_item->saved.f = p_item->value.f; - break; - -@@ -315,11 +317,13 @@ int config_LoadConfigFile( vlc_object_t - fclose (file); - - module_list_free (list); -+#ifndef LC_C_LOCALE - if (loc != (locale_t)0) - { - uselocale (baseloc); - freelocale (loc); - } -+#endif - return 0; - } - -@@ -570,8 +574,10 @@ static int SaveConfigFile( vlc_object_t - "\n" ); - - /* Ensure consistent number formatting... */ -+#ifndef LC_C_LOCALE - locale_t loc = newlocale (LC_NUMERIC_MASK, "C", NULL); - locale_t baseloc = uselocale (loc); -+#endif - - /* We would take the config lock here. But this would cause a lock - * inversion with the serializer above and config_AutoSaveConfigFile(). -@@ -683,11 +689,13 @@ static int SaveConfigFile( vlc_object_t - vlc_rwlock_unlock (&config_lock); - - module_list_free (list); -+#ifndef LC_C_LOCALE - if (loc != (locale_t)0) - { - uselocale (baseloc); - freelocale (loc); - } -+#endif - - /* - * Restore old settings from the config in file + long long l; +@@ -223,7 +223,7 @@ int config_LoadConfigFile( vlc_object_t + int64_t l; + + errno = 0; +- l = strtoi (psz_option_value); ++ l = vlc_strtoi (psz_option_value); + if ((l > item->max.i) || (l < item->min.i)) + errno = ERANGE; + if (errno) diff --git a/multimedia/vlc/patches/patch-src_misc_messages.c b/multimedia/vlc/patches/patch-src_misc_messages.c deleted file mode 100644 index c966b4dbb58..00000000000 --- a/multimedia/vlc/patches/patch-src_misc_messages.c +++ /dev/null @@ -1,65 +0,0 @@ -$NetBSD: patch-src_misc_messages.c,v 1.1 2013/09/08 16:28:27 joerg Exp $ - ---- src/misc/messages.c.orig 2010-08-08 17:32:50.000000000 +0000 -+++ src/misc/messages.c -@@ -301,7 +301,9 @@ void msg_GenericVa (vlc_object_t *p_this - return; - - msg_bank_t *bank = libvlc_bank (p_this->p_libvlc); -+#ifndef LC_C_LOCALE - locale_t locale = uselocale (bank->locale); -+#endif - - #ifndef __GLIBC__ - /* Expand %m to strerror(errno) - only once */ -@@ -321,7 +323,9 @@ void msg_GenericVa (vlc_object_t *p_this - char errbuf[2001]; - size_t errlen; - --#ifndef WIN32 -+#ifdef LC_C_LOCALE -+ strncpy(errbuf, strerror_l( errno, bank->locale), 1001); -+#elif !defined(WIN32) - strerror_r( errno, errbuf, 1001 ); - #else - int sockerr = WSAGetLastError( ); -@@ -361,7 +365,7 @@ void msg_GenericVa (vlc_object_t *p_this - - /* Convert message to string */ - vlc_va_copy( args, _args ); -- if( vasprintf( &psz_str, psz_format, args ) == -1 ) -+ if( vasprintf_l( &psz_str, bank->locale, psz_format, args ) == -1 ) - psz_str = NULL; - va_end( args ); - -@@ -372,7 +376,9 @@ void msg_GenericVa (vlc_object_t *p_this - fprintf( stderr, "main warning: can't store message (%m): " ); - #else - char psz_err[1001]; --#ifndef WIN32 -+#ifdef LC_C_LOCALE -+ strncpy(psz_err, strerror_l( errno, bank->locale), 1001 ); -+#elif !defined(WIN32) - /* we're not using GLIBC, so we are sure that the error description - * will be stored in the buffer we provide to strerror_r() */ - strerror_r( errno, psz_err, 1001 ); -@@ -384,14 +390,18 @@ void msg_GenericVa (vlc_object_t *p_this - #endif - vlc_va_copy( args, _args ); - /* We should use utf8_vfprintf - but it calls malloc()... */ -- vfprintf( stderr, psz_format, args ); -+ vfprintf_l( stderr, bank->locale, psz_format, args ); - va_end( args ); - fputs( "\n", stderr ); - vlc_restorecancel (canc); -+#ifndef LC_C_LOCALE - uselocale (locale); -+#endif - return; - } -+#ifndef LC_C_LOCALE - uselocale (locale); -+#endif - - msg_item_t * p_item = malloc (sizeof (*p_item)); - if (p_item == NULL) diff --git a/multimedia/vlc/patches/patch-src_text_charset.c b/multimedia/vlc/patches/patch-src_text_charset.c deleted file mode 100644 index 3581682181b..00000000000 --- a/multimedia/vlc/patches/patch-src_text_charset.c +++ /dev/null @@ -1,61 +0,0 @@ -$NetBSD: patch-src_text_charset.c,v 1.1 2013/09/08 16:28:27 joerg Exp $ - ---- src/text/charset.c.orig 2013-05-15 20:27:52.000000000 +0000 -+++ src/text/charset.c -@@ -78,6 +78,9 @@ char *vlc_fix_readdir( const char *psz_s - */ - double us_strtod( const char *str, char **end ) - { -+#ifdef LC_C_LOCALE -+ return strtod_l(str, end, LC_C_LOCALE); -+#else - locale_t loc = newlocale (LC_NUMERIC_MASK, "C", NULL); - locale_t oldloc = uselocale (loc); - double res = strtod (str, end); -@@ -88,6 +91,7 @@ double us_strtod( const char *str, char - freelocale (loc); - } - return res; -+#endif - } - - -@@ -97,6 +101,9 @@ double us_strtod( const char *str, char - */ - float us_strtof( const char *str, char **end ) - { -+#ifdef LC_C_LOCALE -+ return strtof_l(str, end, LC_C_LOCALE); -+#else - locale_t loc = newlocale (LC_NUMERIC_MASK, "C", NULL); - locale_t oldloc = uselocale (loc); - float res = strtof (str, end); -@@ -107,6 +114,7 @@ float us_strtof( const char *str, char * - freelocale (loc); - } - return res; -+#endif - } - - -@@ -126,6 +134,14 @@ double us_atof( const char *str ) - */ - int us_asprintf( char **ret, const char *format, ... ) - { -+#ifdef LC_C_LOCALE -+ va_list ap; -+ int i_rc; -+ va_start( ap, format ); -+ i_rc = vasprintf_l( ret, LC_C_LOCALE, format, ap ); -+ va_end( ap ); -+ return i_rc; -+#else - va_list ap; - locale_t loc = newlocale( LC_NUMERIC_MASK, "C", NULL ); - locale_t oldloc = uselocale( loc ); -@@ -142,4 +158,5 @@ int us_asprintf( char **ret, const char - } - - return i_rc; -+#endif - } |