gnu: gnupg: Upgrade support libraries.

[jackhill/guix/guix.git] / gnu / packages / xorg.scm

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index bc5da3b..cde6475 100644 (file)
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -59,8 +59,7 @@
             "04c3md570j67g55h3bix1qbngcslnq91skli51k3g1avki88zkm9"))))
     (build-system gnu-build-system)
     (inputs
-      `(("libx11" ,libx11)
-        ("libxext" ,libxext)
+      `(("libxext" ,libxext)
         ("libxmu" ,libxmu)
         ("libxt" ,libxt)
         ("pkg-config" ,pkg-config)))
@@ -153,6 +152,31 @@ and Matrox.")
          `("--enable-nouveau-experimental-api")))))
 
 
+(define-public mtdev
+  (package
+    (name "mtdev")
+    (version "1.1.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "http://bitmath.org/code/mtdev/mtdev-"
+               version ".tar.bz2"))
+        (sha256
+          (base32
+            "159ndzwfpw0xr8mw4lhl47w9c2krshlfrscs7k6n186vknv2hk3d"))))
+    (build-system gnu-build-system)
+    (home-page "http://bitmath.org/code/mtdev/")
+    (synopsis "Multitouch protocol translation library")
+    (description "Mtdev is a stand-alone library which transforms all
+variants of kernel MT events to the slotted type B protocol.  The events
+put into mtdev may be from any MT device, specifically type A without
+contact tracking, type A with contact tracking, or type B with contact
+tracking.")
+    (license license:x11)))
+
+
+
 ;; packages without propagated input
 ;; (rationale for this separation: The packages in PROPAGATED_INPUTS need to
 ;; be defined first, the split makes book-keeping easier.)
@@ -355,6 +379,11 @@ and Matrox.")
           (base32
             "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"))))
     (build-system gnu-build-system)
+    (inputs
+      `(("bdftopcf" ,bdftopcf)
+        ("font-util", font-util)
+        ("mkfontdir" ,mkfontdir)
+        ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
@@ -376,6 +405,11 @@ and Matrox.")
           (base32
             "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"))))
     (build-system gnu-build-system)
