igt-gpu-tools: rename from intel-gpu-tools 1.22 -> 1.23

Make the libdrm_intel dependency configurable and add an option to build
and install the tests.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 116 insertions, 117 deletions

diff --git a/patches/intel-gpu-tools-1.22/autogen.sh b/patches/intel-gpu-tools-1.22/autogen.sh
deleted file mode 100755
index 6605b17f4..000000000
--- a/patches/intel-gpu-tools-1.22/autogen.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-
-set -e
-
-echo "EXTRA_DIST =" > gtk-doc.make
-echo "CLEANFILES =" >> gtk-doc.make
-
-aclocal $ACLOCAL_FLAGS
-
-libtoolize \
-	--force \
-	--copy
-
-autoreconf \
-	--force \
-	--install \
-	--warnings=cross \
-	--warnings=syntax \
-	--warnings=obsolete \
-	--warnings=unsupported
-
diff --git a/rules/igt-gpu-tools.in b/rules/igt-gpu-tools.in
new file mode 100644
index 000000000..35f18cd64
--- /dev/null
+++ b/rules/igt-gpu-tools.in
@@ -0,0 +1,41 @@
+## SECTION=multimedia_tools
+
+menuconfig IGT_GPU_TOOLS
+	tristate
+	select GLIB
+	select CAIRO
+	select LIBKMOD
+	select LIBDRM
+	select LIBPCIACCESS
+	select LIBUNWIND
+	select OPENSSL
+	select PROCPS
+	select UDEV
+	select UDEV_LIBUDEV
+	select ZLIB
+	prompt "igt-gpu-tools"
+	help
+	  igt-gpu-tools is a package of tools for debugging the Intel
+	  graphics driver, including a GPU hang dumping program,
+	  performance monitor, and performance microbenchmarks for
+	  regression testing the DRM.
+
+if IGT_GPU_TOOLS
+
+config IGT_GPU_TOOLS_INTEL
+	bool
+	default LIBDRM_INTEL
+
+config IGT_GPU_TOOLS_AMDGPU
+	bool
+	default LIBDRM_AMDGPU
+
+config IGT_GPU_TOOLS_NOUVEAU
+	bool
+	default LIBDRM_NOUVEAU
+
+config IGT_GPU_TOOLS_TESTS
+	bool
+	prompt "build and install tests"
+
+endif
diff --git a/rules/igt-gpu-tools.make b/rules/igt-gpu-tools.make
new file mode 100644
index 000000000..ef65e8078
--- /dev/null
+++ b/rules/igt-gpu-tools.make
@@ -0,0 +1,75 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2016 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_IGT_GPU_TOOLS) += igt-gpu-tools
+
+#
+# Paths and names
+#
+IGT_GPU_TOOLS_VERSION	:= 1.23
+IGT_GPU_TOOLS_MD5	:= 04c1f10d6fd85e079271540b0ea786e9
+IGT_GPU_TOOLS		:= igt-gpu-tools-$(IGT_GPU_TOOLS_VERSION)
+IGT_GPU_TOOLS_SUFFIX	:= tar.xz
+IGT_GPU_TOOLS_URL	:= $(call ptx/mirror, XORG, individual/app/$(IGT_GPU_TOOLS).$(IGT_GPU_TOOLS_SUFFIX))
+IGT_GPU_TOOLS_SOURCE	:= $(SRCDIR)/$(IGT_GPU_TOOLS).$(IGT_GPU_TOOLS_SUFFIX)
+IGT_GPU_TOOLS_DIR	:= $(BUILDDIR)/$(IGT_GPU_TOOLS)
+IGT_GPU_TOOLS_LICENSE	:= MIT AND ISC
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+IGT_GPU_TOOLS_LIBDRM-y					:=
+ifdef PTXCONF_ARCH_X86
+IGT_GPU_TOOLS_LIBDRM-$(PTXCONF_IGT_GPU_TOOLS_INTEL)	+= intel
+endif
+IGT_GPU_TOOLS_LIBDRM-$(PTXCONF_IGT_GPU_TOOLS_AMDGPU)	+= amdgpu
+IGT_GPU_TOOLS_LIBDRM-$(PTXCONF_IGT_GPU_TOOLS_NOUVEAU)	+= nouveau
+
+IGT_GPU_TOOLS_CONF_TOOL	:= meson
+IGT_GPU_TOOLS_CONF_OPT	:= \
+	$(CROSS_MESON_USR) \
+	-Dbuild_overlay=false \
+	-Doverlay_backends=auto \
+	-Dbuild_audio=false \
+	-Dbuild_chamelium=false \
+	-Dwith_valgrind=false \
+	-Dbuild_man=false \
+	-Dbuild_docs=false \
+	-Dbuild_tests=$(call ptx/truefalse,PTXCONF_IGT_GPU_TOOLS_TESTS) \
+	-Dwith_libdrm=$(subst $(space),$(comma),$(IGT_GPU_TOOLS_LIBDRM-y)) \
+	-Duse_rpath=false
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/igt-gpu-tools.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, igt-gpu-tools)
+	@$(call install_fixup, igt-gpu-tools,PRIORITY,optional)
+	@$(call install_fixup, igt-gpu-tools,SECTION,base)
+	@$(call install_fixup, igt-gpu-tools,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
+	@$(call install_fixup, igt-gpu-tools,DESCRIPTION,missing)
+
+	@$(call install_tree, igt-gpu-tools, 0, 0, -, /usr/lib)
+	@$(call install_tree, igt-gpu-tools, 0, 0, -, /usr/bin)
+	@$(call install_tree, igt-gpu-tools, 0, 0, -, /usr/share/igt-gpu-tools)
+	@$(call install_tree, igt-gpu-tools, 0, 0, -, /usr/libexec/igt-gpu-tools)
+
+	@$(call install_finish, igt-gpu-tools)
+
+	@$(call touch)
+
+# vim: syntax=make
diff --git a/rules/intel-gpu-tools.in b/rules/intel-gpu-tools.in
deleted file mode 100644
index f9115ef46..000000000
--- a/rules/intel-gpu-tools.in
+++ /dev/null
@@ -1,20 +0,0 @@
-## SECTION=multimedia_tools
-
-config INTEL_GPU_TOOLS
-	tristate
-	select GLIB
-	select CAIRO
-	select LIBDRM
-	select LIBDRM_INTEL
-	select LIBPCIACCESS
-	select LIBUNWIND
-	select PROCPS
-	select UDEV
-	select UDEV_LIBUDEV
-	select ZLIB
-	prompt "intel-gpu-tools"
-	help
-	  intel-gpu-tools is a package of tools for debugging the Intel
-	  graphics driver, including a GPU hang dumping program,
-	  performance monitor, and performance microbenchmarks for
-	  regression testing the DRM.
diff --git a/rules/intel-gpu-tools.make b/rules/intel-gpu-tools.make
deleted file mode 100644
index dad7ce1f1..000000000
--- a/rules/intel-gpu-tools.make
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2016 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_INTEL_GPU_TOOLS) += intel-gpu-tools
-
-#
-# Paths and names
-#
-INTEL_GPU_TOOLS_VERSION	:= 1.22
-INTEL_GPU_TOOLS_MD5	:= 965c591b23a132084113c2a0604f537a
-INTEL_GPU_TOOLS		:= intel-gpu-tools-$(INTEL_GPU_TOOLS_VERSION)
-INTEL_GPU_TOOLS_SUFFIX	:= tar.xz
-INTEL_GPU_TOOLS_URL	:= $(call ptx/mirror, XORG, individual/app/$(INTEL_GPU_TOOLS).$(INTEL_GPU_TOOLS_SUFFIX))
-INTEL_GPU_TOOLS_SOURCE	:= $(SRCDIR)/$(INTEL_GPU_TOOLS).$(INTEL_GPU_TOOLS_SUFFIX)
-INTEL_GPU_TOOLS_DIR	:= $(BUILDDIR)/$(INTEL_GPU_TOOLS)
-INTEL_GPU_TOOLS_LICENSE	:= MIT AND ISC
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-INTEL_GPU_TOOLS_CONF_TOOL	:= autoconf
-INTEL_GPU_TOOLS_CONF_OPT	:= \
-	$(CROSS_AUTOCONF_USR) \
-	$(GLOBAL_LARGE_FILE_OPTION) \
-	--disable-gtk-doc \
-	--disable-gtk-doc-html \
-	--disable-gtk-doc-pdf \
-	--disable-selective-werror \
-	--disable-strict-compilation \
-	--disable-chamelium \
-	--disable-audio \
-	--enable-intel \
-	--disable-amdgpu \
-	--disable-nouveau \
-	--disable-vc4 \
-	--disable-shader-debugger \
-	--disable-debug \
-	--disable-werror \
-	--disable-git-hash \
-	--disable-tests
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-
-$(STATEDIR)/intel-gpu-tools.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, intel-gpu-tools)
-	@$(call install_fixup, intel-gpu-tools,PRIORITY,optional)
-	@$(call install_fixup, intel-gpu-tools,SECTION,base)
-	@$(call install_fixup, intel-gpu-tools,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
-	@$(call install_fixup, intel-gpu-tools,DESCRIPTION,missing)
-
-	@$(call install_tree, intel-gpu-tools, 0, 0, -, /usr/bin)
-
-	@$(call install_finish, intel-gpu-tools)
-
-	@$(call touch)
-
-# vim: syntax=make