Accepting request 245008 from home:mnhauke:test

Update to Version 1.9.0 + fix source url

OBS-URL: https://build.opensuse.org/request/show/245008
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/hwloc?expand=0&rev=4

hwloc-1.7-manpage.patch

@@ -1,12 +0,0 @@
-diff -ru hwloc-1.7-original/utils/hwloc-info.1in hwloc-1.7/utils/hwloc-info.1in
---- hwloc-1.7-original/utils/hwloc-info.1in	2013-03-26 21:00:18.000000000 +0100
-+++ hwloc-1.7/utils/hwloc-info.1in	2013-05-09 09:19:06.397752380 +0200
-@@ -148,7 +148,7 @@
- before reading this man page.  Most of the concepts described in
- hwloc(7) directly apply to the hwloc-calc utility.
- .
--..\" **************************
-+.\" **************************
- .\"    Examples Section
- .\" **************************
- .SH EXAMPLES

hwloc-1.7.patch

@@ -1,35 +0,0 @@
-diff -ru hwloc-1.7-orig/src/topology-gl.c hwloc-1.7/src/topology-gl.c
---- hwloc-1.7-orig/src/topology-gl.c	2013-03-26 21:00:17.000000000 +0100
-+++ hwloc-1.7/src/topology-gl.c	2013-04-23 16:18:46.497469010 +0200
-@@ -85,12 +85,18 @@
-       gpu_number = ptr_binary_data[1];
-       free(ptr_binary_data);
- 
-+#ifdef NV_CTRL_PCI_DOMAIN
-+
-       /* Gets the ID's of the GPU defined by gpu_number
-        * For further details, see the <NVCtrl/NVCtrlLib.h> */
-       err = XNVCTRLQueryTargetAttribute(display, NV_CTRL_TARGET_TYPE_GPU, gpu_number, 0,
-                                         NV_CTRL_PCI_DOMAIN, &nv_ctrl_pci_domain);
-       if (!err)
-         continue;
-+#else
-+      nv_ctrl_pci_domain = 0;
-+#endif
-+
- 
-       err = XNVCTRLQueryTargetAttribute(display, NV_CTRL_TARGET_TYPE_GPU, gpu_number, 0,
-                                         NV_CTRL_PCI_BUS, &nv_ctrl_pci_bus);
-@@ -102,11 +108,6 @@
-       if (!err)
-         continue;
- 
--      err = XNVCTRLQueryTargetAttribute(display, NV_CTRL_TARGET_TYPE_GPU, gpu_number, 0,
--                                        NV_CTRL_PCI_DOMAIN, &nv_ctrl_pci_domain);
--      if (!err)
--        continue;
--
-       err = XNVCTRLQueryTargetAttribute(display, NV_CTRL_TARGET_TYPE_GPU, gpu_number, 0,
-                                         NV_CTRL_PCI_FUNCTION, &nv_ctrl_pci_func);
-       if (!err)
-Only in hwloc-1.7/src: .topology-gl.c.swp

hwloc-1.7.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fc81d4b536bb35be8e6658f9452a4101b775ff5ae5d3bdef2413d4c5a1c142df
-size 3300570

hwloc.changes

