vlc: Fix installation

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Mar 20 15:27:47 2018 +0100
Changeset:	51aa9c5e635f6cf911b1c76d38b1aa3ea54a09ec

Modified Files:
	vlc/Makefile
	vlc/PLIST
	vlc/options.mk

Log Message:
vlc: Fix installation

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=51aa9c5e635f6cf911b1c76d38b1aa3ea54a09ec

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 vlc/Makefile   |   4 +-
 vlc/PLIST      | 152 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 vlc/options.mk |  25 +---------
 3 files changed, 134 insertions(+), 47 deletions(-)

diffs:
diff --git a/vlc/Makefile b/vlc/Makefile
index 84fd8b3aba..685661ed0d 100644
--- a/vlc/Makefile
+++ b/vlc/Makefile
@@ -34,7 +34,6 @@ 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
@@ -43,9 +42,7 @@ 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
@@ -193,5 +190,6 @@ BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20100201
 .if "${OPSYS}" == "Linux"
 .  include "../../audio/alsa-lib/buildlink3.mk"
 .endif
+.include "../../lang/lua52/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/vlc/PLIST b/vlc/PLIST
index e2e762286d..190211da65 100644
--- a/vlc/PLIST
+++ b/vlc/PLIST
@@ -1,4 +1,18 @@
 @comment $NetBSD$
+@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
 bin/rvlc
@@ -107,11 +121,47 @@ lib/libvlc.la
 lib/libvlccore.la
 lib/pkgconfig/libvlc.pc
 lib/pkgconfig/vlc-plugin.pc
-${PLIST.jack}lib/vlc/plugins/access/libaccess_jack_plugin.la
 lib/vlc/libvlc_vdpau.la
 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
 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
 ${PLIST.oss}lib/vlc/plugins/access/libaccess_oss_plugin.la
@@ -129,7 +179,6 @@ 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/liblive555_plugin.la
 lib/vlc/plugins/access/librtp_plugin.la
 lib/vlc/plugins/access/libsatip_plugin.la
 lib/vlc/plugins/access/libsdp_plugin.la
@@ -206,7 +255,6 @@ 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
@@ -281,14 +329,17 @@ 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.vlc-skins}lib/vlc/plugins/gui/libskins2_plugin.la
 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
 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.a
+lib/vlc/plugins/lua/liblua_plugin.la
+lib/vlc/plugins/lua/liblua_plugin.so
 lib/vlc/plugins/meta_engine/libfolder_plugin.la
 lib/vlc/plugins/meta_engine/libtaglib_plugin.la
 lib/vlc/plugins/misc/libaddonsfsstorage_plugin.la
@@ -333,7 +384,6 @@ ${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/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
@@ -446,7 +496,6 @@ lib/vlc/plugins/video_output/libglconv_vdpau_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_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
@@ -456,6 +505,7 @@ ${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
@@ -469,6 +519,23 @@ 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
@@ -485,6 +552,65 @@ 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/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
@@ -495,17 +621,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/osdmenu/default/volume
-@pkgdir share/vlc/osdmenu/default/selection
-@pkgdir share/vlc/osdmenu/default/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
diff --git a/vlc/options.mk b/vlc/options.mk
index 2ca4550953..f460931f21 100644
--- a/vlc/options.mk
+++ b/vlc/options.mk
@@ -2,7 +2,7 @@
 
 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_SUPPORTED_OPTIONS+=		vlc-skins x11
 PKG_SUGGESTED_OPTIONS=		dbus x11
 
 .include "../../mk/bsd.prefs.mk"
@@ -52,29 +52,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)