[blfs-book] r23210 - in trunk/BOOK: introduction/welcome multimedia/videoutils

[ken--- via blfs-book]

Author: ken
Date: Wed May 27 23:55:38 2020
New Revision: 23210

Log:
Fix vlc to build with qt-5.15,
based on a patch at OpenSuse.

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/videoutils/vlc.xml

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Wed May 27 23:22:34 
2020        (r23209)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Wed May 27 23:55:38 
2020        (r23210)
@@ -45,6 +45,9 @@
       <para>May 28th, 2020</para>
       <itemizedlist>
         <listitem>
+          <para>[ken] - Adapt vlc-3.0.10 for changes in Qt-5.15.</para>
+        </listitem>
+        <listitem>
           <para>[thomas] - Upgrade to openssh-8.3p1. Fixes
           <ulink url="&blfs-ticket-root;13580">#13580</ulink>.</para>
         </listitem>

Modified: trunk/BOOK/multimedia/videoutils/vlc.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/vlc.xml    Wed May 27 23:22:34 2020        
(r23209)
+++ trunk/BOOK/multimedia/videoutils/vlc.xml    Wed May 27 23:55:38 2020        
(r23210)
@@ -231,6 +231,11 @@
 
     <screen><userinput>sed -i '/vlc_demux.h/a #define LUA_COMPAT_APIINTCASTS' 
modules/lua/vlc.h   &amp;&amp;
 sed -i '/LIBSSH2_VERSION_NUM/s/10801/10900/' modules/access/sftp.c &amp;&amp;
+sed -i '/#include &lt;QWidget&gt;/a\#include &lt;QPainterPath&gt;/'            
\
+    modules/gui/qt/util/timetooltip.hpp                            &amp;&amp;
+sed -i '/#include/&lt;QPainter&gt;/a\#include &lt;QPainterPath&gt;/'           
\
+    modules/gui/qt/components/playlist/views.cpp                   \
+    modules/gui/qt/dialogs/plugins.cpp                             &amp;&amp;
 
 BUILDCC=gcc ./configure --prefix=/usr    \
                         --disable-opencv \
@@ -267,6 +272,12 @@
     </para>
 
     <para>
+      <command>sed ... a\#include &lt;QPainterPath&gt;/ ...</command>: These 
two
+      sed commands fix building with Qt-5.15.0.
+
+     </para>
+
+    <para>
       <parameter>--disable-opencv</parameter>: This switch is required to 
disable
       <application>opencv</application> which is not compatible with this 
       version of <application>vlc</application>.
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page