- updated to 1.20

- updated update patch (one more i686 fix needed)
- removed obsolete link patch

diff --git a/xorg-app-intel-gpu-tools-link.patch b/xorg-app-intel-gpu-tools-link.patch
deleted file mode 100644 (file)
index 5156c0f..0000000
--- a/xorg-app-intel-gpu-tools-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- intel-gpu-tools-1.18/configure.ac.orig     2017-03-13 14:55:37.000000000 +0100
-+++ intel-gpu-tools-1.18/configure.ac  2017-03-16 21:57:34.831632824 +0100
-@@ -176,7 +176,7 @@
- PKG_CHECK_MODULES(GLIB, glib-2.0)
- 
- # for chamelium
--PKG_CHECK_MODULES(XMLRPC, xmlrpc_client, [xmlrpc=yes], [xmlrpc=no])
-+PKG_CHECK_MODULES(XMLRPC, [xmlrpc_client xmlrpc_util xmlrpc], [xmlrpc=yes], [xmlrpc=no])
- PKG_CHECK_MODULES(PIXMAN, pixman-1, [pixman=yes], [pixman=no])
- AM_CONDITIONAL(HAVE_CHAMELIUM, [test "x$xmlrpc$pixman" = xyesyes])
- 

diff --git a/xorg-app-intel-gpu-tools-update.patch b/xorg-app-intel-gpu-tools-update.patch
index 9958c0a25c0d0c6236f7989a40c5924e92caedbd..b05263bac4fbdbb323c7bb60f1220fee9b163ecd 100644 (file)
--- a/xorg-app-intel-gpu-tools-update.patch
+++ b/xorg-app-intel-gpu-tools-update.patch
@@ -42,3 +42,14 @@
                bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
  
                setup_hw_bits();
+--- intel-gpu-tools-1.20/lib/igt_x86.h.orig    2017-10-04 12:36:48.000000000 +0200
++++ intel-gpu-tools-1.20/lib/igt_x86.h 2017-11-28 21:08:36.351787994 +0100
+@@ -40,7 +40,7 @@
+ #define AVX   0x80
+ #define AVX2  0x100
+ 
+-#if defined(__x86_64__)
++#if 1
+ unsigned igt_x86_features(void);
+ char *igt_x86_features_to_string(unsigned features, char *line);
+ #else

diff --git a/xorg-app-intel-gpu-tools.spec b/xorg-app-intel-gpu-tools.spec
index 6af6e7bcd4cf1936427266a05bb84ea41417cae1..f7d56e1d6724482d72af5d371e41868fad10bcd4 100644 (file)
--- a/xorg-app-intel-gpu-tools.spec
+++ b/xorg-app-intel-gpu-tools.spec
@@ -8,15 +8,15 @@
 Summary:       Tools for Intel DRM driver
 Summary(pl.UTF-8):     Narzędzia do sterownika Intel DRM
 Name:          xorg-app-intel-gpu-tools
-Version:       1.19
+Version:       1.20
 Release:       1
 License:       MIT
 Group:         X11/Applications
 Source0:       https://xorg.freedesktop.org/archive/individual/app/intel-gpu-tools-%{version}.tar.bz2
-# Source0-md5: 4fdfa56acca3b046fc61fb12686656f3
-Patch0:                %{name}-link.patch
+# Source0-md5: 3b77a6a23274afe363bd5c942fe42562
 Patch1:                %{name}-update.patch
 URL:           http://intellinuxgraphics.org/
+BuildRequires: alsa-lib-devel
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.12
 BuildRequires: bison
@@ -28,9 +28,10 @@ BuildRequires:       glib2-devel >= 2.0
 %if %(locale -a | grep -q '^C\.UTF-8$'; echo $?)
 BuildRequires: glibc-localedb-all
 %endif
+BuildRequires: gsl-devel
 BuildRequires: gtk-doc >= 1.14
 BuildRequires: kmod-devel
-BuildRequires: libdrm-devel >= 2.4.75
+BuildRequires: libdrm-devel >= 2.4.82
 BuildRequires: libtool >= 2:2.2
 %{?with_libunwind:BuildRequires:       libunwind-devel}
 BuildRequires: pixman-devel
@@ -49,7 +50,7 @@ BuildRequires:        xorg-lib-libpciaccess-devel >= 0.10
 BuildRequires: xorg-proto-dri2proto-devel >= 2.6
 BuildRequires: xorg-util-util-macros >= 1.16
 Requires:      cairo >= 1.12.0
-Requires:      libdrm >= 2.4.75
+Requires:      libdrm >= 2.4.82
 Requires:      xorg-lib-libXrandr >= 1.3
 Requires:      xorg-lib-libpciaccess >= 0.10
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,7 +65,6 @@ sterownika Intel DRM.
 
 %prep
 %setup -q -n intel-gpu-tools-%{version}
-%patch0 -p1
 %patch1 -p1
 
 %build
@@ -74,6 +74,8 @@ sterownika Intel DRM.
 %{__autoheader}
 %{__automake}
 %configure \
+       --enable-audio \
+       --enable-chamellium \
        --enable-shader-debugger \
        --disable-silent-rules \
        --with-html-dir=%{_gtkdocdir} \