;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 David Thompson <davet@gnu.org>
-;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
#:use-module (gnu packages databases)
#:use-module (gnu packages documentation)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages freedesktop)
#:use-module (gnu packages fribidi)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
(replace 'build
(lambda _
(invoke "g++" "-c" "guid.cpp" "-o" "guid.o"
- "-std=c++11" "-DGUID_LIBUUID")
+ "-DGUID_LIBUUID")
(invoke "ar" "rvs" "libcrossguid.a" "guid.o")))
(replace 'check
(lambda _
- (invoke "g++" "-c" "test.cpp" "-o" "test.o"
- "-std=c++11")
- (invoke "g++" "-c" "testmain.cpp" "-o" "testmain.o"
- "-std=c++11")
+ (invoke "g++" "-c" "test.cpp" "-o" "test.o")
+ (invoke "g++" "-c" "testmain.cpp" "-o" "testmain.o")
(invoke "g++" "test.o" "guid.o" "testmain.o"
"-o" "test" "-luuid")
(invoke (string-append (getcwd) "/test"))))
(define-public kodi
(package
(name "kodi")
- (version "18.0rc3")
+ (version "18.4")
(source (origin
(method git-fetch)
(uri (git-reference
(file-name (git-file-name name version))
(sha256
(base32
- "0bwi4gwmwppjw6bf0zihyg42zwnd0imq0aw4xxsgnacqakhxzii0"))
- (patches (search-patches "kodi-skip-test-449.patch"))
+ "1m0295czxabdcqyqf5m94av9d88pzhnzjvyfs1q07xqq82h313p7"))
+ (patches (search-patches "kodi-skip-test-449.patch"
+ "kodi-increase-test-timeout.patch"
+ "kodi-set-libcurl-ssl-parameters.patch"))
(snippet
'(begin
(use-modules (guix build utils))
("libxrender" ,libxrender)
("libxslt" ,libxslt)
("lzo" ,lzo)
- ("mariadb" ,mariadb)
+ ("mariadb" ,mariadb "lib")
+ ("mariadb-dev" ,mariadb "dev")
("openssl" ,openssl)
("pcre" ,pcre)
("pulseaudio" ,pulseaudio)
license:bsd-3 ;misc, gtest
license:bsd-2)))) ;xbmc/freebsd
+(define-public kodi/wayland
+ (package/inherit kodi
+ (name "kodi-wayland")
+ (arguments
+ (substitute-keyword-arguments (package-arguments kodi)
+ ((#:configure-flags flags)
+ `(append '("-DCORE_PLATFORM_NAME=wayland"
+ "-DWAYLAND_RENDER_SYSTEM=gl")
+ ,flags))))
+ (inputs
+ `(("libinput" ,libinput)
+ ("libxkbcommon" ,libxkbcommon)
+ ("waylandpp" ,waylandpp)
+ ("waylandp-protocols" ,wayland-protocols)
+ ,@(package-inputs kodi)))
+ (synopsis "Kodi with Wayland rendering backend")))
+
(define-public kodi-cli
(let ((commit "104dc23b2a993c8e6db8c46f4f8bec24b146549b") ; Add support for
(revision "1")) ; `$HOME/.kodirc'.