[Lunar-commits] <moonbase> vlc: Version bump to 2.0.0.

Dennis `stumbles` Veatch stumbles at lunar-linux.org
Wed Feb 22 16:21:43 CET 2012


commit 504ed05301ccd8743d0ccd9f40890d1c6aec5e32
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Wed Feb 22 10:21:43 2012 -0500

    vlc: Version bump to 2.0.0.
---
 video/vlc/BUILD   |   30 +++++++++++-------------------
 video/vlc/DEPENDS |   14 ++++++++++----
 video/vlc/DETAILS |   10 +++++-----
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/video/vlc/BUILD b/video/vlc/BUILD
index 201c174..e336f3a 100644
--- a/video/vlc/BUILD
+++ b/video/vlc/BUILD
@@ -1,31 +1,23 @@
 (
 
-  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
+  if in_depends $MODULE lua; then
+    LUA_LIBS+=" /usr/lib/lua"
+  fi &&
 
-  # Use a default font which actually exists
-  sedit "s:truetype/freefont/FreeSerifBold.ttf:dejavu-ttf/DejaVuSerif-Bold.ttf:" modules/misc/freetype.c
+  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 &&
 
   if in_depends vlc qt4; then
    . /etc/profile.d/qt4.rc
-  fi
+  fi &&
 
-#  OPTS+=" --enable-xvideo --disable-nls --disable-mozilla --enable-real --enable-realrtsp"
-  OPTS+=" --enable-xvideo --enable-real --enable-realrtsp"
+  OPTS+=" --enable-xvideo --enable-real --enable-realrtsp --enable-media-library --disable-sid" &&
 
-  default_build
+  default_build &&
 
-  # It's 2009. Why can't VLC install their own icons yet?
-  for x in 16x16 32x32 48x48 128x128 ; do
-    mkdir -p /usr/share/icons/hicolor/$x/apps/
-    ln -sf /usr/share/vlc/vlc$x.png /usr/share/icons/hicolor/$x/apps/vlc.png ;
-  done
+  sedit "s:Icon=vlc:Icon=/usr/share/icons/hicolor/32x32/apps/vlc.png:" /usr/share/applications/vlc.desktop &&
+  sedit "s:Categories=:Categories=Multimedia;:" /usr/share/applications/vlc.desktop &&
 
   if [[ -e /usr/bin/gtk-update-icon-cache ]] ; then
     gtk-update-icon-cache -f /usr/share/icons/hicolor/
diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS
index ddc6fee..4262551 100644
--- a/video/vlc/DEPENDS
+++ b/video/vlc/DEPENDS
@@ -7,7 +7,10 @@ optional_depends  "neon"         ""  "--disable-neon" "for neon optimizations sp
 optional_depends  "libproxy"     ""  "--disable-libproxy" "for proxy support"
 optional_depends  "libnotify"    "--enable-notify"  "" "for notify support"
 optional_depends  "taglib"       ""  "--disable-taglib"    "for taglib support"
-optional_depends  "opencv"       "--enable-opencv"  "" "for OpenCV (computer vision) filter support"
+
+# Causes the make to fail, no fix as yet.
+#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"
@@ -24,14 +27,14 @@ optional_depends  "libmpcdec"    ""  ""  "for Musepack 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  "libdvdnav"    "--enable-dvdnav"  "--disable-dvdnav"  "for DVD navigation"
 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  "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  "v4l-utils"    "--enable-v4l2" "--disable-v4l2" "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"
@@ -39,7 +42,6 @@ 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"
@@ -66,3 +68,7 @@ optional_depends  "libgcrypt"    "" "--disable-libgcrypt" "for encryption suppor
 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"
+optional_depends  "vcdimager"    "--enable-vcdx"  "--disble-vcdx" "for navigating VCD with libvcdinfo support"
+optional_depends  "libblueray"   "--enable-bluray" "--disable-bluray" "for blueray support"
+optional_depends  "xcb-util-keysyms" "--enable-xcb" "--disable-xcb" "for xcb-keysyms support"
+optional_depends  "libprojectM"  "--enable-projectm" "--disable-projectm" "for visual effects support"
diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index 567d108..6aee0d2 100644
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -1,11 +1,11 @@
           MODULE=vlc
-         VERSION=1.1.13
-          SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=http://www.videolan.org/pub/videolan/vlc/$VERSION
-      SOURCE_VFY=sha1:05bbc7ff427f3b919b29a45ce014caff9ba92648
+         VERSION=2.0.0
+          SOURCE=$MODULE-$VERSION.tar.xz
+      SOURCE_URL=http://download.videolan.org/pub/videolan/vlc/2.0.0/
+      SOURCE_VFY=sha1:c28c4c8128110fd02a7bdf55c9dad5cc20eb91b8
         WEB_SITE=http://www.videolan.org
          ENTERED=20011113
-         UPDATED=20111221
+         UPDATED=20120222
            SHORT="Videolan client multimedia player"
 
 cat << EOF


More information about the Lunar-commits mailing list