From 1c1eacec94692711b9dbf3598c7957613dbb5b64 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Tue, 14 Dec 2021 18:41:03 +0300
Subject: [PATCH] hwloc-2.7.0

---
 .../misc/hwloc/files/hwloc-1.8.1-gl.patch     | 11 +++++++++++
 hardware/misc/hwloc/pspec.xml                 | 19 +++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 hardware/misc/hwloc/files/hwloc-1.8.1-gl.patch

diff --git a/hardware/misc/hwloc/files/hwloc-1.8.1-gl.patch b/hardware/misc/hwloc/files/hwloc-1.8.1-gl.patch
new file mode 100644
index 0000000000..47daa95933
--- /dev/null
+++ b/hardware/misc/hwloc/files/hwloc-1.8.1-gl.patch
@@ -0,0 +1,11 @@
+--- hwloc-1.8.1/config/hwloc.m4.orig	2014-01-30 17:46:58.000000000 +0400
++++ hwloc-1.8.1/config/hwloc.m4	2014-02-27 13:46:28.587238873 +0400
+@@ -948,7 +948,7 @@
+                hwloc_gl_happy=no])
+ 
+         AC_CHECK_HEADERS([NVCtrl/NVCtrl.h], [
+-          AC_CHECK_LIB([XNVCtrl], [XNVCTRLQueryTargetAttribute], [:], [hwloc_gl_happy=no], [-lXext])
++          AC_CHECK_LIB([XNVCtrl], [XNVCTRLQueryTargetAttribute], [:], [hwloc_gl_happy=no], [-lXext -lX11])
+         ], [hwloc_gl_happy=no])
+ 
+         if test "x$hwloc_gl_happy" = "xyes"; then
diff --git a/hardware/misc/hwloc/pspec.xml b/hardware/misc/hwloc/pspec.xml
index ce2a4fa28f..3ef77642ff 100644
--- a/hardware/misc/hwloc/pspec.xml
+++ b/hardware/misc/hwloc/pspec.xml
@@ -14,12 +14,17 @@
         <IsA>app:console</IsA>
         <Summary>Portable Hardware Locality (hwloc)</Summary>
         <Description>The Portable Hardware Locality (hwloc) software package provides a portable abstraction (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various system attributes such as cache and memory information as well as the locality of I/O devices such as network interfaces, InfiniBand HCAs or GPUs.</Description>
-        <Archive sha1sum="1b87ff3820b28e718dfdca626a1d27521ea613f6" type="tarbz2">https://download.open-mpi.org/release/hwloc/v2.2/hwloc-2.2.0.tar.bz2</Archive>
+        <Archive sha1sum="6e971b7d182ef8dde3c95b1c6afc2c4c7b5a0ce7" type="tarbz2">https://download.open-mpi.org/release/hwloc/v2.7/hwloc-2.7.0.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>cairo-devel</Dependency>
+            <Dependency>pciutils-devel</Dependency>
             <Dependency>libxml2-devel</Dependency>
             <Dependency>numactl-devel</Dependency>
+            <Dependency>libpciaccess-devel</Dependency>
         </BuildDependencies>
+        <Patches>
+            <Patch level="1">hwloc-1.8.1-gl.patch</Patch>
+        </Patches>
     </Source>
 
     <Package>
@@ -29,6 +34,8 @@
             <Dependency>cairo</Dependency>
             <Dependency>libxml2</Dependency>
             <Dependency>numactl</Dependency>
+            <Dependency>libX11</Dependency>
+            <Dependency>libpciaccess</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>
@@ -38,6 +45,7 @@
             <Path fileType="executable">/usr/bin</Path>
             <Path fileType="data">/usr/share/hwloc</Path>
             <Path fileType="data">/usr/share/applications</Path>
+            <Path fileType="data">/usr/share/bash-completion/completions/hwloc</Path>
         </Files>
     </Package>
 
@@ -54,6 +62,13 @@
     </Package>
 
     <History>
+        <Update release="2">
+            <Date>2021-12-14</Date>
+            <Version>2.7.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="1">
             <Date>2020-05-22</Date>
             <Version>2.2.0</Version>
@@ -62,4 +77,4 @@
             <Email>bluedevil@sctzine.com</Email>
         </Update>
     </History>
-</PISI>
\ No newline at end of file
+</PISI>