kodi: 15.2 -> 16.0

This commit is contained in:
Edward Tjörnhammar 2016-02-21 15:31:41 +01:00
parent 8968a6e604
commit ad4bfe4dda

View File

@ -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
@ -36,18 +37,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 +69,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
@ -85,7 +87,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 = ''