Changeset 94b42903 for multimedia/videoutils

Timestamp:

02/11/2018 05:41:19 PM (6 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.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, 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:

4628cd88

Parents:

2433413

Message:

Archive openssl-1.1.x. Moved to LFS.
Update to v4l-utils-1.14.2.
Update to vlc-3.0.0.

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

Location:

multimedia/videoutils

Files:

• ffmpeg.xml (modified) (1 diff)
• vlc.xml (modified) (6 diffs)

multimedia/videoutils/ffmpeg.xml

@@ -111 +111 @@
       <xref linkend="opencv"/>,
       <xref linkend="openjpeg"/>,
-      <xref linkend="openssl"/> or
       <xref linkend="gnutls"/>,
       <xref linkend="pulseaudio"/>,

multimedia/videoutils/vlc.xml

@@ -7 +7 @@
   <!ENTITY vlc-download-http "https://download.videolan.org/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz">
   <!ENTITY vlc-download-ftp  " ">
-  <!ENTITY vlc-md5sum        "b721fddf65aaf64eeee5629aa9bf7c9e">
-  <!ENTITY vlc-size          "21 MB">
-  <!ENTITY vlc-buildsize     "546 MB (add 3 MB for tests)">
-  <!ENTITY vlc-time          "1.6 SBU (using parallelism=4; add 0.1 SBU for tests)">
+  <!ENTITY vlc-md5sum        "a953d8b90e56f06828c4ca8e390c5c9b">
+  <!ENTITY vlc-size          "24 MB">
+  <!ENTITY vlc-buildsize     "615 MB (add 12 MB for tests)">
+  <!ENTITY vlc-time          "2.0 SBU (using parallelism=4; 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>
@@ -222 +211 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../vlc-&vlc-version;-ffmpeg3-1.patch    &amp;&amp;
-sed -i 's/error-implicit-function-declaration//' configure &amp;&amp;
-
-./configure --prefix=/usr --disable-atmo &amp;&amp;
+<screen><userinput>sed -i '/luaL_checkint(/s/checkint/checkinteger/' modules/lua/{demux,libs/*}.c &amp;&amp;
+sed -i '/DEPRECATED/s:^://:'  modules/text_renderer/freetype/text_layout.c     &amp;&amp;
+
+BUILDCC=gcc ./configure --prefix=/usr &amp;&amp;
 
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make -k check</command>.
+      To test the results, issue: <command>make check</command>.
     </para>
 
@@ -236 +225 @@
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
-
+<!--
     <note>
       <para>
@@ -245 +234 @@
       </para>
     </note>
-
+-->
 <screen role="root"><userinput>make docdir=/usr/share/doc/vlc-&vlc-version; install</userinput></screen>
 
@@ -257 +246 @@
 
     <para>
-      <command>sed ... configure</command>: This command removes 
-      a gcc option that treats a warning as an error.
-    </para>
-<!--
-    <para>
-      <envar>CFLAGS="-DLUA_COMPAT_5_1"</envar>: This environment variable
-      ensures the use of the correct variation of <xref linkend='lua'/>.
-    </para>
--->
-    <para>
-      <parameter>--disable-atmo</parameter>: This switch disables
-      trying to build AtmoLight (homemade Philips Ambilight clone).
-    </para>
-
-    <para>
-      <option>--enable-opencv=no</option>: This switch disables
-      <application>OpenCV</application> suport.
+      <command>sed ... modules/lua/...</command>: This command allows
+      building with the current version of <xref linkend="lua"/>.
+    </para>
+
+    <para>
+      <command>sed ... text_layout.c</command>: This command allows
+      building with the current version of <xref linkend="freetype2"/>.
     </para>