From 1e3fbf3c6d65a1a92d0e1477f296680d877bd63b Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Sat, 12 Mar 2016 12:23:47 -0500
Subject: gnu: Add crossguid.

* gnu/packages/kodi.scm (crossguid): New variable.
---
 gnu/packages/kodi.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

(limited to 'gnu/packages/kodi.scm')

diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 4a9cebde01..dfd8722b99 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -21,6 +21,7 @@
   #:use-module (guix utils)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages audio)
@@ -68,6 +69,55 @@
   #:use-module (gnu packages yasm)
   #:use-module (gnu packages zip))
 
+(define-public crossguid
+  (let ((commit "8f399e8bd4252be9952f3dfa8199924cc8487ca4"))
+    (package
+      (name "crossguid")
+      (version (string-append "0.0-1." (string-take commit 7)))
+      ;; There's no official release.  Just a Git repository.
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/graeme-hill/crossguid.git")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "1i29y207qqddvaxbn39pk2fbh3gx8zvdprfp35wasj9rw2wjk3s9"))))
+      (build-system gnu-build-system)
+      (arguments
+       '(#:phases
+         (modify-phases %standard-phases
+           (delete 'configure) ; no configure script
+           ;; There's no build system here, so we have to do it ourselves.
+           (replace 'build
+             (lambda _
+               (and (zero? (system* "g++" "-c" "guid.cpp" "-o" "guid.o"
+                                    "-std=c++11" "-DGUID_LIBUUID"))
+                    (zero? (system* "ar" "rvs" "libcrossguid.a" "guid.o")))))
+           (replace 'check
+             (lambda _
+               (and (zero? (system* "g++" "-c" "test.cpp" "-o" "test.o"
+                                    "-std=c++11"))
+                    (zero? (system* "g++" "-c" "testmain.cpp" "-o" "testmain.o"
+                                    "-std=c++11"))
+                    (zero? (system* "g++" "test.o" "guid.o" "testmain.o"
+                                    "-o" "test" "-luuid"))
+                    (zero? (system* (string-append (getcwd) "/test"))))))
+           (replace 'install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let ((out (assoc-ref outputs "out")))
+                 (install-file "guid.h" (string-append out "/include"))
+                 (install-file "libcrossguid.a"
+                               (string-append out "/lib"))
+                 #t))))))
+      (inputs
+       `(("util-linux" ,util-linux)))
+      (synopsis "Lightweight universal identifier library")
+      (description "CrossGuid is a minimal @acronym{GUID}/@acronym{UUID}
+generator library for C++.")
+      (home-page "https://github.com/graeme-hill/crossguid")
+      (license license:expat))))
+
 (define-public kodi
   (package
     (name "kodi")
-- 
cgit v1.2.3


From 9ced12de01919b04f8b93b8dbbf99f74298622a0 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Mon, 29 Feb 2016 21:34:00 -0500
Subject: gnu: kodi: Update to 16.0.

* gnu/packages/kodi.scm (kodi): Update to 16.0.
[inputs]: Add crossguid, dcadec, and util-linux.
---
 gnu/packages/kodi.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/kodi.scm')

diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index dfd8722b99..5710e1fd48 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -121,15 +121,15 @@ generator library for C++.")
 (define-public kodi
   (package
     (name "kodi")
-    (version "15.2")
+    (version "16.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://mirrors.kodi.tv/releases/source/"
-                                  version "-Isengard.tar.gz"))
+                                  version "-Jarvis.tar.gz"))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "043i0f1crx9glwxil4xm45z5kxpkrx316gi4ir4d3rbd5safp2nx"))
+                "0iirspvv7czf785l2lqf232dvdaj87srbn9ni97ngvnd6w9yl884"))
               (snippet
                ;; Delete bundled ffmpeg.
                ;; TODO: Delete every other bundled library.
@@ -211,7 +211,9 @@ generator library for C++.")
        ("bluez" ,bluez)
        ("boost" ,boost)
        ("bzip2" ,bzip2)
+       ("crossguid" ,crossguid)
        ("curl" ,curl)
+       ("dcadec" ,dcadec)
        ("dbus" ,dbus)
        ("enca" ,enca)
        ("eudev" ,eudev)
@@ -263,6 +265,7 @@ generator library for C++.")
        ("taglib" ,taglib)
        ("tinyxml" ,tinyxml)
        ("unzip" ,unzip)
+       ("util-linux" ,util-linux)
        ("zip" ,zip)
        ("zlib" ,zlib)))
     (synopsis "Media center for home theater computers")
-- 
cgit v1.2.3