Changeset 51d044f for x

Timestamp:

01/31/2016 02:31:35 AM (8 years ago)

Author:

DJ Lucas <dj@…>

Branches:

systemd-13485

Children:

3acf108

Parents:

3e63daa9

Message:

Remainder of -systemd.xml cleanup.

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

Location:

x

Files:

• installing/installing.xml (modified) (2 diffs)
• installing/mesalib.xml (moved) (moved from x/installing/mesalib-systemd.xml )
• installing/x7driver-vmmouse-systemd.xml (deleted)
• installing/x7driver-vmmouse.xml (modified) (4 diffs)
• installing/x7driver-vmware-systemd.xml (deleted)
• installing/x7driver-vmware.xml (modified) (6 diffs)
• installing/x7driver-wacom-systemd.xml (deleted)
• installing/x7driver-wacom.xml (modified) (3 diffs)
• installing/x7driver.xml (modified) (2 diffs)
• installing/xorg-server.xml (moved) (moved from x/installing/xorg-server-systemd.xml )
• lib/qt4-systemd.xml (deleted)
• lib/qt5-systemd.xml (deleted)
• lib/webkitgtk26-systemd.xml (deleted)

x/installing/installing.xml

@@ -65 +65 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util-wm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util-cursor.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mesalib-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mesalib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xbitmaps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7app.xml"/>
@@ -71 +71 @@
   <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="xorg-server-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"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="twm.xml"/>

x/installing/x7driver-vmmouse.xml

@@ -28 +28 @@
 
       <para>
-        The <application>Xorg VMMouse Driver</application> package contains the VMMouse input
-        driver for the Xorg X server. The VMMouse driver enables support for the special
-        VMMouse protocol that is provided by VMware virtual machines to give absolute
-        pointer positioning.
+        The <application>Xorg VMMouse Driver</application> package contains the
+        VMMouse input driver for the Xorg X server. The VMMouse driver enables
+        support for the special VMMouse protocol that is provided by VMware
+        virtual machines to give absolute pointer positioning. It can be used
+        with <application>Qemu</application>, too.
       </para>
 
-      &lfs76_checked;
+      &lfs77_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -70 +71 @@
       </itemizedlist>
 
-      <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+      <bridgehead renderas="sect4">Additional Downloads</bridgehead>
       <itemizedlist spacing="compact">
         <listitem>
@@ -96 +97 @@
 
       <para>
-        Install <application>Xorg VMMouse Driver</application> by running the following
-        commands:
+        Install <application>Xorg VMMouse Driver</application> by running the
+        following commands:
       </para>
 
-<screen><userinput>/xf86-input-vmmouse-&xorg-vmmouse-driver-version;-build_fix-1.patch &amp;&amp;
+<screen><userinput>patch -Np1 -i ../xf86-input-vmmouse-&xorg-vmmouse-driver-version;-build_fix-1.patch &amp;&amp;
+sed -i -e '/__i386__/a iopl(3);' tools/vmmouse_detect.c      &amp;&amp;
+
 ./configure $XORG_CONFIG               \
             --without-hal-callouts-dir \
@@ -125 +128 @@
         disable installation of the <application>HAL</application>
         components which are not needed on Linux.
+      </para>
+
+      <para>
+        <command>sed -i -e '/__i386__/a iopl(3);' ...</command>: This command
+        allows <command>vmmouse_detect</command> to detect the VMMouse protocol
+        in a <application>Qemu</application> virtual machine.
       </para>
 

x/installing/x7driver-vmware.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY xorg-vmware-driver-version "13.0.2">
+  <!ENTITY xorg-vmware-driver-version "13.1.0">
 
   <!ENTITY xorg-vmware-driver-download-http "&xorg-download-http;/driver/xf86-video-vmware-&xorg-vmware-driver-version;.tar.bz2">
   <!ENTITY xorg-vmware-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-vmware-&xorg-vmware-driver-version;.tar.bz2">
-  <!ENTITY xorg-vmware-driver-md5sum        "91d1d7d33181766714405ab013d31244">
-  <!ENTITY xorg-vmware-driver-size          "432 KB">
-  <!ENTITY xorg-vmware-driver-buildsize     "9.1 MB">
+  <!ENTITY xorg-vmware-driver-md5sum        "0cba22fed4cb639d5c4276f7892c543d">
+  <!ENTITY xorg-vmware-driver-size          "452 KB">
+  <!ENTITY xorg-vmware-driver-buildsize     "7.9 MB">
   <!ENTITY xorg-vmware-driver-time          "0.1 SBU">
 ]>
