Changeset ba1e8dd for kde/core/phonon.xml

Timestamp:

01/03/2014 02:45:45 PM (11 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 7.10, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gimp3, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

68bd004

Parents:

739148a

Message:

KDE related fixes (patch received, thanks).

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

File:

• kde/core/phonon.xml (modified) (5 diffs)

kde/core/phonon.xml

@@ -62 +62 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="automoc4"/> and
-    <xref linkend="glib2"/>
+      <xref linkend="automoc4"/> and
+      <xref linkend="glib2"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend='pulseaudio'/> and
-    <ulink url="http://projects.kde.org/projects/kdesupport/libqzeitgeist/">QZeitgeist</ulink>
+      <xref linkend="pulseaudio"/>,
+      <xref linkend="qt5"/> and
+      <ulink url="http://projects.kde.org/projects/kdesupport/libqzeitgeist/">QZeitgeist</ulink>
     </para>
 
@@ -87 +88 @@
     commands:</para>
 
+<!-- CMAKE_INSTALL_LIBDIR is used so the package doesn't write over lib64 symlink on 64 bit system -->
 <screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
@@ -92 +94 @@
 cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
       -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_INSTALL_LIBDIR=lib \
       -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE \
       -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces \
@@ -106 +109 @@
     <title>Command Explanations</title>
 
-    <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to apply
-    higher level of compiler optimizations.</para>
+    <para>
+      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
+      to apply higher level of the compiler optimizations.
+    </para>
 
-    <para><option>-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE</option>:
-    This option ensures that the plugins and mkspecs files get installed in
-    the correct location.</para>
+    <para>
+      <parameter>-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE</parameter>:
+      This switch ensures that the plugins and mkspecs files get installed in
+      the correct location.
+    </para>
 
-    <para><option>-DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces</option>:
-    This option sets the correct installation path for a D-Bus interfaces file.
+    <para>
+     <parameter>-DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces</parameter>:
+      This switch sets the correct installation path for the 
+      <application>D-Bus</application> interfaces file.
+    </para>
+
+    <para>
+      <option>-DPHONON_BUILD_PHONON4QT5=ON</option>: Use this switch if you want to
+      build <application>Phonon</application> against <application>Qt5</application>.
+      Note that both <application>Qt4</application> and <application>Qt5</application>
+      versions can be installed at the same time without any conflicts.
     </para>
 
@@ -128 +144 @@
 
       <seglistitem>
-        <seg>none</seg>
-        <seg>libphonon.so and libphononexperimental.so</seg>
-        <seg>none</seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libphonon.so and
+          libphononexperimental.so
+        </seg>
+        <seg>
+          &qt4-dir;/include/KDE/Phonon,
+          &qt4-dir;/include/phonon, and
+          &qt4-dir;/share/phonon
+        </seg>
       </seglistitem>
     </segmentedlist>