Changeset e4d2b8d


Ignore:
Timestamp:
06/07/2016 09:56:46 PM (6 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.1, 11.0, 7.10, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/refactor-virt, lazarus, nosym, perl-modules, qt5new, trunk, upgradedb, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
1552ac8
Parents:
96a04dff
Message:

Remove reference to qt4 in avahi and networkmanager.
Update to vlc-3.0.0-20160606.
Move opnecv 3rd party static library to /usr/lib.

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

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • general.ent

    r96a04dff re4d2b8d  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "06">                   <!-- Always 2 digits -->
     3<!ENTITY day          "07">                   <!-- Always 2 digits -->
    44<!ENTITY month        "06">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2016">
     
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "June 6th &year;">
     9<!ENTITY releasedate  "June 7th &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
  • general/graphlib/opencv.xml

    r96a04dff re4d2b8d  
    174174    </para>
    175175
    176 <screen role="root"><userinput>make install</userinput></screen>
     176<screen role="root"><userinput>make install               &amp;&amp;
     177mv -v /usr/share/OpenCV/3rdparty/lib/libippicv.a /usr/lib &amp;&amp;
     178rm -rv /usr/share/OpenCV/3rdparty
     179</userinput></screen>
    177180
    178181  </sect2>
     
    186189    <para><parameter>-DWITH_IPP=ON</parameter>: This option instructs the make
    187190    procedure to use the downloaded IPP package.</para>
     191
     192    <para><command>mv -v /usr/share/OpenCV/3rdparty/lib/libippicv.a
     193    /usr/lib</command>: This command move a library to a location where it
     194    can be found.</para>
    188195
    189196  </sect2>
  • introduction/welcome/changelog.xml

    r96a04dff re4d2b8d  
    4444
    4545-->
     46    <listitem>
     47      <para>June 7th, 2016</para>
     48      <itemizedlist>
     49        <listitem>
     50          <para>[bdubbs] - Remove reference to qt4 in avahi
     51          and networkmanager.</para>
     52        </listitem>
     53        <listitem>
     54          <para>[bdubbs] - Update to vlc-3.0.0-20160606. Fixes
     55          <ulink url="&blfs-ticket-root;7918">#7918</ulink>.</para>
     56        </listitem>
     57        <listitem>
     58          <para>[bdubbs] - Move opnecv 3rd party static library to
     59          /usr/lib.</para>
     60        </listitem>
     61      </itemizedlist>
     62    </listitem>
     63
    4664    <listitem>
    4765      <para>June 6th, 2016</para>
  • multimedia/videoutils/vlc.xml

    r96a04dff re4d2b8d  
    55  %general-entities;
    66
    7   <!ENTITY vlc-download-http "http://download.videolan.org/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz">
    8   <!ENTITY vlc-download-ftp  " ">
    9   <!ENTITY vlc-md5sum        "ecbc65be549e5cc83e4cbe0129e66dcd">
    10   <!ENTITY vlc-size          "21 MB">
    11   <!ENTITY vlc-buildsize     "603 MB (add xx MB for tests)">
    12   <!ENTITY vlc-time          "4.6 SBU (add x.y SBU for tests)">
     7  <!ENTITY vlc-download-http "&sources-anduin-http;/vlc/vlc-&vlc-version;.tar.xz">
     8  <!ENTITY vlc-download-ftp  "&sources-anduin-ftp;/vlc/vlc-&vlc-version;.tar.xz">
     9  <!ENTITY vlc-md5sum        "ea02989ea69f8eda65a4dcf73982eed2">
     10  <!ENTITY vlc-size          "20 MB">
     11  <!ENTITY vlc-buildsize     "673 MB (add 4 MB for tests)">
     12  <!ENTITY vlc-time          "6.0 SBU (add 0.2 SBU for tests)">
    1313]>
    1414
     
    7171        <para>
    7272          Estimated build time: &vlc-time;
    73         </para>
    74       </listitem>
    75     </itemizedlist>
    76 
    77     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    78     <itemizedlist spacing="compact">
    79       <listitem>
    80         <para>
    81           Required patch:
    82           <ulink
    83             url="&patch-root;/vlc-&vlc-version;-ffmpeg3-1.patch"/>
    8473        </para>
    8574      </listitem>
     
    153142      <ulink url="http://www.videolan.org/developers/libdca.html">libdca</ulink>,
    154143      <ulink url="http://code.google.com/p/libkate/">libkate</ulink>,
    155       <!--<ulink url="http://code.google.com/p/libtiger/">libtiger</ulink>,-->
    156144      <ulink url="http://www.khronos.org/openmax/">OpenMAX</ulink>,
    157145      <ulink url="http://sourceforge.net/projects/schrodinger/">Schroedinger</ulink>,
     
    183171    <bridgehead renderas="sect4">Optional interface plugins</bridgehead>
    184172    <para role="optional">
    185       <xref linkend="qt4"/> (required for the graphical user interface),
    186       <xref linkend="qt5"/> (for some plugins, but currently broken with
    187       Qt-5.5),
     173      <xref linkend="qt5"/> (required for the graphical user interface),
    188174      <ulink url="http://pkgbuild.com/~giovanni/libtar/">libtar</ulink>, and
    189175      <ulink url="http://www.lirc.org/">LIRC</ulink>
    190       <!--<ulink url="http://www.feep.net/libtar/">libtar</ulink>-->
    191176    </para>
    192177
     
    222207
    223208    <para>
    224       If both Qt4 and Qt5 are installed, Qt5 needs to be hidden from
    225       <envar>PKG_CONFIG_PATH</envar>, due to a bug. Temporarily do it by issuing:
    226     </para>
    227 
    228 <screen><userinput>SAVEPATH=$PKG_CONFIG_PATH &amp;&amp;
    229 PKG_CONFIG_PATH="\
    230 `echo $PKG_CONFIG_PATH | sed 's@:/opt/qt5/lib/pkgconfig@@'`"</userinput></screen>
    231 
    232     <para>
    233209      If you wish to avoid many invalid warnings, issue:
    234210    </para>
     
    240216    </para>
    241217
    242 <screen><userinput>patch -Np1 -i ../vlc-&vlc-version;-ffmpeg3-1.patch &amp;&amp;
    243 
    244 CXX="g++ -std=c++11"              \
    245 CFLAGS="-DLUA_COMPAT_5_1"         \
    246 OPENCV_LIBS="-L/usr/share/OpenCV" \
     218<screen><userinput>BUILDCC=gcc                      \
     219CFLAGS="-I $XORG_PREFIX/include" \
    247220./configure --prefix=/usr &amp;&amp;
    248221
     
    250223
    251224    <para>
    252       Again, if both Qt4 and 5 are installed, restore
    253       <envar>PKG_CONFIG_PATH</envar>:
    254     </para>
    255 
    256 <screen><userinput>PKG_CONFIG_PATH=$SAVEPATH &amp;&amp;
    257 unset SAVEPATH</userinput></screen>
    258 
    259     <para>
    260       To test the results, issue: <command>make -k check</command>. Tests must be
    261       run from an active X session. One test fails for unknown reasons.
     225      To test the results, issue: <command>make -k check</command>.
     226      One test fails for unknown reasons.
    262227    </para>
    263228
     
    285250
    286251    <para>
    287       <envar>CXX="g++ -std=c++11"</envar> This environment variable
     252      <envar>BUILDCC=gcc</envar> This environment variable
    288253      is needed for compatibility with <xref linkend='gcc'/>.
    289254    </para>
    290255
    291256    <para>
    292       <envar>CFLAGS="-DLUA_COMPAT_5_1"</envar> This environment variable
    293       is needed for compatibilty with <xref linkend='lua'/>.
    294     </para>
    295 
    296     <para>
    297       <envar>OPENCV_LIBS="-L/usr/share/OpenCV"</envar> This environment variable
    298       helps the linker to find <filename>libippicv.a</filename> installed by
    299       <application>OpenCV</application> 3.
     257      <envar>CFLAGS="-I $XORG_PREFIX/include"</envar> This environment variable
     258      is needed if <application>xorg</application> is not installed in
     259      <filename class="directory">/usr</filename>.
    300260    </para>
    301261
  • networking/netutils/avahi.xml

    r96a04dff re4d2b8d  
    8989    <bridgehead renderas="sect4">Optional</bridgehead>
    9090    <para role="optional">
    91       <xref linkend="dbus-python"/>,
    92       <xref linkend="pygtk"/> and
    93       <xref linkend="qt4"/>
     91      <xref linkend="dbus-python"/> and
     92      <xref linkend="pygtk"/>
    9493    </para>
    9594
     
    173172    <para>
    174173      <parameter>--disable-qt3</parameter>: This parameter disables the
    175       building of <application>Qt3</application> mainloop integration.
    176     </para>
    177 
    178     <para>
    179       <parameter>--disable-qt4</parameter>: This parameter disables the building
    180       of <application>Qt4Core</application> mainloop integration. Omit
    181       this if you have installed <application>Qt4</application>.
     174      attempt to build the obsolete <application>Qt3</application>
     175      portions of the package.
     176    </para>
     177
     178    <para>
     179      <parameter>--disable-qt4</parameter>: This parameter disables the
     180      attempt to build the obsolete <application>Qt4Core</application>
     181      portions of the package.
    182182    </para>
    183183
  • networking/netutils/networkmanager.xml

    r96a04dff re4d2b8d  
    4040    </para>
    4141
    42     &lfs79_checked;
     42    &lfs79_checked;&gcc6_checked;
    4343
    4444    <bridgehead renderas="sect3">Package Information</bridgehead>
     
    106106      <xref linkend="bluez"/>,
    107107      <xref linkend="gtk-doc"/>,
    108       <xref linkend="qt4"/>,
     108      <xref linkend="qt5"/> (for examples),
    109109      <xref linkend="valgrind"/>,
    110110      <ulink url="http://libteam.org/">libteam</ulink>, and
     
    121121    <title>Installation of NetworkManager</title>
    122122
     123    <para>If <xref linkend="qt5"/> is installed and the Qt based
     124    examples are desired, fix the configure script:</para>
     125
     126<screen><userinput>sed -e '/Qt[CDN]/s/Qt/Qt5/g'       \
     127    -e 's/moc_location/host_bins/' \
     128    -i configure</userinput></screen>
     129
    123130    <para>
    124131      Install <application>NetworkManager</application> by running the
     
    126133    </para>
    127134
    128 <screen><userinput>./configure --prefix=/usr        \
     135<screen><userinput>CXXFLAGS="-O2 -fPIC"             \
     136./configure --prefix=/usr        \
    129137            --sysconfdir=/etc    \
    130138            --localstatedir=/var \
     
    150158  <sect2 role="commands">
    151159    <title>Command Explanations</title>
     160
     161    <para>
     162      <envar>CXXFLAGS="-O2 -fPIC"</envar>: These compiler options are
     163      necessary to build the Qt5 based examples.
     164    </para>
    152165
    153166    <para>
  • packages.ent

    r96a04dff re4d2b8d  
    788788<!ENTITY xine-ui-version              "0.99.9">
    789789<!ENTITY transcode-version            "1.1.7">
    790 <!ENTITY vlc-version                  "2.2.3">
     790<!ENTITY vlc-version                  "3.0.0-20160606">
    791791
    792792<!-- Chapter 49 -->
Note: See TracChangeset for help on using the changeset viewer.