Author: dj Date: Sun Jan 24 19:56:13 2016 New Revision: 16839 Log: partial cleanup of -systemd.xml files
Deleted: branches/systemd/general/genlib/libgusb-systemd.xml branches/systemd/general/genlib/qca-systemd.xml Modified: branches/systemd/general/genlib/genlib.xml branches/systemd/general/genlib/libdrm-systemd.xml branches/systemd/general/genlib/libdrm.xml branches/systemd/general/genlib/libgusb.xml branches/systemd/general/genlib/qca.xml Modified: branches/systemd/general/genlib/genlib.xml ============================================================================== --- branches/systemd/general/genlib/genlib.xml Sun Jan 24 12:02:10 2016 (r16838) +++ branches/systemd/general/genlib/genlib.xml Sun Jan 24 19:56:13 2016 (r16839) @@ -72,7 +72,7 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libcroco.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libdaemon.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libdbusmenuqt.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libdrm-systemd.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libdrm.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libesmtp.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libevdev-systemd.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libffi.xml"/> @@ -80,7 +80,7 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libgpg-error-systemd.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libgsf.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libgudev.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libgusb-systemd.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libgusb.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libical.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libidn.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libinput-systemd.xml"/> @@ -113,7 +113,7 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="popt.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="pth.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="ptlib.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="qca-systemd.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="qca.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="qjson.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="talloc.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="wayland-systemd.xml"/> Modified: branches/systemd/general/genlib/libdrm-systemd.xml ============================================================================== Binary file (source and/or target). No diff available. Modified: branches/systemd/general/genlib/libdrm.xml ============================================================================== --- branches/systemd/general/genlib/libdrm.xml Sun Jan 24 12:02:10 2016 (r16838) +++ branches/systemd/general/genlib/libdrm.xml Sun Jan 24 19:56:13 2016 (r16839) @@ -6,10 +6,10 @@ <!ENTITY libdrm-download-http "http://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.bz2";> <!ENTITY libdrm-download-ftp " "> - <!ENTITY libdrm-md5sum "543b2d28359ef33974fa0e772dd61732"> - <!ENTITY libdrm-size "628 KB"> - <!ENTITY libdrm-buildsize "15 MB (with the test suite)"> - <!ENTITY libdrm-time "0.4 SBU (up to an additional 2.0 SBU for the test suite)"> + <!ENTITY libdrm-md5sum "c6809c48538d6e5999588832045ff014"> + <!ENTITY libdrm-size "680 KB"> + <!ENTITY libdrm-buildsize "17 MB (with tests)"> + <!ENTITY libdrm-time "0.8 SBU (with tests)"> ]> <sect1 id="libdrm" xreflabel="libdrm-&libdrm-version;"> @@ -82,7 +82,6 @@ <bridgehead renderas="sect4">Optional</bridgehead> <para role="optional"> - <xref linkend="cairo"/> (for the testsuite), <xref linkend="DocBook"/>, <xref linkend="docbook-xsl"/> and <xref linkend="libxslt"/> (to build manual pages), and @@ -102,13 +101,19 @@ commands: </para> -<screen><userinput>sed -e "/pthread-stubs/d" -i configure.ac && -autoreconf -fiv && +<screen><userinput>sed -e "/pthread-stubs/d" \ + -i configure.ac && +autoreconf -fiv && + ./configure --prefix=/usr --enable-udev && + make</userinput></screen> <para> - To check the results, issue <command>make check</command>. + To check the results, issue <command>make check</command>. Tests may hang + for unknown reasons. If nouveau threaded test hangs, you can disable it + with + <command>sed -i 's/^TESTS/#&/' tests/nouveau/Makefile.in</command>. </para> <para> @@ -132,6 +137,11 @@ <parameter>--enable-udev</parameter>: This parameter enables support for using <application>Udev</application> instead of <command>mknod</command>. </para> +<!-- + <para> + <parameter>-\-disable-valgrind</parameter>: This parameter fixes a hard dependency on + <application>Valgrind</application>. + </para> --> </sect2> @@ -148,12 +158,11 @@ None </seg> <seg> - libdrm.so, libdrm_amdgpu.so, libdrm_intel.so, libdrm_nouveau.so, - libdrm_radeon.so and libkms.so + libdrm_amdgpu.so, libdrm_intel.so, libdrm_nouveau.so, + libdrm_radeon.so, libdrm.so, and libkms.so </seg> <seg> - /usr/include/libdrm and - /usr/include/libkms + /usr/include/lib{drm,kms} </seg> </seglistitem> </segmentedlist> @@ -163,23 +172,11 @@ <?dbfo list-presentation="list"?> <?dbhtml list-presentation="table"?> - <varlistentry id="libdrm-lib"> - <term><filename class="libraryfile">libdrm.so</filename></term> - <listitem> - <para> - contains the Direct Rendering Manager API functions. - </para> - <indexterm zone="libdrm libdrm-lib"> - <primary sortas="c-libdrm">libdrm.so</primary> - </indexterm> - </listitem> - </varlistentry> - <varlistentry id="libdrm_amdgpu"> <term><filename class="libraryfile">libdrm_amdgpu.so</filename></term> <listitem> <para> - contains the AMD specific DRM functions. + contains the AMDGPU specific Direct Rendering Manager functions. </para> <indexterm zone="libdrm libdrm_amdgpu"> <primary sortas="c-libdrm_amdgpu">libdrm_amdgpu.so</primary> @@ -212,6 +209,18 @@ </indexterm> </listitem> </varlistentry> + + <varlistentry id="libdrm-lib"> + <term><filename class="libraryfile">libdrm.so</filename></term> + <listitem> + <para> + contains the Direct Rendering Manager API functions. + </para> + <indexterm zone="libdrm libdrm-lib"> + <primary sortas="c-libdrm">libdrm.so</primary> + </indexterm> + </listitem> + </varlistentry> <varlistentry id="libdrm_radeon"> <term><filename class="libraryfile">libdrm_radeon.so</filename></term> Modified: branches/systemd/general/genlib/libgusb.xml ============================================================================== Binary file (source and/or target). No diff available. Modified: branches/systemd/general/genlib/qca.xml ============================================================================== --- branches/systemd/general/genlib/qca.xml Sun Jan 24 12:02:10 2016 (r16838) +++ branches/systemd/general/genlib/qca.xml Sun Jan 24 19:56:13 2016 (r16839) @@ -4,12 +4,12 @@ <!ENTITY % general-entities SYSTEM "../../general.ent"> %general-entities; - <!ENTITY qca-download-http "http://delta.affinix.com/download/qca/2.0/qca-&qca-version;.tar.bz2";> + <!ENTITY qca-download-http "http://download.kde.org/stable/qca/&qca-version;/src/qca-&qca-version;.tar.xz";> <!ENTITY qca-download-ftp " "> - <!ENTITY qca-md5sum "c2b00c732036244701bae4853a2101cf"> - <!ENTITY qca-size "933 KB"> - <!ENTITY qca-buildsize "29.2 MB"> - <!ENTITY qca-time "1.9 SBU"> + <!ENTITY qca-md5sum "657cc701316600199199a6b6cb2c73c9"> + <!ENTITY qca-size "676 KB"> + <!ENTITY qca-buildsize "28 MB"> + <!ENTITY qca-time "1.2 SBU (additional 0.3 SBU for the tests)"> ]> <sect1 id="qca" xreflabel="qca-&qca-version;"> @@ -34,7 +34,7 @@ and conventions. <application>Qca</application> separates the API from the implementation, using plugins known as Providers.</para> - &lfs76_checked; + &lfs78_checked; <bridgehead renderas="sect3">Package Information</bridgehead> <itemizedlist spacing="compact"> @@ -62,25 +62,24 @@ <bridgehead renderas="sect4">Required</bridgehead> <para role="required"> - <xref linkend="cmake"/> and - <xref linkend="qt4"/> - </para> - - <bridgehead renderas="sect4">Recommended</bridgehead> - <para role="recommended"> - <xref linkend="cacerts"/> + <xref linkend="cacerts"/>, + <xref linkend="cmake"/>, + <xref linkend="qt4"/> or <xref linkend="qt5"/>, and + <xref linkend="which"/> </para> <bridgehead renderas="sect4">Optional</bridgehead> - <para role="optional"> - <xref linkend="cyrus-sasl"/>, - <xref linkend="gnupg2"/>, - <xref linkend="libgcrypt"/>, - <xref linkend="nss"/>, - <xref linkend="openssl"/>, - <xref linkend="qt5"/>, - <ulink url="http://botan.randombit.net/";>Botan</ulink> and - <ulink url="https://github.com/OpenSC/pkcs11-helper";>pkcs11-helper</ulink> + <para role="Optional"> + <xref linkend="cyrus-sasl"/>, + <xref linkend="gnupg2"/>, + <xref linkend="libgcrypt"/>, + <xref linkend="libgpg-error"/>, + <xref linkend="nss"/>, + <xref linkend="nspr"/>, + <xref linkend="openssl"/>, + <xref linkend="p11-kit"/>, + <xref linkend="doxygen"/>, and + <xref linkend="which"/> </para> <para condition="html" role="usernotes">User Notes: @@ -91,21 +90,21 @@ <sect2 role="installation"> <title>Installation of Qca</title> + <para>If desired, remove a lot of irritating warnings when building:</para> + +<screen><userinput>sed -i 's/BSD/DEFAULT/' CMakeLists.txt</userinput></screen> + <para>Install <application>Qca</application> by running the following commands:</para> <screen><userinput>mkdir build && cd build && -cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DQT4_BUILD=ON \ - -DQCA_DOC_INSTALL_DIR=/usr/share/doc/qca-2.1.0 \ - -DQCA_FEATURE_INSTALL_DIR=/usr/share/qt4/mkspecs/features \ - -DQCA_INCLUDE_INSTALL_DIR=/usr/include/qt4 \ - -DQCA_PRIVATE_INCLUDE_INSTALL_DIR=/usr/include/qt4 \ - -DQCA_PLUGINS_INSTALL_DIR=/usr/lib/qt4/plugins \ - -Wno-dev .. && +cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \ + -DCMAKE_BUILD_TYPE=Release \ + -DQT4_BUILD=ON \ + -DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man \ + .. && make</userinput></screen> @@ -115,46 +114,20 @@ <screen role="root"><userinput>make install</userinput></screen> - <para> - If <application>Qt4</application> isn't installed in - <filename class="directory">/usr</filename>, ensure - it can properly find the modules installed by this - package by running the following commands as the - <systemitem class="username">root</systemitem> user: - </para> - -<screen role="root"><userinput>if [[ ${QT4DIR} != "/usr" ]] -then - ln -sfv /usr/include/qt4/QtCrypto \ - ${QT4DIR}/include/qt4/ && - ln -sfv /usr/share/qt4/mkspecs/features/crypto.prf \ - ${QT4DIR}/share/qt4/mkspecs/features/ && - - install -v -dm755 ${QT4DIR}/lib/qt4/plugins/crypto && - - for file in /usr/lib/qt4/plugins/crypto/* - do - ln -sfv ${file} ${QT4DIR}/lib/qt4/plugins/crypto/ - done && - - unset file -fi</userinput></screen> - </sect2> <sect2 role="commands"> <title>Command Explanations</title> - <para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used - to apply higher level of the compiler optimizations.</para> - - <para><parameter>-DQT4_BUILD=ON</parameter>: This switch is used to ensure - that <application>Qt4</application> version of the library is built even if - <application>Qt5</application> is present.</para> - - <para><parameter>-DQCA_*_INSTALL_DIR=...</parameter>: These switches are used - to ensure that files depending on the <application>Qt4</application> - installation prefix are installed in the correct locations.</para> + <para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is + used to apply a higher level of compiler optimizations.</para> + + <para><parameter>-DQT4_BUILD=ON</parameter>: This switch is used to force + building with Qt4 even if Qt5 is found. There are no packages in BLFS + that use the Qt5 version of Qca.</para> + + <para><parameter>-DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man</parameter>: + Install the qca man page in the normal location.</para> </sect2> @@ -167,16 +140,12 @@ <segtitle>Installed Directories</segtitle> <seglistitem> - <seg>mozcerts and qcatool2</seg> - <seg>libqca.so</seg> + <seg>mozcerts and qcatool (if building with Qt5, the binaries have a -qt5 suffix)</seg> + <seg>libqca.so (libqca-qt5.so if building with Qt5) and plugins at &qt4-dir;/lib/qca/crypto</seg> <seg> - /usr/include/qt4/QtCrypto, - /usr/lib/cmake/Qca, - /usr/lib/qt4/plugins/crypto and, - depending on the <application>Qt4</application> - installation prefix, - $QT4DIR/include/qt4/QtCrypto and - $QT4DIR/lib/qt4/plugins/crypto + &qt4-dir;/include/QtCrypto (or &qt5-dir;/include/Qca-qt5), + &qt4-dir;/lib/cmake/Qca (or &qt5-dir;/lib/cmake/Qca-qt5) and + &qt4-dir;/lib/qca (or &qt5-dir;/lib/qca-qt5) </seg> </seglistitem> </segmentedlist> @@ -197,13 +166,13 @@ </listitem> </varlistentry> - <varlistentry id="qcatool2"> - <term><command>qcatool2</command></term> + <varlistentry id="qcatool"> + <term><command>qcatool</command></term> <listitem> <para>is a command line tool for performing various cryptographic - operations with Qca.</para> - <indexterm zone="qca qcatool2"> - <primary sortas="b-qcatool2">qcatool2</primary> + operations with Qca.</para> + <indexterm zone="qca qcatool"> + <primary sortas="b-qcatool">qcatool</primary> </indexterm> </listitem> </varlistentry> -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
