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

intel-gpu-tools: update from 1.10 to 1.11

Browse Source
This commit is contained in:
Pascal Wittmann 2015-06-14 21:23:37 +02:00
parent a9c3392836
commit 23393964bb
2 changed files with 6 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch
View File

@ -1,37 +0,0 @@
From 233808a58db1f62d773b03f9dad599924170aca6 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 18 Mar 2015 08:36:37 +0000
Subject: lib/batch: Trivial compile fix for 32-bit builds
intel_batchbuffer.c: In function 'fill_object':
intel_batchbuffer.c:589:20: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
obj->relocs_ptr = (uint64_t)relocs;
^
intel_batchbuffer.c: In function 'exec_blit':
intel_batchbuffer.c:598:21: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
exec.buffers_ptr = (uint64_t)objs;
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
index 666c323..c1c27a6 100644
--- a/lib/intel_batchbuffer.c
+++ b/lib/intel_batchbuffer.c
@@ -548,7 +548,7 @@ fill_object(struct drm_i915_gem_exec_object2 *obj, uint32_t gem_handle,
memset(obj, 0, sizeof(*obj));
obj->handle = gem_handle;
obj->relocation_count = count;
- obj->relocs_ptr = (uint64_t)relocs;
+ obj->relocs_ptr = (uintptr_t)relocs;
}
static void exec_blit(int fd,
@@ -557,7 +557,7 @@ static void exec_blit(int fd,
{
struct drm_i915_gem_execbuffer2 exec;
- exec.buffers_ptr = (uint64_t)objs;
+ exec.buffers_ptr = (uintptr_t)objs;
exec.buffer_count = count;
exec.batch_start_offset = 0;
exec.batch_len = batch_len * 4;

12
pkgs/development/tools/misc/intel-gpu-tools/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev, libX11, libXext, libXv, libXrandr, glib, bison }:
{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev
, libX11, libXext, libXv, libXrandr, glib, bison, libunwind }:
stdenv.mkDerivation rec {
name = "intel-gpu-tools-1.10";
name = "intel-gpu-tools-1.11";
src = fetchurl {
url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2";
sha256 = "0x4q7gv14yaniycgdxym9nazlj6wzcvjjhg40bbm5lkw5pqvxwkd";
sha256 = "1r5dbp2gdxqryv1fhxy83k4d1kfp7rv8q370fhncamrb8m8390j8";
};
buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 libXext libXv libXrandr glib bison ];
patches = [ ./compile-fix.patch ];
buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11
libXext libXv libXrandr glib bison libunwind ];
meta = with stdenv.lib; {
homepage = https://01.org/linuxgraphics/;