Author: bdubbs
Date: Thu Jul 28 15:34:28 2016
New Revision: 17614
Log:
Revert vlc to version 2.2.4 with gcc6 patch.
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/multimedia/videoutils/vlc.xml
trunk/BOOK/packages.ent
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Wed Jul 27 11:29:35 2016 (r17613)
+++ trunk/BOOK/general.ent Thu Jul 28 15:34:28 2016 (r17614)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "26"> <!-- Always 2 digits -->
+<!ENTITY day "28"> <!-- Always 2 digits -->
<!ENTITY month "07"> <!-- Always 2 digits -->
<!ENTITY year "2016">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "July 26th &year;">
+<!ENTITY releasedate "July 28th &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development -->
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Wed Jul 27 11:29:35
2016 (r17613)
+++ trunk/BOOK/introduction/welcome/changelog.xml Thu Jul 28 15:34:28
2016 (r17614)
@@ -46,6 +46,16 @@
<listitem>
<para>July 26th, 2016</para>
<itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Revert vlc to version 2.2.4 with gcc6 patch. Fixes
+ <ulink url="&blfs-ticket-root;8110">#8110</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>July 26th, 2016</para>
+ <itemizedlist>
<listitem revision="systemd">
<para>[renodr] - Update to evolution-3.20.4. Fixes
<ulink url="&blfs-ticket-root;8086">#8086</ulink>.</para>
Modified: trunk/BOOK/multimedia/videoutils/vlc.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/vlc.xml Wed Jul 27 11:29:35 2016
(r17613)
+++ trunk/BOOK/multimedia/videoutils/vlc.xml Thu Jul 28 15:34:28 2016
(r17614)
@@ -6,10 +6,10 @@
<!ENTITY vlc-download-http
"&sources-anduin-http;/vlc/vlc-&vlc-version;.tar.xz">
<!ENTITY vlc-download-ftp
"&sources-anduin-ftp;/vlc/vlc-&vlc-version;.tar.xz">
- <!ENTITY vlc-md5sum "ea02989ea69f8eda65a4dcf73982eed2">
- <!ENTITY vlc-size "20 MB">
- <!ENTITY vlc-buildsize "673 MB (add 4 MB for tests)">
- <!ENTITY vlc-time "6.0 SBU (add 0.2 SBU for tests)">
+ <!ENTITY vlc-md5sum "55666c9898f658c7fcca12725bf7dd1b">
+ <!ENTITY vlc-size "21 MB">
+ <!ENTITY vlc-buildsize "559 MB (add 4 MB for tests)">
+ <!ENTITY vlc-time "5.0 SBU (add 0.2 SBU for tests)">
]>
<sect1 id="vlc" xreflabel="VLC-&vlc-version;">
@@ -74,6 +74,24 @@
</listitem>
</itemizedlist>
+ <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+ <itemizedlist spacing="compact">
+ <listitem>
+ <para>
+ Required patch:
+ <ulink
+ url="&patch-root;/vlc-&vlc-version;-ffmpeg3-1.patch"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Required patch:
+ <ulink
+ url="&patch-root;/vlc-&vlc-version;-gcc6_fixes-1.patch"/>
+ </para>
+ </listitem>
+ </itemizedlist>
+
<bridgehead renderas="sect3">VLC Dependencies</bridgehead>
<bridgehead renderas="sect4">Recommended</bridgehead>
@@ -193,8 +211,9 @@
<xref linkend="gnutls"/>,
<xref linkend="libnotify"/>,
<xref linkend="libxml2"/>,
- <xref linkend="taglib"/>, and
- <xref linkend="xdg-utils"/> (runtime)
+ <xref linkend="taglib"/>,
+ <xref linkend="xdg-utils"/> (runtime), and
+ <ulink url="http://www.ambilight4pc.com/atmolight.html";>AtmoLight</ulink>
</para>
<para condition="html" role="usernotes">
@@ -215,9 +234,11 @@
Install <application>VLC</application> by running the following commands:
</para>
-<screen><userinput>BUILDCC=gcc \
-CFLAGS="-I $XORG_PREFIX/include" \
-./configure --prefix=/usr &&
+<screen><userinput>patch -Np1 -i ../vlc-&vlc-version;-ffmpeg3-1.patch
&&
+patch -Np1 -i ../vlc-&vlc-version;-gcc6_fixes-1.patch &&
+
+CFLAGS="-DLUA_COMPAT_5_1" \
+./configure --prefix=/usr --disable-atmo &&
make</userinput></screen>
@@ -249,14 +270,13 @@
<title>Command Explanations</title>
<para>
- <envar>BUILDCC=gcc</envar> This environment variable
- is needed for compatibility with <xref linkend='gcc'/>.
+ <envar>CFLAGS="-DLUA_COMPAT_5_1"</envar> This environment variable
+ ensures the use of the correct variation of <xref linkend='lua'/>.
</para>
<para>
- <envar>CFLAGS="-I $XORG_PREFIX/include"</envar> This environment variable
- is needed if <application>xorg</application> is not installed in
- <filename class="directory">/usr</filename>.
+ <option>--disable-atmo</option>: This switch disables
+ trying to build AtmoLight (homemade Philips Ambilight clone).
</para>
<para>
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Wed Jul 27 11:29:35 2016 (r17613)
+++ trunk/BOOK/packages.ent Thu Jul 28 15:34:28 2016 (r17614)
@@ -789,7 +789,7 @@
<!ENTITY mplayer-version "SVN-r37794">
<!ENTITY xine-ui-version "0.99.9">
<!ENTITY transcode-version "1.1.7">
-<!ENTITY vlc-version "3.0.0-20160606">
+<!ENTITY vlc-version "2.2.4">
<!-- Chapter 49 -->
<!ENTITY cdrdao-version "1.2.3">
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
