From 2f196d9cdc7f1e825d012bd1e8a3fe2de7319869 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Tue, 23 Aug 2016 14:19:49 +0200 Subject: [PATCH] package/amd-catalyst: Add support AMD CCCLE The AMD Catalyst Linux driver includes a graphical controler center for AMD graphics accelerators, called Catalyst Controler Center. This commits adds support to install this tool by adding a separated prompt. Signed-off-by: Romain Perier [Thomas: - As noticed by Yann, fixed the dependency of the comment related to the Qt PNG functionality. - Also add the Qt PNG dependency to the BR2_PACKAGE_AMD_CATALYST_CCCLE option itself, noticed by Yann. - Add an empty line, also noticed by Yann.] Signed-off-by: Thomas Petazzoni --- package/amd-catalyst/Config.in | 17 +++++++++++++++++ package/amd-catalyst/amd-catalyst.mk | 10 ++++++++++ 2 files changed, 27 insertions(+) diff --git a/package/amd-catalyst/Config.in b/package/amd-catalyst/Config.in index b10ed3b11f..55099accf0 100644 --- a/package/amd-catalyst/Config.in +++ b/package/amd-catalyst/Config.in @@ -45,6 +45,23 @@ config BR2_PACKAGE_AMD_CATALYST_CMDLINE_TOOLS help Build and install the AMD command line tools. +comment "Catalyst Control Center needs Qt4 with X11 and PNG support" + depends on !BR2_PACKAGE_QT || !BR2_PACKAGE_QT_X11 \ + || BR2_PACKAGE_QT_NOPNG + +config BR2_PACKAGE_AMD_CATALYST_CCCLE + bool "Catalyst Control Center" + depends on BR2_PACKAGE_QT + depends on BR2_PACKAGE_QT_X11 + depends on !BR2_PACKAGE_QT_NOPNG + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps-ng + select BR2_PACKAGE_PROCPS_NG # runtime + select BR2_PACKAGE_QT_GUI_MODULE + select BR2_PACKAGE_QT_ACCESSIBILITY + help + Installs the Catalyst Control Center, a Qt graphical tool to + control AMD graphics accelerators. + endif comment "amd-catalyst kernel module needs a kernel to be built" diff --git a/package/amd-catalyst/amd-catalyst.mk b/package/amd-catalyst/amd-catalyst.mk index 4c1844c4d3..07eb0faf7f 100644 --- a/package/amd-catalyst/amd-catalyst.mk +++ b/package/amd-catalyst/amd-catalyst.mk @@ -128,6 +128,15 @@ define AMD_CATALYST_INSTALL_CMDLINE_TOOLS endef endif +ifeq ($(BR2_PACKAGE_AMD_CATALYST_CCCLE), y) +define AMD_CATALYST_INSTALL_CCCLE + $(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/bin/amdcccle \ + $(TARGET_DIR)/usr/bin/amdcccle + $(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/sbin/amdnotifyui \ + $(TARGET_DIR)/usr/sbin/amdnotifyui +endef +endif + define AMD_CATALYST_INSTALL_STAGING_CMDS $(call AMD_CATALYST_INSTALL_STAGING_XORG) endef @@ -135,6 +144,7 @@ endef define AMD_CATALYST_INSTALL_TARGET_CMDS $(call AMD_CATALYST_INSTALL_XORG) $(call AMD_CATALYST_INSTALL_CMDLINE_TOOLS) + $(call AMD_CATALYST_INSTALL_CCCLE) endef $(eval $(generic-package)) -- 2.30.2