;;; Copyright © 2017, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (gnu packages curl)
#:use-module (gnu packages databases)
#:use-module (gnu packages documentation)
+ #:use-module (gnu packages file-systems)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages fribidi)
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/graeme-hill/crossguid.git")
+ (url "https://github.com/graeme-hill/crossguid")
(commit commit)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(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"))))
(string-append out "/lib"))
#t))))))
(inputs
- `(("util-linux" ,util-linux)))
+ `(("libuuid" ,util-linux "lib")))
(synopsis "Lightweight universal identifier library")
(description "CrossGuid is a minimal GUID/UUID
generator library for C++.")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/xbmc/libdvdnav.git")
+ (url "https://github.com/xbmc/libdvdnav")
(commit commit)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/xbmc/libdvdread.git")
+ (url "https://github.com/xbmc/libdvdread")
(commit commit)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/xbmc/libdvdcss.git")
+ (url "https://github.com/xbmc/libdvdcss")
(commit commit)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(define-public kodi
(package
(name "kodi")
- (version "18.3")
+ (version "18.8")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/xbmc/xbmc.git")
+ (url "https://github.com/xbmc/xbmc")
(commit (string-append version "-Leia"))))
(file-name (git-file-name name version))
(sha256
(base32
- "18fbl5hs3aqccrn0m3x7hp95wlafjav0yvrwmb5q3gj24mwf6jld"))
+ "0qpkpz43s207msvv3qkiy6vzqwcgmydxv3py7vc29mv6h30chrva"))
(patches (search-patches "kodi-skip-test-449.patch"
+ "kodi-increase-test-timeout.patch"
"kodi-set-libcurl-ssl-parameters.patch"))
(snippet
'(begin
(lambda _
(invoke "make" "kodi-test"))))))
;; TODO: Add dependencies for:
- ;; - nfs
;; - cec
;; - plist
;; - shairplay
("libcdio" ,libcdio)
("libdrm" ,libdrm)
("libgcrypt" ,libgcrypt)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libltdl" ,libltdl)
("libmad" ,libmad)
("libmicrohttpd" ,libmicrohttpd)
("libmpeg2" ,libmpeg2)
+ ("libnfs" ,libnfs)
("libogg" ,libogg)
("libpng" ,libpng)
("libssh" ,libssh)
("libxrender" ,libxrender)
("libxslt" ,libxslt)
("lzo" ,lzo)
- ("mariadb" ,mariadb)
+ ("mariadb-dev" ,mariadb "lib")
+ ("mariadb-dev" ,mariadb "dev")
("openssl" ,openssl)
("pcre" ,pcre)
("pulseaudio" ,pulseaudio)