Author: krejzi Date: Fri Aug 23 18:12:18 2013 New Revision: 11682 Log: revert some parts of previous two commits
Added: trunk/BOOK/archive/qt.xml (contents, props changed) trunk/BOOK/multimedia/hwaccel/ trunk/BOOK/multimedia/hwaccel/hwaccel.xml (contents, props changed) trunk/BOOK/multimedia/hwaccel/libva.xml (contents, props changed) trunk/BOOK/multimedia/hwaccel/libvdpau.xml (contents, props changed) Deleted: trunk/BOOK/archive/qt4.xml trunk/BOOK/x/installing/libva.xml trunk/BOOK/x/installing/libvdpau.xml Modified: trunk/BOOK/multimedia/multimedia.xml trunk/BOOK/x/installing/x7driver.xml trunk/BOOK/x/lib/qt4.xml Added: trunk/BOOK/archive/qt.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/BOOK/archive/qt.xml Fri Aug 23 18:12:18 2013 (r11682) @@ -0,0 +1,563 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ + <!ENTITY % general-entities SYSTEM "../../general.ent"> + %general-entities; + + <!ENTITY qt-download-http "&trinity-repo-http;/qt3-3.3.8.d.tar.gz"> + <!ENTITY qt-download-ftp "&trinity-repo-ftp;/qt3-3.3.8.d.tar.gz "> + <!ENTITY qt-md5sum "78dc675e84aed595375449818cbb589a"> + <!ENTITY qt-size "16.8 MB"> + <!ENTITY qt-buildsize "801 MB"> + <!ENTITY qt-time "8.6 SBU"> +]> + +<sect1 id="qt" xreflabel="Qt-&qt-version;"> + <?dbhtml filename="qt.html" ?> + + <sect1info> + <othername>$LastChangedBy$</othername> + <date>$Date$</date> + </sect1info> + + <title>Qt-&qt-version;</title> + + <indexterm zone="qt"> + <primary sortas="a-qt">Qt</primary> + </indexterm> + + <sect2 role="package"> + <title>Introduction to Qt</title> + + <para>The <application>Qt</application> package contains a + <application>C++</application> GUI library. This is useful for creating + graphical applications or executing graphical applications that are + dynamically linked to the <application>Qt</application> library. Two of + the major users of <application>Qt</application> are + <application>KDE</application> and its follow on project, + <application>Trinity</application>.</para> + + <bridgehead renderas="sect3">Package Information</bridgehead> + <itemizedlist spacing="compact"> + <listitem> + <para>Download (HTTP): <ulink url="&qt-download-http;"/></para> + </listitem> + <listitem> + <para>Download (FTP): <ulink url="&qt-download-ftp;"/></para> + </listitem> + <listitem> + <para>Download MD5 sum: &qt-md5sum;</para> + </listitem> + <listitem> + <para>Download size: &qt-size;</para> + </listitem> + <listitem> + <para>Estimated disk space required: &qt-buildsize;</para> + </listitem> + <listitem> + <para>Estimated build time: &qt-time;</para> + </listitem> + </itemizedlist> + + <bridgehead renderas="sect3">Additional Downloads</bridgehead> + <itemizedlist spacing='compact'> + <listitem> + <para>Required Patch: <ulink + url="&patch-root;/qt-3.3.8.d-libpng15-1.patch"/> + </para> + </listitem> + </itemizedlist> + + <bridgehead renderas="sect3">Qt Dependencies</bridgehead> + + <bridgehead renderas="sect4">Required</bridgehead> + <para role="required"><xref linkend="x-window-system"/></para> + + <bridgehead renderas="sect4">Recommended</bridgehead> + <para role="recommended"> + <xref linkend="libjpeg"/> and + <xref linkend="libmng"/> + </para> + + <para>Note: if for whatever reason you do not have the recommended + libraries installed on your system, you must remove the corresponding + <parameter>-system-<replaceable><library></replaceable></parameter> and + <parameter>-plugin-imgfmt-<replaceable><library></replaceable></parameter> + parameters from the <command>configure</command> commands shown in the + instructions below.</para> + + <bridgehead renderas="sect4">Optional</bridgehead> + <para role="optional"> + <xref linkend="cups"/>, + <xref linkend="mysql"/>, + <xref linkend="postgresql"/>, + <xref linkend="unixodbc"/>, + <xref linkend="sqlite"/>, and + <ulink url="http://firebird.sourceforge.net/";>Firebird</ulink> + </para> + + <para condition="html" role="usernotes">User Notes: + <ulink url="&blfs-wiki;/qt"/></para> + + </sect2> + + <sect2 role="installation"> + <title>Installation of Qt</title> + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; + href="../../xincludes/X11R6_symlink.xml"/> + + <para>There are several ways to install a complicated package such as + <application>Qt</application>. The files are not completely position + independent. Installation procedures execute the program + <command>pkg-config</command> to determine the location of package + executables, libraries, headers, and other files. For + <application>Qt</application>, <command>pkg-config</command> will look + for the file <filename>lib/pkgconfig/qt-mt.pc</filename> which must be + modified if relocating the package. This file is set up correctly by + the build process.</para> + + <para>The default installation places the files in + <filename class='directory'>/usr/local/qt/</filename>. Many commercial + distributions place the files in the system's + <filename class='directory'>/usr</filename> hierarchy. The package can + also be installed in an arbitrary directory.</para> + + <para>This section will demonstrate two different methods.</para> + + <warning> + <para>Building <application>Qt</application> in a + <command>chroot</command> environment may fail.</para> + </warning> + + <note> + <para>The build time for <application>Qt</application> is quite long. If + you want to save some time and don't want the tutorials and examples, + change the first <command>make</command> command to:</para> + +<screen><userinput>make sub-tools</userinput></screen> + + </note> + + <sect3> + <title>Method 1 - Installing in the '/usr' Hierarchy</title> + + <para>The advantage of this method is that no updates to the + <filename>/etc/ld.so.conf</filename> or + <filename>/etc/man_db.conf</filename> files are required. The package + files are distributed within several subdirectories of the + <filename class='directory'>/usr</filename> hierarchy. + This is the method that most commercial distributions use.</para> + + <note> + <para>If <application>Qt</application> is being reinstalled, run the + following commands from a console or non-Qt based window manager. + It overwrites <application>Qt</application> libraries that should not + be in use during the install process.</para> + </note> + +<screen><userinput>sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf && + +bash +export PATH=$PWD/bin:$PATH && +export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH && + +patch -Np1 -i ../qt-3.3.8.d-libpng15-1.patch && + +./configure -prefix /usr \ + -docdir /usr/share/doc/qt \ + -headerdir /usr/include/qt \ + -plugindir /usr/lib/qt/plugins \ + -datadir /usr/share/qt \ + -sysconfdir /etc/qt \ + -translationdir /usr/share/qt/translations \ + -qt-gif \ + -system-zlib \ + -system-libpng \ + -system-libjpeg \ + -system-libmng \ + -plugin-imgfmt-png \ + -plugin-imgfmt-jpeg \ + -plugin-imgfmt-mng \ + -no-exceptions \ + -thread \ + -tablet && + +make && +exit</userinput></screen> + + <para>This package does not come with a test suite.</para> + + <para>Now, as the <systemitem class="username">root</systemitem> + user:</para> + +<screen role="root"><userinput>make install && +ln -v -sf libqt-mt.so /usr/lib/libqt.so && +ln -v -snf ../../bin /usr/share/qt/bin && +ln -v -snf ../../include/qt /usr/share/qt/include && +ln -v -snf ../../lib /usr/share/qt/lib && +cp -v -r doc/man /usr/share && +cp -v -r examples /usr/share/doc/qt</userinput></screen> + + </sect3> + + <sect3> + <title>Method 2 - Installing in '/opt'</title> + + <para>This is the method recommended by the <application>Qt</application> + developers. It has the advantage of keeping all the package files + consolidated in a dedicated directory hierarchy. By using this method, + an update can be made without overwriting a previous installation and + users can easily revert to a previous version by changing one symbolic + link.</para> + + <para>The <application>Qt</application> developers use a default location + of <filename class='directory'>/usr/local/qt/</filename>, however this + procedure puts the files in <filename + class='directory'>/opt/qt-&qt-version;/</filename> + and then creates a symbolic link to <filename>/opt/qt/</filename>.</para> + +<screen><userinput>bash +export QTDIR=$PWD && +export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH && +export PATH=$PWD/bin:$PATH && + +patch -Np1 -i ../qt-3.3.8.d-libpng15-1.patch && + +./configure -prefix /opt/qt-&qt-version; \ + -sysconfdir /etc/qt \ + -qt-gif \ + -system-zlib \ + -system-libpng \ + -system-libjpeg \ + -system-libmng \ + -plugin-imgfmt-png \ + -plugin-imgfmt-jpeg \ + -plugin-imgfmt-mng \ + -no-exceptions \ + -thread \ + -tablet && + +make && +exit</userinput></screen> + + <para>This package does not come with a test suite.</para> + + <para>Now, as the <systemitem class="username">root</systemitem> + user:</para> + +<screen role="root"><userinput>make install && +ln -v -sfn qt-&qt-version; /opt/qt && +ln -v -s libqt-mt.so /opt/qt/lib/libqt.so && +cp -v -r doc/man examples /opt/qt/doc</userinput></screen> + + </sect3> + + </sect2> + + <sect2 role="commands"> + <title>Command Explanations</title> + + <para><command>sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf</command>: + In Method 1, <application>Qt</application> is being installed into + the standard system directories. The runtime library search path does not + need to be set in this case.</para> + + <para><command>bash</command>: This command enters a sub-shell to isolate + environment changes.</para> + + <para><command>export QTDIR=$PWD</command>: This command defines where + the root of the <application>Qt</application> directory is located.</para> + + <para><command>export LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH</command>: + This command allows the not yet installed <application>Qt</application> + libraries to be used by the not yet installed <application>Qt</application> + programs.</para> + + <para><command>export PATH=$PWD/bin:$PATH</command>: This command + allows the build process to find supporting executables.</para> + + <para><parameter>-qt-gif</parameter>: This switch adds support for + <filename>gif</filename> files to the libraries.</para> + + <para><parameter>-system-zlib -system-libpng -system-libjpeg + -system-mng</parameter>: These switches force the build instructions to use + the shared libraries that are on your system instead of creating a custom + set of support libraries for these functions.</para> + + <para><parameter>-plugin-imgfmt-png -plugin-imgfmt-jpeg + -plugin-imgfmt-mng</parameter>: These switches enable run-time linking of + the referenced libraries.</para> + + <para>If you pass the + <option>-plugin-sql-<replaceable><driver></replaceable></option> or + <option>-qt-sql-<replaceable><driver></replaceable></option> switch + to the <command>configure</command> command, you must also pass + <option>-I<replaceable></path/to/sql/headers></replaceable></option> + so <command>make</command> can find the appropriate header files. For + instance, building in <application>MySQL</application> support (as opposed + to building the plugin) will need to use <option>-I/usr/include/mysql + -qt-sql-mysql</option>.</para> + + <note> + <para>To check if <application>mysql</application> is autotetected + properly, examine the output of <command>./configure -I/usr/include/mysql + -help</command>. Other database support will require similar + <command>configure</command> parameters.</para> + </note> + + <para><parameter>-no-exceptions</parameter>: This switch disables + the exceptions coding generated by the <application>C++</application> + compiler.</para> + + <para><parameter>-thread</parameter>: This switch adds + support for multi-threading.</para> + + <para><command>ln -v -sf libqt-mt.so /usr/lib/libqt.so</command>: This + command allows <command>configure</command> scripts to find a working + <application>Qt</application> installation.</para> + + <para><command>ln -v -snf ../../bin /usr/share/qt/bin</command>: This + command and the following two allow the + <filename class="directory">/usr</filename> style installation to mimic + the <filename class="directory">/opt</filename> style installation by + making all binaries, headers and libraries available from a single + directory, <filename class="directory">/usr/share/qt</filename>.</para> + + <para><command>cp -v -r doc/man examples /usr/share (or + /opt/qt/doc)</command>: + This command installs the man pages and examples which are missed by + <command>make install</command>.</para> + + <para><command>exit</command>: This command returns to the parent shell + and eliminates the environment variables set earlier.</para> + + </sect2> + + <sect2 role="configuration"> + <title>Configuring Qt</title> + + <sect3 id='qt-config'> + <title>Configuration Information</title> + + <para>The <envar>QTDIR</envar> environment variable needs to be set when + building packages that depend on <application>Qt</application>. Add the + following to the <filename>.bash_profile</filename> initialization script + for each user that builds packages using the <application>Qt</application> + libraries. Alternatively, the variable can be set in the system wide + <filename>/etc/profile</filename> file.</para> + + <para>For Method 1 (This is optional, only set this if an application is + unable to find the installed libraries or headers):</para> + +<screen><literal>export QTDIR=/usr/share/qt</literal></screen> + + <para>or for Method 2:</para> + +<screen><literal>export QTDIR=/opt/qt</literal></screen> + + <para>If you installed <application>Qt</application> using Method 2, + you also need to update the following configuration files so that + <application>Qt</application> is correctly found by other packages + and system processes.</para> + + <para>Update the <filename>/etc/ld.so.conf</filename> and + <filename>/etc/man_db.conf</filename> files:</para> + +<screen role="root"><userinput>cat >> /etc/ld.so.conf << "EOF" && +<literal># Begin qt addition to /etc/ld.so.conf + +/opt/qt/lib + +# End qt addition</literal> +EOF +ldconfig && +cat >> /etc/man_db.conf << "EOF" +<literal># Begin qt addition to man_db.conf + +MANDATORY_MANPATH /opt/qt/doc/man +MANPATH_MAP /opt/qt/bin /opt/qt/doc/man +MANDB_MAP /opt/qt/doc/man /var/cache/man/qt + +# End qt addition to man_db.conf</literal> +EOF</userinput></screen> + + <indexterm zone="qt qt-config"> + <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary> + </indexterm> + + <indexterm zone="qt qt-config"> + <primary sortas="e-etc-man_db.conf">/etc/man_db.conf</primary> + </indexterm> + + <indexterm zone="qt qt-config"> + <primary sortas="e-etc-profile">/etc/profile</primary> + </indexterm> + + <indexterm zone="qt qt-config"> + <primary sortas="e-AA.bash_profile">~/.bash_profile</primary> + </indexterm> + + <para>Update the <envar>PKG_CONFIG_PATH</envar> environment variable + in your <filename>~/.bash_profile</filename> or + <filename>/etc/profile</filename> with the following:</para> + +<screen><literal>PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig</literal></screen> + + <para>If you want the <application>Qt</application> executables in your + shell search path, update the <envar>PATH</envar> environment variable + in your <filename>~/.bash_profile</filename> or + <filename>/etc/profile</filename> to include + <filename class='directory'>/opt/qt/bin</filename>.</para> + + <tip><para>The PATH, MANPATH, and PKG_CONFIG_PATH can be updated in + the extrapaths.sh (or other script) in the /etc/profile.d directory + if you set up the startup files as recommended in + <xref linkend='postlfs-config-profile'/>.</para></tip> + + <para>As with most libraries, there is no explicit configuration to do. + After updating <filename>/etc/ld.so.conf</filename> as explained above, + run <command>/sbin/ldconfig</command> so that <command>ldd</command> + can find the shared libraries.</para> + + </sect3> + + </sect2> + + <sect2 role="content"> + <title>Contents</title> + + <segmentedlist> + <segtitle>Installed Programs</segtitle> + <segtitle>Installed Libraries</segtitle> + <segtitle>Installed Directories</segtitle> + + <seglistitem> + <seg>assistant, designer, linguist, lrelease, lupdate, moc, + qm2ts, qmake, qtconfig, and uic</seg> + <seg>libqt-mt.so, libqt.so libqui.so, libdesignercore.a, + libeditor.a, and libqassistantclient.a</seg> + <seg>/opt/qt-&qt-version; or /usr/lib/qt, /usr/share/qt, + /usr/share/doc/qt, /usr/include/qt, and /etc/qt</seg> + </seglistitem> + </segmentedlist> + + <variablelist> + <bridgehead renderas="sect3">Short Descriptions</bridgehead> + <?dbfo list-presentation="list"?> + <?dbhtml list-presentation="table"?> + + <varlistentry id="assistant"> + <term><command>assistant</command></term> + <listitem> + <para>is a tool for presenting on-line documentation.</para> + <indexterm zone="qt assistant"> + <primary sortas="b-assistant">assistant</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="designer"> + <term><command>designer</command></term> + <listitem> + <para>is a full-fledged GUI builder. It includes + powerful features such as preview mode, automatic widget + layout, support for custom widgets, and an advanced + property editor.</para> + <indexterm zone="qt designer"> + <primary sortas="b-designer">designer</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="linguist"> + <term><command>linguist</command></term> + <listitem> + <para>provides support for translating applications into + local languages. </para> + <indexterm zone="qt linguist"> + <primary sortas="b-linguist">linguist</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="lrelease"> + <term><command>lrelease</command></term> + <listitem> + <para>is a simple command line tool. It reads a Qt project + file and produces message files used by the application.</para> + <indexterm zone="qt lrelease"> + <primary sortas="b-lrelease">lrelease</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="lupdate"> + <term><command>lupdate</command></term> + <listitem> + <para>reads a Qt project file, finds the translatable + strings in the specified source, header and Qt Designer + interface files, and produces or updates the translation + files listed in the project file.</para> + <indexterm zone="qt lupdate"> + <primary sortas="b-lupdate">lupdate</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="moc"> + <term><command>moc</command></term> + <listitem> + <para>generates Qt meta object support code.</para> + <indexterm zone="qt moc"> + <primary sortas="b-moc">moc</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="qm2ts"> + <term><command>qm2ts</command></term> + <listitem> + <para>is a tool for converting Qt message file formats.</para> + <indexterm zone="qt qm2ts"> + <primary sortas="b-qm2ts">qm2ts</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="qmake"> + <term><command>qmake</command></term> + <listitem> + <para>qmake uses information stored in project files to + determine what should go in the makefiles it generates.</para> + <indexterm zone="qt qmake"> + <primary sortas="b-qmake">qmake</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="qtconfig"> + <term><command>qtconfig</command></term> + <listitem> + <para>is used to customize the appearance of Qt applications.</para> + <indexterm zone="qt qtconfig"> + <primary sortas="b-qtconfig">qtconfig</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="uic"> + <term><command>uic</command></term> + <listitem> + <para>is a Qt user interface compiler.</para> + <indexterm zone="qt uic"> + <primary sortas="b-uic">uic</primary> + </indexterm> + </listitem> + </varlistentry> + + </variablelist> + + </sect2> + +</sect1> Added: trunk/BOOK/multimedia/hwaccel/hwaccel.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/BOOK/multimedia/hwaccel/hwaccel.xml Fri Aug 23 18:12:18 2013 (r11682) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ + <!ENTITY % general-entities SYSTEM "../../general.ent"> + %general-entities; +]> + +<!-- +$LastChangedBy$ +$Date$ +--> + +<chapter id="multimedia-hwaccel"> + <?dbhtml filename="hwaccel.html"?> + + <title>Hardware Accelerated Video Decoding Libraries and Drivers</title> + + <para> + This chapter contains libraries and hardware specific drivers which + provide interfaces to hardware video decoders. They enable hardware + accelerated video decoding in apps that support it. + </para> + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libva.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libvdpau.xml"/> + +</chapter> Added: trunk/BOOK/multimedia/hwaccel/libva.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/BOOK/multimedia/hwaccel/libva.xml Fri Aug 23 18:12:18 2013 (r11682) @@ -0,0 +1,231 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ + <!ENTITY % general-entities SYSTEM "../../general.ent"> + %general-entities; + + <!ENTITY libva-http "http://www.freedesktop.org/software/vaapi/releases";> + + <!ENTITY libva-download-http "&libva-http;/libva/libva-&libva-version;.tar.bz2"> + <!ENTITY libva-download-ftp " "> + <!ENTITY libva-md5sum "ca95b343050cf8feaf98dfe08ce0191b"> + <!ENTITY libva-size "896 KB"> + <!ENTITY libva-buildsize "20 MB"> + <!ENTITY libva-time "0.2 SBU"> + + <!ENTITY libva-intel-driver-download-http "&libva-http;/libva-intel-driver/libva-intel-driver-&libva-intel-driver-version;.tar.bz2"> + <!ENTITY libva-intel-driver-download-ftp " "> + <!ENTITY libva-intel-driver-md5sum "afdd4c91ac552a14b4d0ce93b75c88bb"> + <!ENTITY libva-intel-driver-size "840 KB"> + <!ENTITY libva-intel-driver-buildsize "22 MB"> + <!ENTITY libva-intel-driver-time "0.1 SBU"> +]> + +<sect1 id="libva" xreflabel="libva-&libva-version;"> + <?dbhtml filename="libva.html"?> + + <sect1info> + <othername>$LastChangedBy$</othername> + <date>$Date$</date> + </sect1info> + + <title>libva-&libva-version;</title> + + <indexterm zone="libva"> + <primary sortas="a-libva">libva</primary> + </indexterm> + + <sect2 role="package"> + <title>Introduction to libva</title> + + <para> + The <application>libva</application> package contains a library which + provides access to hardware accelerated video processing, using hardware + to accelerate video processing in order to offload the central processing + unit (CPU) to decode and encode compressed digital video. + </para> + + &lfs73_checked; + + <bridgehead renderas="sect3">Package Information</bridgehead> + <itemizedlist spacing="compact"> + <listitem> + <para> + Download (HTTP): <ulink url="&libva-download-http;"/> + </para> + </listitem> + <listitem> + <para> + Download (FTP): <ulink url="&libva-download-ftp;"/> + </para> + </listitem> + <listitem> + <para> + Download MD5 sum: &libva-md5sum; + </para> + </listitem> + <listitem> + <para> + Download size: &libva-size; + </para> + </listitem> + <listitem> + <para> + Estimated disk space required: &libva-buildsize; + </para> + </listitem> + <listitem> + <para> + Estimated build time: &libva-time; + </para> + </listitem> + </itemizedlist> + + <bridgehead renderas="sect3">Additional Downloads</bridgehead> + <itemizedlist spacing="compact"> + <listitem> + <para> + Intel Driver Download (HTTP): <ulink url="&libva-intel-driver-download-http;"/> + </para> + </listitem> + <listitem> + <para> + Intel Driver Download (FTP): <ulink url="&libva-intel-driver-download-ftp;"/> + </para> + </listitem> + <listitem> + <para> + Intel Driver Download MD5 sum: &libva-intel-driver-md5sum; + </para> + </listitem> + <listitem> + <para> + Intel Driver Download size: &libva-intel-driver-size; + </para> + </listitem> + <listitem> + <para> + Estimated disk space required: &libva-intel-driver-buildsize; + </para> + </listitem> + <listitem> + <para> + Estimated build time: &libva-intel-driver-time; + </para> + </listitem> + </itemizedlist> + + <bridgehead renderas="sect3">libva Dependencies</bridgehead> + + <bridgehead renderas="sect4">Required</bridgehead> + <para role="required"> + <xref linkend="mesalib"/> + </para> + + <bridgehead renderas="sect4">Optional</bridgehead> + <para role="optional"> + <xref linkend="doxygen"/> and + <ulink url="http://wayland.freedesktop.org/";>Wayland</ulink> + </para> + + <para condition="html" role="usernotes"> + User Notes: <ulink url="&blfs-wiki;/libva"/> + </para> + </sect2> + + <sect2 role="installation"> + <title>Installation of libva</title> + + <para> + Install <application>libva</application> by running the following + commands: + </para> + +<screen><userinput>./configure --prefix=/usr && +make</userinput></screen> + + <para> + This package does not come with a test suite. + </para> + + <para> + Now, as the <systemitem class="username">root</systemitem> user: + </para> + +<screen role="root"><userinput>make install</userinput></screen> + + </sect2> + + <sect2 role="installation"> + <title>Installation of libva-intel-driver</title> + + <para> + Install <application>libva-intel-driver</application> by running the + following commands: + </para> + +<screen><userinput>./configure --prefix=/usr && +make</userinput></screen> + + <para> + This package does not come with a test suite. + </para> + + <para> + Now, as the <systemitem class="username">root</systemitem> user: + </para> + +<screen role="root"><userinput>make install</userinput></screen> + + </sect2> + + <sect2 role="content"> + <title>Contents</title> + + <segmentedlist> + <segtitle>Installed Programs</segtitle> + <segtitle>Installed Libraries</segtitle> + <segtitle>Installed Drivers</segtitle> + <segtitle>Installed Directory</segtitle> + + <seglistitem> + <seg> + avcenc, h264encode, loadjpeg, mpeg2vaenc, mpeg2vldemo, + putsurface, putsurface_wayland and vainfo + </seg> + <seg> + libva-drm.so, libva-egl.so, libva-glx.so, libva.so, + libva-tpi.so, libva-wayland.so and libva-x11.so + </seg> + <seg> + dummy_drv_video.so and i965_drv_video.so + </seg> + <seg> + /usr/include/va + </seg> + </seglistitem> + </segmentedlist> + + <variablelist> + <bridgehead renderas="sect3">Short Descriptions</bridgehead> + <?dbfo list-presentation="list"?> + <?dbhtml list-presentation="table"?> + + <varlistentry id="libva-lib"> + <term><filename class="libraryfile">libva.so</filename></term> + <listitem> + <para> + contains API functions which provide access to hardware + accelerated video processing. + </para> + <indexterm zone="libva libva-lib"> + <primary sortas="c-libva">libva.so</primary> + </indexterm> + </listitem> + </varlistentry> + + </variablelist> + + </sect2> + +</sect1> Added: trunk/BOOK/multimedia/hwaccel/libvdpau.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/BOOK/multimedia/hwaccel/libvdpau.xml Fri Aug 23 18:12:18 2013 (r11682) @@ -0,0 +1,165 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ + <!ENTITY % general-entities SYSTEM "../../general.ent"> + %general-entities; + + <!ENTITY libvdpau-download-http "http://people.freedesktop.org/~aplattner/vdpau/libvdpau-&libvdpau-version;.tar.gz";> + <!ENTITY libvdpau-download-ftp " "> + <!ENTITY libvdpau-md5sum "cb81b0c3b7d32b2b2a51894ef05b95ce"> + <!ENTITY libvdpau-size "476 KB"> + <!ENTITY libvdpau-buildsize "4.0 MB"> + <!ENTITY libvdpau-time "0.1 SBU"> +]> + +<sect1 id="libvdpau" xreflabel="libvdpau-&libvdpau-version;"> + <?dbhtml filename="libvdpau.html"?> + + <sect1info> + <othername>$LastChangedBy$</othername> + <date>$Date$</date> + </sect1info> + + <title>libvdpau-&libvdpau-version;</title> + + <indexterm zone="libvdpau"> + <primary sortas="a-libvdpau">libvdpau</primary> + </indexterm> + + <sect2 role="package"> + <title>Introduction to libvdpau</title> + + <para> + The <application>libvdpau</application> package contains a library which + allows video programs to offload portions of the video decoding process + and video post-processing to the GPU video-hardware. + </para> + + &lfs73_checked; + + <bridgehead renderas="sect3">Package Information</bridgehead> + <itemizedlist spacing="compact"> + <listitem> + <para> + Download (HTTP): <ulink url="&libvdpau-download-http;"/> + </para> + </listitem> + <listitem> + <para> + Download (FTP): <ulink url="&libvdpau-download-ftp;"/> + </para> + </listitem> + <listitem> + <para> + Download MD5 sum: &libvdpau-md5sum; + </para> + </listitem> + <listitem> + <para> + Download size: &libvdpau-size; + </para> + </listitem> + <listitem> + <para> + Estimated disk space required: &libvdpau-buildsize; + </para> + </listitem> + <listitem> + <para> + Estimated build time: &libvdpau-time; + </para> + </listitem> + </itemizedlist> + + <bridgehead renderas="sect3">libvdpau Dependencies</bridgehead> + + <bridgehead renderas="sect4">Required</bridgehead> + <para role="required"> + <xref linkend="xorg7-lib"/> + </para> + + <bridgehead renderas="sect4">Optional</bridgehead> + <para role="optional"> + <xref linkend="doxygen"/>, + <xref linkend="graphviz"/> and + <xref linkend="texlive"/> + </para> + + <bridgehead renderas="sect4">Runtime Dependency</bridgehead> + <para role="optional"> + <xref linkend="mesalib"/> + </para> + + <para condition="html" role="usernotes"> + User Notes: <ulink url="&blfs-wiki;/libvdpau"/> + </para> + </sect2> + + <sect2 role="installation"> + <title>Installation of libvdpau</title> + + <para> + Install <application>libvdpau</application> by running the following + commands: + </para> + +<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc && +make</userinput></screen> + + <para> + To test the results, issue: <command>make check</command>. + </para> + + <para> + Now, as the <systemitem class="username">root</systemitem> user: + </para> + +<screen role="root"><userinput>make install</userinput></screen> + + </sect2> + + <sect2 role="content"> + <title>Contents</title> + + <segmentedlist> + <segtitle>Installed Programs</segtitle> + <segtitle>Installed Library</segtitle> + <segtitle>Installed Directories</segtitle> + + <seglistitem> + <seg> + None + </seg> + <seg> + libvdpau.so + </seg> + <seg> + /usr/include/libvdpau and + /usr/lib/libvdpau + </seg> + </seglistitem> + </segmentedlist> + + <variablelist> + <bridgehead renderas="sect3">Short Descriptions</bridgehead> + <?dbfo list-presentation="list"?> + <?dbhtml list-presentation="table"?> + + <varlistentry id="libvdpau-lib"> + <term><filename class="libraryfile">libvdpau.so</filename></term> + <listitem> + <para> + contains functions to offload portions of the video decoding + process and video post-processing to the GPU video-hardware. + </para> + <indexterm zone="libvdpau libvdpau-lib"> + <primary sortas="c-libvdpau">libvdpau.so</primary> + </indexterm> + </listitem> + </varlistentry> + + </variablelist> + + </sect2> + +</sect1> Modified: trunk/BOOK/multimedia/multimedia.xml ============================================================================== --- trunk/BOOK/multimedia/multimedia.xml Fri Aug 23 15:54:33 2013 (r11681) +++ trunk/BOOK/multimedia/multimedia.xml Fri Aug 23 18:12:18 2013 (r11682) @@ -16,6 +16,7 @@ <title>Multimedia</title> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libdriv/libdriv.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="hwaccel/hwaccel.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="audioutils/audioutils.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="videoutils/videoutils.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="cdwriteutils/cdwriteutils.xml"/> Modified: trunk/BOOK/x/installing/x7driver.xml ============================================================================== --- trunk/BOOK/x/installing/x7driver.xml Fri Aug 23 15:54:33 2013 (r11681) +++ trunk/BOOK/x/installing/x7driver.xml Fri Aug 23 18:12:18 2013 (r11682) @@ -160,24 +160,6 @@ </sect3> - <sect3 id="hw-video-acceleration"> - <title>Hardware Video Acceleration</title> - - <itemizedlist spacing="compact"> - <listitem> - <para> - <xref linkend="libva"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="libvdpau"/> - </para> - </listitem> - </itemizedlist> - - </sect3> - </sect2> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; @@ -237,10 +219,4 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="x7driver-vmware.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; - href="libva.xml"/> - - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; - href="libvdpau.xml"/> - </sect1> Modified: trunk/BOOK/x/lib/qt4.xml ============================================================================== --- trunk/BOOK/x/lib/qt4.xml Fri Aug 23 15:54:33 2013 (r11681) +++ trunk/BOOK/x/lib/qt4.xml Fri Aug 23 18:12:18 2013 (r11682) @@ -39,7 +39,7 @@ of <application>Qt</application> is <application>KDE</application>. </para> - &lfs74_checked; + &lfs73_checked; <bridgehead renderas="sect3">Package Information</bridgehead> <itemizedlist spacing="compact"> @@ -79,8 +79,9 @@ <bridgehead renderas="sect4">Required</bridgehead> <para role="required"> - <xref linkend="alsa-lib"/> and - <xref linkend="mesalib"/> + <xref linkend="alsa-lib"/>, + <xref linkend="mesalib"/> and + <xref linkend="qtchooser"/> </para> <bridgehead renderas="sect4">Recommended</bridgehead> @@ -93,7 +94,7 @@ <xref linkend="libmng"/>, <xref linkend="libpng"/>, <xref linkend="libtiff"/>, - <xref linkend="openssl"/>, and + <xref linkend="openssl"/> and <xref linkend="sqlite"/> </para> @@ -104,8 +105,7 @@ <xref linkend="gst-plugins-base"/> (For QtWebKit HTML5 Video), <xref linkend="mysql"/>, <xref linkend="postgresql"/>, - <xref linkend="pulseaudio"/>, - <xref linkend="qtchooser"/> (if also installing Qt5), and + <xref linkend="pulseaudio"/> and <xref linkend="unixodbc"/> </para> @@ -117,51 +117,7 @@ <sect2 role="installation"> <title>Installation of Qt</title> - <para> - - There are several ways to install a complicated package such as - <application>Qt</application>. The files are not completely position - independent. Installation procedures execute the program - <command>pkg-config</command> to determine the location of package - executables, libraries, headers, and other files. For - <application>Qt</application>, <command>pkg-config</command> will look - for the appropriate <filename>lib/pkgconfig/Qt*.pc</filename> files - which must be modified if relocating the package. These files are set up - correctly by the build process. - </para> - - <para> - The default installation places the files in <filename - class='directory'>/usr/local/qt/</filename>. Many commercial - distributions place the files in the system's <filename - class='directory'>/usr</filename> hierarchy. The package can also be - installed in an arbitrary directory. - </para> - - <para> - The advantage of installing in <filename - class='directory'>/usr</filename> is that no updates to the - <filename>/etc/ld.so.conf</filename> or - <filename>/etc/man_db.conf</filename> files are required. The package - files are distributed within several subdirectories of the <filename - class='directory'>/usr</filename> hierarchy. This is the method that - most commercial distributions use. It is also supported by the - optional <application>qtchooser</application> application. - </para> - - <para> - The advantage of installing <application>Qt4</application> in a custom - directory such as <filename - class='directory'>/opt/qt-&qt4-version;</filename> is that it keeps all - the package files consolidated in a dedicated directory hierarchy. By - using this method, an update can be made without overwriting a previous - installation and users can easily revert to a previous version by - changing one symbolic link or merely changing the PATH variable. It - also allows a developer to maintain multiple versions of - <application>Qt4</application> for testing. - </para> - - <warning> + <warning> <para> If you did not install some of the recommended dependencies, examine <command>./configure --help</command> output to check how to disable @@ -171,8 +127,7 @@ <caution> <para> - If <application>Qt</application> is being reinstalled into the - same directory as an existing instance, run the + If <application>Qt</application> is being reinstalled, run the following commands from a console or non-Qt based window manager. It overwrites <application>Qt</application> libraries that should not be in use during the install process. @@ -188,8 +143,6 @@ </para> </note> - <bridgehead renderas="sect3">Method 1: Installing in /usr</bridgehead> - <para> Install <application>Qt</application> by running the following commands: @@ -198,31 +151,30 @@ <screen><userinput>sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \ config.tests/unix/libmng/libmng.cpp && -./configure -prefix /usr \ - -bindir /usr/lib/qt4/bin \ - -plugindir /usr/lib/qt4/plugins \ - -importdir /usr/lib/qt4/imports \ - -headerdir /usr/include/qt4 \ - -datadir /usr/share/qt4 \ - -sysconfdir /etc/xdg \ - -docdir /usr/share/doc/qt4 \ - -demosdir /usr/share/doc/qt4/demos \ - -examplesdir /usr/share/doc/qt4/examples \ +./configure -confirm-license \ + -opensource \ + -release \ + -prefix /usr \ + -bindir /usr/lib/qt4/bin \ + -headerdir /usr/include/qt4 \ + -datadir /usr/share/qt4 \ + -plugindir /usr/lib/qt4/plugins \ + -importdir /usr/lib/qt4/imports \ -translationdir /usr/share/qt4/translations \ - -confirm-license \ - -opensource \ - -release \ - -dbus-linked \ - -openssl-linked \ - -system-sqlite \ - -no-phonon \ + -sysconfdir /etc/xdg \ + -docdir /usr/share/doc/qt4 \ + -demosdir /usr/share/doc/qt4/demos \ + -examplesdir /usr/share/doc/qt4/examples \ + -dbus-linked \ + -openssl-linked \ + -system-sqlite \ + -no-phonon \ -no-phonon-backend \ - -no-nis \ - -no-openvg \ - -nomake demos \ - -nomake examples \ - -optimized-qmake && - + -no-nis \ + -no-openvg \ + -nomake demos \ + -nomake examples \ + -optimized-qmake && make</userinput></screen> <para> @@ -236,13 +188,13 @@ <screen role="root"><userinput>make install && rm -rf /usr/tests && install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \ - /usr/share/pixmaps/qt4logo.png && + /usr/share/pixmaps/qt4logo.png && install -v -Dm644 tools/assistant/tools/assistant/images/assistant-128.png \ /usr/share/pixmaps/assistant-qt4.png && install -v -Dm644 tools/designer/src/designer/images/designer.png \ - /usr/share/pixmaps/designer-qt4.png && + /usr/share/pixmaps/designer-qt4.png && install -v -Dm644 tools/linguist/linguist/images/icons/linguist-128-32.png \ - /usr/share/pixmaps/linguist-qt4.png && + /usr/share/pixmaps/linguist-qt4.png && install -v -Dm644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \ /usr/share/pixmaps/qdbusviewer-qt4.png</userinput></screen> @@ -274,71 +226,6 @@ ln -sfv ../lib/qt4/bin/$(basename $file) /usr/bin/$(basename $file)-qt4 done</userinput></screen> - <bridgehead renderas="sect3">Method 2: Installing in /opt/qt-&qt4-version;</bridgehead> - - <para> - Install <application>Qt</application> in /opt/qt-&qt4-version; - by running the following commands: - </para> - -<screen><userinput>sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \ - config.tests/unix/libmng/libmng.cpp && - -export QTDIR=/opt/qt-&qt4-version; - -./configure -prefix $QTDIR \ - -sysconfdir /etc/xdg \ - -confirm-license \ - -opensource \ - -release \ - -dbus-linked \ - -openssl-linked \ - -system-sqlite \ - -plugin-sql-sqlite \ - -no-phonon \ - -no-phonon-backend \ - -no-nis \ - -no-openvg \ - -nomake demos \ - -nomake examples \ - -optimized-qmake && - -make</userinput></screen> - - <para> - Now, as the <systemitem class="username">root</systemitem> user: - </para> - -<screen role="root"><userinput>make install && -ln -svfn qt-$VERSION /opt/qt && - -install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \ - /usr/share/pixmaps/qt4logo.png && -install -v -Dm644 tools/assistant/tools/assistant/images/assistant-128.png \ - /usr/share/pixmaps/assistant-qt4.png && -install -v -Dm644 tools/designer/src/designer/images/designer.png \ - /usr/share/pixmaps/designer-qt4.png && -install -v -Dm644 tools/linguist/linguist/images/icons/linguist-128-32.png \ - /usr/share/pixmaps/linguist-qt4.png && -install -v -Dm644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \ - /usr/share/pixmaps/qdbusviewer-qt4.png</userinput></screen> - - <para> - Remove references to the build directory from installed files by - running the following command as the - <systemitem class="username">root</systemitem> user: - </para> - -<screen role="root"><userinput>for file in 3Support CLucene Core DBus Declarative DesignerComponents \ - Designer Gui Help Multimedia Network OpenGL Script \ - ScriptTools Sql Svg Test UiTools WebKit XmlPatterns Xml; do - sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' \ - $QTDIR/lib/libQt${file}.prl - perl -pi -e "s, -L$PWD/?\S+,,g" $QTDIR/lib/pkgconfig/Qt${file}.pc -done - -unset file</userinput></screen> - </sect2> <sect2 role="commands"> @@ -417,8 +304,7 @@ <title>Configuration Information</title> <para> - If you installed <application>Qt</application> in /usr, - create an environment variable needed by certain packages. + Create an environment variable needed by certain packages. As the <systemitem class="username">root</systemitem> user: </para> @@ -432,56 +318,12 @@ # End /etc/profile.d/qt.sh</literal> EOF</userinput></screen> - <para> - If you installed <application>Qt</application> in a location other - than /usr, you need to update the following configuration files so - that <application>Qt</application> is correctly found by other packages - and system processes.</para> - - <para>As the <systemitem class="username">root</systemitem> user, update - the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's - run-time cache file: - </para> - -<screen role="root"><userinput>cat >> /etc/ld.so.conf << EOF - <literal># Begin Qt addition - -/opt/qt/lib - -# End Qt addition</literal> -EOF - -ldconfig</userinput></screen> - - <indexterm zone="qt4 qtconfig-qt4"> - <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary> - </indexterm> - - <para> - As the <systemitem class="username">root</systemitem> user, create - the <filename>/etc/profile.d/qt.sh</filename> file: - </para> - -<screen role="root"><userinput>cat > /etc/profile.d/qt.sh << EOF - <literal># Begin /etc/profile.d/qt.sh - -QTDIR=/opt/qt - -pathappend /opt/qt/bin PATH -pathappend /opt/qt/lib/pkgconfig PKG_CONFIG_PATH - -export QTDIR - -# End /etc/profile.d/qt.sh</literal> -EOF</userinput></screen> - <para> - For all methods, Create the menu entries for installed applications. + Create the menu entries for installed applications. As the <systemitem class="username">root</systemitem> user: </para> <screen role="root"><userinput>install -dm755 /usr/share/applications - cat > /usr/share/applications/qtconfig-qt4.desktop << "EOF" <literal>[Desktop Entry] Name=Qt4 Config @@ -493,7 +335,6 @@ Type=Application Categories=Qt;Settings;</literal> EOF - cat > /usr/share/applications/assistant-qt4.desktop << "EOF" <literal>[Desktop Entry] Name=Qt4 Assistant @@ -505,7 +346,6 @@ Type=Application Categories=Qt;Development;Documentation;</literal> EOF - cat > /usr/share/applications/designer-qt4.desktop << "EOF" <literal>[Desktop Entry] Name=Qt4 Designer @@ -518,7 +358,6 @@ Type=Application Categories=Qt;Development;</literal> EOF - cat > /usr/share/applications/linguist-qt4.desktop << "EOF" <literal>[Desktop Entry] Name=Qt4 Linguist @@ -531,7 +370,6 @@ Type=Application Categories=Qt;Development;</literal> EOF - cat > /usr/share/applications/qdbusviewer-qt4.desktop << "EOF" <literal>[Desktop Entry] Name=Qt4 QDbusViewer @@ -578,8 +416,8 @@ <seg> /usr/include/qt4, /usr/lib/qt4, - /usr/share/doc/qt4, and - /usr/share/qt4 (OR $QTDIR) + /usr/share/doc/qt4 and + /usr/share/qt4 </seg> </seglistitem> </segmentedlist> -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