+    (inputs
+      `(("bdftopcf" ,bdftopcf)
+        ("font-util", font-util)
+        ("mkfontdir" ,mkfontdir)
+        ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
@@ -667,8 +701,7 @@ and Matrox.")
             "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"))))
     (build-system gnu-build-system)
     (inputs
-      `(("mkfontscale" ,mkfontscale)
-        ("mkfontdir" ,mkfontdir)
+      `(("mkfontdir" ,mkfontdir)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -918,8 +951,7 @@ and Matrox.")
             "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"))))
     (build-system gnu-build-system)
     (inputs
-      `(("mkfontscale" ,mkfontscale)
-        ("mkfontdir" ,mkfontdir)
+      `(("mkfontdir" ,mkfontdir)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -968,8 +1000,7 @@ and Matrox.")
             "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"))))
     (build-system gnu-build-system)
     (inputs
-      `(("mkfontscale" ,mkfontscale)
-        ("mkfontdir" ,mkfontdir)
+      `(("mkfontdir" ,mkfontdir)
         ("font-util" ,font-util)
         ("bdftopcf" ,bdftopcf)
         ("pkg-config" ,pkg-config)))
@@ -1020,8 +1051,7 @@ and Matrox.")
             "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"))))
     (build-system gnu-build-system)
     (inputs
-      `(("mkfontscale" ,mkfontscale)
-        ("mkfontdir" ,mkfontdir)
+      `(("mkfontdir" ,mkfontdir)
         ("font-util" ,font-util)
         ("bdftopcf" ,bdftopcf)
         ("pkg-config" ,pkg-config)))
@@ -1237,8 +1267,7 @@ and Matrox.")
             "1aq6v671s2x5rc6zn0rgxb4wddg4vq94mckw3cpwl7ccrjjvd5hl"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto)
-        ("libice" ,libice)
+      `(("libice" ,libice)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -1458,7 +1487,6 @@ and Matrox.")
     (build-system gnu-build-system)
     (inputs
       `(("xtrans" ,xtrans)
-        ("xproto" ,xproto)
         ("util-linux" ,util-linux)
         ("libice" ,libice)
         ("pkg-config" ,pkg-config)))
@@ -1561,8 +1589,7 @@ and Matrox.")
             "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz"))))
     (build-system gnu-build-system)
     (inputs
-      `(("renderproto" ,renderproto)
-        ("libx11" ,libx11)
+      `(("libx11" ,libx11)
         ("xproto" ,xproto)
         ("libxrender" ,libxrender)
         ("xproto" ,xproto)
@@ -1576,34 +1603,6 @@ and Matrox.")
     (license license:x11)))
 
 
-(define-public libxi
-  (package
-    (name "libxi")
-    (version "1.6.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libXi-"
-               version
-               ".tar.bz2"))
-        (sha256
-          (base32
-            "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj"))))
-    (build-system gnu-build-system)
-    (inputs
-      `(("xproto" ,xproto)
-        ("xextproto" ,xextproto)
-        ("libxext" ,libxext)
-        ("libx11" ,libx11)
-        ("inputproto" ,inputproto)
-        ("pkg-config" ,pkg-config)))
-    (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
-    (description "X.org provides an implementation of the X Window System")
-    (license license:x11)))
-
-
 (define-public libxkbfile
   (package
     (name "libxkbfile")
@@ -1621,7 +1620,6 @@ and Matrox.")
     (build-system gnu-build-system)
     (inputs
       `(("libx11" ,libx11)
-        ("kbproto" ,kbproto)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -1647,9 +1645,7 @@ and Matrox.")
     (inputs
       `(("libxt" ,libxt)
         ("xproto" ,xproto)
-        ("xextproto" ,xextproto)
         ("libxext" ,libxext)
-        ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -1676,9 +1672,7 @@ and Matrox.")
       `(("gettext" ,gnu:gettext)
         ("libxt" ,libxt)
         ("xproto" ,xproto)
-        ("xextproto" ,xextproto)
         ("libxext" ,libxext)
-        ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -1703,7 +1697,6 @@ and Matrox.")
     (build-system gnu-build-system)
     (inputs
       `(("xproto" ,xproto)
-        ("xextproto" ,xextproto)
         ("libxext" ,libxext)
         ("libx11" ,libx11)
         ("resourceproto" ,resourceproto)
@@ -1730,8 +1723,7 @@ and Matrox.")
             "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xextproto" ,xextproto)
-        ("libxext" ,libxext)
+      `(("libxext" ,libxext)
         ("libx11" ,libx11)
         ("scrnsaverproto" ,scrnsaverproto)
         ("pkg-config" ,pkg-config)))
@@ -1741,34 +1733,6 @@ and Matrox.")
     (license license:x11)))
 
 
-(define-public libxv
-  (package
-    (name "libxv")
-    (version "1.0.7")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libXv-"
-               version
-               ".tar.bz2"))
-        (sha256
-          (base32
-            "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx"))))
-    (build-system gnu-build-system)
-    (inputs
-      `(("xproto" ,xproto)
-        ("xextproto" ,xextproto)
-        ("libxext" ,libxext)
-        ("libx11" ,libx11)
-        ("videoproto" ,videoproto)
-        ("pkg-config" ,pkg-config)))
-    (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
-    (description "X.org provides an implementation of the X Window System")
-    (license license:x11)))
-
-
 (define-public libxxf86dga
   (package
     (name "libxxf86dga")
@@ -1795,32 +1759,6 @@ and Matrox.")
     (license license:x11)))
 
 
-(define-public libxxf86vm
-  (package
-    (name "libxxf86vm")
-    (version "1.1.2")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libXxf86vm-"
-               version
-               ".tar.bz2"))
-        (sha256
-          (base32
-            "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55"))))
-    (build-system gnu-build-system)
-    (inputs
-      `(("libx11" ,libx11)
-        ("libxext" ,libxext)
-        ("pkg-config" ,pkg-config)
-        ("xf86vidmodeproto" ,xf86vidmodeproto)))
-    (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
-    (description "X.org provides an implementation of the X Window System")
-    (license license:x11)))
-
-
 (define-public luit
   (package
     (name "luit")
@@ -1895,6 +1833,29 @@ and Matrox.")
     (license license:x11)))
 
 
+;; The package is missing from X11R7.7.
+(define-public printproto
+  (package
+    (name "printproto")
+    (version "1.0.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/individual/proto/printproto-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j"))))
+    (build-system gnu-build-system)
+    (inputs `(("pkg-config" ,pkg-config)))
+    (home-page "http://www.x.org/wiki/")
+    (synopsis "xorg implementation of the X Window System")
+    (description "X.org provides an implementation of the X Window System")
+    (license license:x11)))
+
+
 (define-public randrproto
   (package
     (name "randrproto")
@@ -2071,8 +2032,6 @@ and Matrox.")
     (inputs
       `(("libxt" ,libxt)
         ("libxmu" ,libxmu)
-        ("libsm" ,libsm)
-        ("libice" ,libice)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -2219,7 +2178,6 @@ and Matrox.")
       `(("libx11" ,libx11)
         ("libxrandr" ,libxrandr)
         ("libxrender" ,libxrender)
-        ("libxcb" ,libxcb)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -2360,7 +2318,6 @@ and Matrox.")
     (build-system gnu-build-system)
     (inputs
       `(("libxcursor" ,libxcursor)
-        ("libx11" ,libx11)
         ("libpng" ,libpng)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
@@ -2386,17 +2343,14 @@ and Matrox.")
     (build-system gnu-build-system)
     (inputs
       `(("inputproto" ,inputproto)
+        ("libx11" ,libx11)
         ("libxxf86vm" ,libxxf86vm)
-;;         ("libxxf86misc" ,libxxf86misc)
         ("libxxf86dga" ,libxxf86dga)
         ("libxtst" ,libxtst)
         ("libxrender" ,libxrender)
         ("libxinerama" ,libxinerama)
         ("libxi" ,libxi)
-        ("libxext" ,libxext)
         ("libxcomposite" ,libxcomposite)
-        ("libxcb" ,libxcb)
-        ("libx11" ,libx11)
         ("libdmx" ,libdmx)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
@@ -2422,9 +2376,7 @@ and Matrox.")
     (build-system gnu-build-system)
     (inputs
       `(("mesa" ,mesa)
-        ("glproto" ,glproto)
         ("libx11" ,libx11)
-        ("glproto" ,glproto)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -2590,8 +2542,10 @@ and Matrox.")
           (base32
             "0g5b1s6q1dg38l8y47cwg7cs5nivwj0agmp71g273ws0lfg4bc8s"))))
     (build-system gnu-build-system)
-    ;; FIXME: Add required input mtdev.
-    (inputs `(("pkg-config" ,pkg-config)
+    (inputs `(("libx11" ,libx11)
+              ("libxi" ,libxi)
+              ("mtdev" ,mtdev)
+              ("pkg-config" ,pkg-config)
               ("xorg-server" ,xorg-server)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -2785,52 +2739,54 @@ and Matrox.")
     (license license:x11)))
 
 
-;; FIXME: Compilation errors
-(define-public xf86-video-geode
-  (package
-    (name "xf86-video-geode")
-    (version "2.11.13")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/xf86-video-geode-"
-               version
-               ".tar.bz2"))
-        (sha256
-          (base32
-            "09p2cjd2fb7h32k9qs4wp7qvhfn2zv454spv5mfplv7w2jis4863"))))
-    (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)
-              ("xorg-server" ,xorg-server)))
-    (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
-    (description "X.org provides an implementation of the X Window System")
-    (license license:x11)))
+;; Compilation errors: Assembler messages operand size mismatch etc.
+;; (define-public xf86-video-geode
+;;   (package
+;;     (name "xf86-video-geode")
+;;     (version "2.11.13")
+;;     (source
+;;       (origin
+;;         (method url-fetch)
+;;         (uri (string-append
+;;                "mirror://xorg/X11R7.7/src/everything/xf86-video-geode-"
+;;                version
+;;                ".tar.bz2"))
+;;         (sha256
+;;           (base32
+;;             "09p2cjd2fb7h32k9qs4wp7qvhfn2zv454spv5mfplv7w2jis4863"))))
+;;     (build-system gnu-build-system)
+;;     (inputs `(("pkg-config" ,pkg-config)
+;;               ("xorg-server" ,xorg-server)))
+;;     (home-page "http://www.x.org/wiki/")
+;;     (synopsis "xorg implementation of the X Window System")
+;;     (description "X.org provides an implementation of the X Window System")
+;;     (license license:x11)))
 
 
-;; FIXME: Add required input "glide"
-(define-public xf86-video-glide
-  (package
-    (name "xf86-video-glide")
-    (version "1.2.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/xf86-video-glide-"
-               version
-               ".tar.bz2"))
-        (sha256
-          (base32
-            "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l"))))
-    (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)
-              ("xorg-server" ,xorg-server)))
-    (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
-    (description "X.org provides an implementation of the X Window System")
-    (license license:x11)))
+;; Driver for obsolete graphics cards, depends on libglide:
+;; http://sourceforge.net/projects/glide/ ,
+;; last updated in 2003, and which does not compile out of the box any more.
+;; (define-public xf86-video-glide
+;;   (package
+;;     (name "xf86-video-glide")
+;;     (version "1.2.0")
+;;     (source
+;;       (origin
+;;         (method url-fetch)
+;;         (uri (string-append
+;;                "mirror://xorg/X11R7.7/src/everything/xf86-video-glide-"
+;;                version
+;;                ".tar.bz2"))
+;;         (sha256
+;;           (base32
+;;             "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l"))))
+;;     (build-system gnu-build-system)
+;;     (inputs `(("pkg-config" ,pkg-config)
+;;               ("xorg-server" ,xorg-server)))
+;;     (home-page "http://www.x.org/wiki/")
+;;     (synopsis "xorg implementation of the X Window System")
+;;     (description "X.org provides an implementation of the X Window System")
+;;     (license license:x11)))
 
 
 (define-public xf86-video-glint
@@ -3365,28 +3321,28 @@ and Matrox.")
     (license license:x11)))
 
 
-;; FIXME: Add input providing dev/wscons/wsconsio.h; only relevant for BSD?
-(define-public xf86-video-wsfb
-  (package
-    (name "xf86-video-wsfb")
-    (version "0.4.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-"
-               version
-               ".tar.bz2"))
-        (sha256
-          (base32
-            "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"))))
-    (build-system gnu-build-system)
-    (inputs `(("pkg-config" ,pkg-config)
-              ("xorg-server" ,xorg-server)))
-    (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
-    (description "X.org provides an implementation of the X Window System")
-    (license license:bsd-2)))
+;; Only relevant for the frame buffer on BSD systems.
+;; (define-public xf86-video-wsfb
+;;   (package
+;;     (name "xf86-video-wsfb")
+;;     (version "0.4.0")
+;;     (source
+;;       (origin
+;;         (method url-fetch)
+;;         (uri (string-append
+;;                "mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-"
+;;                version
+;;                ".tar.bz2"))
+;;         (sha256
+;;           (base32
+;;             "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"))))
+;;     (build-system gnu-build-system)
+;;     (inputs `(("pkg-config" ,pkg-config)
+;;               ("xorg-server" ,xorg-server)))
+;;     (home-page "http://www.x.org/wiki/")
+;;     (synopsis "xorg implementation of the X Window System")
+;;     (description "X.org provides an implementation of the X Window System")
+;;     (license license:bsd-2)))
 
 
 (define-public xf86bigfontproto
@@ -3566,7 +3522,6 @@ and Matrox.")
         ("libxrandr" ,libxrandr)
         ("libxinerama" ,libxinerama)
         ("libxi" ,libxi)
-        ("libxext" ,libxext)
         ("libx11" ,libx11)
         ("inputproto" ,inputproto)
         ("pkg-config" ,pkg-config)))
@@ -3646,7 +3601,6 @@ and Matrox.")
       `(("libxt" ,libxt)
         ("xproto" ,xproto)
         ("libxaw" ,libxaw)
-        ("libx11" ,libx11)
         ("inputproto" ,inputproto)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
@@ -3674,21 +3628,8 @@ and Matrox.")
       `(("gettext" ,gnu:gettext)
         ("intltool" ,intltool)
         ("libx11" ,libx11)
-        ;; required to set PERL5LIB, although it is propagated by intltool
-        ("perl-xml-parser" ,perl-xml-parser)
         ("pkg-config" ,pkg-config)
         ("xkbcomp" ,xkbcomp)))
-    (arguments
-      `(#:phases
-         (alist-replace
-          'configure
-          (lambda* (#:key inputs #:allow-other-keys #:rest args)
-            (let ((configure (assoc-ref %standard-phases 'configure))
-                  (perl-xml-parser (assoc-ref inputs "perl-xml-parser")))
-              ;; FIXME: This should be done more centrally.
-              (setenv "PERL5LIB" (string-append perl-xml-parser "/lib/perl5/site_perl"))
-              (apply configure args)))
-         %standard-phases)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
@@ -3980,8 +3921,7 @@ and Matrox.")
             "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1"))))
     (build-system gnu-build-system)
     (inputs
-      `(;("libxxf86misc" ,libxxf86misc)
-        ("xproto" ,xproto)
+      `(("xproto" ,xproto)
         ("libxmu" ,libxmu)
         ("libxext" ,libxext)
         ("libx11" ,libx11)
@@ -4011,7 +3951,6 @@ and Matrox.")
       `(("libxmu" ,libxmu)
         ("libxcursor" ,libxcursor)
         ("xbitmaps" ,xbitmaps)
-        ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -4085,7 +4024,6 @@ and Matrox.")
     (inputs
       `(("libxt" ,libxt)
         ("xproto" ,xproto)
-        ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -4109,10 +4047,9 @@ and Matrox.")
             "0fmcr5yl03xw7m8p9h1rk67rrj7gp5x16a547xhmg8idw2f6r9lg"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto)
-        ("libxcb" ,libxcb)
-        ("libx11" ,libx11)
-        ("pkg-config" ,pkg-config)))
+      `(("libx11" ,libx11)
+        ("pkg-config" ,pkg-config)
+        ("xproto" ,xproto)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
@@ -4192,9 +4129,7 @@ and Matrox.")
     (inputs
       `(("xproto" ,xproto)
         ("libxfixes" ,libxfixes)
-        ("xextproto" ,xextproto)
         ("libx11" ,libx11)
-        ("fixesproto" ,fixesproto)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -4221,7 +4156,6 @@ and Matrox.")
       `(("xextproto" ,xextproto)))
     (inputs
       `(("libxau" ,libxau)
-        ("xproto" ,xproto)
         ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
@@ -4248,8 +4182,7 @@ and Matrox.")
     (propagated-inputs
       `(("xineramaproto" ,xineramaproto)))
     (inputs
-      `(("xextproto" ,xextproto)
-        ("libxext" ,libxext)
+      `(("libxext" ,libxext)
         ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
@@ -4258,6 +4191,34 @@ and Matrox.")
     (license license:x11)))
 
 
+;; The package is missing from X11R7.7.
+(define-public libxp
+  (package
+    (name "libxp")
+    (version "1.0.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/individual/lib/libXp-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1blwrr5zhmwwy87j0svmhv3hc13acyn5j14n5rv0anz81iav2r3y"))))
+    (build-system gnu-build-system)
+    (propagated-inputs
+      `(("printproto" ,printproto)))
+    (inputs
+      `(("libx11" ,libx11)
+        ("libxext" ,libxext)
+        ("pkg-config" ,pkg-config)))
+    (home-page "http://www.x.org/wiki/")
+    (synopsis "xorg implementation of the X Window System")
+    (description "X.org provides an implementation of the X Window System")
+    (license license:x11)))
+
+
 (define-public libxrender
   (package
     (name "libxrender")
@@ -4304,8 +4265,6 @@ and Matrox.")
       `(("recordproto" ,recordproto)))
     (inputs
       `(("libxi" ,libxi)
-        ("xextproto" ,xextproto)
-        ("libxext" ,libxext)
         ("libx11" ,libx11)
         ("inputproto" ,inputproto)
         ("pkg-config" ,pkg-config)))
@@ -4315,29 +4274,27 @@ and Matrox.")
     (license license:x11)))
 
 
-(define-public libxvmc
+(define-public libxv
   (package
-    (name "libxvmc")
+    (name "libxv")
     (version "1.0.7")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libXvMC-"
+               "mirror://xorg/X11R7.7/src/everything/libXv-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18"))))
+            "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("libxv" ,libxv)))
+     `(("videoproto" ,videoproto)))
     (inputs
       `(("xproto" ,xproto)
-        ("xextproto" ,xextproto)
         ("libxext" ,libxext)
         ("libx11" ,libx11)
-        ("videoproto" ,videoproto)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -4396,71 +4353,6 @@ and Matrox.")
 
 
 
-;; package outside the x.org system proper of height 2
-
-(define-public mesa
-  (package
-    (name "mesa")
-    ;; In newer versions (9.0.5 and 9.1 tested), "make" results in an
-    ;; infinite configure loop, see
-    ;; https://bugs.freedesktop.org/show_bug.cgi?id=61527
-    (version "8.0.5")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "ftp://ftp.freedesktop.org/pub/mesa/" version
-               "/MesaLib-" version
-               ".tar.bz2"))
-        (sha256
-          (base32
-            "0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si"))))
-    (build-system gnu-build-system)
-    (propagated-inputs
-      `(("glproto" ,glproto)
-        ("libdrm" ,libdrm-2.4.33)
-        ("libxdamage" ,libxdamage)))
-    (inputs
-      `(("bison" ,bison)
-        ("dri2proto" ,dri2proto)
-        ("expat" ,expat)
-        ("flex" ,flex)
-        ("libx11" ,libx11)
-        ("libxext" ,libxext)
-        ("libxfixes" ,libxfixes)
-        ("libxml2" ,libxml2)
-        ("libxxf86vm" ,libxxf86vm)
-        ("makedepend" ,makedepend)
-        ("pkg-config" ,pkg-config)
-        ("python" ,python)))
-    (arguments
-      `(#:configure-flags
-         `("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm
-        #:phases
-         (alist-cons-after
-          'unpack 'remove-symlink
-          (lambda* (#:key #:allow-other-keys)
-            ;; remove dangling symlink to /usr/include/wine/windows
-            (delete-file "src/gallium/state_trackers/d3d1x/w32api"))
-         (alist-replace
-          'configure
-          (lambda* (#:key inputs #:allow-other-keys #:rest args)
-            (let ((configure (assoc-ref %standard-phases 'configure))
-                  (libxml2 (assoc-ref inputs "libxml2")))
-              ;; FIXME: This should be done more centrally.
-              (setenv "PYTHONPATH" (string-append libxml2 "/lib/python2.7/site-packages"))
-              (apply configure args)))
-         %standard-phases))))
-    (home-page "http://mesa3d.org/")
-    (synopsis "Mesa, an OpenGL implementation")
-    (description "Mesa is a free implementation of the OpenGL specification -
-a system for rendering interactive 3D graphics. A variety of device drivers
-allows Mesa to be used in many different environments ranging from software
-emulation to complete hardware acceleration for modern GPUs.")
-    (license license:x11)))
-
-
-
 ;; packages of height 2 in the propagated-inputs tree
 
 (define-public libice
@@ -4513,30 +4405,25 @@ emulation to complete hardware acceleration for modern GPUs.")
     (description "X.org provides an implementation of the X Window System")
     (license license:x11)))
 
-
-(define-public libxaw
+(define-public libxfixes
   (package
-    (name "libxaw")
-    (version "1.0.11")
+    (name "libxfixes")
+    (version "5.0")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libXaw-"
+               "mirror://xorg/X11R7.7/src/everything/libXfixes-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47"))))
+            "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("libxext" ,libxext)
-        ("libxmu" ,libxmu)
-        ("libxpm" ,libxpm)))
+      `(("fixesproto" ,fixesproto)))
     (inputs
-      `(("libxt" ,libxt)
-        ("xproto" ,xproto)
-        ("xextproto" ,xextproto)
+      `(("xproto" ,xproto)
         ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
@@ -4545,27 +4432,29 @@ emulation to complete hardware acceleration for modern GPUs.")
     (license license:x11)))
 
 
-(define-public libxfixes
+(define-public libxfont
   (package
-    (name "libxfixes")
-    (version "5.0")
+    (name "libxfont")
+    (version "1.4.5")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libXfixes-"
+               "mirror://xorg/X11R7.7/src/everything/libXfont-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk"))))
+            "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("fixesproto" ,fixesproto)))
+      `(("fontsproto" ,fontsproto)
+        ("freetype" ,freetype)
+        ("libfontenc" ,libfontenc)
+        ("xproto" ,xproto)))
     (inputs
-      `(("xproto" ,xproto)
-        ("xextproto" ,xextproto)
-        ("libx11" ,libx11)
+      `(("zlib" ,zlib)
+        ("xtrans" ,xtrans)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -4573,29 +4462,27 @@ emulation to complete hardware acceleration for modern GPUs.")
     (license license:x11)))
 
 
-(define-public libxfont
+(define-public libxi
   (package
-    (name "libxfont")
-    (version "1.4.5")
+    (name "libxi")
+    (version "1.6.1")
     (source
       (origin
         (method url-fetch)
         (uri (string-append
-               "mirror://xorg/X11R7.7/src/everything/libXfont-"
+               "mirror://xorg/X11R7.7/src/everything/libXi-"
                version
                ".tar.bz2"))
         (sha256
           (base32
-            "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv"))))
+            "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj"))))
     (build-system gnu-build-system)
     (propagated-inputs
-      `(("fontsproto" ,fontsproto)
-        ("freetype" ,freetype)
-        ("libfontenc" ,libfontenc)
-        ("xproto" ,xproto)))
+      `(("libxext" ,libxext)))
     (inputs
-      `(("zlib" ,zlib)
-        ("xtrans" ,xtrans)
+      `(("xproto" ,xproto)
+        ("libx11" ,libx11)
+        ("inputproto" ,inputproto)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -4624,9 +4511,7 @@ emulation to complete hardware acceleration for modern GPUs.")
     (inputs
       `(("libxrender" ,libxrender)
         ("xproto" ,xproto)
-        ("xextproto" ,xextproto)
         ("libx11" ,libx11)
-        ("renderproto" ,renderproto)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -4634,6 +4519,149 @@ emulation to complete hardware acceleration for modern GPUs.")
     (license license:x11)))
 
 
+(define-public libxvmc
+  (package
+    (name "libxvmc")
+    (version "1.0.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXvMC-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18"))))
+    (build-system gnu-build-system)
+    (propagated-inputs
+      `(("libxv" ,libxv)))
+    (inputs
+      `(("xproto" ,xproto)
+        ("libxext" ,libxext)
+        ("libx11" ,libx11)
+        ("pkg-config" ,pkg-config)))
+    (home-page "http://www.x.org/wiki/")
+    (synopsis "xorg implementation of the X Window System")
+    (description "X.org provides an implementation of the X Window System")
+    (license license:x11)))
+
+
+(define-public libxxf86vm
+  (package
+    (name "libxxf86vm")
+    (version "1.1.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXxf86vm-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55"))))
+    (build-system gnu-build-system)
+    (propagated-inputs
+      `(("libxext" ,libxext)
+        ("xf86vidmodeproto" ,xf86vidmodeproto)))
+    (inputs
+      `(("libx11" ,libx11)
+        ("pkg-config" ,pkg-config)))
+    (home-page "http://www.x.org/wiki/")
+    (synopsis "xorg implementation of the X Window System")
+    (description "X.org provides an implementation of the X Window System")
+    (license license:x11)))
+
+
+;; package outside the x.org system proper of height 3
+
+(define-public mesa
+  (package
+    (name "mesa")
+    ;; In newer versions (9.0.5 and 9.1 tested), "make" results in an
+    ;; infinite configure loop, see
+    ;; https://bugs.freedesktop.org/show_bug.cgi?id=61527
+    (version "8.0.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "ftp://ftp.freedesktop.org/pub/mesa/" version
+               "/MesaLib-" version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si"))))
+    (build-system gnu-build-system)
+    (propagated-inputs
+      `(("glproto" ,glproto)
+        ("libdrm" ,libdrm-2.4.33)
+        ("libxdamage" ,libxdamage)
+        ("libxxf86vm" ,libxxf86vm)))
+    (inputs
+      `(("bison" ,bison)
+        ("dri2proto" ,dri2proto)
+        ("expat" ,expat)
+        ("flex" ,flex)
+        ("libx11" ,libx11)
+        ("libxfixes" ,libxfixes)
+        ("libxml2" ,libxml2)
+        ("makedepend" ,makedepend)
+        ("pkg-config" ,pkg-config)
+        ("python" ,python)))
+    (arguments
+      `(#:configure-flags
+         `("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm
+        #:phases
+         (alist-cons-after
+          'unpack 'remove-symlink
+          (lambda* (#:key #:allow-other-keys)
+            ;; remove dangling symlink to /usr/include/wine/windows
+            (delete-file "src/gallium/state_trackers/d3d1x/w32api"))
+         %standard-phases)))
+    (home-page "http://mesa3d.org/")
+    (synopsis "Mesa, an OpenGL implementation")
+    (description "Mesa is a free implementation of the OpenGL specification -
+a system for rendering interactive 3D graphics. A variety of device drivers
+allows Mesa to be used in many different environments ranging from software
+emulation to complete hardware acceleration for modern GPUs.")
+    (license license:x11)))
+
+
+
+;; packages of height 3 in the propagated-inputs tree
+
+(define-public libxcb
+  (package
+    (name "libxcb")
+    (version "1.8.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "http://xcb.freedesktop.org/dist/libxcb-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j"))))
+    (build-system gnu-build-system)
+    (propagated-inputs
+      `(("libpthread-stubs" ,libpthread-stubs)
+        ("libxau" ,libxau)
+        ("libxdmcp" ,libxdmcp)))
+    (inputs
+      `(("xcb-proto" ,xcb-proto)
+        ("libxslt" ,libxslt)
+        ("pkg-config" ,pkg-config)
+        ("python" ,python)))
+    (home-page "http://www.x.org/wiki/")
+    (synopsis "xorg implementation of the X Window System")
+    (description "X.org provides an implementation of the X Window System")
+    (license license:x11)))
+
+
 (define-public xorg-server
   (package
     (name "xorg-server")
@@ -4668,18 +4696,13 @@ emulation to complete hardware acceleration for modern GPUs.")
         ("damageproto" ,damageproto)
         ("dbus" ,dbus)
         ("dmxproto" ,dmxproto)
-        ("glproto" ,glproto)
         ("libdmx" ,libdmx)
-        ("libx11" ,libx11)
         ("libxau" ,libxau)
         ("libxaw" ,libxaw)
         ("libxdmcp" ,libxdmcp)
-        ("libxext" ,libxext)
         ("libxfixes" ,libxfixes)
         ("libxfont" ,libxfont)
         ("libxkbfile" ,libxkbfile)
-        ("libxmu" ,libxmu)
-        ("libxpm" ,libxpm)
         ("libxrender" ,libxrender)
         ("libxres" ,libxres)
         ("libxt" ,libxt)
@@ -4696,13 +4719,10 @@ emulation to complete hardware acceleration for modern GPUs.")
         ("xf86dgaproto" ,xf86dgaproto)
         ("xf86driproto" ,xf86driproto)
         ("xf86vidmodeproto" ,xf86vidmodeproto)
-;;        ("xkbcomp" ,xkbcomp)
 ;;        ("xkbutils" ,xkbutils)
 ;;        ("xkeyboard-config" ,xkeyboard-config)
         ("xtrans" ,xtrans)
         ("zlib" ,zlib)))
-    (arguments
-     `(#:tests? #f))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
@@ -4710,39 +4730,6 @@ emulation to complete hardware acceleration for modern GPUs.")
 
 
 
-;; packages of height 3 in the propagated-inputs tree
-
-(define-public libxcb
-  (package
-    (name "libxcb")
-    (version "1.8.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "http://xcb.freedesktop.org/dist/libxcb-"
-               version
-               ".tar.bz2"))
-        (sha256
-          (base32
-            "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j"))))
-    (build-system gnu-build-system)
-    (propagated-inputs
-      `(("libpthread-stubs" ,libpthread-stubs)
-        ("libxau" ,libxau)
-        ("libxdmcp" ,libxdmcp)))
-    (inputs
-      `(("xcb-proto" ,xcb-proto)
-        ("libxslt" ,libxslt)
-        ("pkg-config" ,pkg-config)
-        ("python" ,python)
-        ("xproto" ,xproto)))
-    (home-page "http://www.x.org/wiki/")
-    (synopsis "xorg implementation of the X Window System")
-    (description "X.org provides an implementation of the X Window System")
-    (license license:x11)))
-
-
 ;; packages of height 4 in the propagated-inputs tree
 
 (define-public libx11
@@ -4765,7 +4752,6 @@ emulation to complete hardware acceleration for modern GPUs.")
         ("libxcb" ,libxcb)))
     (inputs
       `(("inputproto" ,inputproto)
-        ("libxcb" ,libxcb)
         ("pkg-config" ,pkg-config)
         ("xextproto" ,xextproto)
         ("xtrans" ,xtrans)))
@@ -4798,8 +4784,7 @@ emulation to complete hardware acceleration for modern GPUs.")
         ("libxfixes" ,libxfixes)
         ("xproto" ,xproto)))
     (inputs
-      `(("fixesproto" ,fixesproto)
-        ("pkg-config" ,pkg-config)))
+      `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
@@ -4825,10 +4810,37 @@ emulation to complete hardware acceleration for modern GPUs.")
       `(("libx11" ,libx11)
         ("libice" ,libice)
         ("libsm" ,libsm)))
+    (inputs
+      `(("libx11" ,libx11)
+        ("pkg-config" ,pkg-config)))
+    (home-page "http://www.x.org/wiki/")
+    (synopsis "xorg implementation of the X Window System")
+    (description "X.org provides an implementation of the X Window System")
+    (license license:x11)))
+
+
+(define-public libxaw
+  (package
+    (name "libxaw")
+    (version "1.0.11")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/X11R7.7/src/everything/libXaw-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47"))))
+    (build-system gnu-build-system)
+    (propagated-inputs
+      `(("libxext" ,libxext)
+        ("libxmu" ,libxmu)
+        ("libxpm" ,libxpm)
+        ("libxt" ,libxt)))
     (inputs
       `(("xproto" ,xproto)
-        ("libx11" ,libx11)
-        ("kbproto" ,kbproto)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -4836,3 +4848,31 @@ emulation to complete hardware acceleration for modern GPUs.")
     (license license:x11)))
 
 
+;; package outside the x.org system proper of height 5
+
+(define-public libxaw3d
+  (package
+    (name "libxaw3d")
+    (version "1.6.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/individual/lib/libXaw3d-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "0awplv1nf53ywv01yxphga3v6dcniwqnxgnb0cn4khb121l12kxp"))))
+    (build-system gnu-build-system)
+    (propagated-inputs
+      `(("libxext" ,libxext)
+        ("libxmu" ,libxmu)
+        ("libxt" ,libxt)))
+    (inputs
+      `(("libx11" ,libx11)
+        ("pkg-config" ,pkg-config)))
+    (home-page "http://www.x.org/wiki/")
+    (synopsis "xorg implementation of the X Window System")
+    (description "X.org provides an implementation of the X Window System")
+    (license license:x11)))