linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-24 23:32:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix vlc for the API changes in QT-5.11.

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@20190 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Ken Moffat 2018-06-02 20:15:43 +00:00
parent 7fe2fc8c9b
commit da283f396c
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
general.ent
View File

@ -1,12 +1,12 @@
<!-- $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 #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development -->

9
introduction/welcome/changelog.xml
View File

@ -41,6 +41,15 @@
</itemizedlist>
</listitem>
-->
<listitem>
<para>May 31st, 2018</para>
<itemizedlist>
<listitem>
<para>[ken] - Fix vlc build for QT-5.11 API changes.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>May 31st, 2018</para>
<itemizedlist>

8
multimedia/videoutils/vlc.xml
View File

@ -212,6 +212,8 @@
<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;
@ -254,6 +256,12 @@ make</userinput></screen>
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>
<para>
<option>--disable-opencv</option>: This switch is required to disable
<application>opencv</application> which is not compatible with this