diff options
author | kamil <kamil@pkgsrc.org> | 2018-04-25 22:39:02 +0000 |
---|---|---|
committer | kamil <kamil@pkgsrc.org> | 2018-04-25 22:39:02 +0000 |
commit | 703bb0696e3b5e3bfaa7b732c6be48b9f96c0752 (patch) | |
tree | fecd6ae99101bf060d3034a97b69254896710064 /multimedia | |
parent | 5a129ab2e9693cd363e79c5a3c861aae4ebf3267 (diff) | |
download | pkgsrc-703bb0696e3b5e3bfaa7b732c6be48b9f96c0752.tar.gz |
multimedia/vlc2: import vlc2-2.2.6
VideoLAN is a project of French students from the Ecole Centrale Paris
and developers from all over the world. Its main goals is MPEG streaming
on a network, but it also features a standalone multimedia player. The
VideoLAN Server can stream video read from a hard disk, a DVD player,
a satellite card or an MPEG 2 compression card, and unicast or multicast
it on a network. The VideoLAN Client can read the stream from the network
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 package ships the 2.2.x version of VLC.
Diffstat (limited to 'multimedia')
34 files changed, 1832 insertions, 0 deletions
diff --git a/multimedia/vlc2/DESCR b/multimedia/vlc2/DESCR new file mode 100644 index 00000000000..5ba05189e89 --- /dev/null +++ b/multimedia/vlc2/DESCR @@ -0,0 +1,12 @@ +VideoLAN is a project of French students from the Ecole Centrale Paris +and developers from all over the world. Its main goals is MPEG streaming +on a network, but it also features a standalone multimedia player. The +VideoLAN Server can stream video read from a hard disk, a DVD player, +a satellite card or an MPEG 2 compression card, and unicast or multicast +it on a network. The VideoLAN Client can read the stream from the network +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 package ships the 2.2.x version of VLC. diff --git a/multimedia/vlc2/Makefile b/multimedia/vlc2/Makefile new file mode 100644 index 00000000000..2866076e84e --- /dev/null +++ b/multimedia/vlc2/Makefile @@ -0,0 +1,199 @@ +# $NetBSD: Makefile,v 1.70 2018/04/25 22:39:02 kamil Exp $ + +DISTNAME= vlc-${VLC_VERSION} +PKGNAME= ${DISTNAME:S/vlc/vlc2/} +CATEGORIES= multimedia +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} +MASTER_SITES+= http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/ +EXTRACT_SUFX= .tar.xz + +VLC_VERSION= 2.2.6 + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://www.videolan.org/ +COMMENT= VLC media player and streaming server +LICENSE= gnu-gpl-v2 + +CONFLICTS= vlc07-[0-9]* vlc08-[0-9]* + +USE_LIBTOOL= yes +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+= altivec cdrom oss v4l2 x86simd + +.include "../../mk/bsd.prefs.mk" +.include "options.mk" + +BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0 +BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1 + +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 optimized modules +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" +PLIST.x86simd= yes +CONFIGURE_ARGS+= --enable-mmx \ + --enable-sse +.endif +.if ${MACHINE_ARCH} == "powerpc" +PLIST.altivec= yes +CONFIGURE_ARGS+= --enable-altivec +.endif + +# SunOS cdio interface is unsupported +.if ${OPSYS} != "SunOS" +PLIST.cdrom= yes +.endif + +# Enable when cleanly builds +.if exists(/usr/include/linux/videodev2.h) # || exists(/usr/include/sys/videoio.h) +CONFIGURE_ARGS+= --enable-v4l2 +PLIST.v4l2= yes +.else +CONFIGURE_ARGS+= --disable-v4l2 +.endif + +INSTALLATION_DIRS+= share/vlc/http/dialogs share/vlc/http/images \ + share/vlc/http/js share/vlc/http/old \ + share/vlc/http/old/admin share/vlc/http/old/vlm \ + share/vlc/http/requests share/vlc/osdmenu/default \ + share/vlc/osdmenu/default/selected \ + share/vlc/osdmenu/default/selection \ + share/vlc/osdmenu/default/volume \ + share/vlc/osdmenu/dvd/selected \ + share/vlc/osdmenu/dvd/volume \ + share/vlc/osdmenu/dvd/unselect \ + share/vlc/osdmenu/dvd/selection \ + share/vlc/skins2/fonts \ + ${PKGMANDIR}/man1 + +post-install: + ${INSTALL_DATA} ${WRKSRC}/doc/vlc.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 +SUBST_STAGE.oss= pre-configure +SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g" +SUBST_FILES.oss+= modules/access/oss.c +SUBST_FILES.oss+= modules/audio_output/oss.c +SUBST_FILES.oss+= po/*.po +SUBST_MESSAGE.oss= Fixing hardcoded audio device. + +SUBST_CLASSES+= fnt +SUBST_STAGE.fnt= pre-configure +SUBST_SED.fnt= -e "s,${ORIGFNT},${DEFAULT_FONT}," +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/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 "../../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" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/pcre/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" +.include "../../security/libgcrypt/buildlink3.mk" +.include "../../security/gnutls/buildlink3.mk" + +.include "../../multimedia/ffmpeg2/buildlink3.mk" +.include "../../multimedia/libdvdplay/buildlink3.mk" +.include "../../multimedia/libdvbpsi0/buildlink3.mk" +.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 "../../sysutils/desktop-file-utils/desktopdb.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/vlc2/PLIST b/multimedia/vlc2/PLIST new file mode 100644 index 00000000000..7a6ddafbf9b --- /dev/null +++ b/multimedia/vlc2/PLIST @@ -0,0 +1,563 @@ +@comment $NetBSD: PLIST,v 1.14 2018/04/25 22:39:02 kamil Exp $ +bin/cvlc +${PLIST.x11}bin/qvlc +bin/rvlc +${PLIST.vlc-skins}bin/svlc +bin/vlc +bin/vlc-wrapper +include/vlc/deprecated.h +include/vlc/libvlc.h +include/vlc/libvlc_events.h +include/vlc/libvlc_media.h +include/vlc/libvlc_media_discoverer.h +include/vlc/libvlc_media_library.h +include/vlc/libvlc_media_list.h +include/vlc/libvlc_media_list_player.h +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_addons.h +include/vlc/plugins/vlc_aout.h +include/vlc/plugins/vlc_aout_volume.h +include/vlc/plugins/vlc_arrays.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 +include/vlc/plugins/vlc_block_helper.h +include/vlc/plugins/vlc_charset.h +include/vlc/plugins/vlc_codec.h +include/vlc/plugins/vlc_common.h +include/vlc/plugins/vlc_config.h +include/vlc/plugins/vlc_config_cat.h +include/vlc/plugins/vlc_configuration.h +include/vlc/plugins/vlc_cpu.h +include/vlc/plugins/vlc_demux.h +include/vlc/plugins/vlc_dialog.h +include/vlc/plugins/vlc_epg.h +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 +include/vlc/plugins/vlc_http.h +include/vlc/plugins/vlc_httpd.h +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 +include/vlc/plugins/vlc_playlist.h +include/vlc/plugins/vlc_plugin.h +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_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_osd.h +include/vlc/plugins/vlc_vout_window.h +include/vlc/plugins/vlc_xlib.h +include/vlc/plugins/vlc_xml.h +include/vlc/vlc.h +lib/libvlc.la +lib/libvlccore.la +lib/pkgconfig/libvlc.pc +lib/pkgconfig/vlc-plugin.pc +lib/vlc/plugins/access/libaccess_bd_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_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 +${PLIST.cdrom}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 +${PLIST.cdrom}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/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/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 +lib/vlc/plugins/codec/libaes3_plugin.la +lib/vlc/plugins/codec/libaraw_plugin.la +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/libflac_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 +${PLIST.vaapi}lib/vlc/plugins/codec/libvaapi_drm_plugin.la +${PLIST.vaapi}lib/vlc/plugins/codec/libvaapi_x11_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 +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/liboldrc_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/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 +lib/vlc/plugins/demux/libnsc_plugin.la +lib/vlc/plugins/demux/libnsv_plugin.la +lib/vlc/plugins/demux/libnuv_plugin.la +lib/vlc/plugins/demux/libogg_plugin.la +lib/vlc/plugins/demux/libplaylist_plugin.la +lib/vlc/plugins/demux/libps_plugin.la +lib/vlc/plugins/demux/libpva_plugin.la +lib/vlc/plugins/demux/librawaud_plugin.la +lib/vlc/plugins/demux/librawdv_plugin.la +lib/vlc/plugins/demux/librawvid_plugin.la +lib/vlc/plugins/demux/libreal_plugin.la +lib/vlc/plugins/demux/libsmf_plugin.la +lib/vlc/plugins/demux/libsubtitle_plugin.la +lib/vlc/plugins/demux/libts_plugin.la +lib/vlc/plugins/demux/libtta_plugin.la +lib/vlc/plugins/demux/libty_plugin.la +lib/vlc/plugins/demux/libvc1_plugin.la +lib/vlc/plugins/demux/libvobsub_plugin.la +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.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 +${PLIST.dbus}lib/vlc/plugins/misc/libdbus_screensaver_plugin.la +lib/vlc/plugins/misc/libexport_plugin.la +lib/vlc/plugins/misc/libfingerprinter_plugin.la +lib/vlc/plugins/misc/libgnutls_plugin.la +lib/vlc/plugins/misc/liblogger_plugin.la +lib/vlc/plugins/misc/libstats_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 +lib/vlc/plugins/mux/libmux_asf_plugin.la +lib/vlc/plugins/mux/libmux_avi_plugin.la +lib/vlc/plugins/mux/libmux_dummy_plugin.la +lib/vlc/plugins/mux/libmux_mp4_plugin.la +lib/vlc/plugins/mux/libmux_mpjpeg_plugin.la +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 +lib/vlc/plugins/stream_filter/libdash_plugin.la +lib/vlc/plugins/stream_filter/libdecomp_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/libsvg_plugin.la +lib/vlc/plugins/text_renderer/libtdummy_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/libcolorthres_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 +lib/vlc/plugins/video_filter/libmarq_plugin.la +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/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 +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/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/libsubsdelay_plugin.la +lib/vlc/plugins/video_filter/libtransform_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.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 +${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-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/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-xmas.xpm +share/icons/hicolor/32x32/apps/vlc.png +share/icons/hicolor/32x32/apps/vlc.xpm +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 +share/locale/ff/LC_MESSAGES/vlc.mo +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 +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/ks_IN/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/mai/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 +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 +share/locale/pt_BR/LC_MESSAGES/vlc.mo +share/locale/pt_PT/LC_MESSAGES/vlc.mo +share/locale/ro/LC_MESSAGES/vlc.mo +share/locale/ru/LC_MESSAGES/vlc.mo +share/locale/si/LC_MESSAGES/vlc.mo +share/locale/sk/LC_MESSAGES/vlc.mo +share/locale/sl/LC_MESSAGES/vlc.mo +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 +${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 +share/vlc/vlc.ico +@pkgdir share/vlc/skins2/fonts +@pkgdir share/vlc/osdmenu/dvd/volume +@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/vlc2/PLIST.Linux b/multimedia/vlc2/PLIST.Linux new file mode 100644 index 00000000000..dd3a2a457c8 --- /dev/null +++ b/multimedia/vlc2/PLIST.Linux @@ -0,0 +1,8 @@ +@comment $NetBSD: PLIST.Linux,v 1.3 2018/04/25 22:39:02 kamil 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/vlc2/buildlink3.mk b/multimedia/vlc2/buildlink3.mk new file mode 100644 index 00000000000..719ec2853ca --- /dev/null +++ b/multimedia/vlc2/buildlink3.mk @@ -0,0 +1,13 @@ +# $NetBSD: buildlink3.mk,v 1.3 2018/04/25 22:39:02 kamil Exp $ + +BUILDLINK_TREE+= vlc2 + +.if !defined(VLC2_BUILDLINK3_MK) +VLC2_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.vlc2+= vlc2>=2.2 +BUILDLINK_PKGSRCDIR.vlc2?= ../../multimedia/vlc2 + +.endif # VLC2_BUILDLINK3_MK + +BUILDLINK_TREE+= -vlc2 diff --git a/multimedia/vlc2/distinfo b/multimedia/vlc2/distinfo new file mode 100644 index 00000000000..562cbdf6eb5 --- /dev/null +++ b/multimedia/vlc2/distinfo @@ -0,0 +1,32 @@ +$NetBSD: distinfo,v 1.26 2018/04/25 22:39:02 kamil Exp $ + +SHA1 (vlc-2.2.6.tar.xz) = d299dce6a5c94af4292657b6cb99c44654024f70 +RMD160 (vlc-2.2.6.tar.xz) = b2727834bcbbf0d274e3a0b4a3317f3b914f9ad4 +SHA512 (vlc-2.2.6.tar.xz) = 9aff5922eb8b3c6a24e6153c367b0170dbc67602ae3e9304f52d2da00c9081d66cc98abd722b7c95b6c7d2e6cc7c86f21f9cba42c7d4bf29ca97d0f2d3553f8d +Size (vlc-2.2.6.tar.xz) = 22198720 bytes +SHA1 (patch-bin_override.c) = 0190b65ec29ccdb7ef89d7c6af74a6bfdfc17076 +SHA1 (patch-compat_Makefile.am) = 983e9e29380702326d114274db99af72b5bdb3dd +SHA1 (patch-compat_Makefile.in) = d520534929290864ee30a286633f8ae118106ae1 +SHA1 (patch-configure) = 90cdfc62aa0bbc68ec76758ca0acdcb13dbfe56d +SHA1 (patch-include_vlc__common.h) = 26ab2c96230e3fbe26dd4bce60db7c5331eb3f6c +SHA1 (patch-include_vlc__fixups.h) = 1a9f58b70f43fb87381d75d856682e3bcad14f6c +SHA1 (patch-include_vlc_atomic.h) = 3f3acc51e2e3645951b8c39c2cf61dab6c7d756d +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_dialogs_messages.cpp) = 8f4abf85ecd435bb1d2964e5ac16fc09ecaa5ab0 +SHA1 (patch-modules_gui_qt4_input__manager.cpp) = cf9db2c8a4bd4b6080cca0534dcc5065555c6d4a +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_services__discovery_mtp.c) = 03ad7d3efecc95bb27aaa216b78719662999102e +SHA1 (patch-modules_video__output_sdl.c) = fcb5daacd5fe0627dcf1eaad79c8e2a27d6c948a +SHA1 (patch-src_config_file.c) = 87c53b6d3a2d1fa9cf5b7e8e672ab2a08cafe3bb diff --git a/multimedia/vlc2/hacks.mk b/multimedia/vlc2/hacks.mk new file mode 100644 index 00000000000..893c7515e4b --- /dev/null +++ b/multimedia/vlc2/hacks.mk @@ -0,0 +1,15 @@ +# $NetBSD: hacks.mk,v 1.1 2018/04/25 22:39:02 kamil Exp $ + +.if !defined(VLC2_HACKS_MK) +VLC2_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/vlc2/options.mk b/multimedia/vlc2/options.mk new file mode 100644 index 00000000000..9bbf9dbeba9 --- /dev/null +++ b/multimedia/vlc2/options.mk @@ -0,0 +1,180 @@ +# $NetBSD: options.mk,v 1.13 2018/04/25 22:39:02 kamil Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.vlc2 +PKG_SUPPORTED_OPTIONS= dbus debug dts faad gnome jack live pulseaudio +PKG_SUPPORTED_OPTIONS+= sdl vlc-skins x11 +PKG_SUGGESTED_OPTIONS= dbus x11 + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} != "SunOS" +PKG_SUGGESTED_OPTIONS+= live +.endif + +### Add VAAPI if it is available +.include "../../multimedia/libva/available.mk" +PLIST_VARS+= vaapi +.if ${VAAPI_AVAILABLE} == "yes" +PKG_SUPPORTED_OPTIONS+= vaapi +PKG_SUGGESTED_OPTIONS+= vaapi +.endif + +### Add LIRC if it is available +.include "../../comms/lirc/available.mk" +PLIST_VARS+= lirc +.if ${LIRC_AVAILABLE} == "yes" +PKG_SUPPORTED_OPTIONS+= lirc +PKG_SUGGESTED_OPTIONS+= lirc +.endif + +### +.include "../../mk/bsd.options.mk" + +PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} + +## PulseAudio support + +.if !empty(PKG_OPTIONS:Mpulseaudio) +CONFIGURE_ARGS+= --enable-pulse +.include "../../audio/pulseaudio/buildlink3.mk" +PLIST.pulseaudio= yes +.else +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) +CONFIGURE_ARGS+= --enable-sdl +CONFIGURE_ARGS+= --enable-sdl-image +.include "../../devel/SDL/buildlink3.mk" +.include "../../graphics/SDL_image/buildlink3.mk" +PLIST.sdl= yes +.else +CONFIGURE_ARGS+= --disable-sdl +CONFIGURE_ARGS+= --disable-sdl-image +.endif + +## gnome integration + +.if !empty(PKG_OPTIONS:Mgnome) +CONFIGURE_ARGS+= --enable-gnomevfs +.include "../../sysutils/gnome-vfs/buildlink3.mk" +PLIST.gnome= yes +.else +CONFIGURE_ARGS+= --disable-gnomevfs +.endif + +## DBUS message bus support + +.if !empty(PKG_OPTIONS:Mdbus) +CONFIGURE_ARGS+= --enable-dbus +.include "../../sysutils/dbus/buildlink3.mk" +PLIST.dbus= yes +.else +CONFIGURE_ARGS+= --disable-dbus +.endif + +## DEBUG build or release build + +.if !empty(PKG_OPTIONS:Mdebug) +CONFIGURE_ARGS+= --enable-debug +CONFIGURE_ARGS+= --disable-optimizations +.endif + +## SKINS frontend + +.if !empty(PKG_OPTIONS:Mvlc-skins) +CONFIGURE_ARGS+= --enable-skins2 +PLIST.vlc-skins= yes +INSTALLATION_DIRS+= share/vlc/skins2 +.else +CONFIGURE_ARGS+= --disable-skins2 +.endif + +## 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" +.include "../../x11/libXv/buildlink3.mk" +.include "../../x11/libXvMC/buildlink3.mk" +.include "../../x11/libXxf86vm/buildlink3.mk" +.include "../../x11/libXdamage/buildlink3.mk" +.include "../../x11/libXinerama/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libxcb/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-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-qt \ + --disable-freetype +.endif + +.if !empty(PKG_OPTIONS:Mfaad) +CONFIGURE_ARGS+= --enable-faad +PLIST.faad= yes +.include "../../audio/faad2/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-faad +.endif + +## DTS support (libdca is non-redistributable) + +.if !empty(PKG_OPTIONS:Mdts) +CONFIGURE_ARGS+= --enable-dca +PLIST.dts= yes +. include "../../audio/libdca/buildlink3.mk" +.else +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 +PLIST.vaapi= yes +.include "../../multimedia/libva/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-libva +.endif + +## LIRC support +.if !empty(PKG_OPTIONS:Mlirc) +CONFIGURE_ARGS+= --enable-lirc +PLIST.lirc= yes +.include "../../comms/lirc/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-lirc +.endif diff --git a/multimedia/vlc2/patches/patch-bin_override.c b/multimedia/vlc2/patches/patch-bin_override.c new file mode 100644 index 00000000000..b4c97179d20 --- /dev/null +++ b/multimedia/vlc2/patches/patch-bin_override.c @@ -0,0 +1,13 @@ +$NetBSD: patch-bin_override.c,v 1.1 2018/04/25 22:39:02 kamil 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/vlc2/patches/patch-compat_Makefile.am b/multimedia/vlc2/patches/patch-compat_Makefile.am new file mode 100644 index 00000000000..f1d1de22832 --- /dev/null +++ b/multimedia/vlc2/patches/patch-compat_Makefile.am @@ -0,0 +1,25 @@ +$NetBSD: patch-compat_Makefile.am,v 1.1 2018/04/25 22:39:02 kamil 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/vlc2/patches/patch-compat_Makefile.in b/multimedia/vlc2/patches/patch-compat_Makefile.in new file mode 100644 index 00000000000..2728b79b0df --- /dev/null +++ b/multimedia/vlc2/patches/patch-compat_Makefile.in @@ -0,0 +1,131 @@ +$NetBSD: patch-compat_Makefile.in,v 1.1 2018/04/25 22:39:02 kamil Exp $ + +See comment on patch_compat_Makefile.am. + +--- compat/Makefile.in.orig 2017-05-24 12:55:21.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) +@@ -995,10 +995,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) +@@ -1036,33 +1036,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`; \ +@@ -1072,7 +1048,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) +@@ -1229,9 +1205,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 +@@ -1267,7 +1240,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 +@@ -1294,7 +1267,7 @@ install-dvi: install-dvi-am + + install-dvi-am: + +-install-exec-am: install-pkglibLTLIBRARIES ++install-exec-am: + + install-html: install-html-am + +@@ -1334,24 +1307,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-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 ++ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am + + .PRECIOUS: Makefile + diff --git a/multimedia/vlc2/patches/patch-configure b/multimedia/vlc2/patches/patch-configure new file mode 100644 index 00000000000..51cceb2ba6c --- /dev/null +++ b/multimedia/vlc2/patches/patch-configure @@ -0,0 +1,24 @@ +$NetBSD: patch-configure,v 1.1 2018/04/25 22:39:02 kamil Exp $ + +Remove bogus Solaris exclusion. + +--- configure.orig 2016-05-31 16:56:33.000000000 +0000 ++++ configure +@@ -26281,7 +26281,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sse_inline" >&5 + $as_echo "$ac_cv_sse_inline" >&6; } + +- if test "${ac_cv_sse_inline}" != "no" -a "${SYS}" != "solaris"; then : ++ if test "${ac_cv_sse_inline}" != "no"; then : + + + $as_echo "#define CAN_COMPILE_SSE 1" >>confdefs.h +@@ -26324,7 +26324,7 @@ rm -f core conftest.err conftest.$ac_obj + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sse2_inline" >&5 + $as_echo "$ac_cv_sse2_inline" >&6; } +- if test "${ac_cv_sse2_inline}" != "no" -a "${SYS}" != "solaris"; then : ++ if test "${ac_cv_sse2_inline}" != "no"; then : + + + $as_echo "#define CAN_COMPILE_SSE2 1" >>confdefs.h diff --git a/multimedia/vlc2/patches/patch-include_vlc__common.h b/multimedia/vlc2/patches/patch-include_vlc__common.h new file mode 100644 index 00000000000..907115ae648 --- /dev/null +++ b/multimedia/vlc2/patches/patch-include_vlc__common.h @@ -0,0 +1,48 @@ +$NetBSD: patch-include_vlc__common.h,v 1.1 2018/04/25 22:39:02 kamil 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/vlc2/patches/patch-include_vlc__fixups.h b/multimedia/vlc2/patches/patch-include_vlc__fixups.h new file mode 100644 index 00000000000..496151cb55d --- /dev/null +++ b/multimedia/vlc2/patches/patch-include_vlc__fixups.h @@ -0,0 +1,54 @@ +$NetBSD: patch-include_vlc__fixups.h,v 1.1 2018/04/25 22:39:02 kamil Exp $ + +on NetBSD-current, just define "uselocale", nothing else +fixes build + +static_assert: Assume that a compiler in C11 or C++11 frontend mode +has the _Static_assert keyword, but define the macro if it is missing +from the headers. + +--- include/vlc_fixups.h.orig 2015-04-13 19:54:35.000000000 +0000 ++++ include/vlc_fixups.h +@@ -218,16 +218,28 @@ int posix_memalign (void **, size_t, siz + + /* 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,9 +250,12 @@ static inline locale_t newlocale(int mas + return NULL; + } + #endif ++#endif + +-#if !defined (HAVE_STATIC_ASSERT) ++#if !defined (static_assert) ++# if !(__STDC_VERSION__ - 0 >= 201112L || __cplusplus >= 201103L) + # define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); })) ++# endif + # define static_assert _Static_assert + #endif + diff --git a/multimedia/vlc2/patches/patch-include_vlc_atomic.h b/multimedia/vlc2/patches/patch-include_vlc_atomic.h new file mode 100644 index 00000000000..9078741e2bf --- /dev/null +++ b/multimedia/vlc2/patches/patch-include_vlc_atomic.h @@ -0,0 +1,22 @@ +$NetBSD: patch-include_vlc_atomic.h,v 1.1 2018/04/25 22:39:02 kamil Exp $ + +C++11 ships everything we need, just use <atomic> instead +of the vlc_atomic.h #ifdef maze. + +--- include/vlc_atomic.h.orig 2015-02-02 19:42:28.000000000 +0000 ++++ include/vlc_atomic.h +@@ -32,7 +32,14 @@ + /*** Native C11 atomics ***/ + # include <stdatomic.h> + ++#elif defined(__cplusplus) && (__cplusplus >= 201103L) ++#include <atomic> ++using std::atomic_uint_least32_t; ++using std::atomic_uintptr_t; ++using std::atomic_uint; + # else ++#include <sys/types.h> ++#include <stdint.h> + + # define ATOMIC_FLAG_INIT false + diff --git a/multimedia/vlc2/patches/patch-modules_access_directory.c b/multimedia/vlc2/patches/patch-modules_access_directory.c new file mode 100644 index 00000000000..c442cf4f0c3 --- /dev/null +++ b/multimedia/vlc2/patches/patch-modules_access_directory.c @@ -0,0 +1,25 @@ +$NetBSD: patch-modules_access_directory.c,v 1.3 2018/04/25 22:39:02 kamil 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/vlc2/patches/patch-modules_access_file.c b/multimedia/vlc2/patches/patch-modules_access_file.c new file mode 100644 index 00000000000..87fd884afdd --- /dev/null +++ b/multimedia/vlc2/patches/patch-modules_access_file.c @@ -0,0 +1,23 @@ +$NetBSD: patch-modules_access_file.c,v 1.1 2018/04/25 22:39:02 kamil 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/vlc2/patches/patch-modules_access_rtp_Makefile.am b/multimedia/vlc2/patches/patch-modules_access_rtp_Makefile.am new file mode 100644 index 00000000000..709546291b7 --- /dev/null +++ b/multimedia/vlc2/patches/patch-modules_access_rtp_Makefile.am @@ -0,0 +1,13 @@ +$NetBSD: patch-modules_access_rtp_Makefile.am,v 1.1 2018/04/25 22:39:02 kamil 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/vlc2/patches/patch-modules_gui_qt4_components_controller.cpp b/multimedia/vlc2/patches/patch-modules_gui_qt4_components_controller.cpp new file mode 100644 index 00000000000..9be8c600b40 --- /dev/null +++ b/multimedia/vlc2/patches/patch-modules_gui_qt4_components_controller.cpp @@ -0,0 +1,18 @@ +$NetBSD: patch-modules_gui_qt4_components_controller.cpp,v 1.1 2018/04/25 22:39:02 kamil 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/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 ), +- slider, setPosition( float, int64_t, int ) ); ++ CONNECT( THEMIM->getIM(), positionUpdated( float, putime_t, int ), ++ slider, setPosition( float, putime_t, int ) ); + /* And update the IM, when the position has changed */ + CONNECT( slider, sliderDragged( float ), + THEMIM->getIM(), sliderUpdate( float ) ); diff --git a/multimedia/vlc2/patches/patch-modules_gui_qt4_components_extended__panels.cpp b/multimedia/vlc2/patches/patch-modules_gui_qt4_components_extended__panels.cpp new file mode 100644 index 00000000000..ba035e703e3 --- /dev/null +++ b/multimedia/vlc2/patches/patch-modules_gui_qt4_components_extended__panels.cpp @@ -0,0 +1,34 @@ +$NetBSD: patch-modules_gui_qt4_components_extended__panels.cpp,v 1.1 2018/04/25 22:39:02 kamil 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/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; + +- int64_t i_delay; ++ putime_t i_delay; + if( THEMIM->getInput() ) + { + i_delay = var_GetTime( THEMIM->getInput(), "audio-delay" ); +@@ -1600,7 +1600,7 @@ void SyncControls::advanceAudio( double + { + if( THEMIM->getInput() && b_userAction ) + { +- int64_t i_delay = f_advance * 1000000; ++ putime_t i_delay = f_advance * 1000000; + var_SetTime( THEMIM->getInput(), "audio-delay", i_delay ); + } + } +@@ -1609,7 +1609,7 @@ void SyncControls::advanceSubs( double f + { + if( THEMIM->getInput() && b_userAction ) + { +- int64_t i_delay = f_advance * 1000000; ++ putime_t i_delay = f_advance * 1000000; + var_SetTime( THEMIM->getInput(), "spu-delay", i_delay ); + } + } diff --git a/multimedia/vlc2/patches/patch-modules_gui_qt4_components_interface__widgets.cpp b/multimedia/vlc2/patches/patch-modules_gui_qt4_components_interface__widgets.cpp new file mode 100644 index 00000000000..94231f96995 --- /dev/null +++ b/multimedia/vlc2/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 2018/04/25 22:39:02 kamil 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/vlc2/patches/patch-modules_gui_qt4_components_interface__widgets.hpp b/multimedia/vlc2/patches/patch-modules_gui_qt4_components_interface__widgets.hpp new file mode 100644 index 00000000000..59cd06f1c6e --- /dev/null +++ b/multimedia/vlc2/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 2018/04/25 22:39:02 kamil 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/vlc2/patches/patch-modules_gui_qt4_dialogs_messages.cpp b/multimedia/vlc2/patches/patch-modules_gui_qt4_dialogs_messages.cpp new file mode 100644 index 00000000000..4bf259476e6 --- /dev/null +++ b/multimedia/vlc2/patches/patch-modules_gui_qt4_dialogs_messages.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-modules_gui_qt4_dialogs_messages.cpp,v 1.1 2018/04/25 22:39:02 kamil Exp $ + +Fix build with clang. &this->verbosity is unsigned. + +--- modules/gui/qt4/dialogs/messages.cpp.orig 2014-11-16 18:57:59.000000000 +0000 ++++ modules/gui/qt4/dialogs/messages.cpp +@@ -143,7 +143,7 @@ MessagesDialog::~MessagesDialog() + + void MessagesDialog::changeVerbosity( int i_verbosity ) + { +- atomic_store( &this->verbosity, i_verbosity ); ++ atomic_store( &this->verbosity, (unsigned int)i_verbosity ); + } + + void MessagesDialog::updateConfig() diff --git a/multimedia/vlc2/patches/patch-modules_gui_qt4_input__manager.cpp b/multimedia/vlc2/patches/patch-modules_gui_qt4_input__manager.cpp new file mode 100644 index 00000000000..879dcac962b --- /dev/null +++ b/multimedia/vlc2/patches/patch-modules_gui_qt4_input__manager.cpp @@ -0,0 +1,52 @@ +$NetBSD: patch-modules_gui_qt4_input__manager.cpp,v 1.1 2018/04/25 22:39:02 kamil 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.cpp.orig 2016-04-18 11:10:31.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 ); + } + playlist_Lock( THEPL ); + // Add root items only +@@ -453,7 +453,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" ) / CLOCK_FREQ; + i_time = var_GetTime( p_input , "time"); +@@ -995,21 +995,21 @@ void InputManager::setAtoB() + { + timeB = var_GetTime( THEMIM->getInput(), "time" ); + var_SetTime( THEMIM->getInput(), "time" , timeA ); +- CONNECT( this, positionUpdated( float, int64_t, int ), +- this, AtoBLoop( float, int64_t, int ) ); ++ CONNECT( this, positionUpdated( float, putime_t, int ), ++ this, AtoBLoop( float, putime_t, int ) ); + } + else + { + timeA = 0; + timeB = 0; +- disconnect( this, SIGNAL( positionUpdated( float, int64_t, int ) ), +- this, SLOT( AtoBLoop( float, int64_t, int ) ) ); ++ disconnect( this, SIGNAL( positionUpdated( float, putime_t, int ) ), ++ this, SLOT( AtoBLoop( float, putime_t, int ) ) ); + } + emit AtoBchanged( (timeA != 0 ), (timeB != 0 ) ); + } + + /* Function called regularly when in an AtoB loop */ +-void InputManager::AtoBLoop( float, int64_t i_time, int ) ++void InputManager::AtoBLoop( float, putime_t i_time, int ) + { + if( timeB && i_time >= timeB ) + var_SetTime( THEMIM->getInput(), "time" , timeA ); diff --git a/multimedia/vlc2/patches/patch-modules_gui_qt4_input__manager.hpp b/multimedia/vlc2/patches/patch-modules_gui_qt4_input__manager.hpp new file mode 100644 index 00000000000..a88131f82c4 --- /dev/null +++ b/multimedia/vlc2/patches/patch-modules_gui_qt4_input__manager.hpp @@ -0,0 +1,38 @@ +$NetBSD: patch-modules_gui_qt4_input__manager.hpp,v 1.1 2018/04/25 22:39:02 kamil 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/vlc2/patches/patch-modules_gui_qt4_main__interface.cpp b/multimedia/vlc2/patches/patch-modules_gui_qt4_main__interface.cpp new file mode 100644 index 00000000000..6b9ee999f9e --- /dev/null +++ b/multimedia/vlc2/patches/patch-modules_gui_qt4_main__interface.cpp @@ -0,0 +1,23 @@ +$NetBSD: patch-modules_gui_qt4_main__interface.cpp,v 1.1 2018/04/25 22:39:02 kamil 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/vlc2/patches/patch-modules_gui_qt4_main__interface.hpp b/multimedia/vlc2/patches/patch-modules_gui_qt4_main__interface.hpp new file mode 100644 index 00000000000..27a89320588 --- /dev/null +++ b/multimedia/vlc2/patches/patch-modules_gui_qt4_main__interface.hpp @@ -0,0 +1,25 @@ +$NetBSD: patch-modules_gui_qt4_main__interface.hpp,v 1.1 2018/04/25 22:39:02 kamil 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/vlc2/patches/patch-modules_gui_qt4_util_input__slider.cpp b/multimedia/vlc2/patches/patch-modules_gui_qt4_util_input__slider.cpp new file mode 100644 index 00000000000..548a3afc7e6 --- /dev/null +++ b/multimedia/vlc2/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 2018/04/25 22:39:02 kamil 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/vlc2/patches/patch-modules_gui_qt4_util_input__slider.hpp b/multimedia/vlc2/patches/patch-modules_gui_qt4_util_input__slider.hpp new file mode 100644 index 00000000000..27f8338ca06 --- /dev/null +++ b/multimedia/vlc2/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 2018/04/25 22:39:02 kamil 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/vlc2/patches/patch-modules_gui_skins2_src_theme__loader.cpp b/multimedia/vlc2/patches/patch-modules_gui_skins2_src_theme__loader.cpp new file mode 100644 index 00000000000..7ddc96377cb --- /dev/null +++ b/multimedia/vlc2/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 2018/04/25 22:39:02 kamil 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/vlc2/patches/patch-modules_misc_inhibit_xdg.c b/multimedia/vlc2/patches/patch-modules_misc_inhibit_xdg.c new file mode 100644 index 00000000000..072a851f967 --- /dev/null +++ b/multimedia/vlc2/patches/patch-modules_misc_inhibit_xdg.c @@ -0,0 +1,78 @@ +$NetBSD: patch-modules_misc_inhibit_xdg.c,v 1.1 2018/04/25 22:39:02 kamil 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/vlc2/patches/patch-modules_services__discovery_mtp.c b/multimedia/vlc2/patches/patch-modules_services__discovery_mtp.c new file mode 100644 index 00000000000..4314648ad03 --- /dev/null +++ b/multimedia/vlc2/patches/patch-modules_services__discovery_mtp.c @@ -0,0 +1,14 @@ +$NetBSD: patch-modules_services__discovery_mtp.c,v 1.1 2018/04/25 22:39:02 kamil Exp $ + +Need strings.h for rindex(). + +--- modules/services_discovery/mtp.c.orig 2015-02-02 19:42:29.000000000 +0000 ++++ modules/services_discovery/mtp.c +@@ -24,6 +24,7 @@ + # include "config.h" + #endif + ++#include <strings.h> + #include <vlc_common.h> + #include <vlc_plugin.h> + #include <vlc_services_discovery.h> diff --git a/multimedia/vlc2/patches/patch-modules_video__output_sdl.c b/multimedia/vlc2/patches/patch-modules_video__output_sdl.c new file mode 100644 index 00000000000..26b0e6b2e29 --- /dev/null +++ b/multimedia/vlc2/patches/patch-modules_video__output_sdl.c @@ -0,0 +1,17 @@ +$NetBSD: patch-modules_video__output_sdl.c,v 1.1 2018/04/25 22:39:02 kamil Exp $ + +--- modules/video_output/sdl.c.orig 2014-11-16 18:57:59.000000000 +0000 ++++ modules/video_output/sdl.c +@@ -41,10 +41,9 @@ + #include <SDL.h> + + #if !defined(_WIN32) && !defined(__OS2__) +-# ifdef X_DISPLAY_MISSING +-# error Xlib required due to XInitThreads +-# endif ++# ifdef HAVE_X11_XLIB_H + # include <vlc_xlib.h> ++# endif + #endif + + /***************************************************************************** diff --git a/multimedia/vlc2/patches/patch-src_config_file.c b/multimedia/vlc2/patches/patch-src_config_file.c new file mode 100644 index 00000000000..fa70cc1bbca --- /dev/null +++ b/multimedia/vlc2/patches/patch-src_config_file.c @@ -0,0 +1,25 @@ +$NetBSD: patch-src_config_file.c,v 1.3 2018/04/25 22:39:02 kamil Exp $ + +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 +@@ -138,7 +138,7 @@ static FILE *config_OpenConfigFile( vlc_ + } + + +-static int64_t strtoi (const char *str) ++static int64_t vlc_strtoi (const char *str) + { + char *end; + 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) |