ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: kodi: Update to 18.0b5.

Browse source 
* gnu/packages/kodi.scm (kodi): Update to 18.0b5.
[source]: Update snippet.
[inputs]: Add flatbuffers, fstrcmp.
(crossguid): Update to commit fef89a4174a7bf8cd99fa9154864ce9e8e3bf989.
(libdvdnav/kodi, libdvdread/kodi): Update to 6.0.0-Leia-Alpha-3.
(libdvdcss/kodi): Update to 1.4.2-Leia-Beta-5.
This commit is contained in:
Efraim Flashner 2018-11-08 11:55:38 +02:00
parent 988b78ba28
commit e3407254d5
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
gnu/packages/kodi.scm
View file

@ -64,6 +64,7 @@ (define-module (gnu packages kodi)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages samba) #:use-module (gnu packages samba)
#:use-module (gnu packages sdl) #:use-module (gnu packages sdl)
#:use-module (gnu packages serialization)
#:use-module (gnu packages ssh) #:use-module (gnu packages ssh)
#:use-module (gnu packages swig) #:use-module (gnu packages swig)
#:use-module (gnu packages textutils) #:use-module (gnu packages textutils)
@ -77,11 +78,12 @@ (define-module (gnu packages kodi)
#:use-module (gnu packages assembly)) #:use-module (gnu packages assembly))
(define-public crossguid (define-public crossguid
(let ((commit "8f399e8bd4252be9952f3dfa8199924cc8487ca4")) (let ((commit "fef89a4174a7bf8cd99fa9154864ce9e8e3bf989")
(revision "2"))
(package (package
(name "crossguid") (name "crossguid")
(version (string-append "0.0-1." (string-take commit 7))) (version (string-append "0.0-" revision "." (string-take commit 7)))
;; There's no official release. Just a Git repository. ;; This is the commit that Kodi wants.
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -90,13 +92,12 @@ (define-public crossguid
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"1i29y207qqddvaxbn39pk2fbh3gx8zvdprfp35wasj9rw2wjk3s9")))) "1blrkc7zcqrqcr5msvhyhm98s2jvm9hr0isqs4288q2r4mdnrfq0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) ; no configure script (delete 'configure) ; no configure script
;; There's no build system here, so we have to do it ourselves.
(replace 'build (replace 'build
(lambda _ (lambda _
(invoke "g++" "-c" "guid.cpp" "-o" "guid.o" (invoke "g++" "-c" "guid.cpp" "-o" "guid.o"
@ -131,7 +132,7 @@ (define-public crossguid
;; of the standard build process. To make things easier, we bootstrap ;; of the standard build process. To make things easier, we bootstrap
;; and patch shebangs here, so we don't have to worry about it later. ;; and patch shebangs here, so we don't have to worry about it later.
(define libdvdnav/kodi (define libdvdnav/kodi
(let ((commit "6.0.0-Leia-Alpha-1")) (let ((commit "6.0.0-Leia-Alpha-3"))
(package (package
(name "libdvdnav-bootstrapped") (name "libdvdnav-bootstrapped")
(version commit) (version commit)
@ -143,7 +144,7 @@ (define libdvdnav/kodi
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"1xiyfgf8v8aknlxlzsvk6pbzkhclz0hbh3s1b0w6ivkng2k310j9")))) "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f '(#:tests? #f
@ -166,7 +167,7 @@ (define libdvdnav/kodi
(license license:gpl2+)))) (license license:gpl2+))))
(define libdvdread/kodi (define libdvdread/kodi
(let ((commit "6.0.0-Leia-Alpha-1")) (let ((commit "6.0.0-Leia-Alpha-3"))
(package (package
(name "libdvdread-bootstrapped") (name "libdvdread-bootstrapped")
(version commit) (version commit)
@ -178,7 +179,7 @@ (define libdvdread/kodi
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"1c3g18n2vwhgcfz3dka1pmw58bnv2ram7xjvizfiykb3sgi9zfwp")))) "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f '(#:tests? #f
@ -201,7 +202,7 @@ (define libdvdread/kodi
(license (list license:gpl2+ license:lgpl2.1+))))) (license (list license:gpl2+ license:lgpl2.1+)))))
(define libdvdcss/kodi (define libdvdcss/kodi
(let ((commit "1.4.1-Leia-Alpha-1")) (let ((commit "1.4.2-Leia-Beta-5"))
(package (package
(name "libdvdcss-bootstrapped") (name "libdvdcss-bootstrapped")
(version commit) (version commit)
@ -213,7 +214,7 @@ (define libdvdcss/kodi
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"0adafwsawxssj3nilkql447v0l4a2584rdpmy5rfjmznh91lykgh")))) "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f '(#:tests? #f
@ -265,27 +266,23 @@ (define-public fstrcmp
(license license:gpl3+))) (license license:gpl3+)))
(define-public kodi (define-public kodi
;; We package the git version because the current released
;; version was cut while the cmake transition was in turmoil.
(let ((commit "ec16dbca4dcf2923f53f819695a6d47c52e68d74")
(revision "8"))
(package (package
(name "kodi") (name "kodi")
(version (git-version "18.0_alpha" revision commit)) (version "18.0b5")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/xbmc/xbmc.git") (url "https://github.com/xbmc/xbmc.git")
(commit commit))) (commit (string-append version "-Leia"))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1rxg752cl59124cfpfwmyjldn6qpq5jginxddpzvgagfadf10i4d")) "042qzvhys3sajby6ywgmrsymhji37qk0iqgppznrvm53vrizwsam"))
(snippet (snippet
'(begin '(begin
(use-modules (guix build utils)) (use-modules (guix build utils))
(for-each delete-file-recursively (for-each delete-file-recursively
'("project/BuildDependencies/bin/" '("project/BuildDependencies/"
;; TODO: Purge these jars. ;; TODO: Purge these jars.
;;"tools/codegenerator/groovy" ;;"tools/codegenerator/groovy"
;; And these sources: ;; And these sources:
@ -401,10 +398,12 @@ (define-public kodi
("eudev" ,eudev) ("eudev" ,eudev)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg)
("flac" ,flac) ("flac" ,flac)
("flatbuffers" ,flatbuffers)
("fmt" ,fmt) ("fmt" ,fmt)
("fontconfig" ,fontconfig) ("fontconfig" ,fontconfig)
("freetype" ,freetype) ("freetype" ,freetype)
("fribidi" ,fribidi) ("fribidi" ,fribidi)
("fstrcmp" ,fstrcmp)
("giflib" ,giflib) ("giflib" ,giflib)
("glew" ,glew) ("glew" ,glew)
("gnutls" ,gnutls) ("gnutls" ,gnutls)
@ -458,7 +457,7 @@ (define-public kodi
license:expat ;cpluff, dbwrappers license:expat ;cpluff, dbwrappers
license:public-domain ;cpluff/examples license:public-domain ;cpluff/examples
license:bsd-3 ;misc, gtest license:bsd-3 ;misc, gtest
license:bsd-2))))) ;xbmc/freebsd license:bsd-2)))) ;xbmc/freebsd
(define-public kodi-cli (define-public kodi-cli
(let ((commit "104dc23b2a993c8e6db8c46f4f8bec24b146549b") ; Add support for (let ((commit "104dc23b2a993c8e6db8c46f4f8bec24b146549b") ; Add support for