@@ -1,3 +1,157 @@
+-------------------------------------------------------------------
+Sun Aug 17 18:42:36 UTC 2014 - mardnh@gmx.de
+
+- removed patches (fixed upstream)
+   * hwloc-1.7-manpage.patch
+   * hwloc-1.7.patch 
+
+- Update to Version 1.9.0
+  * API
+    + Add hwloc_obj_type_sscanf() to extend hwloc_obj_type_of_string() with
+      type-specific attributes such as Cache/Group depth and Cache type.
+      hwloc_obj_type_of_string() is moved to hwloc/deprecated.h.
+    + Add hwloc_linux_get_tid_last_cpu_location() for retrieving the
+      last CPU where a Linux thread given by TID ran.
+    + Add hwloc_distrib() to extend the old hwloc_distribute[v]() functions.
+      hwloc_distribute[v]() is moved to hwloc/deprecated.h.
+    + Don't mix total and local memory when displaying verbose object attributes
+      with hwloc_obj_attr_snprintf() or in lstopo.
+  * Backends
+    + Add CPUVendor, CPUModelNumber and CPUFamilyNumber info attributes for
+      x86, ia64 and Xeon Phi sockets on Linux, to extend the x86-specific
+      support added in v1.8.1. Requested by Ralph Castain.
+    + Add many CPU- and Platform-related info attributes on ARM and POWER
+      platforms, in the Machine and Socket objects.
+    + Add CUDA info attributes describing the number of multiprocessors and
+      cores and the size of the global, shared and L2 cache memories in CUDA
+      OS devices.
+    + Add OpenCL info attributes describing the number of compute units and
+      the global memory size in OpenCL OS devices.
+    + The synthetic backend now accepts extended types such as L2Cache, L1i or
+      Group3. lstopo also exports synthetic strings using these extended types.
+  * Tools
+    + lstopo
+      - Do not overwrite output files by default anymore.
+        Pass -f or --force to enforce it.
+      - Display OpenCL, CUDA and Xeon Phi numbers of cores and memory sizes
+        in the graphical output.
+      - Fix export to stdout when specifying a Cairo-based output type
+        with --of.
+    + hwloc-ps
+      - Add -e or --get-last-cpu-location to report where processes/threads
+        run instead of where they are bound.
+      - Report locations as likely-more-useful objects such as Cores or Sockets
+        instead of Caches when possible.
+    + hwloc-bind
+      - Fix failure on Windows when not using --pid.
+      - Add -e as a synonym to --get-last-cpu-location.
+    + hwloc-distrib
+      - Add --reverse to distribute using last objects first and singlify
+        into last bits first. Thanks to Jirka Hladky for the suggestion.
+    + hwloc-info
+      - Report unified caches when looking for data or instruction cache
+        ancestor objects.
+  * Misc
+    + Add experimental Visual Studio support under contrib/windows.
+      Thanks to Eloi Gaudry for his help and for providing the first draft.
+    + Fix some overzealous assertions and warnings about the ordering of
+      objects on a level with respect to cpusets. The ordering is only
+      guaranteed for complete cpusets (based on the first bit in sets).
+    + Fix some memory leaks when importing xml diffs and when exporting a
+      "too complex" entry.
+  1.8.1:
+  * Fix the cpuid code on Windows 64bits so that the x86 backend gets
+    enabled as expected and can populate CPU information.
+    Thanks to Robin Scher for reporting the problem.
+  * Add CPUVendor/CPUModelNumber/CPUFamilyNumber attributes when running
+    on x86 architecture. Thanks to Ralph Castain for the suggestion.
+  * Work around buggy BIOS reporting duplicate NUMA nodes on Linux.
+    Thanks to Jeff Becker for reporting the problem and testing the patch.
+  * Add a name to the lstopo graphical window. Thanks to Michael Prokop
+    for reporting the issue.
+  1.8.0:
+  * New components
+    + Add the "linuxpci" component that always works on Linux even when
+      libpciaccess and libpci aren't available (and even with a modified
+      file-system root). By default the old "pci" component runs first
+      because "linuxpci" lacks device names (obj->name is always NULL).
+  * API
+    + Add the topology difference API in hwloc/diff.h for manipulating
+      many similar topologies.
+    + Add hwloc_topology_dup() for duplicating an entire topology.
+    + hwloc.h and hwloc/helper.h have been reorganized to clarify the
+      documentation sections. The actual inline code has moved out of hwloc.h
+      into the new hwloc/inlines.h.
+    + Deprecated functions are now in hwloc/deprecated.h, and not in the
+      official documentation anymore.
+  * Tools
+    + Add hwloc-diff and hwloc-patch tools together with the new diff API.
+    + Add hwloc-compress-dir to (de)compress an entire directory of XML files
+      using hwloc-diff and hwloc-patch.
+    + Object colors in the graphical output of lstopo may be changed by adding
+      a "lstopoStyle" info attribute. See CUSTOM COLORS in the lstopo(1) manpage
+      for details. Thanks to Jirka Hladky for discussing the idea.
+    + hwloc-gather-topology may now gather I/O-related files on Linux when
+      --io is given. Only the linuxpci component supports discovering I/O
+      objects from these extended tarballs.
+    + hwloc-annotate now supports --ri to remove/replace info attributes with
+      a given name.
+    + hwloc-info supports "root" and "all" special locations for dumping
+      information about the root object.
+    + lstopo now supports --append-legend to append custom lines of text
+      to the legend in the graphical output. Thanks to Jirka Hladky for
+      discussing the idea.
+    + hwloc-calc and friends have a more robust parsing of locations given
+      on the command-line and they report useful error messages about it.
+    + Add --whole-system to hwloc-bind, hwloc-calc, hwloc-distances and
+      hwloc-distrib, and add --restrict to hwloc-bind for uniformity among
+      tools.
+  * Misc
+    + Calling hwloc_topology_load() or hwloc_topology_set_*() on an already
+      loaded topology now returns an error (deprecated since release 1.6.1).
+    + Fix the initialisation of cpusets and nodesets in Group objects added
+      when inserting PCI hostbridges.
+    + Never merge Group objects that were added explicitly by the user with
+      hwloc_custom_insert_group_object_by_parent().
+    + Add a sanity check during dynamic plugin loading to prevent some
+      crashes when hwloc is dynamically loaded by another plugin mechanisms.
+    + Add --with-hwloc-plugins-path to specify the install/load directories
+      of plugins.
+    + Add the MICSerialNumber info attribute to the root object when running
+      hwloc inside a Xeon Phi to match the same attribute in the MIC OS device
+      when running in the host.
+  1.7.2:
+  * Do not create invalid block OS devices on very old Linux kernel such
+    as RHEL4 2.6.9.
+  * Fix PCI subvendor/device IDs.
+  * Fix the management of Misc objects inserted by parent.
+    Thanks to Jirka Hladky for reporting the problem.
+  * Add a Port<n>State into attribute to OpenFabrics OS devices.
+  * Add a MICSerialNumber info attribute to Xeon PHI/MIC OS devices.
+  * Improve verbose error messages when failing to load from XML.
+  1.7.1:
+  * Fix a failed assertion in the distance grouping code when loading a XML
+    file that already contains some groups.
+    Thanks to Laercio Lima Pilla for reporting the problem.
+  * Remove unexpected Group objects when loading XML topologies with I/O
+    objects and NUMA distances.
+    Thanks to Elena Elkina for reporting the problem and testing patches.
+  * Fix PCI link speed discovery when using libpciaccess.
+  * Fix invalid libpciaccess virtual function device/vendor IDs when using
+    SR-IOV PCI devices on Linux.
+  * Fix GL component build with old NVCtrl releases.
+    Thanks to Jirka Hladky for reporting the problem.
+  * Fix embedding breakage caused by libltdl.
+    Thanks to Pavan Balaji for reporting the problem.
+  * Always use the system-wide libltdl instead of shipping one inside hwloc.
+  * Document issues when enabling plugins while embedding hwloc in another
+    project, in the documentation section Embedding hwloc in Other Software.
+  * Add a FAQ entry "How to get useful topology information on NetBSD?"
+    in the documentation.
+  * Somes fixes in the renaming code for embedding.
+  * Miscellaneous minor build fixes.
+
+
 -------------------------------------------------------------------
 Tue Nov 12 22:17:52 UTC 2013 - meissner@suse.com
 

