Changeset 12fbef3 for multimedia/videoutils/vlc.xml

Timestamp:

02/01/2016 12:21:29 AM (8 years ago)

Author:

DJ Lucas <dj@…>

Branches:

systemd-13485

Children:

d6e4445

Parents:

3144280

Message:

Completed Section VII Merge from trunk.

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

File:

• multimedia/videoutils/vlc.xml (modified) (9 diffs)

multimedia/videoutils/vlc.xml

@@ -33 +33 @@
     <para>
       <application>VLC</application> is a media player, streamer, and encoder.
-      It can play from many inputs like files, network streams, capture device,
-      desktops, or DVD, SVCD, VCD, and audio CD. It can play most audio and
-      video codecs (MPEG 1/2/4, H264, VC-1, DivX, WMV, Vorbis, AC3, AAC, etc.),
-      but can also convert to different formats and/or send streams through the
-      network.
-    </para>
-
-    &lfs77_checked;
+      It can play from many inputs, such as files, network streams, capture
+      devices, desktops, or DVD, SVCD, VCD, and audio CD. It can use most audio
+      and video codecs (MPEG 1/2/4, H264, VC-1, DivX, WMV, Vorbis, AC3, AAC,
+      etc.), and it can also convert to different formats and/or send streams
+      through the network.
+    </para>
+
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -86 +86 @@
       <xref linkend="libmad"/>,
       <xref linkend="lua"/>, and
-      <xref linkend="x-window-system"/>
+      <xref linkend="x-window-system"/>,
     </para>
 
@@ -96 +96 @@
     <bridgehead renderas="sect4">Optional input plugins</bridgehead>
     <para role="optional">
+
       <xref linkend="libdv"/>,
       <xref linkend="libdvdcss"/>,
       <xref linkend="libdvdread"/>,
       <xref linkend="libdvdnav"/>,
+      <xref linkend="opencv"/>,
       <xref linkend="samba"/>,
       <xref linkend="v4l-utils"/>,
@@ -106 +108 @@
       <ulink url="http://sourceforge.net/projects/libcddb/">libcddb</ulink>,
       <ulink url="http://code.google.com/p/libproxy/">libproxy</ulink>,
-      <ulink url="http://www.live555.com/">Live555</ulink>,
-      <ulink url="http://sourceforge.net/projects/opencvlibrary/">OpenCV</ulink>, and
+      <ulink url="http://www.live555.com/">Live555</ulink>, and
       <ulink url="http://www.gnu.org/software/vcdimager/">VCDImager</ulink>
       (requires <xref linkend="libcdio"/>)
@@ -172 +173 @@
     <bridgehead renderas="sect4">Optional interface plugins</bridgehead>
     <para role="optional">
-      <xref linkend="qt4"/> or
-      <xref linkend="qt5"/> (required for the graphical user interface),
+      <xref linkend="qt4"/> (required for the graphical user interface),
+      <xref linkend="qt5"/> (for some plugins),
       <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>
 
@@ -212 +214 @@
     </para>
 
-<screen><userinput>sed "s:&lt; 56:&lt; 57:g" -i configure &amp;&amp;
-./configure --prefix=/usr        &amp;&amp;
+<screen><userinput>sed -e 's:libsmbclient.h:samba-4.0/&amp;:' \
+    -i modules/access/smb.c &amp;&amp;
+
+sed -e '/LUA_C/ i #define LUA_COMPAT_APIINTCASTS' \
+    -i modules/lua/vlc.h    &amp;&amp;
+
+sed -e '/core.h/ {
+        a #include &lt;opencv2/imgproc/imgproc_c.h&gt;
+        a #include &lt;opencv2/imgproc/imgproc.hpp&gt;
+    }' \
+    -i modules/video_filter/opencv_example.cpp &amp;&amp;
+
+./bootstrap &amp;&amp;
+
+OPENCV_LIBS="-L/usr/share/OpenCV" \
+./configure --prefix=/usr &amp;&amp;
+
+sed -e '/seems to be moved/s/^/#/' \
+    -i autotools/ltmain.sh libtool &amp;&amp;
+
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make check</command>.
+      To test the results, issue: <command>make check</command>. Tests must be
+      run from an active X session.
     </para>
 
@@ -223 +244 @@
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
+
+    <note>
+      <para>
+        If the XORG_PREFIX is not /usr, make sure the LIBRARY_PATH
+        environment variable is set properly when doing the install, For example:
+        <command>sudo make LIBRARY_PATH=$XORG_PREFIX/lib ... install</command>.
+      </para>
+    </note>
 
 <screen role="root"><userinput>make docdir=/usr/share/doc/vlc-&vlc-version; install</userinput></screen>
@@ -235 +264 @@
 
     <para>
-      <command>sed ... configure</command>: This sed fixes compilation with
-      <application>FFMpeg</application> 2.4.
+      <command>sed -i ...</command>: This sed fixes compilation with
+      <application>Samba</application> 4.
+    </para>
+
+    <para>
+      <command>sed -e ... -i modules/lua/vlc.h</command> This sed fixes
+      compilation with <application>lua</application> 5.3.
+    </para>
+
+    <para>
+      <command>sed -e ... -i modules/video_filter/opencv_example.cpp</command>
+      This sed partially fixes compilation with
+      <application>OpenCV</application> 3.
+    </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.
+    </para>
+
+    <para>
+      <command>./bootstrap</command>: This command calls autoreconf to generate
+      m4 macros and prepare Makefiles.
+    </para>
+
+    <para>
+      <command>sed -e ... -i.orig autotools/ltmain.sh libtool</command>: This
+      optional sed removes a lot of invalid build warnings.
+      If desired, remove it.
+    </para>
+
+    <para>
+      <option>--enable-opencv=no</option>: This switch disables
+      <application>OpenCV</application> suport.
     </para>
 
@@ -273 +335 @@
       have <application>libgcrypt</application> installed.
     </para>
+
+<!--
+    <para>
+      <option>- -enable-shine</option>: Use this option if you wish to build the
+      <application>Shine</application> plugin.
+    </para>
+
+    <para>
+      <option>- -enable-tremor</option>: Use this option if you have
+      <application>Tremor</application> installed and wish to build the
+      <application>Tremor</application> plugin.
+    </para>
+
+    <para>
+      <option>- -enable-aa</option>: Use this option if you have
+      <application>AAlib</application> installed and wish to build the
+      <application>AAlib</application> plugin.
+    </para>
+-->
 
     <note>