Changeset 9d8d0ca for x/installing

Timestamp:

10/05/2014 03:15:11 AM (10 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

kde5-14686, systemd-13485

Children:

78ff3a8

Parents:

de106f59

Message:

Merge more updates from trunk.

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

Location:

x/installing

Files:

• x7driver-ati.xml (modified) (1 diff)
• xkeyboard-config-systemd.xml (modified) (1 diff)
• xorg-server-systemd.xml (modified) (5 diffs)

x/installing/x7driver-ati.xml

@@ -8 +8 @@
   <!ENTITY radeon-marketing-names "&radeon-wiki;#Decoder_ring_for_engineering_vs_marketing_names">
 
-  <!ENTITY xorg-ati-driver-version "7.4.0">
+  <!ENTITY xorg-ati-driver-version "7.5.0">
 
   <!ENTITY xorg-ati-driver-download-http "&xorg-download-http;/driver/xf86-video-ati-&xorg-ati-driver-version;.tar.bz2">
   <!ENTITY xorg-ati-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-ati-&xorg-ati-driver-version;.tar.bz2">
-  <!ENTITY xorg-ati-driver-md5sum        "8ee095009e927d61be522f392bdb843e">
-  <!ENTITY xorg-ati-driver-size          "813 KB">
+  <!ENTITY xorg-ati-driver-md5sum        "29654190e37310b87e44a14c229967ee">
+  <!ENTITY xorg-ati-driver-size          "791 KB">
   <!ENTITY xorg-ati-driver-buildsize     "17 MB">
   <!ENTITY xorg-ati-driver-time          "0.2 SBU">

x/installing/xkeyboard-config-systemd.xml

@@ -9 +9 @@
   <!ENTITY xkeyboard-config-download-ftp
            "&xorg-download-ftp;/data/xkeyboard-config/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
-  <!ENTITY xkeyboard-config-md5sum        "1fd54ceb9092d1dbcaabaf03653092bc">
-  <!ENTITY xkeyboard-config-size          "916 KB">
-  <!ENTITY xkeyboard-config-buildsize     "19 MB">
+  <!ENTITY xkeyboard-config-md5sum        "a415775ca8ecf4dfafc9488b8cbd7114">
+  <!ENTITY xkeyboard-config-size          "922 KB">
+  <!ENTITY xkeyboard-config-buildsize     "14 MB">
   <!ENTITY xkeyboard-config-time          "less than 0.1 SBU">
 ]>

x/installing/xorg-server-systemd.xml

@@ -7 +7 @@
   <!ENTITY xorg-server-download-http "&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
   <!ENTITY xorg-server-download-ftp  "&xorg-download-ftp;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
-  <!ENTITY xorg-server-md5sum        "8a9ff6ee9907360f09b5bdabb8089502">
-  <!ENTITY xorg-server-size          "5.6 MB">
-  <!ENTITY xorg-server-buildsize     "434 MB">
-  <!ENTITY xorg-server-time          "1.6 SBU">
+  <!ENTITY xorg-server-md5sum        "b1ff364222e921d32de40c4786e8bc47">
+  <!ENTITY xorg-server-size          "5.5 MB">
+  <!ENTITY xorg-server-buildsize     "495 MB">
+  <!ENTITY xorg-server-time          "1.4 SBU">
 ]>
 
@@ -75 +75 @@
       <listitem>
         <para>
-          Recommended patch:
-          <ulink url="&patch-root;/xorg-server-&xorg-server-version;-upstream_glamor_fix-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
           Optional patch:
-          <ulink url="&patch-root;/xorg-server-&xorg-server-version;-add_prime_support-2.patch"/>
+          <ulink url="&patch-root;/xorg-server-&xorg-server-version;-add_prime_support-1.patch"/>
         </para>
       </listitem>
@@ -125 +119 @@
 
     <para>
-      If you are going to build Glamor, apply the recommended patch by running
-      the following command:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-upstream_glamor_fix-1.patch</userinput></screen>
-
-    <para>
       If you have downloaded the optional patch, apply it by running
       the following command:
     </para>
 
-<screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-add_prime_support-2.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-add_prime_support-1.patch</userinput></screen>
 
     <para>
@@ -142 +129 @@
     </para>
 
-<screen><userinput>sed -i "/scrnintstr/i #include &lt;xorg-server.h&gt;" exa/exa.h glamor/glamor.h &amp;&amp;
-./configure $XORG_CONFIG                    \
+<screen><userinput>./configure $XORG_CONFIG                    \
            --with-xkb-output=/var/lib/xkb   \
            --enable-dmx                     \
@@ -166 +152 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ...</command>: This sed fixes several header files that are
-      broken with Glibc 2.20 so the drivers using them wouldn't fail to build.
-    </para>
 
     <para>