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

Merge pull request #75697 from georgewhewell/add-kodi-gbm

Browse Source 
kodi: add option for GBM backend
This commit is contained in:
Peter Hoeg 2020-03-29 13:49:23 +08:00 committed by GitHub
commit 4e3d5eb1f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@
, vdpauSupport ? true, libvdpau ? null , vdpauSupport ? true, libvdpau ? null
, useWayland ? false, wayland ? null, wayland-protocols ? null , useWayland ? false, wayland ? null, wayland-protocols ? null
, waylandpp ? null, libxkbcommon ? null , waylandpp ? null, libxkbcommon ? null
, useGbm ? false, mesa ? null, libinput ? null
}: }:
assert dbusSupport -> dbus != null; assert dbusSupport -> dbus != null;
@ -185,6 +186,11 @@ in stdenv.mkDerivation {
wayland waylandpp wayland waylandpp
# Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise
libxkbcommon.dev libxkbcommon.dev
]
++ lib.optional useGbm [
libxkbcommon.dev
mesa.dev
libinput.dev
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
@ -207,6 +213,9 @@ in stdenv.mkDerivation {
] ++ lib.optional useWayland [ ] ++ lib.optional useWayland [
"-DCORE_PLATFORM_NAME=wayland" "-DCORE_PLATFORM_NAME=wayland"
"-DWAYLAND_RENDER_SYSTEM=gl" "-DWAYLAND_RENDER_SYSTEM=gl"
] ++ lib.optional useGbm [
"-DCORE_PLATFORM_NAME=gbm"
"-DGBM_RENDER_SYSTEM=gles"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

6
pkgs/top-level/all-packages.nix
View File

@ -22674,6 +22674,8 @@ in
kodiPlainWayland = callPackage ../applications/video/kodi { useWayland = true; }; kodiPlainWayland = callPackage ../applications/video/kodi { useWayland = true; };
kodiGBM = callPackage ../applications/video/kodi { useGbm = true; };
kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {});
kodi = wrapKodi { kodi = wrapKodi {
@ -22684,6 +22686,10 @@ in
kodi = kodiPlainWayland; kodi = kodiPlainWayland;
}; };
kodi-gbm = wrapKodi {
kodi = kodiGBM;
};
kodi-cli = callPackage ../tools/misc/kodi-cli { }; kodi-cli = callPackage ../tools/misc/kodi-cli { };
kodi-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers =