- updated to 1.3.2

- removed obsolete new_SKL_ids,llvm-3.8 patches
- adjusted EGL,OpenGL dependencies for libglvnd compatibility (but it still relies on Mesa versioning of .pc files)
- don't disable C++>=14 on recent compilers
- doesn't build with llvm 11 though, release 0.1

diff --git a/beignet.spec b/beignet.spec
index 04c02df8a21c074af62a3ca0cb854c3ab718b37e..c62d919ab37637d3ce45435886c4a81816135c01 100644 (file)
--- a/beignet.spec
+++ b/beignet.spec
@@ -1,20 +1,18 @@
 Summary:       Open source implementation of the OpenCL specification for Intel GPUs
 Summary(pl.UTF-8):     Mająca otwarte źródła implementacja specyfikacji OpenCL dla GPU formy Intel
 Name:          beignet
-Version:       1.3.1
-Release:       3
+Version:       1.3.2
+Release:       0.1
 License:       LGPL v2+
 Group:         Libraries
+#Source0Download: https://www.freedesktop.org/wiki/Software/Beignet/NEWS/
 Source0:       https://01.org/sites/default/files/beignet-%{version}-source.tar.gz
-# Source0-md5: 850886a71a34672ca26a42046d0bb442
+# Source0-md5: a577ab18d67a891c8767b8ea62253543
 Patch0:                cflags.patch
 Patch1:                static_llvm.patch
-Patch2:                new_SKL_ids.patch
-Patch3:                llvm-3.8.patch
-URL:           http://www.freedesktop.org/wiki/Software/Beignet/
+URL:           https://www.freedesktop.org/wiki/Software/Beignet/
+BuildRequires: EGL-devel
 BuildRequires: Mesa-libgbm-devel
-BuildRequires: Mesa-libGL-devel >= 13.0.0
-BuildRequires: Mesa-libEGL-devel >= 13.0.0
 BuildRequires: OpenGL-devel
 BuildRequires: clang-devel >= 3.9
 BuildRequires: cmake >= 2.6.0
@@ -26,6 +24,8 @@ BuildRequires:        llvm-devel >= 3.9
 BuildRequires: ncurses-devel
 BuildRequires: ocl-icd-devel
 BuildRequires: pkgconfig
+BuildRequires: pkgconfig(egl) >= 13.0.0
+BuildRequires: pkgconfig(gl) >= 13.0.0
 BuildRequires: python
 BuildRequires: sed >= 4.0
 BuildRequires: xorg-lib-libX11-devel
@@ -56,8 +56,11 @@ poleceń, jądra i programów oraz uruchamia je na GPU.
 %setup -qn Beignet-%{version}-Source
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
+
+# don't lower default -std= on g++ 5+ (recent llvm requires C++14)
+%if "%{_ver_ge '%{cxx_version}' '5.0'}" == "1"
+%{__sed} -i -e 's/ -std=c++0x / /' CMakeLists.txt
+%endif
 
 %build
 install -d build

