Author: igor
Date: Tue Oct 1 05:12:32 2013
New Revision: 11900
Log:
update to vlc-2.1.0
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/multimedia/videoutils/vlc.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Mon Sep 30 21:53:01 2013 (r11899)
+++ trunk/BOOK/general.ent Tue Oct 1 05:12:32 2013 (r11900)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "30"> <!-- Always 2 digits -->
-<!ENTITY month "09"> <!-- Always 2 digits -->
+<!ENTITY day "01"> <!-- Always 2 digits -->
+<!ENTITY month "10"> <!-- Always 2 digits -->
<!ENTITY year "2013">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "September 30th, &year;">
+<!ENTITY releasedate "October 1st, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!--
version|testing|unstable|development] -->
@@ -807,7 +807,7 @@
<!ENTITY mplayer-version "1.1.1">
<!ENTITY xine-ui-version "0.99.7">
<!ENTITY transcode-version "1.1.7">
-<!ENTITY vlc-version "2.0.8">
+<!ENTITY vlc-version "2.1.0">
<!-- Chapter 41 -->
<!ENTITY cdrdao-version "1.2.3">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Mon Sep 30 21:53:01
2013 (r11899)
+++ trunk/BOOK/introduction/welcome/changelog.xml Tue Oct 1 05:12:32
2013 (r11900)
@@ -44,6 +44,16 @@
-->
<listitem>
+ <para>October 1st, 2013</para>
+ <itemizedlist>
+ <listitem>
+ <para>[igor] - Update to vlc-2.1.0. Fixes
+ <ulink url="&blfs-ticket-root;4112">#4112</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>September 30th, 2013</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/multimedia/videoutils/vlc.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/vlc.xml Mon Sep 30 21:53:01 2013
(r11899)
+++ trunk/BOOK/multimedia/videoutils/vlc.xml Tue Oct 1 05:12:32 2013
(r11900)
@@ -8,10 +8,10 @@
"http://download.videolan.org/pub/videolan/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz";>
<!ENTITY vlc-download-ftp
"ftp://ftp.videolan.org/pub/videolan/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz";>
- <!ENTITY vlc-md5sum "6445eb55aa087f30abe27423535e1ab8">
- <!ENTITY vlc-size "18 MB">
- <!ENTITY vlc-buildsize "as much as 600 MB, but likely around 500 MB">
- <!ENTITY vlc-time "4.0 SBU">
+ <!ENTITY vlc-md5sum "8c77bda671821f5b9ede96b6816e2ade">
+ <!ENTITY vlc-size "19 MB">
+ <!ENTITY vlc-buildsize "354 MB">
+ <!ENTITY vlc-time "3.5 SBU">
]>
<sect1 id="vlc" xreflabel="VLC-&vlc-version;">
@@ -76,42 +76,25 @@
</listitem>
</itemizedlist>
- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
- <itemizedlist spacing="compact">
- <listitem>
- <para>
- Required patch:
- <ulink url="&patch-root;/vlc-&vlc-version;-opencv_fixes-1.patch"/>
- </para>
- </listitem>
- <listitem>
- <para>
- Required patch:
- <ulink url="&patch-root;/vlc-&vlc-version;-live_fixes-1.patch"/>
- </para>
- </listitem>
- </itemizedlist>
-
<bridgehead renderas="sect3">VLC Dependencies</bridgehead>
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
- <xref linkend="alsa-lib"/>,
- <xref linkend="dbus"/>,
+ <xref linkend="lua"/>,
+ <xref linkend="libmad"/>,
<xref linkend="ffmpeg"/>,
- <xref linkend="gnutls"/>,
<xref linkend="liba52"/>,
- <xref linkend="libgcrypt"/>,
- <xref linkend="libmad"/>,
- <xref linkend="libva"/>,
- <xref linkend="lua"/> and
- <xref linkend="qt4"/> (<application>Qt</application> is required for the
- graphical user interface; without <application>Qt</application> you will
- only be able to use the command line or
<application>ncurses</application>
- interface)
+ <xref linkend="x-window-system"/>,
+ <xref linkend="alsa-lib"/>, and
+ <xref linkend="libgcrypt"/>
</para>
- <bridgehead renderas="sect4">Optional input drivers and
libraries</bridgehead>
+ <bridgehead renderas="sect4">Optional features and packages</bridgehead>
+ <para role="optional">
+ <xref linkend="dbus"/>
+ </para>
+
+ <bridgehead renderas="sect4">Optional input plugins</bridgehead>
<para role="optional">
<ulink url="http://code.google.com/p/libproxy/";>libproxy</ulink>,
<ulink url="http://www.live555.com/";>Live555</ulink>,
@@ -143,6 +126,7 @@
<bridgehead renderas="sect4">Optional codec plugins</bridgehead>
<para role="optional">
+ <xref linkend="libva"/>,
<ulink url="http://www.khronos.org/openmax/";>OpenMAX</ulink>,
<xref linkend="faad2"/>,
<ulink url="http://www.twolame.org/";>Twolame</ulink>,
@@ -180,19 +164,18 @@
<bridgehead renderas="sect4">Optional audio plugins</bridgehead>
<para role="optional">
<xref linkend="pulseaudio"/>,
- <ulink url="http://www.portaudio.com/";>PortAudio</ulink>,
- <ulink url="http://jackaudio.org/";>JACK</ulink> and
+ <ulink url="http://jackaudio.org/";>JACK</ulink>, and
<xref linkend="libsamplerate"/>
</para>
<bridgehead renderas="sect4">Optional interface plugins</bridgehead>
<para role="optional">
- <xref linkend="xcb-util-keysyms"/>,
- <ulink url="http://www.lirc.org/";>LIRC</ulink> and
+ <xref linkend="qt4"/> (required for the graphical user interface),
+ <ulink url="http://www.lirc.org/";>LIRC</ulink>, and
<ulink url="http://www.feep.net/libtar/";>libtar</ulink>
</para>
- <bridgehead renderas="sect4">Optional visualization plugins</bridgehead>
+ <bridgehead renderas="sect4">Optional visualisations and video filter
plugins</bridgehead>
<para role="optional">
<ulink url="http://sourceforge.net/projects/goom/";>Goom</ulink> and
<ulink url="http://sourceforge.net/projects/projectm/";>projectM</ulink>
@@ -205,13 +188,13 @@
<ulink url="http://sourceforge.net/projects/pupnp/";>libupnp</ulink>
</para>
- <bridgehead renderas="sect4">Optional miscellaneous
dependencies</bridgehead>
+ <bridgehead renderas="sect4">Optional miscellaneous options</bridgehead>
<para role="optional">
+ <xref linkend="dbus"/>,
+ <xref linkend="gnutls"/>,
<xref linkend="libxml2"/>,
- <xref linkend="taglib"/>,
- <xref linkend="libnotify"/> and
- <ulink
url="http://sourceforge.net/projects/medialibrary/";>MediaLibrary</ulink>
- (requires <xref linkend="sqlite"/>)
+ <xref linkend="taglib"/>, and
+ <xref linkend="libnotify"/>
</para>
<para condition="html" role="usernotes">
@@ -226,11 +209,8 @@
Install <application>VLC</application> by running the following commands:
</para>
-<screen><userinput>patch -Np1 -i ../vlc-&vlc-version;-opencv_fixes-1.patch
&&
-patch -Np1 -i ../vlc-&vlc-version;-live_fixes-1.patch &&
-sed -i 's:libsmbclient.h:samba-4.0/&:' configure.ac modules/access/smb.c
&&
+<screen><userinput>sed -i 's:libsmbclient.h:samba-4.0/&:'
modules/access/smb.c &&
./bootstrap &&
-
./configure --prefix=/usr &&
make</userinput></screen>
@@ -262,13 +242,12 @@
<para>
<command>sed -i ...</command>: This sed fixes compilation with
- <application>Samba</application> 4.
+ <application>Samba</application> 4.
</para>
<para>
- <command>./bootstrap</command>: This command is required because the
patch
- modifies <application>Autotools</application> files and
- <application>VLC</application> uses a custom reconfiguration system.
+ <command>./bootstrap</command>: This command calls autoreconf to generate
+ m4 macros and prepare Makefiles.
</para>
<para>
@@ -277,13 +256,13 @@
</para>
<para>
- <option>--disable-dbus</option>: Use this switch if you don't have
- <application>D-Bus</application> installed.
+ <option>--disable-mad</option>: Use this switch if you don't
+ have <application>libmad</application> installed.
</para>
<para>
- <option>--disable-avcodec</option>: Use this switch if you don't
- have <application>FFmpeg</application> installed.
+ <option>--disable-avcodec --disable-swscale</option>: Use these switches
+ if you don't have <application>FFmpeg</application> installed.
</para>
<para>
@@ -292,37 +271,46 @@
</para>
<para>
- <option>--disable-libgcrypt</option>: Use this switch if you don't
- have <application>libgcrypt</application> installed.
+ <option>--disable-xcb</option>: Use this switch if you don't have
+ <application>X Window System</application> installed.
</para>
<para>
- <option>--disable-mad</option>: Use this switch if you don't
- have <application>libmad</application> installed.
+ <option>--disable-alsa</option>: Use this switch if you don't have
+ <application>ALSA</application> installed.
</para>
<para>
- <option>--enable-shine</option>: Use this option if you wish to build the
- <application>Shine</application> plugin.
+ <option>--disable-libgcrypt</option>: Use this switch if you don't
+ have <application>libgcrypt</application> installed.
</para>
+<!--
<para>
- <option>--enable-faad</option>: Use this option if you have
- <application>FAAD</application> installed and wish to build the
- <application>FAAD</application> plugin.
+ <option>- -enable-shine</option>: Use this option if you wish to build
the
+ <application>Shine</application> plugin.
</para>
<para>
- <option>--enable-tremor</option>: Use this option if you have
+ <option>- -enable-tremor</option>: Use this option if you have
<application>Tremor</application> installed and wish to build the
<application>Tremor</application> plugin.
</para>
<para>
- <option>--enable-aa</option>: Use this option if you have
+ <option>- -enable-aa</option>: Use this option if you have
<application>AAlib</application> installed and wish to build the
<application>AAlib</application> plugin.
</para>
+-->
+
+ <note>
+ <para>
+ There are many options to <application>VLC</application>'s
+ <command>configure</command> command. Check the
+ <command>configure --help</command> output for a complete list.
+ </para>
+ </note>
</sect2>
@@ -336,7 +324,7 @@
<seglistitem>
<seg>
- cvlc, qvlc, rvlc, svlc, vlc and vlc-wrapper
+ cvlc, nvlc, qvlc, rvlc, svlc, vlc and vlc-wrapper
</seg>
<seg>
libvlccore.so, libvlc.so and several libraries in
@@ -367,6 +355,18 @@
</indexterm>
</listitem>
</varlistentry>
+
+ <varlistentry id="nvlc">
+ <term><command>nvlc</command></term>
+ <listitem>
+ <para>
+ is a script to run VLC with the ncurses interface.
+ </para>
+ <indexterm zone="vlc nvlc">
+ <primary sortas="b-nvlc">nvlc</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
<varlistentry id="qvlc">
<term><command>qvlc</command></term>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
