2 files changed, 34 insertions, 40 deletions
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 792cb67f81240..bb3aeed26ca85 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -7,7 +7,7 @@
 , libXt, libXmu, libXext, xextproto
 , libXinerama, libXrandr, randrproto
 , libXtst, libXfixes, fixesproto, systemd
-, SDL, SDL_image, SDL_mixer, alsaLib
+, SDL, SDL2, SDL_image, SDL_mixer, alsaLib
 , mesa, glew, fontconfig, freetype, ftgl
 , libjpeg, jasper, libpng, libtiff
 , libmpeg2, libsamplerate, libmad
@@ -15,7 +15,8 @@
 , lzo, libcdio, libmodplug, libass, libbluray
 , sqlite, mysql, nasm, gnutls, libva, wayland
 , curl, bzip2, zip, unzip, glxinfo, xdpyinfo
-, libcec, libcec_platform
+, libcec, libcec_platform, dcadec, libuuid
+, libcrossguid
 , dbus_libs ? null, dbusSupport ? true
 , udev, udevSupport ? true
 , libusb ? null, usbSupport ? false
@@ -25,6 +26,7 @@
 , rtmpdump ? null, rtmpSupport ? true
 , libvdpau ? null, vdpauSupport ? true
 , libpulseaudio ? null, pulseSupport ? true
+, joystickSupport ? true
 }:
 
 assert dbusSupport  -> dbus_libs != null;
@@ -36,18 +38,18 @@ assert pulseSupport -> libpulseaudio != null;
 assert rtmpSupport  -> rtmpdump != null;
 
 let
