intel-gpu-tools: update and rename to igt-gpu-tools

Also removed musl beacause it's still broken

closes #5759
This commit is contained in:
m3tav3rse 2018-12-12 22:14:37 +01:00 committed by maxice8
parent 25f4293bee
commit d3e2acf103
No known key found for this signature in database
GPG Key ID: 543B9D4F4299F06B
6 changed files with 64 additions and 92 deletions

View File

@ -0,0 +1,36 @@
Source: maxice8, m3tav3rse
Upstream: not upstreamable
Reason: Fixes building of package.
ERROR: Error in gtkdoc helper script:
ERROR: ['gtkdoc-mkhtml', '--path=/builddir/igt-gpu-tools-1.23/docs/reference/igt-gpu-tools:/builddir/igt-gpu-tools-1.23/build/docs/reference/igt-gpu-tools', 'igt-gpu-tools', '../igt-gpu-tools-docs.xml'] failed with status 5
I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl
warning: failed to load external entity "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"
compilation error: file /usr/share/gtk-doc/data/gtk-doc.xsl line 11 element import
xsl:import : unable to load http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl
--- meson.build
+++ meson.build
@@ -232,14 +232,14 @@
subdir('man')
docs_info = 'No'
-if _build_docs
- if _build_tests
- subdir('docs')
- docs_info = 'Yes'
- elif _docs_required
- error('Documentation requires building tests')
- endif
-endif
+#if _build_docs
+# if _build_tests
+# subdir('docs')
+# docs_info = 'Yes'
+# elif _docs_required
+# error('Documentation requires building tests')
+# endif
+#endif
build_info += 'Build documentation: ' + docs_info
message('Build options')

View File

@ -0,0 +1,27 @@
# Template file for 'igt-gpu-tools'
pkgname=igt-gpu-tools
version=1.23
revision=1
build_style=meson
hostmakedepends="flex gtk-doc pkg-config swig"
makedepends="cairo-devel libXrandr-devel libXv-devel libkmod-devel
libunwind-devel procps-ng-devel python3-devel libressl-devel"
short_desc="Tools for development and testing of the Intel DRM driver"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="MIT"
homepage="https://gitlab.freedesktop.org/drm/igt-gpu-tools"
distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
checksum=4d4b086c513bace5c23d0889de3f42ac3ebd3d968c64dedae6e28e006a499ad0
lib32disabled=yes
only_for_archs="i686 x86_64"
post_install() {
vlicense COPYING
}
intel-gpu-tools_package() {
depends="igt-gpu-tools>=${version}_${revision}"
short_desc+=" (transitional dummy package)"
build_style=meta
}

1
srcpkgs/intel-gpu-tools Symbolic link
View File

@ -0,0 +1 @@
igt-gpu-tools

View File

@ -1,34 +0,0 @@
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 <module>
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

View File

@ -1,32 +0,0 @@
For musl libc instead of including <sys/ioctl.h>, which leads to
an error when redefining ioctl(3) and close(3), just define the
prototype for ioctl().
--- benchmarks/gem_exec_tracer.c 2015-08-17 18:38:30.000000000 +0200
+++ benchmarks/gem_exec_tracer.c 2015-09-13 17:03:34.768431063 +0200
@@ -32,7 +32,11 @@
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
+#if defined(__GLIBC__)
#include <sys/ioctl.h>
+#else
+int ioctl(int fd, unsigned long request, ...);
+#endif
#include <unistd.h>
#include <errno.h>
#include <sys/mman.h>
--- tools/aubdump.c 2015-09-08 19:01:19.000000000 +0200
+++ tools/aubdump.c 2015-09-13 17:06:27.850430550 +0200
@@ -32,7 +32,11 @@
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
+#if defined(__GLIBC__)
#include <sys/ioctl.h>
+#else
+int ioctl(int fd, unsigned long request, ...);
+#endif
#include <unistd.h>
#include <errno.h>
#include <sys/mman.h>

View File

@ -1,26 +0,0 @@
# Template file for 'intel-gpu-tools'
pkgname=intel-gpu-tools
version=1.22
revision=2
build_style=meson
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 <xtraeme@voidlinux.eu>"
license="MIT"
homepage="http://cgit.freedesktop.org/xorg/app/intel-gpu-tools/"
distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
checksum=3d66c1dc5110712ca4d22199b3ce9853f261be1690064edf87e69e5392e39a5c
lib32disabled=yes
only_for_archs="i686 i686-musl x86_64 x86_64-musl"
case "$XBPS_TARGET_MACHINE" in
# needs SIGEV_THREAD_ID
*-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/11948/steps/shell_3/logs/stdio";;
esac
post_install() {
vlicense COPYING
}