summaryrefslogtreecommitdiff
path: root/gnu/packages/kodi.scm
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2018-03-14 17:37:20 +0100
committerRicardo Wurmus <rekado@elephly.net>2018-03-14 17:37:20 +0100
commit8c72ed923d77ee55989965bb02628043799b9548 (patch)
tree802e6eb910719a98fa09bf7c2bd884097f649adc /gnu/packages/kodi.scm
parent189be331acfda1c242a9c85fca8d2a0356742f48 (diff)
parentaac6cbbfede0bbfafdbbeeb460f00a244333895d (diff)
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/kodi.scm')
-rw-r--r--gnu/packages/kodi.scm27
1 files changed, 13 insertions, 14 deletions
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index bb17edf2f5..6f8571d22a 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -128,7 +128,7 @@ generator library for C++.")
;; 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.
(define libdvdnav/kodi
- (let ((commit "981488f7f27554b103cca10c1fbeba027396c94a"))
+ (let ((commit "6.0.0-Leia-Alpha-1"))
(package
(name "libdvdnav-bootstrapped")
(version commit)
@@ -140,7 +140,7 @@ generator library for C++.")
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "089pswc51l3avh95zl4cpsh7gh1innh7b2y4xgx840mcmy46ycr8"))))
+ "1xiyfgf8v8aknlxlzsvk6pbzkhclz0hbh3s1b0w6ivkng2k310j9"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f
@@ -163,7 +163,7 @@ generator library for C++.")
(license license:gpl2+))))
(define libdvdread/kodi
- (let ((commit "17d99db97e7b8f23077b342369d3c22a6250affd"))
+ (let ((commit "6.0.0-Leia-Alpha-1"))
(package
(name "libdvdread-bootstrapped")
(version commit)
@@ -175,7 +175,7 @@ generator library for C++.")
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "1gr5aq1cjr3as9mnwrw29cxn4m6f6pfrxdahkdcjy70q3ldg90sl"))))
+ "1c3g18n2vwhgcfz3dka1pmw58bnv2ram7xjvizfiykb3sgi9zfwp"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f
@@ -198,7 +198,7 @@ generator library for C++.")
(license (list license:gpl2+ license:lgpl2.1+)))))
(define libdvdcss/kodi
- (let ((commit "2f12236bc1c92f73c21e973363f79eb300de603f"))
+ (let ((commit "1.4.1-Leia-Alpha-1"))
(package
(name "libdvdcss-bootstrapped")
(version commit)
@@ -210,7 +210,7 @@ generator library for C++.")
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "198r0q73i55ga1dvyqq9nfcri0zq08b94hy8671lg14i3izx44dd"))))
+ "0adafwsawxssj3nilkql447v0l4a2584rdpmy5rfjmznh91lykgh"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f
@@ -235,20 +235,20 @@ generator library for C++.")
(define-public kodi
;; We package the git version because the current released
;; version was cut while the cmake transition was in turmoil.
- (let ((commit "67fd70f01a363002881f3519b50765b756716e3b")
- (revision "7"))
+ (let ((commit "ec16dbca4dcf2923f53f819695a6d47c52e68d74")
+ (revision "8"))
(package
(name "kodi")
- (version (string-append "18.0_alpha-" revision "-" (string-take commit 7)))
+ (version (git-version "18.0_alpha" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/xbmc/xbmc.git")
(commit commit)))
- (file-name (string-append name "-" version "-checkout"))
+ (file-name (git-file-name name version))
(sha256
(base32
- "12975n4r982kmxc0r9w24n3lrj7aj3cs4fjkdjnn0r9jbnvfxhs3"))
+ "1rxg752cl59124cfpfwmyjldn6qpq5jginxddpzvgagfadf10i4d"))
(snippet
'(begin
(use-modules (guix build utils))
@@ -261,7 +261,6 @@ generator library for C++.")
;; "tools/depend/native/TexturePacker"
;; "lib/gtest"
;; "lib/cpluff"
- ;; "lib/libexif"
;; "lib/libUPnP"
"lib/libUPnP/Neptune/ThirdParty"
"project/Win32BuildSetup/tools/7z"))
@@ -312,7 +311,7 @@ generator library for C++.")
;; to make them writable before the build process starts.
(("autoreconf -vif") "chmod -R u+w ."))
- (substitute* "xbmc/linux/LinuxTimezone.cpp"
+ (substitute* "xbmc/platform/linux/LinuxTimezone.cpp"
(("/usr/share/zoneinfo")
(string-append (assoc-ref inputs "tzdata")
"/share/zoneinfo")))
@@ -414,7 +413,7 @@ generator library for C++.")
(description "Kodi is a media center application for playing videos,
music, games, etc. Kodi is highly customizable and features a theme and
plug-in system.")
- (home-page "http://kodi.tv")
+ (home-page "https://kodi.tv")
;; XBMC is largely GPL2+, with some library components as LGPL2.1+, but
;; there are some other licenses spread throughout.
(license (list license:gpl2+ license:lgpl2.1+