[PATCH 1/4] gnu: Add wacom and xf86-input-wacom packages.

[PATCH 1/4] gnu: Add wacom and xf86-input-wacom packages.

[Andy Wingo]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 4528 bytes --]

* gnu/packages/wacom.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add wacom.scm.
---
 gnu-system.am          |  1 +
 gnu/packages/wacom.scm | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 gnu/packages/wacom.scm

diff --git a/gnu-system.am b/gnu-system.am
index 1d3496f..164564a 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -299,6 +299,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/vpn.scm				\
   gnu/packages/vtk.scm				\
   gnu/packages/w3m.scm				\
+  gnu/packages/wacom.scm			\
   gnu/packages/wdiff.scm			\
   gnu/packages/web.scm				\
   gnu/packages/weechat.scm			\
diff --git a/gnu/packages/wacom.scm b/gnu/packages/wacom.scm
new file mode 100644
index 0000000..76e7b2e
--- /dev/null
+++ b/gnu/packages/wacom.scm
@@ -0,0 +1,97 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages wacom)
+  #:use-module (guix packages)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system glib-or-gtk)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg))
+
+(define-public libwacom
+  (package
+    (name "libwacom")
+    (version "0.12")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://sourceforge/linuxwacom/libwacom/"
+                          name "-" version ".tar.bz2"))
+      (sha256
+       (base32
+        "022d0097dk2glgb6772zpcsqm1w42sbsbr3i72pdhzq6naqawys8"))))
+    (build-system glib-or-gtk-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("glib" ,glib)
+       ("gtk+" ,gtk+)
+       ("eudev" ,eudev)
+       ("libxml2" ,libxml2)))
+    (home-page "http://linuxwacom.sourceforge.net/")
+    (synopsis "A library to help implement Wacom tablet settings.")
+    (description
+     "Libwacom is a new library to help implement Wacom tablet settings.  It
+is intended to be used by client-programs that need model identification.  It
+is already being used by the gnome-settings-daemon and the GNOME 3.4 Control
+Center Wacom tablet applet.  In the future, the xf86-input-wacom driver may
+use it as well.")
+    (license license:x11)))
+
+(define-public xf86-input-wacom
+  (package
+    (name "xf86-input-wacom")
+    (version "0.29.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://sourceforge/linuxwacom/xf86-input-wacom/"
+                           name "-" version ".tar.bz2"))
+       (sha256
+        (base32
+         "15lbzjkaf690i69qy0n0ibwczbclqq1nx0418c6a567by5v7wl48"))))
+    (arguments
+     `(#:configure-flags
+       (list (string-append "--with-sdkdir="
+                            (assoc-ref %outputs "out")
+                            "/include/xorg")
+             (string-append "--with-xorg-conf-dir="
+                            (assoc-ref %outputs "out")
+                            "/share/X11/xorg.conf.d"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("xorg-server" ,xorg-server)
+       ("libxrandr" ,libxrandr)
+       ("libxinerama" ,libxinerama)
+       ("libxi" ,libxi)
+       ("eudev" ,eudev)))
+    (home-page "http://linuxwacom.sourceforge.net/")
+    (synopsis "Wacom input driver for X.")
+    (description
+     "The xf86-input-wacom driver is the wacom-specific X11 input driver for
+the X.Org X Server version 1.7 and later (X11R7.5 or later).")
+    (license license:x11)))
-- 
2.2.1

Re: [PATCH 1/4] gnu: Add wacom and xf86-input-wacom packages.

[Ricardo Wurmus]

Andy Wingo writes:

> diff --git a/gnu/packages/wacom.scm b/gnu/packages/wacom.scm
> new file mode 100644
> index 0000000..76e7b2e
> --- /dev/null
> +++ b/gnu/packages/wacom.scm
> @@ -0,0 +1,97 @@
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>

Is this copyright statement really correct?

> +(define-public xf86-input-wacom
> +  (package
> +    (name "xf86-input-wacom")

Should this not go into xorg.scm instead?

~~ Ricardo

Re: [PATCH 1/4] gnu: Add wacom and xf86-input-wacom packages.

[Ludovic Courtès]

Andy Wingo <wingo@pobox.com> skribis:

> * gnu/packages/wacom.scm: New file.
> * gnu-system.am (GNU_SYSTEM_MODULES): Add wacom.scm.

I’ve added both to xdisorg.scm with a proper copyright line, thanks!

Ludo’.