hwloc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package hwloc
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,20 +15,17 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %global lname libhwloc5
 
 Name:           hwloc
-Version:        1.7
+Version:        1.9
 Release:        2%{?dist}
 Summary:        Portable Hardware Locality
 License:        BSD-3-Clause
 Group:          Productivity/Clustering/Computing
 Url:            http://www.open-mpi.org/projects/hwloc/
 Source0:        http://www.open-mpi.org/software/hwloc/v1.7/downloads/%{name}-%{version}.tar.bz2
-#PATCH-FIX-UPSTREAM: allow to build without XNVCTRL
-Patch0:         hwloc-1.7.patch
-#PATCH-FIX-UPSTREAM: minor issue in manpages
-Patch1:         hwloc-1.7-manpage.patch
 Requires:       %{lname} = %{version}-%{release}
 
 BuildRequires:  autoconf
@@ -47,8 +44,8 @@ BuildRequires:  cairo-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  xorg-x11-libICE-devel
-BuildRequires:  xorg-x11-libX11-devel
 BuildRequires:  xorg-x11-libSM-devel
+BuildRequires:  xorg-x11-libX11-devel
 %endif
 #BuildRequires:  libXNVCtrl-devel
 BuildRequires:  ncurses-devel
@@ -124,8 +121,6 @@ Package contains documentation for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %if 0%{?sles_version}