From f956c9995edbc54377b26c90230354ab0649738b7c96e0115048b388f668b332 Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Tue, 25 Sep 2018 11:19:16 +0000
Subject: [PATCH] Accepting request 638014 from home:mimi_vx:branches:science

- update to version 1.2
  * Support for LLVM/Clang 7.0 and 6.0
  * HWLOC 2.0 support
- build kernels with distro support - detect and load cpu
    optimized code on runtime

OBS-URL: https://build.opensuse.org/request/show/638014
OBS-URL: https://build.opensuse.org/package/show/science/pocl?expand=0&rev=41
---
 pocl-1.1.tar.gz |  3 ---
 pocl-1.2.tar.gz |  3 +++
 pocl.changes    |  9 +++++++++
 pocl.spec       | 24 ++++++++++--------------
 4 files changed, 22 insertions(+), 17 deletions(-)
 delete mode 100644 pocl-1.1.tar.gz
 create mode 100644 pocl-1.2.tar.gz

diff --git a/pocl-1.1.tar.gz b/pocl-1.1.tar.gz
deleted file mode 100644
index 1c57dc3..0000000
--- a/pocl-1.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e8dd0693a88c84937754df947b202871a40545b1b0a97ebefa370b0281c3c53
-size 1545659
diff --git a/pocl-1.2.tar.gz b/pocl-1.2.tar.gz
new file mode 100644
index 0000000..a4dd875
--- /dev/null
+++ b/pocl-1.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0c43e68f336892f3a64cba19beb99d9212f529bedb77f7879c0331450b982d46
+size 1603374
diff --git a/pocl.changes b/pocl.changes
index 76a95e3..3ed3349 100644
--- a/pocl.changes
+++ b/pocl.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Sep 25 10:30:51 UTC 2018 - Ondřej Súkup <mimi.vx@gmail.com>
+
+- update to version 1.2
+  * Support for LLVM/Clang 7.0 and 6.0
+  * HWLOC 2.0 support
+- build kernels with distro support - detect and load cpu
+    optimized code on runtime 
+
 -------------------------------------------------------------------
 Mon Jul 30 04:53:06 UTC 2018 - bwiedemann@suse.com
 
diff --git a/pocl.spec b/pocl.spec
index ca14f3a..ec5978c 100644
--- a/pocl.spec
+++ b/pocl.spec
@@ -13,13 +13,13 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
-%define sover  2.1.0
+%define sover  2.2.0
 Name:           pocl
-Version:        1.1
+Version:        1.2
 Release:        0
 Summary:        Portable Computing Language - an OpenCL implementation
 # The whole code is under MIT
@@ -28,11 +28,10 @@ Summary:        Portable Computing Language - an OpenCL implementation
 License:        MIT
 Group:          Development/Tools/Other
 URL:            http://portablecl.org/
-#Source0:        http://portablecl.org/downloads/%{name}-%{version}.tar.gz
 Source0:        https://github.com/pocl/pocl/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source99:       pocl-rpmlintrc
-BuildRequires:  clang < 7
-BuildRequires:  clang-devel < 7
+BuildRequires:  clang < 8
+BuildRequires:  clang-devel < 8
 BuildRequires:  cmake
 BuildRequires:  libboost_headers-devel
 BuildRequires:  libtool
@@ -45,7 +44,7 @@ BuildRequires:  uthash-devel
 BuildRequires:  pkgconfig(OpenCL)
 BuildRequires:  pkgconfig(glew)
 BuildRequires:  pkgconfig(hwloc)
-Requires:       clang < 7
+Requires:       clang < 8
 Requires:       gcc
 Requires:       libstdc++-devel
 Requires:       libut2
@@ -100,12 +99,12 @@ This subpackage provides the development files needed for pocl.
 %define __builder ninja
 %cmake \
   -DENABLE_CUDA=0 \
-  -DENABLE_ICD=1 \
+  -DENABLE_ICD=ON \
   -DPOCL_INSTALL_ICD_VENDORDIR=%{_sysconfdir}/OpenCL/vendors \
   -DCMAKE_C_COMPILER=clang  \
   -DCMAKE_CXX_COMPILER=clang++ \
 %ifarch %{ix86} x86_64
-  -DLLC_HOST_CPU=core2 \
+  -DKERNELLIB_HOST_CPU_VARIANTS=distro \
 %endif
   -DEXTRA_KERNEL_CXX_FLAGS="%{optflags} -std=c++11" \
   -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \
@@ -121,18 +120,15 @@ mv %{buildroot}%{_prefix}%{_libdir} %{buildroot}%{_libdir}
 sed -i 's|%{_prefix}%{_prefix}/|%{_prefix}/|g' %{buildroot}%{_sysconfdir}/OpenCL/vendors/pocl.icd
 # Unbundle vecmath
 #rm -vf %%{buildroot}/%%{_libdir}/pocl/vecmath/
-#ln -vs %%{_includedir}/vecmath %{buildroot}/%%{_libdir}/pocl/vecmath
+#ln -vs %%{_includedir}/vecmath %%{buildroot}/%%{_libdir}/pocl/vecmath
 # <visit0r> but you need to run the .py to generate the files under the pocl dir
 
-#%%check
-#cd build
-#ctest
-
 %post -n libpocl2 -p /sbin/ldconfig
 %postun -n libpocl2 -p /sbin/ldconfig
 
 %files
 %doc CHANGES README doc/sphinx/source/*.rst
+%license LICENSE
 %dir %{_sysconfdir}/OpenCL/
 %dir %{_sysconfdir}/OpenCL/vendors
 %{_sysconfdir}/OpenCL/vendors/pocl.icd