@@ -32 +32 @@
       </para>
 
-      &lfs76_checked;
+      &lfs77_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -68 +68 @@
       </itemizedlist>
 
-      <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Required patch:
-            <ulink url="&patch-root;/xf86-video-vmware-&xorg-vmware-driver-version;-upstream_fixes-1.patch"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
       <bridgehead renderas="sect4">Xorg VMware Driver Dependencies</bridgehead>
 
@@ -99 +89 @@
 
 <screen><literal>Device Drivers  ---&gt;
-  Graphics support ---&gt;
-    DRM driver for VMware Virtual GPU: Y or M
-      Enable framebuffer console under vmwgfx by default: Y</literal></screen>
+  Graphics support  ---&gt;
+    Direct Rendering Manager  ---&gt;
+      &lt;*&gt; Direct Rendering Manager (XFree86 ... support) ---&gt;  [CONFIG_DRM]
+      &lt;*&gt; DRM driver for VMware Virtual GPU                    [CONFIG_DRM_VMWGFX]
+      [*]   Enable framebuffer console under vmwgfx by default [CONFIG_DRM_VMWGFX_FBCON]</literal></screen>
 
       <indexterm zone="xorg-vmware-driver xorg-vmware-driver-kernel">
@@ -116 +108 @@
       </para>
 
-<screen><userinput>patch -Np1 -i ../xf86-video-vmware-&xorg-vmware-driver-version;-upstream_fixes-1.patch &amp;&amp;
-sed -i "/xf86xv.h/i #include &lt;xorg-server.h&gt;" vmwgfx/vmwgfx_overlay.c &amp;&amp;
-./configure $XORG_CONFIG &amp;&amp;
+<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
 make</userinput></screen>
 
@@ -130 +120 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Command Explanations</title>
-
-      <para>
-        <command>sed -i ...</command>: This sed fixes building with latest
-        version of <application>Glibc</application>.
-      </para>
 
     </sect3>

x/installing/x7driver-wacom.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY xorg-wacom-driver-version "0.27.0">
+  <!ENTITY xorg-wacom-driver-version "0.31.0">
 
   <!ENTITY xorg-wacom-driver-download-http "&sourceforge-repo;/linuxwacom/xf86-input-wacom-&xorg-wacom-driver-version;.tar.bz2">
   <!ENTITY xorg-wacom-driver-download-ftp  " ">
-  <!ENTITY xorg-wacom-driver-md5sum        "f75b374c47969fb9b21d9c2134396400">
-  <!ENTITY xorg-wacom-driver-size          "570 KB">
-  <!ENTITY xorg-wacom-driver-buildsize     "6.5 MB (additional 2.3 MB for the tests)">
-  <!ENTITY xorg-wacom-driver-time          "0.1 SBU">
+  <!ENTITY xorg-wacom-driver-md5sum        "e6a2e87b73e2744f839c410d41e6cf8d">
+  <!ENTITY xorg-wacom-driver-size          "580 KB">
+  <!ENTITY xorg-wacom-driver-buildsize     "10.6 MB (with the test suite)">
+  <!ENTITY xorg-wacom-driver-time          "0.1 SBU (with the test suite)">
 ]>
 
@@ -35 +35 @@
       </para>
 
-      &lfs76_built;
+      &lfs77_built;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -93 +93 @@
 
       <para>
-        To use a Wacom tablet, enable the following options in your kernel
-        configuration and recompile:
+        To use a Wacom tablet with USB interface, enable the following
+        options in your kernel configuration and recompile. Note that
+        other configuration options could be required for tablet with a
+        serial or bluetooth interface:
       </para>
 
 <screen><literal>Device Drivers  ---&gt;
-  Input device support  ---&gt;
-    [*] Tablets  ---&gt;
-      Wacom Intuos/Graphire tablet support (USB): Y or M</literal></screen>
+  HID support  ---&gt;
+    &lt;*/M&gt; HID bus support                                      [CONFIG_HID]
+            Special HID drivers ---&gt;
+              &lt;*/M&gt; Wacom Intuos/Graphire tablet support (USB) [CONFIG_HID_WACOM]</literal></screen>
 
       <indexterm zone="xorg-wacom-driver xorg-wacom-driver-kernel">

x/installing/x7driver.xml

@@ -135 +135 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="x7driver-vmmouse-systemd.xml"/>
+    href="x7driver-vmmouse.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="x7driver-wacom-systemd.xml"/>
+    href="x7driver-wacom.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -156 +156 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="x7driver-vmware-systemd.xml"/>
+    href="x7driver-vmware.xml"/>
 
 </sect1>