-  rel = "Isengard";
-  ffmpeg_2_6_4 = fetchurl {
-    url = "https://github.com/xbmc/FFmpeg/archive/2.6.4-${rel}.tar.gz";
-    sha256 = "0gsjz8sr0dqq68gcln29xhz3h35n77769h1gb0ias0apmpaad1r4";
+  rel = "Jarvis";
+  ffmpeg_2_8_6 = fetchurl {
+    url = "https://github.com/xbmc/FFmpeg/archive/2.8.6-${rel}-16.0.tar.gz";
+    sha256 = "00cvjwfpz6ladmln4yny4d4viwflrbgrid1na412g5pif70qv3dh";
   };
 in stdenv.mkDerivation rec {
     name = "kodi-" + version;
-    version = "15.2";
+    version = "16.0";
 
     src = fetchurl {
       url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
-      sha256 = "043i0f1crx9glwxil4xm45z5kxpkrx316gi4ir4d3rbd5safp2nx";
+      sha256 = "0iirspvv7czf785l2lqf232dvdaj87srbn9ni97ngvnd6w9yl884";
     };
 
     buildInputs = [
@@ -68,7 +70,8 @@ in stdenv.mkDerivation rec {
       lzo libcdio libmodplug libass libbluray
       sqlite mysql.lib nasm avahi libdvdcss lame
       curl bzip2 zip unzip glxinfo xdpyinfo
-      libcec libcec_platform
+      libcec libcec_platform dcadec libuuid
+      libcrossguid
     ]
     ++ lib.optional dbusSupport dbus_libs
     ++ lib.optional udevSupport udev
@@ -76,7 +79,9 @@ in stdenv.mkDerivation rec {
     ++ lib.optional sambaSupport samba
     ++ lib.optional vdpauSupport libvdpau
     ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional rtmpSupport rtmpdump;
+    ++ lib.optional rtmpSupport rtmpdump
+    ++ lib.optional joystickSupport SDL2;
+
 
     dontUseCmakeConfigure = true;
 
@@ -85,7 +90,7 @@ in stdenv.mkDerivation rec {
         --replace 'usr/share/zoneinfo' 'etc/zoneinfo'
       substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \
         --replace "/bin/bash" "${bash}/bin/bash -ex"
-      cp ${ffmpeg_2_6_4} tools/depends/target/ffmpeg/ffmpeg-2.6.4-${rel}.tar.gz
+      cp ${ffmpeg_2_8_6} tools/depends/target/ffmpeg/ffmpeg-2.8.6-${rel}-16.0.tar.gz
     '';
 
     preConfigure = ''
@@ -96,7 +101,8 @@ in stdenv.mkDerivation rec {
     ++ lib.optional (!sambaSupport) "--disable-samba"
     ++ lib.optional vdpauSupport "--enable-vdpau"
     ++ lib.optional pulseSupport "--enable-pulse"
-    ++ lib.optional rtmpSupport "--enable-rtmp";
+    ++ lib.optional rtmpSupport "--enable-rtmp"
+    ++ lib.optional joystickSupport "--enable-joystick";
 
     postInstall = ''
       for p in $(ls $out/bin/) ; do
@@ -105,9 +111,8 @@ in stdenv.mkDerivation rec {
           --prefix PATH ":" "${glxinfo}/bin" \
           --prefix PATH ":" "${xdpyinfo}/bin" \
           --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
-              [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump ]
+              [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ]
             }"
-          --prefix LD_LIBRARY_PATH ":" "${libass}/lib" \
       done
     '';
 
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 9e0f4cd2b68d8..96c47a15ef1ca 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, kodi, steam, libcec_platform, tinyxml }:
+{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, cmake, kodi, steam, libcec_platform, tinyxml, unzip }:
 
 let
 
@@ -70,17 +70,15 @@ in
 
   };
 
-  genesis = mkKodiPlugin rec {
+  genesis = (mkKodiPlugin rec {
 
     plugin = "genesis";
     namespace = "plugin.video.genesis";
-    version = "5.1.3";
+    version = "5.1.4";
 
-    src = fetchFromGitHub {
-      owner = "lambda81";
-      repo = "lambda-addons";
-      rev = "f2cd04f33af88d60e1330573bbf2ef9cee7f0a56";
-      sha256 = "0z0ldckqqif9v5nhnjr5n2495cm3z9grjmrh7czl4xlnq4bvviqq";
+    src = fetchurl {
+      url = "https://offshoregit.com/lambda81/lambda-repo/${namespace}/${namespace}-${version}.zip";
+      sha256 = "0b0pdzgg42mgxgkb6sb83rldh4k19c3l9z7g2wnvxm3s2p6rjy3v";
     };
 
     meta = with stdenv.lib; {
@@ -89,8 +87,7 @@ in
       platforms = platforms.all;
       maintainers = with maintainers; [ edwtjo ];
     };
-
-  };
+  }).override { buildInputs = [ unzip ]; };
 
   urlresolver = (mkKodiPlugin rec {
 
@@ -112,24 +109,21 @@ in
       maintainers = with maintainers; [ edwtjo ];
     };
   }).override {
-    patches = [ (fetchpatch {
-      url = https://github.com/Eldorados/script.module.urlresolver/pull/355.patch;
-      sha256 = "0q1n2sqdjqq32202s6ifh81c9a1l5a7yfkkf170dbkiajvxglz1m";
-    }) ];
+    postPatch = "sed -i -e 's,settings_file = os.path.join(addon_path,settings_file = os.path.join(profile_path,g' lib/urlresolver/common.py";
   };
 
-  salts = (mkKodiPlugin rec {
+  salts = mkKodiPlugin rec {
 
     plugin = "salts";
     namespace = "plugin.video.salts";
-    version = "1.0.98";
+    version = "2.0.6";
 
     src = fetchFromGitHub {
       name = plugin + "-" + version + ".tar.gz";
       owner = "tknorris";
       repo = plugin;
-      rev = "02cb63360ac1f60c01ec29d1da94902542f9a47a";
-      sha256 = "10cy633g383m1xy6yap46aqzyz96dh62y7c5rn5nvyw8ms18089z";
+      rev = "5100565bec5818cdcd8a891ab6a6d67b0018e070";
+      sha256 = "00nlcddmgzyi3462i12qikdryfwqzqd1i30rkp485ay16akyj0lr";
     };
 
     meta = with stdenv.lib; {
@@ -137,11 +131,6 @@ in
       description = "Stream All The Sources";
       maintainers = with maintainers; [ edwtjo ];
     };
-  }).override {
-    patches = [ (fetchpatch {
-      url = https://github.com/tknorris/salts/pull/115.patch;
-      sha256 = "157dhp049mw8lna6cg3x549jv2b9zq1vj6v94mil65q2hlw09sjd";
-    }) ];
   };
 
   svtplay = mkKodiPlugin rec {
@@ -226,13 +215,13 @@ in
   pvr-hts = (mkKodiPlugin rec {
     plugin = "pvr-hts";
     namespace = "pvr.hts";
-    version = "2.1.18";
+    version = "2.2.13";
 
     src = fetchFromGitHub {
       owner = "kodi-pvr";
       repo = "pvr.hts";
-      rev = "016b0b3251d6d5bffaf68baf59010e4347759c4a";
-      sha256 = "03lhxipz03r516pycabqc9b89kd7wih3c2dr4p602bk64bsmpi0j";
+      rev = "3274354511e970e2101c2aa437001b2f245f80da";
+      sha256 = "0i7cb61pjv6vbj3x96cm1n4w91mvc8z6lxa8ykjasrrbi95ph7ld";
     };
 
     meta = with stdenv.lib; {