[Lunar-commits] <moonbase> vlc: Adjusting BUILD per changes to build.lunar. Fleshed out the DEPENDS some more.

Auke Kok auke at foo-projects.org
Fri Jun 17 00:42:45 CEST 2011


On 06/16/2011 02:56 PM, Dennis `stumbles` Veatch wrote:
> commit bf16e4815d63b5677b485d9b6717ba863d54d841
> Author: Dennis `stumbles` Veatch<stumbles at lunar-linux.org>
> Date:   Thu Jun 16 17:56:12 2011 -0400
>
>      vlc: Adjusting BUILD per changes to build.lunar. Fleshed out the DEPENDS some more.
>
>      Some of these such as opencv default to off and for this one say no for now as it
>      causes the make to fail.


don't do all of this just yet, we need to do several things before we 
can do all of these changes to modules, and then we should do all of 
moonbase at once instead.

see below for comments:


> ---
>   video/vlc/BUILD   |   22 ++++---
>   video/vlc/DEPENDS |  182 +++++++++++++++++------------------------------------
>   2 files changed, 72 insertions(+), 132 deletions(-)
>
> diff --git a/video/vlc/BUILD b/video/vlc/BUILD
> index 11b5fbc..201c174 100644
> --- a/video/vlc/BUILD
> +++ b/video/vlc/BUILD
> @@ -1,30 +1,34 @@
>   (
>
> +  if in_depends $MOULDE live555; then
> +    OPTS+=" -with-live555-tree=/usr/lib/live"
> +  fi
> +
>   # Fixes a make failure if you say yes to libupnp.
>     if in_depends $MODULE libupnp; then
>       sed -i "27i #include<assert.h>" modules/services_discovery/upnp_intel.cpp
> -  fi&&
> +  fi

keep these in. neither lunar has the code to enforce `set -e`, and 
theedge has not been 'forced as an update', so it's 100% likely that 
people will not even have the needed code for these changes

> -)>  $C_FIFO 2>&1
> +)

you can remove the ) here entirely around the block, but again, don't do 
this just yet.

> diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS
> index 004435b..252429b 100644
> --- a/video/vlc/DEPENDS
> +++ b/video/vlc/DEPENDS
> @@ -1,133 +1,69 @@
>   depends  mpeg2dec
>   depends  ffmpeg
>
> +optional_depends  "udev"         ""  "--disable-udev" "for udev support"
> +optional_depends  "dbus"         ""  "--disable-dbus --disable-dbus-control" "for dbus support"
> +optional_depends  "neon"         ""  "--disable-neon" "for neon optimizations spport"
> +optional_depends  "libproxy"     ""  "--disable-libproxy" "for proxy support"
> +optional_depends  "libnotify"    ""  "--disable-libnotify" "for notify support"
> +optional_depends  "taglib"       ""  "--disable-taglib"    "for taglib 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"     ""  ""  "for ALSA support"
> -optional_depends  "libogg"       ""  ""  "for OGG support"
> -optional_depends  "libvorbis"    ""  ""  "for Vorbis support"
> +optional_depends  "alsa-lib"     ""  "--disable-alsa"  "for ALSA support"
> +optional_depends  "libogg"       ""  "--disable-ogg"  "for OGG support"
> +optional_depends  "libvorbis"    ""  "--disable-vorbis"  "for Vorbis support"
>   optional_depends  "libmodplug"   ""  ""  "for MOD support"
> -optional_depends  "speex"        ""  ""  "for Speex support"
> -optional_depends  "SDL_image"    ""  ""  "for SDL image support"
> -optional_depends  "SDL"          ""  ""  "for SDL support"
> +optional_depends  "speex"        ""  "--disable-speex"  "for Speex support"
> +optional_depends  "SDL_image"    ""  "--disable-sdl-image"  "for SDL image support"
> +optional_depends  "SDL"          ""  "--disable-sdl"  "for SDL support"
>   optional_depends  "libcdio"      ""  ""  "for CD-ROM control"
>   optional_depends  "libcddb"      ""  ""  "for CDDB support"
> -optional_depends  "libmatroska"  ""  ""  "for Matroska support"
> +optional_depends  "libmatroska"  ""  "--disable-mkv"  "for Matroska support"
>   optional_depends  "libmpcdec"    ""  ""  "for Musepack support"
> -optional_depends  "libxml2"      ""  ""  "for XML support"
> -optional_depends  "libpng"       ""  ""  "for PNG support"
> +optional_depends  "libxml2"      ""  "--disable-libxml2"  "for XML support"
> +optional_depends  "libpng"       ""  "--disable-png"  "for PNG support"
>   optional_depends  "gnutls"       ""  ""  "for TLS/SSL support"
>   optional_depends  "libdvdnav"    ""  ""  "for DVD navigation"
> -optional_depends  "gnome-vfs"    ""  ""  "for GNOME Vfs support"
> -optional_depends  "freetype2"    ""  ""  "for TrueType support"
> -optional_depends  "pulseaudio"   ""  ""  "for Pulse Audio support"
> -optional_depends  "libmtp"  ""  ""  "for Media Transfer Protocol support"
> -
> -optional_depends  "a52dec"             \
> -                  ""                   \
> -                  "--disable-a52"      \
> -                  "for a52dec support"
> -
> -optional_depends  "libmad"         \
> -                  ""               \
> -                  "--disable-mad"  \
> -                  "for MP3 support"
> -
> -optional_depends  "fribidi"            \
> -                  ""                   \
> -                  "--disable-fribidi"  \
> -                  "for Fribidi (bidirectional text) support"
> -
> -optional_depends  "ncurses"            \
> -                  ""                   \
> -                  "--disable-ncurses"  \
> -                  "for ncurses support"
> -
> -optional_depends  "librsvg"       \
> -                  "--enable-svg"  \
> -                  ""              \
> -                  "for svg support"
> -
> -optional_depends  "libtheora"        \
> -                  "--enable-theora"  \
> -                  ""                 \
> -                  "for theora support"
> -
> -optional_depends  "jack"           \
> -                  "--enable-jack"  \
> -                  ""               \
> -                  "for jack support"
> -
> -optional_depends  "faad"           \
> -                  "--enable-faad"  \
> -                  ""               \
> -                  "for faad support"
> -
> -optional_depends  "libdvdread"        \
> -                  "--enable-dvdread"  \
> -                  ""                  \
> -                  "for dvd read support"
> -
> -optional_depends  "flac"           \
> -                  "--enable-flac"  \
> -                  ""               \
> -                  "for flac support"
> -
> -optional_depends  "libdc1394"         \
> -                  "--enable-dc1394"   \
> -                  "--disable-dc1394"  \
> -                  "for IEEE1394 cameras support (needed for dv too)"
> -
> -optional_depends  "libdv"         \
> -                  "--enable-dv"   \
> -                  "--disable-dv"  \
> -                  "for dv support"
> -
> -optional_depends  "lirc"           \
> -                  "--enable-lirc"  \
> -                  ""               \
> -                  "for lirc support"
> -
> -optional_depends  "twolame"            \
> -                  "--enable-twolame"   \
> -                  "--disable-twolame"  \
> -                  "for MPEG Audio Layer 2 support"
> -
> -optional_depends  "samba"          \
> -                  "--enable-smb"   \
> -                  "--disable-smb"  \
> -                  "for Samba support"
> -
> -optional_depends  "libdvbpsi"         \
> -                  "--with-dvbpsi"     \
> -                  "--without-dvbpsi"  \
> -                  "for MPEG TS and DVB PSI tables support"
> -
> -optional_depends  "x264-snapshot"   \
> -                  "--enable-x264"   \
> -                  "--disable-x264"  \
> -                  "for H264/AVC support"
> -
> -optional_depends  "qt4"           \
> -                  "--enable-qt4"  \
> -                  "--disable-qt4  --disable-skins2"  \
> -                  "for Qt 4.x support"
> -
> -optional_depends  "live555"              \
> -                  "--enable-live555 --with-live555-tree=/usr/lib/live" \
> -                  "--disable-live555"    \
> -                  "for RTP/RTCP, RTSP, SIP support"
> -
> -optional_depends  "lua"            \
> -                  ""               \
> -                  "--disable-lua"  \
> -                  "for some interfaces (rc, telnet, http) support"
> -
> -optional_depends  "libupnp"        \
> -                  "--enable-upnp"  \
> -                  "--disable-upnp" \
> -                  "Intel UPnp SDK support"
> -
> -optional_depends  "libva"            \
> -                  ""                 \
> -                  "--disable-libva"  \
> -                  "for video acceleration"
> +optional_depends  "gnome-vfs"    ""  "--disable-gnomevfs"  "for GNOME Vfs support"
> +optional_depends  "freetype2"    ""  "--disable-freetype"  "for TrueType support"
> +optional_depends  "pulseaudio"   ""  "--disable-pulse"  "for Pulse Audio support"
> +optional_depends  "libmtp"       ""  "--disable-mtp"  "for Media Transfer Protocol support"
> +optional_depends  "samba"        ""  "--disabe-smb" "for Samba support"
> +optional_depends  "openssh"      "--enable-sftp"  "--disable-sftp" "for sftp support"
> +optional_depends  "libdvbpsi"    ""  "--without-dvbpsi" "for MPEG TS and DVB PSI tables support"
> +optional_depends  "v4l-utils"    "--enable-v4l" "--disable-v4l" "for v4l support"
> +optional_depends  "libcddb"      ""  "--disable-libcddb" "for cddb support"
> +optional_depends  "libshout"     ""  "--disable-shout" "for shoutcast support"
> +optional_depends  "a52dec"       ""  "--disable-a52"  "for a52dec support"
> +optional_depends  "libmad"       ""  "--disable-mad"  "for MP3 support"
> +optional_depends  "fribidi"      ""  "--disable-fribidi" "for Fribidi bidirectional text support"
> +optional_depends  "ncurses"      "--enable-ncurses"  "--disable-ncurses" "for ncurses support"
> +optional_depends  "librsvg"      "" "--disable-svg" "for svg support"
> +optional_depends  "libid3tag"    "--enable-id3tag" "" "for tagging support"
> +optional_depends  "faad"         "--enable-faad"  ""  "for faad support"
> +optional_depends  "libtheora"    ""  "--disable-theora"   "for theora support"
> +optional_depends  "jack"         "--enable-jack"  ""   "for jack support"
> +optional_depends  "libdvdread"   "--enable-dvdread"  ""  "for dvd read support"
> +optional_depends  "flac"         ""  "--disable-flac"  "for flac support"
> +optional_depends  "twolame"      ""  "--disable-twolame"   "for MPEG Audio Layer 2 support"
> +optional_depends  "libtar"       ""  "--disable-libtar" "for skins2 support"
> +optional_depends  "libdca"       ""  "--disable-dca"  "for DTS Coherent Acoustics support"
> +optional_depends  "x264-snapshot" ""  "--disable-x264"  "for H264/AVC support"
> +optional_depends  "fluidsynth"   ""  "--disable-fluidsynth" "for MIDI synthetiser support"
> +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  "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"
> +optional_depends  "schroedinger" "" "--disable-schroedinger" "for dirac video encoding/decoding"
> +optional_depends  "sqlite"       "" "--disable-sqlite"  "for sqlite database support"
> +optional_depends  "%SSL"         "" "--disable-gnutls" "for ssl support"
> +optional_depends  "libgcrypt"    "" "--disable-libgcrypt" "for encryption support"
> +optional_depends  "live555"      "" "--disable-live555" "for RTP/RTCP, RTSP, SIP support"
> +optional_depends  "libupnp"       "--enable-upnp"  "--disable-upnp"  "Intel UPnp SDK support"
> +optional_depends  "libva"         ""               "--disable-libva"  "for video acceleration"


well, this is a major improvement, crazy long list though :)

still missing a few --disable/--without flags though.

Auke


More information about the Lunar-dev mailing list