Changeset da283f39

Timestamp:

06/02/2018 08:15:43 PM (6 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, 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:

c5542b01

Parents:

7fe2fc8

Message:

Fix vlc for the API changes in QT-5.11.

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

Files:

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

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "31">                   <!-- Always 2 digits -->
-<!ENTITY month        "05">                   <!-- Always 2 digits -->
+<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 31st, &year;">
+<!ENTITY releasedate  "June 2nd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[ken] - Fix vlc build for QT-5.11 API changes.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>May 31st, 2018</para>
+      <itemizedlist>
+        <listitem>
           <para>[bdubbs] - Update to xf86-video-fbdev-0.5.0.  Fixes
           <ulink url="&blfs-ticket-root;10833">#10833</ulink>.</para>

multimedia/videoutils/vlc.xml

@@ -213 +213 @@
     <screen><userinput>sed -i '/vlc_demux.h/a #define LUA_COMPAT_APIINTCASTS' modules/lua/vlc.h   &amp;&amp;
 sed -i '/DEPRECATED/s:^://:'  modules/text_renderer/freetype/text_layout.c &amp;&amp;
+sed -i '/#include &lt;QString&gt;/i#include &lt;QButtonGroup&gt;' \
+  modules/gui/qt/components/simple_preferences.cpp                         &amp;&amp;
 
 BUILDCC=gcc ./configure --prefix=/usr --disable-opencv &amp;&amp;
@@ -253 +255 @@
       <command>sed ... text_layout.c</command>: This command allows
       building with the current version of <xref linkend="freetype2"/>.
+    </para>
+
+    <para>
+      <command>sed -i '/#include &lt;QString&gt;/ ...</command> This
+      command allows building with the current version of
+      <xref linkend="qt5"/>.
     </para>