Re: [PATCH 1/2] gnu: Add wlc.

[ng0]

I was working on this package too, I've packaged chck but fail at wlc
because it can't find WaylandProtocols. Do we miss something in a
wayland related package?

I'll append the patch for both chck and wlc, maybe you want to pick it
up again. I'd be interested in getting sway on Guix. If you don't want
to work on this, I'll continue debugging and would welcome input on the
wayland protocols problem.

>From 30ebfaf471d57242863e7239669b42d41fba78d4 Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Sun, 11 Sep 2016 09:40:32 +0000
Subject: [PATCH 1/2] gnu: Add chck.

* gnu/packages/wm.scm (chck): New variable.
---
 gnu/packages/wm.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 6275e6f..b784181 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -34,6 +34,7 @@
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system haskell)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages haskell)
   #:use-module (gnu packages base)
   #:use-module (gnu packages pkg-config)
@@ -51,6 +52,7 @@
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages fribidi)
   #:use-module (gnu packages maths)
+  #:use-module (gnu packages valgrind)
   #:use-module (gnu packages web)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
@@ -457,3 +459,34 @@ experience.")
 dynamic and extensible using the Lua programming language.")
     (license license:gpl2+)
     (home-page "https://awesome.naquadah.org/";)))
+
+(define-public chck
+  (let* ((commit "55d41fbf2c9f58500a0dca8402a3151c6e50742a")
+         (revision "1"))
+    (package
+      (name "chck")
+      (version (string-append "0.0." revision "." (string-take commit 7)))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/Cloudef/chck";)
+                      (commit commit)))
+                (file-name (string-append name "-" version "-checkout"))
+                (sha256
+                 (base32
+                  "13lm9m696jmrghzsbs508sv0y1ccspczb6ipyn917f1xd0fr53j2"))))
+      (build-system cmake-build-system)
+      (arguments
+       `(#:configure-flags (list
+                            "-DCMAKE_BUILD_TYPE=Upstream")))
+      (inputs
+       `(("doxygen" ,doxygen)
+         ("zlib" ,zlib)
+         ("valgrind" ,valgrind)))
+      (native-inputs
+       `(("pkg-config" ,pkg-config)))
+      (home-page "https://github.com/Cloudef/chck";)
+      (synopsis "Collection of C utilities")
+      (description
+       "Collection of C utilities")
+      (license license:zlib))))
-- 
2.10.0

>From c3038eb951ec86eab093806c346fcbf0bad9be79 Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Sun, 11 Sep 2016 10:50:49 +0000
Subject: [PATCH 2/2] gnu: Add wlc.

* gnu/packages/wm.scm (wlc): New variable.
---
 gnu/packages/wm.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index b784181..c52392c 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -36,9 +36,11 @@
   #:use-module (guix build-system haskell)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages haskell)
+  #:use-module (gnu packages gl)
   #:use-module (gnu packages base)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages pth)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages xdisorg)
@@ -490,3 +492,50 @@ dynamic and extensible using the Lua programming 
language.")
       (description
        "Collection of C utilities")
       (license license:zlib))))
+
+(define-public wlc
+  (package
+    (name "wlc")
+    (version "0.0.5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/Cloudef/wlc/archive/v";
+                                  version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "06w22l5igbnbdbln05f42py8q30rl3g5hh7inrv187gv0c33zqna"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:configure-flags (list
+                          "-DCMAKE_BUILD_TYPE=Upstream")))
+                          ;; (string-append "-DCMAKE_INSTALL_LIBDIR="
+                          ;;                (assoc-ref %outputs "out") "/lib")
+                          ;; (string-append "-DCMAKE_INSTALL_PREFIX="
+                          ;;                (assoc-ref %outputs "out")))))
+    (inputs
+     `(("pixman" ,pixman)
+       ("wayland" ,wayland)
+       ("wayland-protocols" ,wayland-protocols)
+       ("libxkbcommon" ,libxkbcommon)
+       ("eudev" ,eudev)
+       ("libinput" ,libinput)
+       ("libx11" ,libx11) ; x11-xcb, xfixes
+       ("libxcb" ,libxcb)
+       ("pth" ,pth)
+       ("libxcomposite" ,libxcomposite)
+       ("mesa" ,mesa) ; libgbm, libegl, libglesv2
+       ("libdrm" ,libdrm)
+       ("dbus" ,dbus)
+       ("xcb-util-image" ,xcb-util-image)
+       ("xcb-util-wm" ,xcb-util-wm)
+       ("xproxo" ,xproto)
+       ("zlib" ,zlib)
+       ("chck" ,chck)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "https://github.com/Cloudef/wlc";)
+    (synopsis "Wayland compositor library")
+    (description
+     "wlc is a Wayland compositor library.")
+    (license license:expat)))
-- 
2.10.0


Tomáš Čech <address@hidden> writes:

> [ Unknown signature status ]
> On Fri, Aug 26, 2016 at 11:13:43AM +0300, Alex Kost wrote:
>>Tomáš Čech (2016-08-25 22:10 +0300) wrote:
>>
>>> +    (description
>>> +     "This is wayland compositor library used by several projects like 
>>> sway,
>>> +orbment or Guile-WM.")
>>
>>Are you sure about Guile-WM?  AFAIK it uses XCB, but not Wayland.
>
> Thanks for the catch. I actully meant Gram.
>
> https://github.com/emallson/gram
>
> I'll send updated the patch.
>
> S_W

-- 
ng0
For non-prism friendly talk find me on http://www.psyced.org