Changeset d06248e

Timestamp:

07/21/2014 01:05:09 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

33d69e3f

Parents:

ca33a20f

Message:

Add libepoxy, install xkeyboard-config into /usr and remove the dependency on xorg libraries, which is innacurate anyways.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@13526 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

x

Files:

• installing/installing.xml (modified) (1 diff)
• installing/xkeyboard-config-systemd.xml (moved) (moved from x/installing/xkeyboard-config.xml ) (5 diffs)
• lib/lib.xml (modified) (1 diff)
• lib/libepoxy-systemd.xml (added)

x/installing/installing.xml

@@ -69 +69 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcursor-themes.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7font.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xkeyboard-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xkeyboard-config-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-server.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7driver.xml"/>

x/installing/xkeyboard-config-systemd.xml

@@ -6 +6 @@
 
   <!ENTITY xkeyboard-config-download-http
-  "&xorg-download-http;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
+           "&xorg-download-http;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
   <!ENTITY xkeyboard-config-download-ftp
-  "&xorg-download-ftp;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
+           "&xorg-download-ftp;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
   <!ENTITY xkeyboard-config-md5sum        "1fd54ceb9092d1dbcaabaf03653092bc">
   <!ENTITY xkeyboard-config-size          "916 KB">
@@ -77 +77 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="xorg7-lib"/>
+      <xref linkend="libxslt"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="xorg7-proto"/>
     </para>
 
@@ -93 +98 @@
     </para>
 
-<screen><userinput>./configure $XORG_CONFIG --with-xkb-rules-symlink=xorg &amp;&amp;
+<screen><userinput>./configure --prefix=/usr          \
+            --disable-runtime-deps \
+            --with-xkb-rules-symlink=xorg &amp;&amp;
 make</userinput></screen>
 
@@ -110 +117 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <parameter>--disable-runtime-deps</parameter>: This switch disables
+      checking for Xorg Protocol Headers which are only required for
+      <application>Xorg</application> at runtime.
+    </para>
 
     <para>
@@ -131 +144 @@
         <seg>None</seg>
         <seg>
-          <envar>$XORG_PREFIX</envar>/share/X11/xkb
+          /usr/share/X11/xkb
         </seg>
       </seglistitem>

x/lib/lib.xml

@@ -48 +48 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imlib2.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="libepoxy-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libglade.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnotify.xml"/>