Changeset 248bac5 for multimedia/videoutils

Timestamp:

02/07/2016 06:51:58 AM (8 years ago)

Author:

DJ Lucas <dj@…>

Branches:

systemd-13485

Children:

f60f672

Parents:

6ef90edf

Message:

Merge r16908, r16909, r16911, and r16912 from trunk. Update to cups-2.1.3, openldap-2.4.44, and vlc-2.2.2.

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

File:

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

multimedia/videoutils/vlc.xml

@@ -8 +8 @@
       <!ENTITY vlc-download-ftp " ">
 <!--  <!ENTITY vlc-download-ftp "ftp://ftp.videolan.org/pub/videolan/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz">-->
-  <!ENTITY vlc-md5sum        "42273945758b521c408fabc7fd6d9946">
-  <!ENTITY vlc-size          "20 MB">
-  <!ENTITY vlc-buildsize     "697 MB">
-  <!ENTITY vlc-time          "4.5 SBU">
+  <!ENTITY vlc-md5sum        "f98d60f0f59ef72b6e3407f2ff09bda6">
+  <!ENTITY vlc-size          "22 MB">
+  <!ENTITY vlc-buildsize     "679 MB (with tests)">
+  <!ENTITY vlc-time          "4.4 SBU (with tests)">
 ]>
 
@@ -107 +107 @@
       <ulink url="http://sourceforge.net/projects/libdc1394/">libdc1394</ulink>,
       <ulink url="http://sourceforge.net/projects/libcddb/">libcddb</ulink>,
-      <ulink url="http://code.google.com/p/libproxy/">libproxy</ulink>,
+      <ulink url="https://github.com/libproxy/libproxy">libproxy</ulink>,
       <ulink url="http://www.live555.com/">Live555</ulink>, and
       <ulink url="http://www.gnu.org/software/vcdimager/">VCDImager</ulink>
@@ -116 +116 @@
     <para role="optional">
       <xref linkend="libogg"/>,
-      <ulink url="http://code.google.com/p/game-music-emu/">Game Music Emu</ulink>,
+      <ulink url="https://github.com/kode54/Game_Music_Emu">Game Music Emu</ulink>,
       <ulink url="http://www.videolan.org/developers/libdvbpsi.html">libdvbpsi</ulink>,
       <ulink url="http://downloads.xiph.org/releases/libshout/">libshout</ulink>,
@@ -123 +123 @@
       <ulink url="http://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
       <ulink url="http://www.musepack.net/">Musepack</ulink>, and
-      <ulink url="http://sourceforge.net/projects/sidplay2/">sidplay-libs</ulink>,
+      <ulink url="http://sourceforge.net/projects/sidplay2/">sidplay-libs</ulink>
     </para>
 
@@ -139 +139 @@
       <xref linkend="speex"/>,
       <xref linkend="x264"/>,
-      <ulink url="http://diracvideo.org/download/dirac-research/">Dirac</ulink>,
+      <ulink url="http://sourceforge.net/projects/dirac/">Dirac</ulink>,
       <ulink url="http://sourceforge.net/projects/fluidsynth/">FluidSynth</ulink>,
       <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://code.google.com/p/libtiger/">libtiger</ulink>,-->
       <ulink url="http://www.khronos.org/openmax/">OpenMAX</ulink>,
-      <ulink url="http://diracvideo.org/download/schroedinger/">Schroedinger</ulink>,
+      <ulink url="http://sourceforge.net/projects/schrodinger/">Schroedinger</ulink>,
       <ulink url="http://wiki.xiph.org/Tremor">Tremor</ulink>,
       <ulink url="http://www.twolame.org/">Twolame</ulink>, and
@@ -174 +174 @@
     <para role="optional">
       <xref linkend="qt4"/> (required for the graphical user interface),
-      <xref linkend="qt5"/> (for some plugins),
+      <xref linkend="qt5"/> (for some plugins, but currently broken with
+      Qt-5.5),
       <ulink url="http://pkgbuild.com/~giovanni/libtar/">libtar</ulink>, and
       <ulink url="http://www.lirc.org/">LIRC</ulink>
@@ -211 +212 @@
 
     <para>
+      If both Qt4 and Qt5 are installed, Qt5 has to be hidden from
+      <envar>PKG_CONFIG_PATH</envar>, due to a bug. Temporarily do it, 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>
       Install <application>VLC</application> by running the following commands:
     </para>
@@ -237 +247 @@
 
     <para>
-      To test the results, issue: <command>make check</command>. Tests must be
-      run from an active X session.
+      Again, if both Qt4 and 5 are installed, restore
+      <envar>PKG_CONFIG_PATH</envar>:
+    </para>
+
+<screen><userinput>PKG_CONFIG_PATH=$SAVEPATH &amp;&amp;
+unset SAVEPATH</userinput></screen>
+
+    <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.
     </para>
 
@@ -382 +400 @@
         </seg>
         <seg>
-          /usr/include/vlc,
-          /usr/lib/vlc,
-          /usr/share/vlc and
+          /usr/{include,lib,share}/vlc and
           /usr/share/doc/vlc-&vlc-version;
         </seg>