From 0019ebbbdc75f7d1611909bf3b40de5a4f21349b Mon Sep 17 00:00:00 2001 From: Dennis Veatch Date: Fri, 8 Aug 2014 14:31:17 -0400 Subject: [PATCH] vlc: Removing some unrecognized switches and compiles with opencv. --- video/vlc/BUILD | 9 +++++++-- video/vlc/DEPENDS | 10 ++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/video/vlc/BUILD b/video/vlc/BUILD index 70a84cda587..0b8b77dc180 100644 --- a/video/vlc/BUILD +++ b/video/vlc/BUILD @@ -1,10 +1,15 @@ sedit "s:FLAC/FLAC:FLAC:g" modules/codec/flac.c && if in_depends $MODULE lua; then - export LUA_LIBS+=" /usr/lib/lua" && + export LUA_LIBS+=" /usr/lib/liblua.so" && export LUA_CFLAGS+=" -DLUA_COMPAT_ALL=1" fi && +if in_depends $MODULE samba ; then + export SMBCLIENT_LIBS+=" /usr/lib/libsmbclient.so" && + export SMBCLIENT_CFLAGS+=" -I/usr/include/libsmbclient.h" +fi && + if module_installed live555; then CPPFLAGS_live555="-I/usr/lib/live/liveMedia -I/usr/lib/live/groupsock -I/usr/lib/live/BasicUsageEnvironment -I/usr/lib/live/UsageEnvironment" fi && @@ -13,7 +18,7 @@ if in_depends vlc qt4; then . /etc/profile.d/qt4.rc fi && -OPTS+=" --enable-xvideo --enable-real --enable-realrtsp --enable-media-library --disable-sid --with-tuning=$CPU" && +OPTS+=" --enable-xvideo --enable-realrtsp --disable-sid" && default_build && diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS index 0d914550842..1e6c200d4dd 100644 --- a/video/vlc/DEPENDS +++ b/video/vlc/DEPENDS @@ -7,10 +7,7 @@ optional_depends "neon" "" "--disable-neon" "for neon optimizations sp optional_depends "libproxy" "" "--disable-libproxy" "for proxy support" optional_depends "libnotify4" "--enable-notify" "" "for notify support" optional_depends "taglib" "" "--disable-taglib" "for taglib support" - -# Causes the make to fail, no fix as yet. -#optional_depends "opencv" "--enable-opencv" "" "for OpenCV (computer vision) filter support" - +optional_depends "opencv" "--enable-opencv" "" "for OpenCV (computer vision) filter support" optional_depends "fontconfig" "" "--disable-fontconfig" "for fontconfig support" optional_depends "dejavu-ttf" "" "" "for DejaVu (default) font" optional_depends "alsa-lib" "" "--disable-alsa" "for ALSA support" @@ -54,9 +51,8 @@ optional_depends "fluidsynth" "" "--disable-fluidsynth" "for MIDI synthetise optional_depends "zvbi" "" "--disable-zvbi" "for VBI including Teletext decoding support" optional_depends "libass" "" "--disable-libass" "for subtitle support" optional_depends "libdc1394" "--enable-dc1394" "--disable-dc1394" "for IEEE1394 cameras support needed for dv" -optional_depends "libdv" "--enable-dv" "--disable-dv" "for dv support" optional_depends "lirc" "--enable-lirc" "" "for lirc support" -optional_depends "qt4" "--enable-qt4" "--disable-qt4 --disable-skins2" "for Qt 4.x support" +optional_depends "qt4" "" "--disable-qt4 --disable-skins2" "for Qt 4.x support" optional_depends "lua" "" "--disable-lua" "for some interfaces rc telnet http support" optional_depends "portaudio" "" "--disable-portaudio" "for portaudio support" optional_depends "aalib" "" "--disable-aa" "for ascii art support" @@ -71,3 +67,5 @@ optional_depends "vcdimager" "--enable-vcdx" "--disable-vcdx" "for navigati optional_depends "libblueray" "--enable-bluray" "--disable-bluray" "for blueray support" optional_depends "libprojectM" "--enable-projectm" "--disable-projectm" "for visual effects support" optional_depends "libssh2" "--enable-sftp" "--disable-sftp" "for SFTP file transfer support" +optional_depends "samba" "--enable-smbclient" "--disable-smbclient" "for smb/CIFS support" +optional_depends "freerdp" "--enable-libfreerdp" "--disable-libfreerdp" "for rdp desktop support"