pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

vlc: Fix installation with all options disabled



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

Modified Files:
	vlc/PLIST
	vlc/options.mk

Log Message:
vlc: Fix installation with all options disabled

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

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

diffstat:
 vlc/PLIST      | 26 +++++++++++++-------------
 vlc/options.mk |  3 ++-
 2 files changed, 15 insertions(+), 14 deletions(-)

diffs:
diff --git a/vlc/PLIST b/vlc/PLIST
index 190211da65..bac626ad87 100644
--- a/vlc/PLIST
+++ b/vlc/PLIST
@@ -121,8 +121,8 @@ lib/libvlc.la
 lib/libvlccore.la
 lib/pkgconfig/libvlc.pc
 lib/pkgconfig/vlc-plugin.pc
-lib/vlc/libvlc_vdpau.la
-lib/vlc/libvlc_xcb_events.la
+${PLIST.x11}lib/vlc/libvlc_vdpau.la
+${PLIST.x11}lib/vlc/libvlc_xcb_events.la
 lib/vlc/lua/extensions/VLSub.luac
 lib/vlc/lua/intf/cli.luac
 lib/vlc/lua/intf/dummy.luac
@@ -269,7 +269,7 @@ 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
-${PLIST.vaapi}lib/vlc/plugins/codec/libuleaddvaudio_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_plugin.la
 lib/vlc/plugins/codec/libvorbis_plugin.la
@@ -329,10 +329,10 @@ 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
-lib/vlc/plugins/gui/libqt_plugin.la
+${PLIST.x11}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
+${PLIST.x11}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
@@ -422,13 +422,13 @@ 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/vaapi/libvaapi_filters_plugin.la
-lib/vlc/plugins/vdpau/libvdpau_adjust_plugin.la
-lib/vlc/plugins/vdpau/libvdpau_avcodec_plugin.la
-lib/vlc/plugins/vdpau/libvdpau_chroma_plugin.la
-lib/vlc/plugins/vdpau/libvdpau_deinterlace_plugin.la
-lib/vlc/plugins/vdpau/libvdpau_display_plugin.la
-lib/vlc/plugins/vdpau/libvdpau_sharpen_plugin.la
+${PLIST.x11}lib/vlc/plugins/vaapi/libvaapi_filters_plugin.la
+${PLIST.x11}lib/vlc/plugins/vdpau/libvdpau_adjust_plugin.la
+${PLIST.x11}lib/vlc/plugins/vdpau/libvdpau_avcodec_plugin.la
+${PLIST.x11}lib/vlc/plugins/vdpau/libvdpau_chroma_plugin.la
+${PLIST.x11}lib/vlc/plugins/vdpau/libvdpau_deinterlace_plugin.la
+${PLIST.x11}lib/vlc/plugins/vdpau/libvdpau_display_plugin.la
+${PLIST.x11}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
@@ -492,7 +492,7 @@ lib/vlc/plugins/video_filter/libwave_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
-lib/vlc/plugins/video_output/libglconv_vdpau_plugin.la
+${PLIST.x11}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
diff --git a/vlc/options.mk b/vlc/options.mk
index f460931f21..561183e84b 100644
--- a/vlc/options.mk
+++ b/vlc/options.mk
@@ -107,7 +107,8 @@ PLIST.egl=		yes
 CONFIGURE_ARGS+=	--without-x \
 			--disable-xcb \
 			--disable-qt \
-			--disable-freetype
+			--disable-freetype \
+			--disable-vdpau
 .endif
 
 .if !empty(PKG_OPTIONS:Mfaad)


Home | Main Index | Thread Index | Old Index