diff --git a/llvm-3.8.patch b/llvm-3.8.patch
deleted file mode 100644 (file)
index a6590b4..0000000
--- a/llvm-3.8.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8e119eb32e01066c23c3d96bd2b42032e03f7628 Mon Sep 17 00:00:00 2001
-From: Yang Rong <rong.r.yang@intel.com>
-Date: Thu, 13 Apr 2017 19:32:51 +0800
-Subject: utest: fix image qualifier of compiler_fill_gl_image test.
-
-After clang check the image qualifier, can't use default qualifier
-to write_image.
-
-Signed-off-by: Yang Rong <rong.r.yang@intel.com>
-Reviewed-by: Pan Xiuli <xiuli.pan@intel.com>
-
-diff --git a/kernels/test_fill_gl_image.cl b/kernels/test_fill_gl_image.cl
-index 4250a57..7b5dce7 100644
---- a/kernels/test_fill_gl_image.cl
-+++ b/kernels/test_fill_gl_image.cl
-@@ -1,5 +1,5 @@
- __kernel void
--test_fill_gl_image(image2d_t img, int color)
-+test_fill_gl_image(write_only image2d_t img, int color)
- {
-       int2 coord;
-         float4 color_v4;
--- 
-cgit v0.10.2
-

diff --git a/new_SKL_ids.patch b/new_SKL_ids.patch
deleted file mode 100644 (file)
index cbdb9df..0000000
--- a/new_SKL_ids.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/src/cl_device_data.h b/src/cl_device_data.h
-index c3d6c45..123b619 100644
---- a/src/cl_device_data.h
-+++ b/src/cl_device_data.h
-@@ -247,7 +247,9 @@
- /* SKL */
- #define PCI_CHIP_SKYLAKE_ULT_GT1      0x1906   /* Intel(R) Skylake ULT - GT1 */
- #define PCI_CHIP_SKYLAKE_ULT_GT2      0x1916   /* Intel(R) Skylake ULT - GT2 */
--#define PCI_CHIP_SKYLAKE_ULT_GT3      0x1926   /* Intel(R) Skylake ULT - GT3 */
-+#define PCI_CHIP_SKYLAKE_ULT_GT3      0x1923   /* Intel(R) Skylake ULT - GT3 */
-+#define PCI_CHIP_SKYLAKE_ULT_GT3E1    0x1926   /* Intel(R) Skylake ULT - GT3E */
-+#define PCI_CHIP_SKYLAKE_ULT_GT3E2    0x1927   /* Intel(R) Skylake ULT - GT3E */
- #define PCI_CHIP_SKYLAKE_ULT_GT2F     0x1921   /* Intel(R) Skylake ULT - GT2F */
- #define PCI_CHIP_SKYLAKE_ULX_GT1      0x190E   /* Intel(R) Skylake ULX - GT1 */
- #define PCI_CHIP_SKYLAKE_ULX_GT2      0x191E   /* Intel(R) Skylake ULX - GT2 */
-@@ -284,6 +286,8 @@
- 
- #define IS_SKL_GT3(devid)               \
-   (devid == PCI_CHIP_SKYLAKE_ULT_GT3 ||   \
-+   devid == PCI_CHIP_SKYLAKE_ULT_GT3E1 ||   \
-+   devid == PCI_CHIP_SKYLAKE_ULT_GT3E2 ||   \
-    devid == PCI_CHIP_SKYLAKE_HALO_GT3 || \
-    devid == PCI_CHIP_SKYLAKE_SRV_GT3 || \
-    devid == PCI_CHIP_SKYLAKE_MEDIA_SRV_GT3)
-diff --git a/src/cl_device_id.c b/src/cl_device_id.c
-index 76549a4..b9a60bb 100644
---- a/src/cl_device_id.c
-+++ b/src/cl_device_id.c
-@@ -605,6 +605,10 @@ skl_gt2_break:
- 
-     case PCI_CHIP_SKYLAKE_ULT_GT3:
-       DECL_INFO_STRING(skl_gt3_break, intel_skl_gt3_device, name, "Intel(R) HD Graphics Skylake ULT GT3");
-+    case PCI_CHIP_SKYLAKE_ULT_GT3E1:
-+      DECL_INFO_STRING(skl_gt3_break, intel_skl_gt3_device, name, "Intel(R) HD Graphics Skylake ULT GT3E");
-+    case PCI_CHIP_SKYLAKE_ULT_GT3E2:
-+      DECL_INFO_STRING(skl_gt3_break, intel_skl_gt3_device, name, "Intel(R) HD Graphics Skylake ULT GT3E");
-     case PCI_CHIP_SKYLAKE_HALO_GT3:
-       DECL_INFO_STRING(skl_gt3_break, intel_skl_gt3_device, name, "Intel(R) HD Graphics Skylake Halo GT3");
-     case PCI_CHIP_SKYLAKE_SRV_GT3: