Changeset 271c4dd

Timestamp:

07/28/2016 10:34:28 PM (8 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

d4606e27

Parents:

1f355dda

Message:

Revert vlc to version 2.2.4 with gcc6 patch.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17614 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/videoutils/vlc.xml (modified) (5 diffs)
• packages.ent (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "26">                   <!-- Always 2 digits -->
+<!ENTITY day          "28">                   <!-- Always 2 digits -->
 <!ENTITY month        "07">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
@@ -7 +7 @@
 <!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 #] -->

introduction/welcome/changelog.xml

@@ -44 +44 @@
 
 -->
+    <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>

multimedia/videoutils/vlc.xml

@@ -7 +7 @@
   <!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)">
 ]>
 
@@ -71 +71 @@
         <para>
           Estimated build time: &vlc-time;
+        </para>
+      </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>
@@ -194 +212 @@
       <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>
 
@@ -216 +235 @@
     </para>
 
-<screen><userinput>BUILDCC=gcc                      \
-CFLAGS="-I $XORG_PREFIX/include" \
-./configure --prefix=/usr &amp;&amp;
+<screen><userinput>patch -Np1 -i ../vlc-&vlc-version;-ffmpeg3-1.patch    &amp;&amp;
+patch -Np1 -i ../vlc-&vlc-version;-gcc6_fixes-1.patch &amp;&amp;
+
+CFLAGS="-DLUA_COMPAT_5_1" \
+./configure --prefix=/usr --disable-atmo &amp;&amp;
 
 make</userinput></screen>
@@ -250 +271 @@
 
     <para>
-      <envar>BUILDCC=gcc</envar> This environment variable
-      is needed for compatibility with <xref linkend='gcc'/>.
-    </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>.
+      <envar>CFLAGS="-DLUA_COMPAT_5_1"</envar> This environment variable
+      ensures the use of the correct variation of <xref linkend='lua'/>.
+    </para>
+
+    <para>
+      <option>--disable-atmo</option>: This switch disables
+      trying to build AtmoLight (homemade Philips Ambilight clone).
     </para>
 

packages.ent

@@ -790 +790 @@
 <!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 -->