Changeset 5909a5ed

Timestamp:

03/23/2019 07:17:14 PM (6 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 9.0, 9.1, gimp3, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

941658d

Parents:

b84bf41

Message:

Fix building vlc-3.0.6 when libssh2 1.8.x is installed

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

Files:

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

introduction/welcome/changelog.xml

@@ -45 +45 @@
       <para>March 23rd, 2019</para>
       <itemizedlist>
+        <listitem>
+          <para>[pierre] - Fix building vlc-3.0.6 when libssh2-1.8.1
+          is installed.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Update to firefox-66.0.1 (security fixes). Fixes

multimedia/videoutils/vlc.xml

@@ -90 +90 @@
     <bridgehead renderas="sect4">Optional features and packages</bridgehead>
     <para role="optional">
-      <xref linkend="dbus"/>
+      <xref linkend="dbus"/> and
+      <xref linkend="libssh2"/>
     </para>
 
@@ -138 +139 @@
       <xref linkend="speex"/>,
       <xref linkend="x264"/>,
+      <ulink url="https://aomedia.googlesource.com/aom/">aom</ulink>,
+      <ulink url="https://code.videolan.org/videolan/dav1d">dav1d</ulink>,
       <ulink url="http://sourceforge.net/projects/dirac/">Dirac</ulink>,
       <ulink url="http://sourceforge.net/projects/fluidsynth/">FluidSynth</ulink>,
@@ -144 +147 @@
       <ulink url="http://www.khronos.org/openmax/">OpenMAX</ulink>,
       <ulink url="http://sourceforge.net/projects/schrodinger/">Schroedinger</ulink>,
+      <ulink url="https://sourceforge.net/p/soxr/wiki/Home/">SoX</ulink>,
       <ulink url="http://wiki.xiph.org/Tremor">Tremor</ulink>,
       <ulink url="http://www.twolame.org/">Twolame</ulink>, and
@@ -212 +216 @@
 
     <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;
 
 BUILDCC=gcc ./configure --prefix=/usr    \
@@ -243 +248 @@
 
     <para>
-      <option>--disable-opencv</option>: This switch is required to disable
+      <command>sed ... modules/access/sftp.c</command>: This command fixes
+      building with <xref linkend="libssh2"/>.
+    </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>.
@@ -249 +259 @@
 
     <para>
-      <option>--disable-vpx</option>: This switch is required to disable
+      <parameter>--disable-vpx</parameter>: This switch is required to disable
       <application>libvpx</application>. The latest version is not compatible 
       with this version of <application>vlc</application>.
@@ -287 +297 @@
       <option>--disable-libgcrypt</option>: Use this switch if you don't
       have <application>libgcrypt</application> installed.
+    </para>
+
+    <para>
+      <option>--disable-sftp</option>: The default is to build the sftp
+      module if <xref linkend="libssh2"/> is installed. Use this switch
+      if you do not want to build this module.
     </para>