From d9f13e3b1e5fb52af65bedb353892178069a75a2 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 19 May 2018 23:46:37 -0300 Subject: [PATCH] intel-gpu-tools: rebuild against libprocps.so.7 Closes: #14564 [via git-merge-pr] --- .../patches/disable-docs.patch | 34 +++++++++++++++++++ srcpkgs/intel-gpu-tools/template | 8 ++--- 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/intel-gpu-tools/patches/disable-docs.patch diff --git a/srcpkgs/intel-gpu-tools/patches/disable-docs.patch b/srcpkgs/intel-gpu-tools/patches/disable-docs.patch new file mode 100644 index 00000000000..17a7fa8a911 --- /dev/null +++ b/srcpkgs/intel-gpu-tools/patches/disable-docs.patch @@ -0,0 +1,34 @@ +Source: maxice8 +Upstream: not upstreamable +Reason: Fixes building of package. + +ERROR: +Error in gtkdoc helper script: +ERROR: 'gtkdoc-mkhtml' failed with status 1 +Traceback (most recent call last): + File "/usr/bin/gtkdoc-mkhtml", line 51, in + sys.exit(mkhtml.run(options)) + File "/usr/share/gtk-doc/python/gtkdoc/mkhtml.py", line 93, in run + quiet] + remaining_args + [gtkdocdir + '/gtk-doc.xsl', document]) + File "/usr/share/gtk-doc/python/gtkdoc/mkhtml.py", line 42, in run_xsltproc + return subprocess.call(command + args) + File "/usr/lib/python2.7/subprocess.py", line 172, in call + return Popen(*popenargs, **kwargs).wait() + File "/usr/lib/python2.7/subprocess.py", line 394, in __init__ + errread, errwrite) + File "/usr/lib/python2.7/subprocess.py", line 1047, in _execute_child + raise child_exception +OSError: [Errno 2] No such file or directory + +--- meson.build ++++ meson.build +@@ -144,6 +144,6 @@ if libdrm_intel.found() + endif + subdir('man') + # has_exe_wrapper() is undefined if building natively +-if not meson.is_cross_build() or not meson.has_exe_wrapper() +- subdir('docs') +-endif ++# if not meson.is_cross_build() or not meson.has_exe_wrapper() ++# subdir('docs') ++# endif diff --git a/srcpkgs/intel-gpu-tools/template b/srcpkgs/intel-gpu-tools/template index 0e3a2120955..e8f343254af 100644 --- a/srcpkgs/intel-gpu-tools/template +++ b/srcpkgs/intel-gpu-tools/template @@ -1,11 +1,11 @@ # Template file for 'intel-gpu-tools' pkgname=intel-gpu-tools version=1.22 -revision=1 +revision=2 build_style=meson -hostmakedepends="pkg-config swig flex gtk-doc" -makedepends="python3-devel libXv-devel libXrandr-devel libpciaccess-devel - libdrm-devel cairo-devel libunwind-devel libkmod-devel procps-ng-devel" +hostmakedepends="flex gtk-doc pkg-config swig" +makedepends="cairo-devel libXrandr-devel libXv-devel libkmod-devel + libunwind-devel procps-ng-devel python3-devel" short_desc="Tools for development and testing of the Intel DRM driver" maintainer="Juan RP " license="MIT"