Author: cjg
Date: Sat Oct 4 20:15:11 2014
New Revision: 14496
Log:
Merge more updates from trunk.
Modified:
branches/systemd/introduction/welcome/changelog.xml
branches/systemd/packages.ent
branches/systemd/x/installing/x7driver-ati.xml
branches/systemd/x/installing/xkeyboard-config-systemd.xml
branches/systemd/x/installing/xorg-server-systemd.xml
Modified: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Sat Oct 4 19:19:08
2014 (r14495)
+++ branches/systemd/introduction/welcome/changelog.xml Sat Oct 4 20:15:11
2014 (r14496)
@@ -110,48 +110,48 @@
<para>September 30th, 2014</para>
<itemizedlist>
<listitem>
- <para>[fernando] - Update to vte-0.38.0. Partially fixes
+ <para>[cjg] - Update to vte-0.38.0. Partially fixes
<ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
</listitem>
<listitem>
- <para>[fernando] - Update to totem-pl-parser-3.10.3. Partially fixes
+ <para>[cjg] - Update to totem-pl-parser-3.10.3. Partially fixes
<ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
</listitem>
<listitem>
- <para>[fernando] - Update to libpeas-1.12.1. Partially fixes
+ <para>[cjg] - Update to libpeas-1.12.1. Partially fixes
<ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
</listitem>
<listitem>
- <para>[fernando] - Update to gsettings-desktop-schemas-3.14.0.
+ <para>[cjg] - Update to gsettings-desktop-schemas-3.14.0.
Partially fixes
<ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
</listitem>
<listitem>
- <para>[fernando] - Update to gnome-desktop-3.14.0. Partially fixes
+ <para>[cjg] - Update to gnome-desktop-3.14.0. Partially fixes
<ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
</listitem>
<listitem>
- <para>[fernando] - Update to gvfs-1.22.0. Partially fixes
+ <para>[cjg] - Update to gvfs-1.22.0. Partially fixes
<ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
</listitem>
<listitem>
- <para>[fernando] - Update to gnome-keyring-3.14.0. Partially fixes
+ <para>[cjg] - Update to gnome-keyring-3.14.0. Partially fixes
<ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
</listitem>
<listitem>
- <para>[fernando] - Update to yelp-xsl-3.14.0. Partially fixes
+ <para>[cjg] - Update to yelp-xsl-3.14.0. Partially fixes
<ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
</listitem>
<listitem>
- <para>[fernando] - Update to gedit-3.14.0. Partially fixes
+ <para>[cjg] - Update to gedit-3.14.0. Partially fixes
<ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
</listitem>
<listitem>
- <para>[fernando] - Update to gtksourceview-3.14.0. Partially fixes
+ <para>[cjg] - Update to gtksourceview-3.14.0. Partially fixes
<ulink url="&blfs-ticket-root;5554">#5554</ulink>.</para>
</listitem>
<listitem>
- <para>[fernando] - Update to gtk+-3.14.1. Fixes
+ <para>[cjg] - Update to gtk+-3.14.1. Fixes
<ulink url="&blfs-ticket-root;5612">#5612</ulink>.</para>
</listitem>
<listitem>
@@ -159,7 +159,7 @@
<ulink url="&blfs-ticket-root;5611">#5611</ulink>.</para>
</listitem>
<listitem>
- <para>[fernando] - Add new page webkitgtk-2.6.0 separated from 2.4
+ <para>[cjg] - Add new page webkitgtk-2.6.0 separated from 2.4
series. Fixes
<ulink url="&blfs-ticket-root;5575">#5575</ulink>.</para>
</listitem>
@@ -208,15 +208,15 @@
<para>September 28th, 2014</para>
<itemizedlist>
<listitem>
- <para>[fernando] - Add adwaita-icon-theme-3.14.0. Fixes
+ <para>[cjg] - Add adwaita-icon-theme-3.14.0. Fixes
<ulink url="&blfs-ticket-root;5596">#5596</ulink>.</para>
</listitem>
<listitem>
- <para>[fernando] - Update to gjs-1.41.91. Fixes
+ <para>[cjg] - Update to gjs-1.41.91. Fixes
<ulink url="&blfs-ticket-root;5595">#5595</ulink>.</para>
</listitem>
<listitem>
- <para>[fernando] - Update to poppler-0.26.5. Fixes
+ <para>[cjg] - Update to poppler-0.26.5. Fixes
<ulink url="&blfs-ticket-root;5600">#5600</ulink>.</para>
</listitem>
</itemizedlist>
Modified: branches/systemd/packages.ent
==============================================================================
--- branches/systemd/packages.ent Sat Oct 4 19:19:08 2014 (r14495)
+++ branches/systemd/packages.ent Sat Oct 4 20:15:11 2014 (r14496)
@@ -334,7 +334,7 @@
<!-- Part IV -->
<!-- Chapter 14 -->
<!ENTITY ppp-version "2.4.5">
-<!ENTITY dhcpcd-version "6.4.6">
+<!ENTITY dhcpcd-version "6.4.7">
<!ENTITY dhcp-version "4.3.1">
<!-- Chapter 15 -->
@@ -432,14 +432,14 @@
<!ENTITY libxcb-version "1.11">
<!ENTITY xbitmaps-version "1.1.1">
<!ENTITY xcursor-themes-version "1.0.4">
-<!ENTITY xkeyboard-config-version "2.12">
+<!ENTITY xkeyboard-config-version "2.13">
<!ENTITY mesalib-version "10.3.0">
<!ENTITY xcb-util-version "0.3.9">
<!ENTITY xcb-util-image-version "0.3.9">
<!ENTITY xcb-util-keysyms-version "0.3.9">
<!ENTITY xcb-util-renderutil-version "0.3.9">
<!ENTITY xcb-util-wm-version "0.4.1">
-<!ENTITY xorg-server-version "1.16.0">
+<!ENTITY xorg-server-version "1.16.1">
<!ENTITY twm-version "1.0.8">
<!ENTITY xterm-version "311">
<!ENTITY xclock-version "1.0.7">
Modified: branches/systemd/x/installing/x7driver-ati.xml
==============================================================================
--- branches/systemd/x/installing/x7driver-ati.xml Sat Oct 4 19:19:08
2014 (r14495)
+++ branches/systemd/x/installing/x7driver-ati.xml Sat Oct 4 20:15:11
2014 (r14496)
@@ -7,12 +7,12 @@
<!ENTITY radeon-wiki "http://wiki.x.org/wiki/RadeonFeature";>
<!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">
]>
Modified: branches/systemd/x/installing/xkeyboard-config-systemd.xml
==============================================================================
--- branches/systemd/x/installing/xkeyboard-config-systemd.xml Sat Oct 4
19:19:08 2014 (r14495)
+++ branches/systemd/x/installing/xkeyboard-config-systemd.xml Sat Oct 4
20:15:11 2014 (r14496)
@@ -8,9 +8,9 @@
"&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">
- <!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">
]>
Modified: branches/systemd/x/installing/xorg-server-systemd.xml
==============================================================================
--- branches/systemd/x/installing/xorg-server-systemd.xml Sat Oct 4
19:19:08 2014 (r14495)
+++ branches/systemd/x/installing/xorg-server-systemd.xml Sat Oct 4
20:15:11 2014 (r14496)
@@ -6,10 +6,10 @@
<!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">
]>
<sect1 id="xorg-server" xreflabel="Xorg-Server-&xorg-server-version;">
@@ -74,14 +74,8 @@
<itemizedlist spacing="compact">
<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>
</itemizedlist>
@@ -124,25 +118,17 @@
<title>Installation of Xorg Server</title>
<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>
Install the server by running the following commands:
</para>
-<screen><userinput>sed -i "/scrnintstr/i #include <xorg-server.h>"
exa/exa.h glamor/glamor.h &&
-./configure $XORG_CONFIG \
+<screen><userinput>./configure $XORG_CONFIG \
--with-xkb-output=/var/lib/xkb \
--enable-dmx \
--enable-glamor \
@@ -167,11 +153,6 @@
<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>
<parameter>--enable-dmx</parameter>: This switch enables building of the
DMX
(Distributed Multihead X) server.
</para>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
