Author: bdubbs Date: Tue Jun 7 14:56:46 2016 New Revision: 17456 Log: Remove reference to qt4 in avahi and networkmanager. Update to vlc-3.0.0-20160606. Move opnecv 3rd party static library to /usr/lib.
Modified: trunk/BOOK/general.ent trunk/BOOK/general/graphlib/opencv.xml trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/multimedia/videoutils/vlc.xml trunk/BOOK/networking/netutils/avahi.xml trunk/BOOK/networking/netutils/networkmanager.xml trunk/BOOK/packages.ent Modified: trunk/BOOK/general.ent ============================================================================== --- trunk/BOOK/general.ent Mon Jun 6 21:30:16 2016 (r17455) +++ trunk/BOOK/general.ent Tue Jun 7 14:56:46 2016 (r17456) @@ -1,12 +1,12 @@ <!-- $LastChangedBy$ $Date$ --> -<!ENTITY day "06"> <!-- Always 2 digits --> +<!ENTITY day "07"> <!-- Always 2 digits --> <!ENTITY month "06"> <!-- Always 2 digits --> <!ENTITY year "2016"> <!ENTITY copyrightdate "2001-&year;"> <!ENTITY copyholder "The BLFS Development Team"> <!ENTITY version "&year;-&month;-&day;"> -<!ENTITY releasedate "June 6th &year;"> +<!ENTITY releasedate "June 7th &year;"> <!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP --> <!ENTITY blfs-version "svn"> <!-- svn|[release #] --> <!ENTITY lfs-version "development"> <!-- x.y|development --> Modified: trunk/BOOK/general/graphlib/opencv.xml ============================================================================== --- trunk/BOOK/general/graphlib/opencv.xml Mon Jun 6 21:30:16 2016 (r17455) +++ trunk/BOOK/general/graphlib/opencv.xml Tue Jun 7 14:56:46 2016 (r17456) @@ -173,7 +173,10 @@ Now, as the <systemitem class="username">root</systemitem> user: </para> -<screen role="root"><userinput>make install</userinput></screen> +<screen role="root"><userinput>make install && +mv -v /usr/share/OpenCV/3rdparty/lib/libippicv.a /usr/lib && +rm -rv /usr/share/OpenCV/3rdparty +</userinput></screen> </sect2> @@ -186,6 +189,10 @@ <para><parameter>-DWITH_IPP=ON</parameter>: This option instructs the make procedure to use the downloaded IPP package.</para> + <para><command>mv -v /usr/share/OpenCV/3rdparty/lib/libippicv.a + /usr/lib</command>: This command move a library to a location where it + can be found.</para> + </sect2> <sect2 role="content"> Modified: trunk/BOOK/introduction/welcome/changelog.xml ============================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml Mon Jun 6 21:30:16 2016 (r17455) +++ trunk/BOOK/introduction/welcome/changelog.xml Tue Jun 7 14:56:46 2016 (r17456) @@ -44,6 +44,24 @@ --> <listitem> + <para>June 7th, 2016</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Remove reference to qt4 in avahi + and networkmanager.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to vlc-3.0.0-20160606. Fixes + <ulink url="&blfs-ticket-root;7918">#7918</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Move opnecv 3rd party static library to + /usr/lib.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>June 6th, 2016</para> <itemizedlist> <listitem> Modified: trunk/BOOK/multimedia/videoutils/vlc.xml ============================================================================== --- trunk/BOOK/multimedia/videoutils/vlc.xml Mon Jun 6 21:30:16 2016 (r17455) +++ trunk/BOOK/multimedia/videoutils/vlc.xml Tue Jun 7 14:56:46 2016 (r17456) @@ -4,12 +4,12 @@ <!ENTITY % general-entities SYSTEM "../../general.ent"> %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 (add xx MB for tests)"> - <!ENTITY vlc-time "4.6 SBU (add x.y SBU for 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)"> ]> <sect1 id="vlc" xreflabel="VLC-&vlc-version;"> @@ -74,17 +74,6 @@ </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> - </itemizedlist> - <bridgehead renderas="sect3">VLC Dependencies</bridgehead> <bridgehead renderas="sect4">Recommended</bridgehead> @@ -152,7 +141,6 @@ <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://www.khronos.org/openmax/">OpenMAX</ulink>, <ulink url="http://sourceforge.net/projects/schrodinger/">Schroedinger</ulink>, <ulink url="http://wiki.xiph.org/Tremor">Tremor</ulink>, @@ -182,12 +170,9 @@ <bridgehead renderas="sect4">Optional interface plugins</bridgehead> <para role="optional"> - <xref linkend="qt4"/> (required for the graphical user interface), - <xref linkend="qt5"/> (for some plugins, but currently broken with - Qt-5.5), + <xref linkend="qt5"/> (required for the graphical user interface), <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> <bridgehead renderas="sect4">Optional visualisations and video filter plugins</bridgehead> @@ -221,15 +206,6 @@ <title>Installation of VLC</title> <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 && -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> @@ -239,26 +215,15 @@ Install <application>VLC</application> by running the following commands: </para> -<screen><userinput>patch -Np1 -i ../vlc-&vlc-version;-ffmpeg3-1.patch && - -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 && make</userinput></screen> <para> - Again, if both Qt4 and 5 are installed, restore - <envar>PKG_CONFIG_PATH</envar>: - </para> - -<screen><userinput>PKG_CONFIG_PATH=$SAVEPATH && -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. + To test the results, issue: <command>make -k check</command>. + One test fails for unknown reasons. </para> <para> @@ -284,19 +249,14 @@ <title>Command Explanations</title> <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 compatibilty 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> <para> Modified: trunk/BOOK/networking/netutils/avahi.xml ============================================================================== --- trunk/BOOK/networking/netutils/avahi.xml Mon Jun 6 21:30:16 2016 (r17455) +++ trunk/BOOK/networking/netutils/avahi.xml Tue Jun 7 14:56:46 2016 (r17456) @@ -88,9 +88,8 @@ <bridgehead renderas="sect4">Optional</bridgehead> <para role="optional"> - <xref linkend="dbus-python"/>, - <xref linkend="pygtk"/> and - <xref linkend="qt4"/> + <xref linkend="dbus-python"/> and + <xref linkend="pygtk"/> </para> <para condition="html" role="usernotes">User Notes: @@ -172,13 +171,14 @@ <para> <parameter>--disable-qt3</parameter>: This parameter disables the - building of <application>Qt3</application> mainloop integration. + attempt to build the obsolete <application>Qt3</application> + portions of the package. </para> <para> - <parameter>--disable-qt4</parameter>: This parameter disables the building - of <application>Qt4Core</application> mainloop integration. Omit - this if you have installed <application>Qt4</application>. + <parameter>--disable-qt4</parameter>: This parameter disables the + attempt to build the obsolete <application>Qt4Core</application> + portions of the package. </para> <para> Modified: trunk/BOOK/networking/netutils/networkmanager.xml ============================================================================== --- trunk/BOOK/networking/netutils/networkmanager.xml Mon Jun 6 21:30:16 2016 (r17455) +++ trunk/BOOK/networking/netutils/networkmanager.xml Tue Jun 7 14:56:46 2016 (r17456) @@ -39,7 +39,7 @@ detected and re-joined automatically the next time it's available. </para> - &lfs79_checked; + &lfs79_checked;&gcc6_checked; <bridgehead renderas="sect3">Package Information</bridgehead> <itemizedlist spacing="compact"> @@ -105,7 +105,7 @@ <para role="optional"> <xref linkend="bluez"/>, <xref linkend="gtk-doc"/>, - <xref linkend="qt4"/>, + <xref linkend="qt5"/> (for examples), <xref linkend="valgrind"/>, <ulink url="http://libteam.org/">libteam</ulink>, and <ulink url="http://www.freedesktop.org/software/ModemManager/"> @@ -120,12 +120,20 @@ <sect2 role="installation"> <title>Installation of NetworkManager</title> + <para>If <xref linkend="qt5"/> is installed and the Qt based + examples are desired, fix the configure script:</para> + +<screen><userinput>sed -e '/Qt[CDN]/s/Qt/Qt5/g' \ + -e 's/moc_location/host_bins/' \ + -i configure</userinput></screen> + <para> Install <application>NetworkManager</application> by running the following commands: </para> -<screen><userinput>./configure --prefix=/usr \ +<screen><userinput>CXXFLAGS="-O2 -fPIC" \ +./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --with-nmtui \ @@ -151,6 +159,11 @@ <title>Command Explanations</title> <para> + <envar>CXXFLAGS="-O2 -fPIC"</envar>: These compiler options are + necessary to build the Qt5 based examples. + </para> + + <para> <parameter>--with-nmtui</parameter>: This parameter enables build of <command>nmtui</command>. </para> Modified: trunk/BOOK/packages.ent ============================================================================== --- trunk/BOOK/packages.ent Mon Jun 6 21:30:16 2016 (r17455) +++ trunk/BOOK/packages.ent Tue Jun 7 14:56:46 2016 (r17456) @@ -787,7 +787,7 @@ <!ENTITY mplayer-version "SVN-r37794"> <!ENTITY xine-ui-version "0.99.9"> <!ENTITY transcode-version "1.1.7"> -<!ENTITY vlc-version "2.2.3"> +<!ENTITY vlc-version "3.0.0-20160606"> <!-- Chapter 49 --> <!ENTITY cdrdao-version "1.2.3"> -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page