Changeset 3d6e95d for multimedia

Timestamp:

06/09/2016 11:28:10 PM (8 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

systemd-13485

Children:

26bc008

Parents:

8ee0429

Message:

(systemd) Merge to trunk r17470

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@17472 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

multimedia

Files:

• libdriv/v4l-utils.xml (modified) (3 diffs)
• videoutils/vlc.xml (modified) (8 diffs)

multimedia/libdriv/v4l-utils.xml

@@ -84 +84 @@
     <para role="optional">
       <xref linkend="alsa-lib"/> and
-      <xref linkend="qt4"/> or
       <xref linkend="qt5"/>
     </para>
@@ -100 +99 @@
   <sect2 role="installation">
     <title>Installation of v4l-utils</title>
-
-    <para>
-      If both Qt4 and Qt5 are installed, Qt5 will be used. If you choose to
-      build against Qt4, temporarily hide it from
-      <envar>PKG_CONFIG_PATH</envar>, issuing:
-    </para>
-
-<screen><userinput>SAVEPATH=$PKG_CONFIG_PATH &amp;&amp;
-PKG_CONFIG_PATH="\
-`echo $PKG_CONFIG_PATH | sed 's@:/opt/qt5/lib/pkgconfig@@'`"</userinput></screen>
 
     <para>
@@ -120 +109 @@
             --disable-static  &amp;&amp;
 make</userinput></screen>
-
-    <para>
-      Again, if both Qt4 and 5 are installed and you chose to build against Qt4,
-      restore <envar>PKG_CONFIG_PATH</envar>:
-    </para>
-
-<screen><userinput>PKG_CONFIG_PATH=$SAVEPATH &amp;&amp;
-unset SAVEPATH</userinput></screen>
 
     <para>

multimedia/videoutils/vlc.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY vlc-download-http "http://download.videolan.org/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz">
-  <!ENTITY vlc-download-ftp " ">
-  <!ENTITY vlc-md5sum        "ecbc65be549e5cc83e4cbe0129e66dcd">
-  <!ENTITY vlc-size          "21 MB">
-  <!ENTITY vlc-buildsize     "603 MB (with tests)">
-  <!ENTITY vlc-time          "4.6 SBU (with tests)">
+  <!ENTITY vlc-download-http "&sources-anduin-http;/vlc/vlc-&vlc-version;.tar.xz">
+  <!ENTITY vlc-download-ftp  "&sources-anduin-ftp;/vlc/vlc-&vlc-version;.tar.xz">
+  <!ENTITY vlc-md5sum        "ea02989ea69f8eda65a4dcf73982eed2">
+  <!ENTITY vlc-size          "20 MB">
+  <!ENTITY vlc-buildsize     "673 MB (add 4 MB for tests)">
+  <!ENTITY vlc-time          "6.0 SBU (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>
@@ -152 +142 @@
       <ulink url="http://www.videolan.org/developers/libdca.html">libdca</ulink>,
       <ulink url="http://code.google.com/p/libkate/">libkate</ulink>,
-      <!--<ulink url="http://code.google.com/p/libtiger/">libtiger</ulink>,-->
       <ulink url="http://www.khronos.org/openmax/">OpenMAX</ulink>,
       <ulink url="http://sourceforge.net/projects/schrodinger/">Schroedinger</ulink>,
@@ -185 +174 @@
       <ulink url="http://pkgbuild.com/~giovanni/libtar/">libtar</ulink>, and
       <ulink url="http://www.lirc.org/">LIRC</ulink>
-      <!--<ulink url="http://www.feep.net/libtar/">libtar</ulink>-->
     </para>
 
@@ -219 +207 @@
 
     <para>
-      If both Qt4 and Qt5 are installed, Qt5 needs to be hidden from
-      <envar>PKG_CONFIG_PATH</envar>, due to a bug. Temporarily do it by issuing:
-    </para>
-
-<screen><userinput>SAVEPATH=$PKG_CONFIG_PATH &amp;&amp;
-PKG_CONFIG_PATH="\
-`echo $PKG_CONFIG_PATH | sed 's@:/opt/qt5/lib/pkgconfig@@'`"</userinput></screen>
-
-    <para>
       If you wish to avoid many invalid warnings, issue:
     </para>
@@ -236 +215 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../vlc-&vlc-version;-ffmpeg3-1.patch &amp;&amp;
-
-CXX="g++ -std=c++11"             \
-CFLAGS="-DLUA_COMPAT_5_1"        \
-OPENCV_LIBS="-L/usr/share/OpenCV" \
+<screen><userinput>BUILDCC=gcc                      \
+CFLAGS="-I $XORG_PREFIX/include" \
 ./configure --prefix=/usr &amp;&amp;
 
@@ -254 +230 @@
 
     <para>
-      To test the results, issue: <command>make -k check</command>. Tests must be
-      run from an active X session. One test fails for unknown reasons.
+      To test the results, issue: <command>make -k check</command>.
+      One test fails for unknown reasons.
     </para>
 
@@ -281 +257 @@
 
     <para>
-      <envar>CXX="g++ -std=c++11"</envar>: This environment variable
+      <envar>BUILDCC=gcc</envar>: This environment variable
       is needed for compatibility with <xref linkend="gcc"/>.
     </para>
 
     <para>
-      <envar>CFLAGS="-DLUA_COMPAT_5_1"</envar>: This environment variable
-      is needed for compatibility with <xref linkend="lua"/>.
-    </para>
-
-    <para>
-      <envar>OPENCV_LIBS="-L/usr/share/OpenCV"</envar> This environment variable
-      helps the linker to find <filename>libippicv.a</filename> installed by
-      <application>OpenCV</application> 3.
+      <envar>CFLAGS="-I $XORG_PREFIX/include"</envar>: This environment variable
+      is needed if <application>xorg</application> is not installed in
+      <filename class="directory">/usr</filename>.
     </para>