From f33950cf4b295a6cae71dc336544d9810fcae87a Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Wed, 6 Feb 2019 22:44:32 +0000
Subject: Wed Feb  6 22:44:32 UTC 2019

a/hwdata-0.320-noarch-1.txz:  Upgraded.
a/kernel-generic-4.19.20-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.19.20-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.19.20-x86_64-1.txz:  Upgraded.
a/mcelog-162-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.19.20-x86-1.txz:  Upgraded.
d/opencl-headers-2.2-noarch-2.txz:  Rebuilt.
  Don't trigger "#pragma message" in cl_version.h when falling back on a
  default version of OpenCL to target. Applications such as ffmpeg detect
  this as an error and fail to compile.
k/kernel-source-4.19.20-noarch-1.txz:  Upgraded.
l/ffmpeg-3.4.5-x86_64-2.txz:  Rebuilt.
  Recompiled against libvpx-1.8.0.
  Reenabled libsmbclient support.
l/gst-plugins-good-1.14.4-x86_64-2.txz:  Rebuilt.
  Recompiled against libvpx-1.8.0.
l/libvpx-1.8.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
n/curl-7.64.0-x86_64-1.txz:  Upgraded.
  This release fixes the following security issues:
  NTLM type-2 out-of-bounds buffer read.
  NTLMv2 type-3 header stack buffer overflow.
  SMTP end-of-response out-of-bounds read.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-16890
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3822
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3823
  (* Security fix *)
n/samba-4.9.4-x86_64-2.txz:  Rebuilt.
  Added time.h to libsmbclient.h to fix ffmpeg compatibility.
  Thanks to USUARIONUEVO.
xap/xine-lib-1.2.9-x86_64-4.txz:  Rebuilt.
  Recompiled against libvpx-1.8.0.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/d/opencl-headers/opencl-headers.SlackBuild             |  8 +++++++-
 .../opencl-headers/opencl.no.pragma.for.default.version.diff  | 11 +++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 source/d/opencl-headers/opencl.no.pragma.for.default.version.diff

(limited to 'source/d/opencl-headers')

diff --git a/source/d/opencl-headers/opencl-headers.SlackBuild b/source/d/opencl-headers/opencl-headers.SlackBuild
index 1b33a02bf..130d860bd 100755
--- a/source/d/opencl-headers/opencl-headers.SlackBuild
+++ b/source/d/opencl-headers/opencl-headers.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=opencl-headers
 VERSION=${VERSION:-$(echo OpenCL-Headers-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 PKGVER=${PKGVER:-2.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -51,6 +51,12 @@ cd $TMP
 rm -rf OpenCL-Headers-$VERSION
 tar xvf $CWD/OpenCL-Headers-$VERSION.tar.?z* || exit 1
 cd OpenCL-Headers-$VERSION || exit 1
+
+# Don't trigger "#pragma message" in cl_version.h when falling back on a default
+# version of OpenCL to target. Applications such as ffmpeg are detecting this as
+# an error and failing to compile:
+zcat $CWD/opencl.no.pragma.for.default.version.diff.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/d/opencl-headers/opencl.no.pragma.for.default.version.diff b/source/d/opencl-headers/opencl.no.pragma.for.default.version.diff
new file mode 100644
index 000000000..725012b1f
--- /dev/null
+++ b/source/d/opencl-headers/opencl.no.pragma.for.default.version.diff
@@ -0,0 +1,11 @@
+--- ./CL/cl_version.h.orig	2019-01-17 12:40:56.000000000 -0600
++++ ./CL/cl_version.h	2019-02-06 15:22:44.022548935 -0600
+@@ -31,7 +31,7 @@
+ 
+ /* Detect which version to target */
+ #if !defined(CL_TARGET_OPENCL_VERSION)
+-#pragma message("cl_version.h: CL_TARGET_OPENCL_VERSION is not defined. Defaulting to 220 (OpenCL 2.2)")
++/* #pragma message("cl_version.h: CL_TARGET_OPENCL_VERSION is not defined. Defaulting to 220 (OpenCL 2.2)") */
+ #define CL_TARGET_OPENCL_VERSION 220
+ #endif
+ #if CL_TARGET_OPENCL_VERSION != 100 && \
-- 
cgit v1.2.3