pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/multimedia/vlc
Module Name: pkgsrc
Committed By: nia
Date: Tue Jul 2 20:52:13 UTC 2019
Modified Files:
pkgsrc/multimedia/vlc: DESCR Makefile PLIST PLIST.Linux buildlink3.mk
distinfo options.mk
pkgsrc/multimedia/vlc/patches: patch-compat_Makefile.am
Added Files:
pkgsrc/multimedia/vlc/patches: patch-configure.ac patch-lib_core.c
patch-lib_video.c patch-m4_dolt.m4
patch-modules_access_http_Makefile.am patch-share_Makefile.am
Removed Files:
pkgsrc/multimedia/vlc/patches: patch-bin_override.c
patch-compat_Makefile.in patch-configure
patch-include_vlc__common.h patch-include_vlc__fixups.h
patch-include_vlc_atomic.h patch-modules_access_directory.c
patch-modules_access_file.c patch-modules_access_rtp_Makefile.am
patch-modules_gui_qt4_components_controller.cpp
patch-modules_gui_qt4_components_extended__panels.cpp
patch-modules_gui_qt4_components_interface__widgets.cpp
patch-modules_gui_qt4_components_interface__widgets.hpp
patch-modules_gui_qt4_dialogs_messages.cpp
patch-modules_gui_qt4_input__manager.cpp
patch-modules_gui_qt4_input__manager.hpp
patch-modules_gui_qt4_main__interface.cpp
patch-modules_gui_qt4_main__interface.hpp
patch-modules_gui_qt4_util_input__slider.cpp
patch-modules_gui_qt4_util_input__slider.hpp
patch-modules_gui_skins2_src_theme__loader.cpp
patch-modules_misc_inhibit_xdg.c
patch-modules_services__discovery_mtp.c
patch-modules_video__output_sdl.c patch-src_config_file.c
Log Message:
vlc: Update to 3.0.7.1
Based on work in pkgsrc-wip.
I've had the opportunity to test this in a NetBSD-8 bulk build - it seems
the package is now fixed. Hopefully.
The 3.0.x release series is considered for long-term support by upstream.
Notably for pkgsrc, this means it will be the last release series that
supports older compilers.
Note that VLC now depends on Qt5 instead of Qt4. Various config flags have
been tweaked (enabled/disabled) to match what other vendors (mainly FreeBSD)
are doing. I have also added an alsa package option.
The full list of upstream changes is probably too long to list.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/vlc/DESCR
cvs rdiff -u -r1.218 -r1.219 pkgsrc/multimedia/vlc/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/multimedia/vlc/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/vlc/PLIST.Linux
cvs rdiff -u -r1.46 -r1.47 pkgsrc/multimedia/vlc/buildlink3.mk
cvs rdiff -u -r1.74 -r1.75 pkgsrc/multimedia/vlc/distinfo
cvs rdiff -u -r1.32 -r1.33 pkgsrc/multimedia/vlc/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/multimedia/vlc/patches/patch-bin_override.c \
pkgsrc/multimedia/vlc/patches/patch-include_vlc__common.h \
pkgsrc/multimedia/vlc/patches/patch-modules_access_directory.c \
pkgsrc/multimedia/vlc/patches/patch-modules_access_file.c \
pkgsrc/multimedia/vlc/patches/patch-modules_access_rtp_Makefile.am \
pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt4_components_controller.cpp \
pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt4_components_extended__panels.cpp \
pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt4_components_interface__widgets.cpp \
pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt4_components_interface__widgets.hpp \
pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt4_dialogs_messages.cpp \
pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.hpp \
pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt4_main__interface.cpp \
pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt4_main__interface.hpp \
pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt4_util_input__slider.cpp \
pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt4_util_input__slider.hpp \
pkgsrc/multimedia/vlc/patches/patch-modules_gui_skins2_src_theme__loader.cpp \
pkgsrc/multimedia/vlc/patches/patch-modules_misc_inhibit_xdg.c \
pkgsrc/multimedia/vlc/patches/patch-modules_services__discovery_mtp.c \
pkgsrc/multimedia/vlc/patches/patch-modules_video__output_sdl.c
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/multimedia/vlc/patches/patch-compat_Makefile.am
cvs rdiff -u -r1.3 -r0 pkgsrc/multimedia/vlc/patches/patch-compat_Makefile.in \
pkgsrc/multimedia/vlc/patches/patch-include_vlc__fixups.h \
pkgsrc/multimedia/vlc/patches/patch-include_vlc_atomic.h \
pkgsrc/multimedia/vlc/patches/patch-src_config_file.c
cvs rdiff -u -r1.8 -r0 pkgsrc/multimedia/vlc/patches/patch-configure
cvs rdiff -u -r0 -r1.6 pkgsrc/multimedia/vlc/patches/patch-configure.ac
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/vlc/patches/patch-lib_core.c \
pkgsrc/multimedia/vlc/patches/patch-lib_video.c \
pkgsrc/multimedia/vlc/patches/patch-m4_dolt.m4 \
pkgsrc/multimedia/vlc/patches/patch-modules_access_http_Makefile.am \
pkgsrc/multimedia/vlc/patches/patch-share_Makefile.am
cvs rdiff -u -r1.2 -r0 \
pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/multimedia/vlc/DESCR
diff -u pkgsrc/multimedia/vlc/DESCR:1.4 pkgsrc/multimedia/vlc/DESCR:1.5
--- pkgsrc/multimedia/vlc/DESCR:1.4 Sun Oct 25 11:00:18 2015
+++ pkgsrc/multimedia/vlc/DESCR Tue Jul 2 20:52:12 2019
@@ -1,10 +1,3 @@
-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.
+VLC is a free and open source cross-platform multimedia player and
+framework that plays most multimedia files as well as DVDs, Audio
+CDs, VCDs, and various streaming protocols.
Index: pkgsrc/multimedia/vlc/Makefile
diff -u pkgsrc/multimedia/vlc/Makefile:1.218 pkgsrc/multimedia/vlc/Makefile:1.219
--- pkgsrc/multimedia/vlc/Makefile:1.218 Tue Nov 27 18:28:48 2018
+++ pkgsrc/multimedia/vlc/Makefile Tue Jul 2 20:52:12 2019
@@ -1,24 +1,23 @@
-# $NetBSD: Makefile,v 1.218 2018/11/27 18:28:48 maya Exp $
+# $NetBSD: Makefile,v 1.219 2019/07/02 20:52:12 nia Exp $
-# (Intended to be upgraded to vlc3 when dependencies resolved)
DISTNAME= vlc-${VLC_VERSION}
-PKGREVISION= 12
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/}
-MASTER_SITES+= http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
+MASTER_SITES= https://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
EXTRACT_SUFX= .tar.xz
-VLC_VERSION= 2.2.6
+VLC_VERSION= 3.0.7.1
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.videolan.org/
+HOMEPAGE= https://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_TOOLS+= bash gmake perl pkg-config
+USE_TOOLS+= autoreconf autoconf automake bison
+USE_TOOLS+= autopoint realpath msgfmt msgmerge xgettext
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -31,42 +30,59 @@ PLIST_VARS+= altivec cdrom oss v4l2 x86
.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
+LUA_VERSIONS_ACCEPTED= 51 52
+
+CONFIGURE_ARGS+= --disable-aribsub
+CONFIGURE_ARGS+= --disable-aribb25
CONFIGURE_ARGS+= --disable-bluray
-CONFIGURE_ARGS+= --disable-bonjour
CONFIGURE_ARGS+= --disable-caca
CONFIGURE_ARGS+= --disable-chromaprint
+CONFIGURE_ARGS+= --disable-chromecast
+CONFIGURE_ARGS+= --disable-dav1d
CONFIGURE_ARGS+= --disable-dc1394
-CONFIGURE_ARGS+= --disable-decklink
CONFIGURE_ARGS+= --disable-dv1394
+CONFIGURE_ARGS+= --disable-decklink
+CONFIGURE_ARGS+= --disable-dsm
CONFIGURE_ARGS+= --disable-freerdp
+CONFIGURE_ARGS+= --disable-fluidlite
CONFIGURE_ARGS+= --disable-goom
CONFIGURE_ARGS+= --disable-gst-decode
-CONFIGURE_ARGS+= --disable-lua
+CONFIGURE_ARGS+= --disable-libplacebo
+CONFIGURE_ARGS+= --disable-live555
CONFIGURE_ARGS+= --disable-mfx
-CONFIGURE_ARGS+= --disable-mmal-codec
+CONFIGURE_ARGS+= --disable-microdns
+CONFIGURE_ARGS+= --disable-mmal
+CONFIGURE_ARGS+= --disable-ncurses
+CONFIGURE_ARGS+= --disable-nfs
CONFIGURE_ARGS+= --disable-notify
CONFIGURE_ARGS+= --disable-opencv
CONFIGURE_ARGS+= --disable-projectm
CONFIGURE_ARGS+= --disable-samplerate
+CONFIGURE_ARGS+= --disable-sdl-image
+CONFIGURE_ARGS+= --disable-secret
CONFIGURE_ARGS+= --disable-sftp
CONFIGURE_ARGS+= --disable-shine
CONFIGURE_ARGS+= --disable-sid
CONFIGURE_ARGS+= --disable-smbclient
+CONFIGURE_ARGS+= --disable-sndio
+CONFIGURE_ARGS+= --disable-spatialaudio
+CONFIGURE_ARGS+= --disable-srt
+CONFIGURE_ARGS+= --disable-svg
+CONFIGURE_ARGS+= --disable-svgdec
+CONFIGURE_ARGS+= --disable-tiger
CONFIGURE_ARGS+= --disable-twolame
CONFIGURE_ARGS+= --disable-udev
CONFIGURE_ARGS+= --disable-vnc
CONFIGURE_ARGS+= --disable-vsxu
+CONFIGURE_ARGS+= --disable-x264
+CONFIGURE_ARGS+= --disable-x26410b
+CONFIGURE_ARGS+= --disable-x265
CONFIGURE_ARGS+= --disable-zvbi
-CFLAGS+= -fPIC
-CXXFLAGS+= -fPIC
-
# which platforms support OSSv4?
-.if ${MACHINE_PLATFORM:MNetBSD-*-*}
+.if ${OPSYS} == "NetBSD"
PLIST.oss= yes
.include "../../mk/oss.buildlink3.mk"
.else
@@ -79,6 +95,7 @@ PLIST.x86simd= yes
CONFIGURE_ARGS+= --enable-mmx \
--enable-sse
.endif
+
.if ${MACHINE_ARCH} == "powerpc"
PLIST.altivec= yes
CONFIGURE_ARGS+= --enable-altivec
@@ -141,59 +158,56 @@ SUBST_MESSAGE.fnt= Fixing hardcoded font
CHECK_WRKREF_SKIP= lib/libvlccore.a \
lib/libvlccore.so*
+pre-configure:
+ ${RUN} cd ${WRKSRC} && ${SH} ./bootstrap
+
+.include "../../archivers/libarchive/buildlink3.mk"
+.include "../../audio/faad2/buildlink3.mk"
.include "../../audio/fluidsynth/buildlink3.mk"
.include "../../audio/flac/buildlink3.mk"
-.include "../../multimedia/libkate/buildlink3.mk"
+.include "../../audio/liba52/buildlink3.mk"
+.include "../../audio/libcddb/buildlink3.mk"
+.include "../../audio/libid3tag/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
.include "../../audio/libmodplug/buildlink3.mk"
.include "../../audio/libopus/buildlink3.mk"
.include "../../audio/libshout/buildlink3.mk"
+.include "../../audio/libsoxr/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/liba52/buildlink3.mk"
-.include "../../audio/libcddb/buildlink3.mk"
-.include "../../audio/libid3tag/buildlink3.mk"
+.include "../../audio/mpg123/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/libebml/buildlink3.mk"
+.include "../../devel/libmtp/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 "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
+.include "../../misc/libcdio/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.include "../../multimedia/libass/buildlink3.mk"
.include "../../multimedia/libdvdplay/buildlink3.mk"
.include "../../multimedia/libdvbpsi0/buildlink3.mk"
.include "../../multimedia/libdvdnav/buildlink3.mk"
.include "../../multimedia/libdvdread/buildlink3.mk"
+.include "../../multimedia/libkate/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"
+.include "../../net/libupnp/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../textproc/libxml2/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"
Index: pkgsrc/multimedia/vlc/PLIST
diff -u pkgsrc/multimedia/vlc/PLIST:1.61 pkgsrc/multimedia/vlc/PLIST:1.62
--- pkgsrc/multimedia/vlc/PLIST:1.61 Mon Jan 1 22:29:45 2018
+++ pkgsrc/multimedia/vlc/PLIST Tue Jul 2 20:52:12 2019
@@ -1,12 +1,27 @@
-@comment $NetBSD: PLIST,v 1.61 2018/01/01 22:29:45 rillig Exp $
+@comment $NetBSD: PLIST,v 1.62 2019/07/02 20:52:12 nia Exp $
+@pkgdir share/vlc/http/dialogs
+@pkgdir share/vlc/http/images
+@pkgdir share/vlc/http/js
+@pkgdir share/vlc/http/old/admin
+@pkgdir share/vlc/http/old/vlm
+@pkgdir share/vlc/http/requests
+@pkgdir share/vlc/osdmenu/default/selected
+@pkgdir share/vlc/osdmenu/default/selection
+@pkgdir share/vlc/osdmenu/default/volume
+@pkgdir share/vlc/osdmenu/dvd/selected
+@pkgdir share/vlc/osdmenu/dvd/selection
+@pkgdir share/vlc/osdmenu/dvd/unselect
+@pkgdir share/vlc/osdmenu/dvd/volume
+@pkgdir share/vlc/skins2/fonts
bin/cvlc
-${PLIST.x11}bin/qvlc
+${PLIST.qt5}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_dialog.h
include/vlc/libvlc_events.h
include/vlc/libvlc_media.h
include/vlc/libvlc_media_discoverer.h
@@ -14,11 +29,12 @@ 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_renderer_discoverer.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_actions.h
include/vlc/plugins/vlc_addons.h
include/vlc/plugins/vlc_aout.h
include/vlc/plugins/vlc_aout_volume.h
@@ -28,6 +44,7 @@ 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_boxes.h
include/vlc/plugins/vlc_charset.h
include/vlc/plugins/vlc_codec.h
include/vlc/plugins/vlc_common.h
@@ -52,10 +69,13 @@ 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_interface.h
+include/vlc/plugins/vlc_interrupt.h
+include/vlc/plugins/vlc_keystore.h
include/vlc/plugins/vlc_main.h
include/vlc/plugins/vlc_md5.h
include/vlc/plugins/vlc_media_library.h
+include/vlc/plugins/vlc_memstream.h
include/vlc/plugins/vlc_messages.h
include/vlc/plugins/vlc_meta.h
include/vlc/plugins/vlc_meta_fetcher.h
@@ -73,18 +93,22 @@ 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_renderer_discovery.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_stream_extractor.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_timestamp_helper.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_viewpoint.h
include/vlc/plugins/vlc_vlm.h
include/vlc/plugins/vlc_vout.h
include/vlc/plugins/vlc_vout_display.h
@@ -97,7 +121,48 @@ lib/libvlc.la
lib/libvlccore.la
lib/pkgconfig/libvlc.pc
lib/pkgconfig/vlc-plugin.pc
-lib/vlc/plugins/access/libaccess_bd_plugin.la
+${PLIST.pulseaudio}lib/vlc/libvlc_pulse.la
+${PLIST.qt5}lib/vlc/libvlc_vdpau.la
+${PLIST.qt5}lib/vlc/libvlc_xcb_events.la
+lib/vlc/lua/extensions/VLSub.luac
+lib/vlc/lua/intf/cli.luac
+lib/vlc/lua/intf/dummy.luac
+lib/vlc/lua/intf/dumpmeta.luac
+lib/vlc/lua/intf/http.luac
+lib/vlc/lua/intf/luac.luac
+lib/vlc/lua/intf/modules/host.luac
+lib/vlc/lua/intf/modules/httprequests.luac
+lib/vlc/lua/intf/telnet.luac
+lib/vlc/lua/meta/art/00_musicbrainz.luac
+lib/vlc/lua/meta/art/01_googleimage.luac
+lib/vlc/lua/meta/art/02_frenchtv.luac
+lib/vlc/lua/meta/art/03_lastfm.luac
+lib/vlc/lua/meta/reader/filename.luac
+lib/vlc/lua/modules/common.luac
+lib/vlc/lua/modules/dkjson.luac
+lib/vlc/lua/modules/sandbox.luac
+lib/vlc/lua/modules/simplexml.luac
+lib/vlc/lua/playlist/anevia_streams.luac
+lib/vlc/lua/playlist/anevia_xml.luac
+lib/vlc/lua/playlist/appletrailers.luac
+lib/vlc/lua/playlist/bbc_co_uk.luac
+lib/vlc/lua/playlist/cue.luac
+lib/vlc/lua/playlist/dailymotion.luac
+lib/vlc/lua/playlist/jamendo.luac
+lib/vlc/lua/playlist/koreus.luac
+lib/vlc/lua/playlist/liveleak.luac
+lib/vlc/lua/playlist/newgrounds.luac
+lib/vlc/lua/playlist/rockbox_fm_presets.luac
+lib/vlc/lua/playlist/soundcloud.luac
+lib/vlc/lua/playlist/twitch.luac
+lib/vlc/lua/playlist/vimeo.luac
+lib/vlc/lua/playlist/vocaroo.luac
+lib/vlc/lua/playlist/youtube.luac
+lib/vlc/lua/sd/icecast.luac
+lib/vlc/lua/sd/jamendo.luac
+${PLIST.alsa}lib/vlc/plugins/access/libaccess_alsa_plugin.la
+lib/vlc/plugins/access/libaccess_concat_plugin.la
+lib/vlc/plugins/access/libaccess_imem_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
@@ -109,14 +174,13 @@ lib/vlc/plugins/access/libdvdnav_plugin.
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/libhttps_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/libsatip_plugin.la
lib/vlc/plugins/access/libsdp_plugin.la
lib/vlc/plugins/access/libshm_plugin.la
lib/vlc/plugins/access/libtcp_plugin.la
@@ -124,43 +188,42 @@ lib/vlc/plugins/access/libtimecode_plugi
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
+${PLIST.qt5}lib/vlc/plugins/access/libxcb_screen_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/libmad_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_pitch_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/libsoxr_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/libtospdif_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
+${PLIST.alsa}lib/vlc/plugins/audio_output/libalsa_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
@@ -168,16 +231,17 @@ ${PLIST.pulseaudio}lib/vlc/plugins/audio
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/libaom_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
+${PLIST.dts}lib/vlc/plugins/codec/libdca_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/libfaad_plugin.la
lib/vlc/plugins/codec/libflac_plugin.la
lib/vlc/plugins/codec/libfluidsynth_plugin.la
lib/vlc/plugins/codec/libg711_plugin.la
@@ -186,13 +250,16 @@ 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/libmpg123_plugin.la
+lib/vlc/plugins/codec/liboggspots_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/librtpvideo_plugin.la
lib/vlc/plugins/codec/libschroedinger_plugin.la
+lib/vlc/plugins/codec/libscte18_plugin.la
lib/vlc/plugins/codec/libscte27_plugin.la
-${PLIST.sdl}lib/vlc/plugins/codec/libsdl_image_plugin.la
+lib/vlc/plugins/codec/libspdif_plugin.la
lib/vlc/plugins/codec/libspeex_plugin.la
lib/vlc/plugins/codec/libspudec_plugin.la
lib/vlc/plugins/codec/libstl_plugin.la
@@ -200,17 +267,18 @@ lib/vlc/plugins/codec/libsubsdec_plugin.
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/libtextst_plugin.la
lib/vlc/plugins/codec/libtheora_plugin.la
+lib/vlc/plugins/codec/libttml_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
+${PLIST.vaapi}lib/vlc/plugins/codec/libvaapi_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
+lib/vlc/plugins/codec/libwebvtt_plugin.la
+${PLIST.qt5}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
@@ -219,7 +287,8 @@ ${PLIST.lirc}lib/vlc/plugins/control/lib
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
+${PLIST.qt5}lib/vlc/plugins/control/libxcb_hotkeys_plugin.la
+lib/vlc/plugins/demux/libadaptive_plugin.la
lib/vlc/plugins/demux/libaiff_plugin.la
lib/vlc/plugins/demux/libasf_plugin.la
lib/vlc/plugins/demux/libau_plugin.la
@@ -230,10 +299,10 @@ lib/vlc/plugins/demux/libdemux_cdg_plugi
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/libdirectory_demux_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/libh26x_plugin.la
lib/vlc/plugins/demux/libimage_plugin.la
lib/vlc/plugins/demux/libmjpeg_plugin.la
lib/vlc/plugins/demux/libmkv_plugin.la
@@ -241,6 +310,7 @@ 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/libnoseek_plugin.la
lib/vlc/plugins/demux/libnsc_plugin.la
lib/vlc/plugins/demux/libnsv_plugin.la
lib/vlc/plugins/demux/libnuv_plugin.la
@@ -254,7 +324,6 @@ lib/vlc/plugins/demux/librawvid_plugin.l
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
@@ -262,8 +331,15 @@ lib/vlc/plugins/demux/libvobsub_plugin.l
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.qt5}lib/vlc/plugins/gui/libqt_plugin.la
${PLIST.vlc-skins}lib/vlc/plugins/gui/libskins2_plugin.la
+lib/vlc/plugins/keystore/libfile_keystore_plugin.la
+${PLIST.dbus}lib/vlc/plugins/keystore/libkwallet_plugin.la
+lib/vlc/plugins/keystore/libmemory_keystore_plugin.la
+lib/vlc/plugins/logger/libconsole_logger_plugin.la
+lib/vlc/plugins/logger/libfile_logger_plugin.la
+lib/vlc/plugins/logger/libsyslog_plugin.la
+lib/vlc/plugins/lua/liblua_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
@@ -276,7 +352,7 @@ 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
+${PLIST.qt5}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
@@ -285,17 +361,20 @@ 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_a52_plugin.la
+lib/vlc/plugins/packetizer/libpacketizer_av1_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_dts_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_mpegaudio_plugin.la
lib/vlc/plugins/packetizer/libpacketizer_mpegvideo_plugin.la
lib/vlc/plugins/packetizer/libpacketizer_vc1_plugin.la
lib/vlc/plugins/plugins.dat
@@ -305,14 +384,28 @@ lib/vlc/plugins/services_discovery/libpo
${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
+${PLIST.qt5}lib/vlc/plugins/services_discovery/libxcb_apps_plugin.la
+lib/vlc/plugins/spu/libaudiobargraph_v_plugin.la
+lib/vlc/plugins/spu/libdynamicoverlay_plugin.la
+lib/vlc/plugins/spu/liblogo_plugin.la
+lib/vlc/plugins/spu/libmarq_plugin.la
+lib/vlc/plugins/spu/libmosaic_plugin.la
+lib/vlc/plugins/spu/libremoteosd_plugin.la
+lib/vlc/plugins/spu/librss_plugin.la
+lib/vlc/plugins/spu/libsubsdelay_plugin.la
+lib/vlc/plugins/stream_extractor/libarchive_plugin.la
+lib/vlc/plugins/stream_filter/libadf_plugin.la
+lib/vlc/plugins/stream_filter/libcache_block_plugin.la
+lib/vlc/plugins/stream_filter/libcache_read_plugin.la
lib/vlc/plugins/stream_filter/libdecomp_plugin.la
-lib/vlc/plugins/stream_filter/libhttplive_plugin.la
+lib/vlc/plugins/stream_filter/libhds_plugin.la
+lib/vlc/plugins/stream_filter/libinflate_plugin.la
+lib/vlc/plugins/stream_filter/libprefetch_plugin.la
lib/vlc/plugins/stream_filter/librecord_plugin.la
-lib/vlc/plugins/stream_filter/libsmooth_plugin.la
+lib/vlc/plugins/stream_filter/libskiptags_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_cycle_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
@@ -320,9 +413,7 @@ lib/vlc/plugins/stream_out/libstream_out
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
@@ -330,11 +421,19 @@ lib/vlc/plugins/stream_out/libstream_out
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
+${PLIST.qt5}lib/vlc/plugins/text_renderer/libfreetype_plugin.la
lib/vlc/plugins/text_renderer/libtdummy_plugin.la
+${PLIST.vaapi}lib/vlc/plugins/vaapi/libvaapi_filters_plugin.la
+${PLIST.qt5}lib/vlc/plugins/vdpau/libvdpau_adjust_plugin.la
+${PLIST.qt5}lib/vlc/plugins/vdpau/libvdpau_avcodec_plugin.la
+${PLIST.qt5}lib/vlc/plugins/vdpau/libvdpau_chroma_plugin.la
+${PLIST.qt5}lib/vlc/plugins/vdpau/libvdpau_deinterlace_plugin.la
+${PLIST.qt5}lib/vlc/plugins/vdpau/libvdpau_display_plugin.la
+${PLIST.qt5}lib/vlc/plugins/vdpau/libvdpau_sharpen_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_10_p010_plugin.la
+lib/vlc/plugins/video_chroma/libi420_nv12_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
@@ -347,13 +446,13 @@ lib/vlc/plugins/video_chroma/libi422_yuy
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/libyuvp_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
@@ -362,9 +461,10 @@ lib/vlc/plugins/video_filter/libcanvas_p
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/libedgedetection_plugin.la
lib/vlc/plugins/video_filter/liberase_plugin.la
lib/vlc/plugins/video_filter/libextract_plugin.la
+lib/vlc/plugins/video_filter/libfps_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
@@ -372,11 +472,8 @@ lib/vlc/plugins/video_filter/libgradient
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
@@ -384,32 +481,30 @@ lib/vlc/plugins/video_filter/libposteriz
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/libflaschen_plugin.la
lib/vlc/plugins/video_output/libgl_plugin.la
-${PLIST.x11}lib/vlc/plugins/video_output/libglx_plugin.la
+${PLIST.egl}${PLIST.qt5}${PLIST.vaapi}lib/vlc/plugins/video_output/libglconv_vaapi_drm_plugin.la
+${PLIST.egl}${PLIST.qt5}${PLIST.vaapi}lib/vlc/plugins/video_output/libglconv_vaapi_x11_plugin.la
+${PLIST.qt5}lib/vlc/plugins/video_output/libglconv_vdpau_plugin.la
+${PLIST.qt5}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
+${PLIST.qt5}lib/vlc/plugins/video_output/libxcb_window_plugin.la
+${PLIST.qt5}lib/vlc/plugins/video_output/libxcb_x11_plugin.la
+${PLIST.qt5}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
+${PLIST.qt5}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
@@ -417,9 +512,7 @@ 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
@@ -429,6 +522,24 @@ 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/doc/vlc/lua/README.txt
+share/doc/vlc/lua/extensions/README.txt
+share/doc/vlc/lua/http/requests/README.txt
+share/doc/vlc/lua/intf/README.txt
+share/doc/vlc/lua/intf/dumpmeta.lua
+share/doc/vlc/lua/meta/README.txt
+share/doc/vlc/lua/meta/art/01_googleimage.lua
+share/doc/vlc/lua/meta/art/README.txt
+share/doc/vlc/lua/meta/fetcher/README.txt
+share/doc/vlc/lua/meta/reader/README.txt
+share/doc/vlc/lua/meta/reader/filename.lua
+share/doc/vlc/lua/playlist/README.txt
+share/doc/vlc/lua/playlist/liveleak.lua
+share/doc/vlc/lua/playlist/youtube.lua
+share/doc/vlc/lua/sd/README.txt
+share/doc/vlc/lua/sd/icast.lua
+share/doc/vlc/lua/sd/icecast.lua
+share/icons/hicolor/128x128/apps/vlc-kb.png
share/icons/hicolor/128x128/apps/vlc-xmas.png
share/icons/hicolor/128x128/apps/vlc.png
share/icons/hicolor/16x16/apps/vlc.png
@@ -443,101 +554,66 @@ share/kde/apps/solid/actions/vlc-openbd.
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
+share/metainfo/vlc.appdata.xml
+share/vlc/lua/http/css/main.css
+share/vlc/lua/http/css/mobile.css
+share/vlc/lua/http/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
+share/vlc/lua/http/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
+share/vlc/lua/http/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
+share/vlc/lua/http/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
+share/vlc/lua/http/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
+share/vlc/lua/http/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
+share/vlc/lua/http/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
+share/vlc/lua/http/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
+share/vlc/lua/http/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
+share/vlc/lua/http/css/ui-lightness/images/ui-icons_222222_256x240.png
+share/vlc/lua/http/css/ui-lightness/images/ui-icons_228ef1_256x240.png
+share/vlc/lua/http/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
+share/vlc/lua/http/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
+share/vlc/lua/http/css/ui-lightness/images/ui-icons_ffffff_256x240.png
+share/vlc/lua/http/css/ui-lightness/jquery-ui-1.8.13.custom.css
+share/vlc/lua/http/custom.lua
+share/vlc/lua/http/dialogs/batch_window.html
+share/vlc/lua/http/dialogs/browse_window.html
+share/vlc/lua/http/dialogs/create_stream.html
+share/vlc/lua/http/dialogs/equalizer_window.html
+share/vlc/lua/http/dialogs/error_window.html
+share/vlc/lua/http/dialogs/mosaic_window.html
+share/vlc/lua/http/dialogs/offset_window.html
+share/vlc/lua/http/dialogs/stream_config_window.html
+share/vlc/lua/http/dialogs/stream_window.html
+share/vlc/lua/http/favicon.ico
+share/vlc/lua/http/images/Audio-48.png
+share/vlc/lua/http/images/Back-48.png
+share/vlc/lua/http/images/Folder-48.png
+share/vlc/lua/http/images/Other-48.png
+share/vlc/lua/http/images/Video-48.png
+share/vlc/lua/http/images/buttons.png
+share/vlc/lua/http/images/speaker-32.png
+share/vlc/lua/http/images/vlc-48.png
+share/vlc/lua/http/images/vlc16x16.png
+share/vlc/lua/http/index.html
+share/vlc/lua/http/js/common.js
+share/vlc/lua/http/js/controllers.js
+share/vlc/lua/http/js/jquery.jstree.js
+share/vlc/lua/http/js/ui.js
+share/vlc/lua/http/mobile.html
+share/vlc/lua/http/mobile_browse.html
+share/vlc/lua/http/mobile_equalizer.html
+share/vlc/lua/http/mobile_view.html
+share/vlc/lua/http/requests/README.txt
+share/vlc/lua/http/requests/browse.json
+share/vlc/lua/http/requests/browse.xml
+share/vlc/lua/http/requests/playlist.json
+share/vlc/lua/http/requests/playlist.xml
+share/vlc/lua/http/requests/playlist_jstree.xml
+share/vlc/lua/http/requests/status.json
+share/vlc/lua/http/requests/status.xml
+share/vlc/lua/http/requests/vlm.xml
+share/vlc/lua/http/requests/vlm_cmd.xml
+share/vlc/lua/http/view.html
+share/vlc/lua/http/vlm.html
+share/vlc/lua/http/vlm_export.html
${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
@@ -548,16 +624,3 @@ 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
Index: pkgsrc/multimedia/vlc/PLIST.Linux
diff -u pkgsrc/multimedia/vlc/PLIST.Linux:1.2 pkgsrc/multimedia/vlc/PLIST.Linux:1.3
--- pkgsrc/multimedia/vlc/PLIST.Linux:1.2 Sun Oct 25 11:00:18 2015
+++ pkgsrc/multimedia/vlc/PLIST.Linux Tue Jul 2 20:52:12 2019
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST.Linux,v 1.2 2015/10/25 11:00:18 wiz Exp $
-lib/vlc/plugins/access/libaccess_alsa_plugin.la
+@comment $NetBSD: PLIST.Linux,v 1.3 2019/07/02 20:52:12 nia Exp $
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
Index: pkgsrc/multimedia/vlc/buildlink3.mk
diff -u pkgsrc/multimedia/vlc/buildlink3.mk:1.46 pkgsrc/multimedia/vlc/buildlink3.mk:1.47
--- pkgsrc/multimedia/vlc/buildlink3.mk:1.46 Sun Oct 25 11:05:48 2015
+++ pkgsrc/multimedia/vlc/buildlink3.mk Tue Jul 2 20:52:12 2019
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.46 2015/10/25 11:05:48 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.47 2019/07/02 20:52:12 nia Exp $
BUILDLINK_TREE+= vlc
.if !defined(VLC_BUILDLINK3_MK)
VLC_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.vlc+= vlc>=2.2
+BUILDLINK_API_DEPENDS.vlc+= vlc>=3.0.1
BUILDLINK_PKGSRCDIR.vlc?= ../../multimedia/vlc
.endif # VLC_BUILDLINK3_MK
Index: pkgsrc/multimedia/vlc/distinfo
diff -u pkgsrc/multimedia/vlc/distinfo:1.74 pkgsrc/multimedia/vlc/distinfo:1.75
--- pkgsrc/multimedia/vlc/distinfo:1.74 Fri May 26 13:26:37 2017
+++ pkgsrc/multimedia/vlc/distinfo Tue Jul 2 20:52:12 2019
@@ -1,32 +1,13 @@
-$NetBSD: distinfo,v 1.74 2017/05/26 13:26:37 maya Exp $
+$NetBSD: distinfo,v 1.75 2019/07/02 20:52:12 nia 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
+SHA1 (vlc-3.0.7.1.tar.xz) = 3f6f9e56695eeea662b86602963721f1ac7afd23
+RMD160 (vlc-3.0.7.1.tar.xz) = 9ed6e0f890582efb455c6ff005233cff6c83fcf3
+SHA512 (vlc-3.0.7.1.tar.xz) = 6b99ae0564630a7a7ca9187c3bb954c601e384522ce93460b73f2dbf31787ce5828daca9f31c781b97db77872d76b6a3e871ff3401d70f1b5829fee7c4e847fd
+Size (vlc-3.0.7.1.tar.xz) = 26052372 bytes
+SHA1 (patch-compat_Makefile.am) = 1c3e0a7c4610c55c3ec9ba80d66b9959661139b3
+SHA1 (patch-configure.ac) = 99e975954323b4e94daeb75ce2ae439b49c51b0f
+SHA1 (patch-lib_core.c) = 8ec5557424e6ddc05cc365aacd1ec847d9a94605
+SHA1 (patch-lib_video.c) = 362aaf7977c264bb70a79e98cf18da923ae62e39
+SHA1 (patch-m4_dolt.m4) = a1aac0c1021001a489f9b515e218904e065ed659
+SHA1 (patch-modules_access_http_Makefile.am) = d91904c6cba1a75a6872d042e4fe87ed9ce65a22
+SHA1 (patch-share_Makefile.am) = 380dc4ac4a1a19cd1ccc8219b3d1d3b927585c49
Index: pkgsrc/multimedia/vlc/options.mk
diff -u pkgsrc/multimedia/vlc/options.mk:1.32 pkgsrc/multimedia/vlc/options.mk:1.33
--- pkgsrc/multimedia/vlc/options.mk:1.32 Mon May 15 11:07:20 2017
+++ pkgsrc/multimedia/vlc/options.mk Tue Jul 2 20:52:12 2019
@@ -1,16 +1,13 @@
-# $NetBSD: options.mk,v 1.32 2017/05/15 11:07:20 jperkin Exp $
+# $NetBSD: options.mk,v 1.33 2019/07/02 20:52:12 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.vlc
-PKG_SUPPORTED_OPTIONS= dbus debug dts faad gnome jack live pulseaudio
-PKG_SUPPORTED_OPTIONS+= sdl vlc-skins x11
-PKG_SUGGESTED_OPTIONS= dbus x11
+PKG_SUPPORTED_OPTIONS= alsa avahi dbus debug dts jack pulseaudio
+PKG_SUPPORTED_OPTIONS+= vlc-skins qt5
+PKG_SUGGESTED_OPTIONS= dbus qt5
+PKG_SUGGESTED_OPTIONS.Linux+= alsa
.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
@@ -32,6 +29,26 @@ PKG_SUGGESTED_OPTIONS+= lirc
PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
+## ALSA support
+
+.if !empty(PKG_OPTIONS:Malsa)
+CONFIGURE_ARGS+= --enable-alsa
+.include "../../audio/alsa-lib/buildlink3.mk"
+PLIST.alsa= yes
+.else
+CONFIGURE_ARGS+= --disable-alsa
+.endif
+
+## Avahi support
+
+.if !empty(PKG_OPTIONS:Mavahi)
+CONFIGURE_ARGS+= --enable-avahi
+.include "../../net/avahi/buildlink3.mk"
+PLIST.avahi= yes
+.else
+CONFIGURE_ARGS+= --disable-avahi
+.endif
+
## PulseAudio support
.if !empty(PKG_OPTIONS:Mpulseaudio)
@@ -52,29 +69,6 @@ PLIST.jack= yes
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)
@@ -102,10 +96,10 @@ INSTALLATION_DIRS+= share/vlc/skins2
CONFIGURE_ARGS+= --disable-skins2
.endif
-## X11 dependency and QT4 frontend
+## X11 dependency and QT5 frontend
PLIST_VARS+= egl
-.if !empty(PKG_OPTIONS:Mx11)
+.if !empty(PKG_OPTIONS:Mqt5)
DEPENDS+= dejavu-ttf>=2.0:../../fonts/dejavu-ttf
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../x11/libXv/buildlink3.mk"
@@ -118,26 +112,21 @@ DEPENDS+= dejavu-ttf>=2.0:../../fonts/de
.include "../../x11/xcb-util-keysyms/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "../../x11/qt5-qtx11extras/buildlink3.mk"
CONFIGURE_ARGS+= --enable-qt \
--with-x
-PLIST.x11= yes
-.if ${X11_TYPE} == "modular" || exists(${X11BASE}/include/EGL/egl.h)
+PLIST.qt5= yes
+. if ${X11_TYPE} == "modular" || exists(${X11BASE}/include/EGL/egl.h)
PLIST.egl= yes
-.endif
+. 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
+ --disable-freetype \
+ --disable-vdpau
.endif
## DTS support (libdca is non-redistributable)
@@ -150,17 +139,6 @@ 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
Index: pkgsrc/multimedia/vlc/patches/patch-compat_Makefile.am
diff -u pkgsrc/multimedia/vlc/patches/patch-compat_Makefile.am:1.1 pkgsrc/multimedia/vlc/patches/patch-compat_Makefile.am:1.2
--- pkgsrc/multimedia/vlc/patches/patch-compat_Makefile.am:1.1 Sun Oct 25 11:00:18 2015
+++ pkgsrc/multimedia/vlc/patches/patch-compat_Makefile.am Tue Jul 2 20:52:13 2019
@@ -1,23 +1,15 @@
-$NetBSD: patch-compat_Makefile.am,v 1.1 2015/10/25 11:00:18 wiz Exp $
+$NetBSD: patch-compat_Makefile.am,v 1.2 2019/07/02 20:52:13 nia Exp $
-Revert upstream commit 78d45cc159a0cf1c44feef11a2b9800d9398048e by
-Rémi Denis-Courmont <remi%remlab.net@localhost>. Mail asking for that to
-be applied upstream was turned down:
+libcompat must be prebuilt with PIC properties in order to be linked
+into PIC libraries.
-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.orig 2018-03-14 22:07:38.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_LIBADD = $(LTLIBOBJS) $(LIBRT) $(LIBM)
-libcompat_la_LDFLAGS = -no-undefined -static
+libcompat_la_LDFLAGS = -no-undefined
Added files:
Index: pkgsrc/multimedia/vlc/patches/patch-configure.ac
diff -u /dev/null pkgsrc/multimedia/vlc/patches/patch-configure.ac:1.6
--- /dev/null Tue Jul 2 20:52:13 2019
+++ pkgsrc/multimedia/vlc/patches/patch-configure.ac Tue Jul 2 20:52:13 2019
@@ -0,0 +1,21 @@
+$NetBSD: patch-configure.ac,v 1.6 2019/07/02 20:52:13 nia Exp $
+
+Fix pkg-config'ing for lua.
+
+--- configure.ac.orig 2019-06-11 14:28:26.000000000 +0000
++++ configure.ac
+@@ -1619,12 +1619,12 @@ AC_ARG_ENABLE(lua,
+ [disable LUA scripting support (default enabled)])])
+ if test "${enable_lua}" != "no"
+ then
+- PKG_CHECK_MODULES(LUA, lua5.2,
++ PKG_CHECK_MODULES(LUA, lua-5.2,
+ [ have_lua=yes ],
+ [
+ AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua 5.1 instead])
+
+- PKG_CHECK_MODULES(LUA, lua5.1,
++ PKG_CHECK_MODULES(LUA, lua-5.1,
+ [ have_lua=yes ],
+ [
+ AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua >= 5.1 instead])
Index: pkgsrc/multimedia/vlc/patches/patch-lib_core.c
diff -u /dev/null pkgsrc/multimedia/vlc/patches/patch-lib_core.c:1.1
--- /dev/null Tue Jul 2 20:52:13 2019
+++ pkgsrc/multimedia/vlc/patches/patch-lib_core.c Tue Jul 2 20:52:13 2019
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib_core.c,v 1.1 2019/07/02 20:52:13 nia Exp $
+
+For unknown reason disable duplicated symbol for vlc_module_name.
+
+--- lib/core.c.orig 2017-11-24 15:29:17.000000000 +0000
++++ lib/core.c
+@@ -257,4 +257,4 @@ int64_t libvlc_clock(void)
+ return mdate();
+ }
+
+-const char vlc_module_name[] = "libvlc";
++// const char vlc_module_name[] = "libvlc";
Index: pkgsrc/multimedia/vlc/patches/patch-lib_video.c
diff -u /dev/null pkgsrc/multimedia/vlc/patches/patch-lib_video.c:1.1
--- /dev/null Tue Jul 2 20:52:13 2019
+++ pkgsrc/multimedia/vlc/patches/patch-lib_video.c Tue Jul 2 20:52:13 2019
@@ -0,0 +1,24 @@
+$NetBSD: patch-lib_video.c,v 1.1 2019/07/02 20:52:13 nia Exp $
+
+Remove undefined references to missing symbol.
+
+--- lib/video.c.orig 2017-11-24 15:29:17.000000000 +0000
++++ lib/video.c
+@@ -719,7 +719,7 @@ static int get_filter_str( vlc_object_t
+ module_t *p_obj = module_find( psz_name );
+ if( !p_obj )
+ {
+- msg_Err( p_parent, "Unable to find filter module \"%s\".", psz_name );
++// msg_Err( p_parent, "Unable to find filter module \"%s\".", psz_name );
+ return VLC_EGENERIC;
+ }
+
+@@ -737,7 +737,7 @@ static int get_filter_str( vlc_object_t
+ }
+ else
+ {
+- msg_Err( p_parent, "Unknown video filter type." );
++// msg_Err( p_parent, "Unknown video filter type." );
+ return VLC_EGENERIC;
+ }
+
Index: pkgsrc/multimedia/vlc/patches/patch-m4_dolt.m4
diff -u /dev/null pkgsrc/multimedia/vlc/patches/patch-m4_dolt.m4:1.1
--- /dev/null Tue Jul 2 20:52:13 2019
+++ pkgsrc/multimedia/vlc/patches/patch-m4_dolt.m4 Tue Jul 2 20:52:13 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-m4_dolt.m4,v 1.1 2019/07/02 20:52:13 nia Exp $
+
+Add NetBSD to dolt.m4. The fallback using libtool does not work
+correctly.
+
+--- m4/dolt.m4.orig 2017-11-24 15:29:17.000000000 +0000
++++ m4/dolt.m4
+@@ -20,6 +20,7 @@ AS_IF([test x$GCC != xyes], [dolt_suppor
+
+ AS_CASE([$host],
+ [*-*-linux*|*-*-freebsd*], [pic_options='-fPIC'],
++ [*-*-netbsd*], [pic_options='-fPIC -DPIC'],
+ [*-apple-darwin*], [pic_options='-fno-common'],
+ [*mingw*|*nacl*], [pic_options='']
+ [*], [dolt_supported=no]
Index: pkgsrc/multimedia/vlc/patches/patch-modules_access_http_Makefile.am
diff -u /dev/null pkgsrc/multimedia/vlc/patches/patch-modules_access_http_Makefile.am:1.1
--- /dev/null Tue Jul 2 20:52:13 2019
+++ pkgsrc/multimedia/vlc/patches/patch-modules_access_http_Makefile.am Tue Jul 2 20:52:13 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-modules_access_http_Makefile.am,v 1.1 2019/07/02 20:52:13 nia Exp $
+
+Remove doubled symbols in libcompat in the vlc_http module.
+
+--- modules/access/http/Makefile.am.orig 2017-11-24 15:29:17.000000000 +0000
++++ modules/access/http/Makefile.am
+@@ -16,7 +16,7 @@ libvlc_http_la_SOURCES = \
+ access/http/connmgr.c access/http/connmgr.h
+ libvlc_http_la_CPPFLAGS = -Dneedsomethinghere
+ libvlc_http_la_LIBADD = \
+- $(LTLIBVLCCORE) ../compat/libcompat.la \
++ $(LTLIBVLCCORE) \
+ $(SOCKET_LIBS) $(LIBPTHREAD)
+ #libvlc_http_la_LDFLAGS = -no-undefined -export-symbols-regex ^vlc_http_
+ #pkglib_LTLIBRARIES += libvlc_http.la
Index: pkgsrc/multimedia/vlc/patches/patch-share_Makefile.am
diff -u /dev/null pkgsrc/multimedia/vlc/patches/patch-share_Makefile.am:1.1
--- /dev/null Tue Jul 2 20:52:13 2019
+++ pkgsrc/multimedia/vlc/patches/patch-share_Makefile.am Tue Jul 2 20:52:13 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-share_Makefile.am,v 1.1 2019/07/02 20:52:13 nia Exp $
+
+Remove unportable tar parameters.
+
+--- share/Makefile.am.orig 2018-02-06 18:41:06.000000000 +0000
++++ share/Makefile.am
+@@ -94,7 +94,7 @@ skins2/default.vlt: $(skins2_default_vlt
+ $(AM_V_at)rm -f -- skins2/default.vlt.tmp
+ $(AM_V_GEN)GZIP=--no-name \
+ tar cvvzf skins2/default.vlt.tmp \
+- --owner=root --group=root --directory="$(srcdir)/skins2" \
++ --directory="$(srcdir)/skins2" \
+ default/
+ $(AM_V_at)mv -f -- skins2/default.vlt.tmp skins2/default.vlt
+
Home |
Main Index |
Thread Index |
Old Index