public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kodi: fix hw accel

Browse Source 
Also, drop SDL build inputs. SDL was not even detected/enabled.
This commit is contained in:
Carles Pagès 2017-12-23 09:28:53 +01:00
parent fb51574bf6
commit 5aa539a537
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/video/kodi/default.nix
View File

@ -8,8 +8,7 @@
, libXt, libXmu, libXext, xextproto , libXt, libXmu, libXext, xextproto
, libXinerama, libXrandr, randrproto , libXinerama, libXrandr, randrproto
, libXtst, libXfixes, fixesproto, systemd , libXtst, libXfixes, fixesproto, systemd
, SDL, SDL2, SDL_image, SDL_mixer, alsaLib , alsaLib, mesa, glew, fontconfig, freetype, ftgl
, mesa, glew, fontconfig, freetype, ftgl
, libjpeg, jasper, libpng, libtiff , libjpeg, jasper, libpng, libtiff
, libmpeg2, libsamplerate, libmad , libmpeg2, libsamplerate, libmad
, libogg, libvorbis, flac, libxslt , libogg, libvorbis, flac, libxslt
@ -44,6 +43,7 @@ assert vdpauSupport -> libvdpau != null;
# - cmake is no longer in project/cmake # - cmake is no longer in project/cmake
# - maybe we can remove auto{conf,make} and libtool from inputs # - maybe we can remove auto{conf,make} and libtool from inputs
# - check if dbus support PR has been merged and add dbus as a buildInput # - check if dbus support PR has been merged and add dbus as a buildInput
# - try to use system ffmpeg (kodi 17 works best with bundled 3.1 with patches)
let let
kodiReleaseDate = "20171115"; kodiReleaseDate = "20171115";
@ -78,7 +78,8 @@ let
preConfigure = '' preConfigure = ''
cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .
''; '';
buildInputs = [ gnutls libidn libtasn1 p11_kit zlib ]; buildInputs = [ gnutls libidn libtasn1 p11_kit zlib libva ]
++ lib.optional vdpauSupport libvdpau;
nativeBuildInputs = [ cmake nasm pkgconfig ]; nativeBuildInputs = [ cmake nasm pkgconfig ];
}; };
@ -124,9 +125,8 @@ in stdenv.mkDerivation rec {
openssl gperf tinyxml2 taglib libssh swig jre openssl gperf tinyxml2 taglib libssh swig jre
libX11 xproto inputproto libXt libXmu libXext xextproto libX11 xproto inputproto libXt libXmu libXext xextproto
libXinerama libXrandr randrproto libXtst libXfixes fixesproto libXinerama libXrandr randrproto libXtst libXfixes fixesproto
SDL SDL_image SDL_mixer alsaLib alsaLib mesa glew fontconfig freetype ftgl
mesa glew fontconfig freetype ftgl libjpeg jasper libpng libtiff wayland
libjpeg jasper libpng libtiff libva wayland
libmpeg2 libsamplerate libmad libmpeg2 libsamplerate libmad
libogg libvorbis flac libxslt systemd libogg libvorbis flac libxslt systemd
lzo libcdio libmodplug libass libbluray lzo libcdio libmodplug libass libbluray
@ -140,7 +140,7 @@ in stdenv.mkDerivation rec {
# libdvdcss libdvdnav libdvdread # libdvdcss libdvdnav libdvdread
] ]
++ lib.optional dbusSupport dbus_libs ++ lib.optional dbusSupport dbus_libs
++ lib.optionals joystickSupport [ cwiid SDL2 ] ++ lib.optionals joystickSupport [ cwiid ]
++ lib.optional nfsSupport libnfs ++ lib.optional nfsSupport libnfs
++ lib.optional pulseSupport libpulseaudio ++ lib.optional pulseSupport libpulseaudio
++ lib.optional rtmpSupport rtmpdump ++ lib.optional rtmpSupport rtmpdump
@ -189,7 +189,7 @@ in stdenv.mkDerivation rec {
wrapProgram $out/bin/$p \ wrapProgram $out/bin/$p \
--prefix PATH ":" "${lib.makeBinPath [ python2 glxinfo xdpyinfo ]}" \ --prefix PATH ":" "${lib.makeBinPath [ python2 glxinfo xdpyinfo ]}" \
--prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
[ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ]}" [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ]}"
done done
substituteInPlace $out/share/xsessions/kodi.desktop \ substituteInPlace $out/share/xsessions/kodi.desktop \