From 295fdc80f2f76c209bec6289e8a8115cbc3867d8 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 6 Aug 2021 18:04:01 +0000 Subject: Fri Aug 6 18:04:01 UTC 2021 a/udisks2-2.9.3-x86_64-1.txz: Upgraded. d/patchelf-0.13-x86_64-1.txz: Upgraded. d/python-pip-21.2.3-x86_64-1.txz: Upgraded. kde/krita-4.4.7-x86_64-1.txz: Upgraded. l/gjs-1.68.2-x86_64-1.txz: Upgraded. l/glib-networking-2.68.2-x86_64-1.txz: Upgraded. l/pcaudiolib-1.2-x86_64-1.txz: Upgraded. l/pipewire-0.3.33-x86_64-1.txz: Upgraded. l/python-pysol_cards-0.10.2-x86_64-1.txz: Upgraded. n/ipset-7.15-x86_64-1.txz: Upgraded. n/libqmi-1.30.0-x86_64-1.txz: Upgraded. n/mobile-broadband-provider-info-20210805-x86_64-1.txz: Upgraded. xap/blackbox-0.77-x86_64-1.txz: Upgraded. --- ChangeLog.rss | 27 +- ChangeLog.txt | 15 + FILELIST.TXT | 198 +- recompress.sh | 1 + source/a/udisks2/udisks2.SlackBuild | 2 +- source/d/patchelf/patchelf.SlackBuild | 2 +- source/kde/kde/build/krita | 2 +- ...Updated-to-support-latest-Khronos-headers.patch | 2434 ++++++++++++++++++++ source/l/ocl-icd/ocl-icd.SlackBuild | 2 + source/l/pcaudiolib/pcaudiolib.SlackBuild | 2 +- .../python-pysol_cards.SlackBuild | 2 +- .../mobile-broadband-provider-info.SlackBuild | 2 +- source/xap/blackbox/blackbox.SlackBuild | 4 +- 13 files changed, 2584 insertions(+), 109 deletions(-) create mode 100644 source/l/ocl-icd/0001-Updated-to-support-latest-Khronos-headers.patch diff --git a/ChangeLog.rss b/ChangeLog.rss index 6060bfa69..d560e91f6 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,32 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Wed, 4 Aug 2021 20:16:51 GMT - Thu, 5 Aug 2021 06:59:47 GMT + Fri, 6 Aug 2021 18:04:01 GMT + Sat, 7 Aug 2021 06:59:47 GMT maintain_current_git.sh v 1.12 + + Fri, 6 Aug 2021 18:04:01 GMT + Fri, 6 Aug 2021 18:04:01 GMT + https://git.slackware.nl/current/tag/?h=20210806180401 + 20210806180401 + + +a/udisks2-2.9.3-x86_64-1.txz: Upgraded. +d/patchelf-0.13-x86_64-1.txz: Upgraded. +d/python-pip-21.2.3-x86_64-1.txz: Upgraded. +kde/krita-4.4.7-x86_64-1.txz: Upgraded. +l/gjs-1.68.2-x86_64-1.txz: Upgraded. +l/glib-networking-2.68.2-x86_64-1.txz: Upgraded. +l/pcaudiolib-1.2-x86_64-1.txz: Upgraded. +l/pipewire-0.3.33-x86_64-1.txz: Upgraded. +l/python-pysol_cards-0.10.2-x86_64-1.txz: Upgraded. +n/ipset-7.15-x86_64-1.txz: Upgraded. +n/libqmi-1.30.0-x86_64-1.txz: Upgraded. +n/mobile-broadband-provider-info-20210805-x86_64-1.txz: Upgraded. +xap/blackbox-0.77-x86_64-1.txz: Upgraded. + ]]> + + Wed, 4 Aug 2021 20:16:51 GMT Wed, 4 Aug 2021 20:16:51 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index e7c9f80dc..9ecde1bbc 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,18 @@ +Fri Aug 6 18:04:01 UTC 2021 +a/udisks2-2.9.3-x86_64-1.txz: Upgraded. +d/patchelf-0.13-x86_64-1.txz: Upgraded. +d/python-pip-21.2.3-x86_64-1.txz: Upgraded. +kde/krita-4.4.7-x86_64-1.txz: Upgraded. +l/gjs-1.68.2-x86_64-1.txz: Upgraded. +l/glib-networking-2.68.2-x86_64-1.txz: Upgraded. +l/pcaudiolib-1.2-x86_64-1.txz: Upgraded. +l/pipewire-0.3.33-x86_64-1.txz: Upgraded. +l/python-pysol_cards-0.10.2-x86_64-1.txz: Upgraded. +n/ipset-7.15-x86_64-1.txz: Upgraded. +n/libqmi-1.30.0-x86_64-1.txz: Upgraded. +n/mobile-broadband-provider-info-20210805-x86_64-1.txz: Upgraded. +xap/blackbox-0.77-x86_64-1.txz: Upgraded. ++--------------------------+ Wed Aug 4 20:16:51 UTC 2021 a/kernel-generic-5.13.8-x86_64-1.txz: Upgraded. a/kernel-huge-5.13.8-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index 16a2035d1..d1e00a2d1 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Wed Aug 4 20:20:34 UTC 2021 +Fri Aug 6 18:07:04 UTC 2021 Here is the file list for this directory. If you are using a mirror site and find missing or extra files in the disk subdirectories, please have the archive administrator refresh the mirror. -drwxr-xr-x 12 root root 4096 2021-08-04 20:16 . +drwxr-xr-x 12 root root 4096 2021-08-06 18:04 . -rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2 -rw-r--r-- 1 root root 15411 2021-03-28 17:36 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 1077949 2021-08-03 18:22 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2021-08-03 18:22 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1077909 2021-08-04 20:20 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2021-08-04 20:20 ./CHECKSUMS.md5.asc -rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING -rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3 -rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT -rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT --rw-r--r-- 1 root root 1584728 2021-08-04 20:16 ./ChangeLog.txt +-rw-r--r-- 1 root root 1585369 2021-08-06 18:04 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2021-08-04 20:16 ./EFI/BOOT -rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2021-08-04 20:16 ./EFI/BOOT -rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh -rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg -rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg --rw-r--r-- 1 root root 1403276 2021-08-03 18:22 ./FILELIST.TXT +-rw-r--r-- 1 root root 1403236 2021-08-04 20:20 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 852651 2021-08-04 20:20 ./PACKAGES.TXT +-rw-r--r-- 1 root root 852651 2021-08-06 18:06 ./PACKAGES.TXT -rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT -rw-r--r-- 1 root root 3629 2021-08-04 19:57 ./README.initrd -rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT @@ -715,13 +715,13 @@ drwxr-xr-x 2 root root 4096 2012-09-20 18:06 ./patches -rw-r--r-- 1 root root 575 2012-09-20 18:06 ./patches/FILE_LIST -rw-r--r-- 1 root root 14 2012-09-20 18:06 ./patches/MANIFEST.bz2 -rw-r--r-- 1 root root 224 2012-09-20 18:06 ./patches/PACKAGES.TXT -drwxr-xr-x 17 root root 4096 2021-08-04 20:20 ./slackware64 --rw-r--r-- 1 root root 333445 2021-08-04 20:20 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2021-08-04 20:20 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 413688 2021-08-04 20:19 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 4096167 2021-08-04 20:19 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 17 root root 4096 2021-08-06 18:06 ./slackware64 +-rw-r--r-- 1 root root 333445 2021-08-06 18:06 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2021-08-06 18:06 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 413688 2021-08-06 18:06 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 4123126 2021-08-06 18:06 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT -drwxr-xr-x 2 root root 32768 2021-08-04 20:19 ./slackware64/a +drwxr-xr-x 2 root root 32768 2021-08-06 18:05 ./slackware64/a -rw-r--r-- 1 root root 327 2021-07-17 17:47 ./slackware64/a/aaa_base-15.0-x86_64-1.txt -rw-r--r-- 1 root root 10788 2021-07-17 17:47 ./slackware64/a/aaa_base-15.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-07-17 17:47 ./slackware64/a/aaa_base-15.0-x86_64-1.txz.asc @@ -1063,9 +1063,9 @@ drwxr-xr-x 2 root root 32768 2021-08-04 20:19 ./slackware64/a -rw-r--r-- 1 root root 412 2021-04-18 18:17 ./slackware64/a/udisks-1.0.5-x86_64-9.txt -rw-r--r-- 1 root root 176992 2021-04-18 18:17 ./slackware64/a/udisks-1.0.5-x86_64-9.txz -rw-r--r-- 1 root root 163 2021-04-18 18:17 ./slackware64/a/udisks-1.0.5-x86_64-9.txz.asc --rw-r--r-- 1 root root 427 2021-02-13 11:19 ./slackware64/a/udisks2-2.9.2-x86_64-2.txt --rw-r--r-- 1 root root 986088 2021-02-13 11:19 ./slackware64/a/udisks2-2.9.2-x86_64-2.txz --rw-r--r-- 1 root root 163 2021-02-13 11:19 ./slackware64/a/udisks2-2.9.2-x86_64-2.txz.asc +-rw-r--r-- 1 root root 427 2021-08-06 17:37 ./slackware64/a/udisks2-2.9.3-x86_64-1.txt +-rw-r--r-- 1 root root 989540 2021-08-06 17:37 ./slackware64/a/udisks2-2.9.3-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-08-06 17:37 ./slackware64/a/udisks2-2.9.3-x86_64-1.txz.asc -rw-r--r-- 1 root root 392 2021-02-13 11:19 ./slackware64/a/unarj-265-x86_64-4.txt -rw-r--r-- 1 root root 17284 2021-02-13 11:19 ./slackware64/a/unarj-265-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-02-13 11:19 ./slackware64/a/unarj-265-x86_64-4.txz.asc @@ -1357,7 +1357,7 @@ drwxr-xr-x 2 root root 20480 2021-08-04 20:19 ./slackware64/ap -rw-r--r-- 1 root root 506 2021-02-13 11:48 ./slackware64/ap/zsh-5.8-x86_64-3.txt -rw-r--r-- 1 root root 3056824 2021-02-13 11:48 ./slackware64/ap/zsh-5.8-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 11:48 ./slackware64/ap/zsh-5.8-x86_64-3.txz.asc -drwxr-xr-x 2 root root 16384 2021-08-04 20:19 ./slackware64/d +drwxr-xr-x 2 root root 16384 2021-08-06 18:06 ./slackware64/d -rw-r--r-- 1 root root 360 2021-07-16 06:49 ./slackware64/d/Cython-0.29.24-x86_64-1.txt -rw-r--r-- 1 root root 2385964 2021-07-16 06:49 ./slackware64/d/Cython-0.29.24-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-07-16 06:49 ./slackware64/d/Cython-0.29.24-x86_64-1.txz.asc @@ -1506,9 +1506,9 @@ drwxr-xr-x 2 root root 16384 2021-08-04 20:19 ./slackware64/d -rw-r--r-- 1 root root 398 2021-06-22 18:21 ./slackware64/d/parallel-20210622-noarch-1.txt -rw-r--r-- 1 root root 471712 2021-06-22 18:21 ./slackware64/d/parallel-20210622-noarch-1.txz -rw-r--r-- 1 root root 163 2021-06-22 18:21 ./slackware64/d/parallel-20210622-noarch-1.txz.asc --rw-r--r-- 1 root root 469 2021-02-13 10:40 ./slackware64/d/patchelf-0.12-x86_64-3.txt --rw-r--r-- 1 root root 65736 2021-02-13 10:40 ./slackware64/d/patchelf-0.12-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-02-13 10:40 ./slackware64/d/patchelf-0.12-x86_64-3.txz.asc +-rw-r--r-- 1 root root 469 2021-08-06 17:31 ./slackware64/d/patchelf-0.13-x86_64-1.txt +-rw-r--r-- 1 root root 64992 2021-08-06 17:31 ./slackware64/d/patchelf-0.13-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-08-06 17:31 ./slackware64/d/patchelf-0.13-x86_64-1.txz.asc -rw-r--r-- 1 root root 544 2021-05-21 16:48 ./slackware64/d/perl-5.34.0-x86_64-1.txt -rw-r--r-- 1 root root 17043004 2021-05-21 16:48 ./slackware64/d/perl-5.34.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-05-21 16:48 ./slackware64/d/perl-5.34.0-x86_64-1.txz.asc @@ -1521,9 +1521,9 @@ drwxr-xr-x 2 root root 16384 2021-08-04 20:19 ./slackware64/d -rw-r--r-- 1 root root 398 2021-06-05 17:57 ./slackware64/d/poke-1.3-x86_64-1.txt -rw-r--r-- 1 root root 604676 2021-06-05 17:57 ./slackware64/d/poke-1.3-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-06-05 17:57 ./slackware64/d/poke-1.3-x86_64-1.txz.asc --rw-r--r-- 1 root root 270 2021-07-31 16:19 ./slackware64/d/python-pip-21.2.2-x86_64-1.txt --rw-r--r-- 1 root root 1761212 2021-07-31 16:19 ./slackware64/d/python-pip-21.2.2-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-07-31 16:19 ./slackware64/d/python-pip-21.2.2-x86_64-1.txz.asc +-rw-r--r-- 1 root root 270 2021-08-06 17:33 ./slackware64/d/python-pip-21.2.3-x86_64-1.txt +-rw-r--r-- 1 root root 1761948 2021-08-06 17:33 ./slackware64/d/python-pip-21.2.3-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-08-06 17:33 ./slackware64/d/python-pip-21.2.3-x86_64-1.txz.asc -rw-r--r-- 1 root root 562 2021-07-20 18:48 ./slackware64/d/python-setuptools-57.4.0-x86_64-1.txt -rw-r--r-- 1 root root 673896 2021-07-20 18:48 ./slackware64/d/python-setuptools-57.4.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-07-20 18:48 ./slackware64/d/python-setuptools-57.4.0-x86_64-1.txz.asc @@ -1606,7 +1606,7 @@ drwxr-xr-x 2 root root 4096 2021-08-04 20:19 ./slackware64/k -rw-r--r-- 1 root root 1170 2021-08-04 19:57 ./slackware64/k/maketag -rw-r--r-- 1 root root 1170 2021-08-04 19:57 ./slackware64/k/maketag.ez -rw-r--r-- 1 root root 18 2021-08-04 19:57 ./slackware64/k/tagfile -drwxr-xr-x 2 root root 77824 2021-08-03 06:57 ./slackware64/kde +drwxr-xr-x 2 root root 77824 2021-08-06 18:06 ./slackware64/kde -rw-r--r-- 1 root root 382 2021-07-09 01:22 ./slackware64/kde/akonadi-21.04.3-x86_64-1.txt -rw-r--r-- 1 root root 2520536 2021-07-09 01:22 ./slackware64/kde/akonadi-21.04.3-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-07-09 01:22 ./slackware64/kde/akonadi-21.04.3-x86_64-1.txz.asc @@ -2311,9 +2311,9 @@ drwxr-xr-x 2 root root 77824 2021-08-03 06:57 ./slackware64/kde -rw-r--r-- 1 root root 330 2021-07-09 01:38 ./slackware64/kde/krfb-21.04.3-x86_64-1.txt -rw-r--r-- 1 root root 1372872 2021-07-09 01:38 ./slackware64/kde/krfb-21.04.3-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-07-09 01:38 ./slackware64/kde/krfb-21.04.3-x86_64-1.txz.asc --rw-r--r-- 1 root root 271 2021-08-03 05:38 ./slackware64/kde/krita-4.4.5-x86_64-2.txt --rw-r--r-- 1 root root 66449260 2021-08-03 05:38 ./slackware64/kde/krita-4.4.5-x86_64-2.txz --rw-r--r-- 1 root root 163 2021-08-03 05:38 ./slackware64/kde/krita-4.4.5-x86_64-2.txz.asc +-rw-r--r-- 1 root root 271 2021-08-06 17:36 ./slackware64/kde/krita-4.4.7-x86_64-1.txt +-rw-r--r-- 1 root root 66366972 2021-08-06 17:36 ./slackware64/kde/krita-4.4.7-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-08-06 17:36 ./slackware64/kde/krita-4.4.7-x86_64-1.txz.asc -rw-r--r-- 1 root root 340 2021-07-10 17:19 ./slackware64/kde/kross-5.84.0-x86_64-1.txt -rw-r--r-- 1 root root 355612 2021-07-10 17:19 ./slackware64/kde/kross-5.84.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-07-10 17:19 ./slackware64/kde/kross-5.84.0-x86_64-1.txz.asc @@ -2713,7 +2713,7 @@ drwxr-xr-x 2 root root 77824 2021-08-03 06:57 ./slackware64/kde -rw-r--r-- 1 root root 296 2021-07-09 01:37 ./slackware64/kde/zeroconf-ioslave-21.04.3-x86_64-1.txt -rw-r--r-- 1 root root 55500 2021-07-09 01:37 ./slackware64/kde/zeroconf-ioslave-21.04.3-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-07-09 01:37 ./slackware64/kde/zeroconf-ioslave-21.04.3-x86_64-1.txz.asc -drwxr-xr-x 2 root root 73728 2021-08-03 18:19 ./slackware64/l +drwxr-xr-x 2 root root 73728 2021-08-06 18:05 ./slackware64/l -rw-r--r-- 1 root root 329 2021-02-13 05:56 ./slackware64/l/GConf-3.2.6-x86_64-7.txt -rw-r--r-- 1 root root 928148 2021-02-13 05:56 ./slackware64/l/GConf-3.2.6-x86_64-7.txz -rw-r--r-- 1 root root 163 2021-02-13 05:56 ./slackware64/l/GConf-3.2.6-x86_64-7.txz.asc @@ -2951,18 +2951,18 @@ drwxr-xr-x 2 root root 73728 2021-08-03 18:19 ./slackware64/l -rw-r--r-- 1 root root 319 2021-02-13 06:32 ./slackware64/l/giflib-5.2.1-x86_64-4.txt -rw-r--r-- 1 root root 255880 2021-02-13 06:32 ./slackware64/l/giflib-5.2.1-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-02-13 06:32 ./slackware64/l/giflib-5.2.1-x86_64-4.txz.asc --rw-r--r-- 1 root root 368 2021-05-06 17:00 ./slackware64/l/gjs-1.68.1-x86_64-1.txt --rw-r--r-- 1 root root 637360 2021-05-06 17:00 ./slackware64/l/gjs-1.68.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-05-06 17:00 ./slackware64/l/gjs-1.68.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 368 2021-08-06 17:24 ./slackware64/l/gjs-1.68.2-x86_64-1.txt +-rw-r--r-- 1 root root 637680 2021-08-06 17:24 ./slackware64/l/gjs-1.68.2-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-08-06 17:24 ./slackware64/l/gjs-1.68.2-x86_64-1.txz.asc -rw-r--r-- 1 root root 424 2021-02-13 06:33 ./slackware64/l/glade-3.38.2-x86_64-3.txt -rw-r--r-- 1 root root 2453628 2021-02-13 06:33 ./slackware64/l/glade-3.38.2-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 06:33 ./slackware64/l/glade-3.38.2-x86_64-3.txz.asc -rw-r--r-- 1 root root 302 2021-02-13 06:33 ./slackware64/l/glib-1.2.10-x86_64-9.txt -rw-r--r-- 1 root root 116392 2021-02-13 06:33 ./slackware64/l/glib-1.2.10-x86_64-9.txz -rw-r--r-- 1 root root 163 2021-02-13 06:33 ./slackware64/l/glib-1.2.10-x86_64-9.txz.asc --rw-r--r-- 1 root root 300 2021-04-23 17:31 ./slackware64/l/glib-networking-2.68.1-x86_64-1.txt --rw-r--r-- 1 root root 129620 2021-04-23 17:31 ./slackware64/l/glib-networking-2.68.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-04-23 17:31 ./slackware64/l/glib-networking-2.68.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 300 2021-08-06 17:24 ./slackware64/l/glib-networking-2.68.2-x86_64-1.txt +-rw-r--r-- 1 root root 130364 2021-08-06 17:24 ./slackware64/l/glib-networking-2.68.2-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-08-06 17:24 ./slackware64/l/glib-networking-2.68.2-x86_64-1.txz.asc -rw-r--r-- 1 root root 407 2021-06-11 16:51 ./slackware64/l/glib2-2.68.3-x86_64-1.txt -rw-r--r-- 1 root root 3999056 2021-06-11 16:51 ./slackware64/l/glib2-2.68.3-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-06-11 16:51 ./slackware64/l/glib2-2.68.3-x86_64-1.txz.asc @@ -3543,9 +3543,9 @@ drwxr-xr-x 2 root root 73728 2021-08-03 18:19 ./slackware64/l -rw-r--r-- 1 root root 383 2021-02-13 07:35 ./slackware64/l/parted-3.4-x86_64-2.txt -rw-r--r-- 1 root root 563840 2021-02-13 07:35 ./slackware64/l/parted-3.4-x86_64-2.txz -rw-r--r-- 1 root root 163 2021-02-13 07:35 ./slackware64/l/parted-3.4-x86_64-2.txz.asc --rw-r--r-- 1 root root 395 2021-02-13 07:35 ./slackware64/l/pcaudiolib-1.1-x86_64-3.txt --rw-r--r-- 1 root root 18516 2021-02-13 07:35 ./slackware64/l/pcaudiolib-1.1-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-02-13 07:35 ./slackware64/l/pcaudiolib-1.1-x86_64-3.txz.asc +-rw-r--r-- 1 root root 395 2021-08-06 17:32 ./slackware64/l/pcaudiolib-1.2-x86_64-1.txt +-rw-r--r-- 1 root root 18748 2021-08-06 17:32 ./slackware64/l/pcaudiolib-1.2-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-08-06 17:32 ./slackware64/l/pcaudiolib-1.2-x86_64-1.txz.asc -rw-r--r-- 1 root root 342 2021-06-16 18:06 ./slackware64/l/pcre-8.45-x86_64-1.txt -rw-r--r-- 1 root root 820296 2021-06-16 18:06 ./slackware64/l/pcre-8.45-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-06-16 18:06 ./slackware64/l/pcre-8.45-x86_64-1.txz.asc @@ -3561,9 +3561,9 @@ drwxr-xr-x 2 root root 73728 2021-08-03 18:19 ./slackware64/l -rw-r--r-- 1 root root 415 2021-02-13 07:37 ./slackware64/l/pilot-link-0.12.5-x86_64-16.txt -rw-r--r-- 1 root root 554276 2021-02-13 07:37 ./slackware64/l/pilot-link-0.12.5-x86_64-16.txz -rw-r--r-- 1 root root 163 2021-02-13 07:37 ./slackware64/l/pilot-link-0.12.5-x86_64-16.txz.asc --rw-r--r-- 1 root root 552 2021-07-20 18:48 ./slackware64/l/pipewire-0.3.32-x86_64-1.txt --rw-r--r-- 1 root root 1449380 2021-07-20 18:48 ./slackware64/l/pipewire-0.3.32-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-07-20 18:48 ./slackware64/l/pipewire-0.3.32-x86_64-1.txz.asc +-rw-r--r-- 1 root root 552 2021-08-06 17:33 ./slackware64/l/pipewire-0.3.33-x86_64-1.txt +-rw-r--r-- 1 root root 1467636 2021-08-06 17:33 ./slackware64/l/pipewire-0.3.33-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-08-06 17:33 ./slackware64/l/pipewire-0.3.33-x86_64-1.txz.asc -rw-r--r-- 1 root root 450 2021-06-05 18:09 ./slackware64/l/polkit-0.119-x86_64-1.txt -rw-r--r-- 1 root root 401768 2021-06-05 18:09 ./slackware64/l/polkit-0.119-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-06-05 18:09 ./slackware64/l/polkit-0.119-x86_64-1.txz.asc @@ -3651,9 +3651,9 @@ drwxr-xr-x 2 root root 73728 2021-08-03 18:19 ./slackware64/l -rw-r--r-- 1 root root 481 2021-05-03 18:37 ./slackware64/l/python-pygments-2.9.0-x86_64-1.txt -rw-r--r-- 1 root root 1309560 2021-05-03 18:37 ./slackware64/l/python-pygments-2.9.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-05-03 18:37 ./slackware64/l/python-pygments-2.9.0-x86_64-1.txz.asc --rw-r--r-- 1 root root 508 2021-02-13 07:41 ./slackware64/l/python-pysol_cards-0.10.1-x86_64-3.txt --rw-r--r-- 1 root root 19384 2021-02-13 07:41 ./slackware64/l/python-pysol_cards-0.10.1-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-02-13 07:41 ./slackware64/l/python-pysol_cards-0.10.1-x86_64-3.txz.asc +-rw-r--r-- 1 root root 508 2021-08-06 17:34 ./slackware64/l/python-pysol_cards-0.10.2-x86_64-1.txt +-rw-r--r-- 1 root root 19480 2021-08-06 17:34 ./slackware64/l/python-pysol_cards-0.10.2-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-08-06 17:34 ./slackware64/l/python-pysol_cards-0.10.2-x86_64-1.txz.asc -rw-r--r-- 1 root root 361 2021-02-13 07:41 ./slackware64/l/python-random2-1.0.1-x86_64-3.txt -rw-r--r-- 1 root root 17568 2021-02-13 07:41 ./slackware64/l/python-random2-1.0.1-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 07:41 ./slackware64/l/python-random2-1.0.1-x86_64-3.txz.asc @@ -3811,7 +3811,7 @@ drwxr-xr-x 2 root root 73728 2021-08-03 18:19 ./slackware64/l -rw-r--r-- 1 root root 463 2021-05-15 18:01 ./slackware64/l/zstd-1.5.0-x86_64-1.txt -rw-r--r-- 1 root root 458040 2021-05-15 18:01 ./slackware64/l/zstd-1.5.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-05-15 18:01 ./slackware64/l/zstd-1.5.0-x86_64-1.txz.asc -drwxr-xr-x 2 root root 32768 2021-08-04 20:19 ./slackware64/n +drwxr-xr-x 2 root root 32768 2021-08-06 18:05 ./slackware64/n -rw-r--r-- 1 root root 357 2021-02-13 11:52 ./slackware64/n/ModemManager-1.14.10-x86_64-3.txt -rw-r--r-- 1 root root 1877092 2021-02-13 11:52 ./slackware64/n/ModemManager-1.14.10-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 11:52 ./slackware64/n/ModemManager-1.14.10-x86_64-3.txz.asc @@ -3937,9 +3937,9 @@ drwxr-xr-x 2 root root 32768 2021-08-04 20:19 ./slackware64/n -rw-r--r-- 1 root root 476 2021-06-30 17:58 ./slackware64/n/iproute2-5.13.0-x86_64-1.txt -rw-r--r-- 1 root root 966856 2021-06-30 17:58 ./slackware64/n/iproute2-5.13.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-06-30 17:58 ./slackware64/n/iproute2-5.13.0-x86_64-1.txz.asc --rw-r--r-- 1 root root 442 2021-07-28 18:23 ./slackware64/n/ipset-7.14-x86_64-1.txt --rw-r--r-- 1 root root 91180 2021-07-28 18:23 ./slackware64/n/ipset-7.14-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-07-28 18:23 ./slackware64/n/ipset-7.14-x86_64-1.txz.asc +-rw-r--r-- 1 root root 442 2021-08-06 17:25 ./slackware64/n/ipset-7.15-x86_64-1.txt +-rw-r--r-- 1 root root 91156 2021-08-06 17:25 ./slackware64/n/ipset-7.15-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-08-06 17:25 ./slackware64/n/ipset-7.15-x86_64-1.txz.asc -rw-r--r-- 1 root root 642 2021-02-13 12:07 ./slackware64/n/iptables-1.8.7-x86_64-3.txt -rw-r--r-- 1 root root 457252 2021-02-13 12:07 ./slackware64/n/iptables-1.8.7-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 12:07 ./slackware64/n/iptables-1.8.7-x86_64-3.txz.asc @@ -4015,9 +4015,9 @@ drwxr-xr-x 2 root root 32768 2021-08-04 20:19 ./slackware64/n -rw-r--r-- 1 root root 403 2021-05-25 17:48 ./slackware64/n/libnftnl-1.2.0-x86_64-1.txt -rw-r--r-- 1 root root 68380 2021-05-25 17:48 ./slackware64/n/libnftnl-1.2.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-05-25 17:48 ./slackware64/n/libnftnl-1.2.0-x86_64-1.txz.asc --rw-r--r-- 1 root root 298 2021-06-07 18:16 ./slackware64/n/libqmi-1.28.6-x86_64-1.txt --rw-r--r-- 1 root root 1334172 2021-06-07 18:16 ./slackware64/n/libqmi-1.28.6-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-06-07 18:16 ./slackware64/n/libqmi-1.28.6-x86_64-1.txz.asc +-rw-r--r-- 1 root root 298 2021-08-06 17:29 ./slackware64/n/libqmi-1.30.0-x86_64-1.txt +-rw-r--r-- 1 root root 1396964 2021-08-06 17:29 ./slackware64/n/libqmi-1.30.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-08-06 17:29 ./slackware64/n/libqmi-1.30.0-x86_64-1.txz.asc -rw-r--r-- 1 root root 334 2021-05-11 18:31 ./slackware64/n/libtirpc-1.3.2-x86_64-1.txt -rw-r--r-- 1 root root 168044 2021-05-11 18:31 ./slackware64/n/libtirpc-1.3.2-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-05-11 18:31 ./slackware64/n/libtirpc-1.3.2-x86_64-1.txz.asc @@ -4035,9 +4035,9 @@ drwxr-xr-x 2 root root 32768 2021-08-04 20:19 ./slackware64/n -rw-r--r-- 1 root root 467 2021-02-13 12:13 ./slackware64/n/metamail-2.7-x86_64-9.txt -rw-r--r-- 1 root root 125712 2021-02-13 12:13 ./slackware64/n/metamail-2.7-x86_64-9.txz -rw-r--r-- 1 root root 163 2021-02-13 12:13 ./slackware64/n/metamail-2.7-x86_64-9.txz.asc --rw-r--r-- 1 root root 593 2021-02-13 12:13 ./slackware64/n/mobile-broadband-provider-info-20201225-x86_64-3.txt --rw-r--r-- 1 root root 58728 2021-02-13 12:13 ./slackware64/n/mobile-broadband-provider-info-20201225-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-02-13 12:13 ./slackware64/n/mobile-broadband-provider-info-20201225-x86_64-3.txz.asc +-rw-r--r-- 1 root root 593 2021-08-06 17:29 ./slackware64/n/mobile-broadband-provider-info-20210805-x86_64-1.txt +-rw-r--r-- 1 root root 59408 2021-08-06 17:29 ./slackware64/n/mobile-broadband-provider-info-20210805-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-08-06 17:29 ./slackware64/n/mobile-broadband-provider-info-20210805-x86_64-1.txz.asc -rw-r--r-- 1 root root 314 2021-02-13 12:13 ./slackware64/n/mtr-0.94-x86_64-3.txt -rw-r--r-- 1 root root 69440 2021-02-13 12:13 ./slackware64/n/mtr-0.94-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 12:13 ./slackware64/n/mtr-0.94-x86_64-3.txz.asc @@ -5263,7 +5263,7 @@ drwxr-xr-x 2 root root 65536 2021-08-03 18:19 ./slackware64/x -rw-r--r-- 1 root root 213 2021-02-13 13:14 ./slackware64/x/xwud-1.0.5-x86_64-4.txt -rw-r--r-- 1 root root 25428 2021-02-13 13:14 ./slackware64/x/xwud-1.0.5-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-02-13 13:14 ./slackware64/x/xwud-1.0.5-x86_64-4.txz.asc -drwxr-xr-x 2 root root 12288 2021-07-28 22:51 ./slackware64/xap +drwxr-xr-x 2 root root 12288 2021-08-06 18:05 ./slackware64/xap -rw-r--r-- 1 root root 625 2021-04-18 18:11 ./slackware64/xap/MPlayer-20210418-x86_64-1.txt -rw-r--r-- 1 root root 2738724 2021-04-18 18:11 ./slackware64/xap/MPlayer-20210418-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-04-18 18:11 ./slackware64/xap/MPlayer-20210418-x86_64-1.txz.asc @@ -5276,9 +5276,9 @@ drwxr-xr-x 2 root root 12288 2021-07-28 22:51 ./slackware64/xap -rw-r--r-- 1 root root 403 2021-07-13 19:10 ./slackware64/xap/audacious-plugins-4.1-x86_64-3.txt -rw-r--r-- 1 root root 1486532 2021-07-13 19:10 ./slackware64/xap/audacious-plugins-4.1-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-07-13 19:10 ./slackware64/xap/audacious-plugins-4.1-x86_64-3.txz.asc --rw-r--r-- 1 root root 431 2021-02-13 13:28 ./slackware64/xap/blackbox-0.76-x86_64-3.txt --rw-r--r-- 1 root root 392660 2021-02-13 13:28 ./slackware64/xap/blackbox-0.76-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-02-13 13:28 ./slackware64/xap/blackbox-0.76-x86_64-3.txz.asc +-rw-r--r-- 1 root root 431 2021-08-05 05:16 ./slackware64/xap/blackbox-0.77-x86_64-1.txt +-rw-r--r-- 1 root root 393060 2021-08-05 05:16 ./slackware64/xap/blackbox-0.77-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-08-05 05:16 ./slackware64/xap/blackbox-0.77-x86_64-1.txz.asc -rw-r--r-- 1 root root 434 2021-06-06 20:13 ./slackware64/xap/blueman-2.2.1-x86_64-1.txt -rw-r--r-- 1 root root 1231936 2021-06-06 20:13 ./slackware64/xap/blueman-2.2.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-06-06 20:13 ./slackware64/xap/blueman-2.2.1-x86_64-1.txz.asc @@ -5527,11 +5527,11 @@ drwxr-xr-x 2 root root 4096 2021-02-15 19:33 ./slackware64/y -rw-r--r-- 1 root root 1486956 2021-02-13 13:56 ./slackware64/y/nethack-3.6.6-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 13:56 ./slackware64/y/nethack-3.6.6-x86_64-3.txz.asc -rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile -drwxr-xr-x 18 root root 4096 2021-08-04 20:20 ./source --rw-r--r-- 1 root root 573840 2021-08-04 20:20 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2021-08-04 20:20 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 798820 2021-08-04 20:20 ./source/FILE_LIST --rw-r--r-- 1 root root 22861950 2021-08-04 20:20 ./source/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2021-08-06 18:07 ./source +-rw-r--r-- 1 root root 573852 2021-08-06 18:07 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2021-08-06 18:07 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 798831 2021-08-06 18:06 ./source/FILE_LIST +-rw-r--r-- 1 root root 22869053 2021-08-06 18:06 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT drwxr-xr-x 122 root root 4096 2021-07-11 17:54 ./source/a -rw-r--r-- 1 root root 1591 2021-04-06 18:09 ./source/a/FTBFSlog @@ -6511,12 +6511,12 @@ drwxr-xr-x 2 root root 4096 2021-04-18 18:17 ./source/a/udisks -rw-r--r-- 1 root root 367 2018-09-19 00:06 ./source/a/udisks/udisks.glibc228.diff.gz -rw-r--r-- 1 root root 753 2015-11-20 19:25 ./source/a/udisks/udisks.no.pci-db.diff.gz -rw-r--r-- 1 root root 37 2010-11-10 05:15 ./source/a/udisks/udisks.url -drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/a/udisks2 +drwxr-xr-x 2 root root 4096 2021-08-06 17:37 ./source/a/udisks2 -rw-r--r-- 1 root root 461 2015-04-21 00:53 ./source/a/udisks2/20-plugdev-group-mount-override.rules -rw-r--r-- 1 root root 571 2020-10-28 19:36 ./source/a/udisks2/doinst.sh.gz -rw-r--r-- 1 root root 882 2018-02-27 06:13 ./source/a/udisks2/slack-desc --rw-r--r-- 1 root root 1228834 2021-02-04 15:16 ./source/a/udisks2/udisks-2.9.2.tar.lz --rwxr-xr-x 1 root root 5159 2021-02-13 05:31 ./source/a/udisks2/udisks2.SlackBuild +-rw-r--r-- 1 root root 1286923 2021-08-04 16:19 ./source/a/udisks2/udisks-2.9.3.tar.lz +-rwxr-xr-x 1 root root 5159 2021-08-06 17:36 ./source/a/udisks2/udisks2.SlackBuild -rw-r--r-- 1 root root 52 2020-10-28 19:37 ./source/a/udisks2/udisks2.url drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/a/unarj -rw-r--r-- 1 root root 269 2006-12-23 05:36 ./source/a/unarj/Makefile.gz @@ -7496,9 +7496,9 @@ drwxr-xr-x 2 root root 4096 2021-06-22 18:21 ./source/d/parallel -rw-r--r-- 1 root root 1763448 2021-06-22 16:26 ./source/d/parallel/parallel-20210622.tar.lz -rwxr-xr-x 1 root root 4533 2021-02-22 20:43 ./source/d/parallel/parallel.SlackBuild -rw-r--r-- 1 root root 857 2018-04-21 03:27 ./source/d/parallel/slack-desc -drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/d/patchelf --rw-r--r-- 1 root root 81662 2020-08-27 11:57 ./source/d/patchelf/patchelf-0.12.tar.lz --rwxr-xr-x 1 root root 4422 2021-02-13 05:31 ./source/d/patchelf/patchelf.SlackBuild +drwxr-xr-x 2 root root 4096 2021-08-06 17:30 ./source/d/patchelf +-rw-r--r-- 1 root root 87194 2021-08-05 12:39 ./source/d/patchelf/patchelf-0.13.tar.lz +-rwxr-xr-x 1 root root 4422 2021-08-06 17:30 ./source/d/patchelf/patchelf.SlackBuild -rw-r--r-- 1 root root 925 2018-02-27 06:13 ./source/d/patchelf/slack-desc drwxr-xr-x 2 root root 4096 2021-05-21 04:53 ./source/d/perl -rw-r--r-- 1 root root 45129 2012-09-04 16:12 ./source/d/perl/Authen-SASL-2.16.tar.gz @@ -7544,8 +7544,8 @@ drwxr-xr-x 2 root root 4096 2021-06-05 17:57 ./source/d/poke -rw-r--r-- 1 root root 2976530 2021-06-05 11:13 ./source/d/poke/poke-1.3.tar.lz -rwxr-xr-x 1 root root 4522 2021-02-27 04:46 ./source/d/poke/poke.SlackBuild -rw-r--r-- 1 root root 850 2021-02-27 04:48 ./source/d/poke/slack-desc -drwxr-xr-x 2 root root 4096 2021-07-31 16:19 ./source/d/python-pip --rw-r--r-- 1 root root 1100361 2021-07-31 07:56 ./source/d/python-pip/pip-21.2.2.tar.lz +drwxr-xr-x 2 root root 4096 2021-08-06 17:33 ./source/d/python-pip +-rw-r--r-- 1 root root 1101135 2021-08-06 10:50 ./source/d/python-pip/pip-21.2.3.tar.lz -rw-r--r-- 1 root root 33 2018-03-29 06:10 ./source/d/python-pip/pip.url -rwxr-xr-x 1 root root 2876 2021-04-25 18:32 ./source/d/python-pip/python-pip.SlackBuild -rw-r--r-- 1 root root 760 2018-02-27 06:13 ./source/d/python-pip/slack-desc @@ -7990,7 +7990,7 @@ drwxr-xr-x 2 root root 16384 2021-06-08 19:05 ./source/kde/kde/build -rw-r--r-- 1 root root 2 2021-02-13 05:34 ./source/kde/kde/build/krename -rw-r--r-- 1 root root 2 2021-03-05 18:56 ./source/kde/kde/build/kreversi -rw-r--r-- 1 root root 2 2021-03-05 18:56 ./source/kde/kde/build/krfb --rw-r--r-- 1 root root 2 2021-08-02 18:12 ./source/kde/kde/build/krita +-rw-r--r-- 1 root root 2 2021-08-06 17:26 ./source/kde/kde/build/krita -rw-r--r-- 1 root root 2 2021-02-16 04:19 ./source/kde/kde/build/kross -rw-r--r-- 1 root root 2 2021-03-05 18:56 ./source/kde/kde/build/kross-interpreters -rw-r--r-- 1 root root 2 2021-03-05 18:56 ./source/kde/kde/build/kruler @@ -8800,7 +8800,7 @@ drwxr-xr-x 2 root root 12288 2021-06-08 19:02 ./source/kde/kde/slack-desc -rw-r--r-- 1 root root 760 2020-11-01 20:11 ./source/kde/kde/slack-desc/zeroconf-ioslave drwxr-xr-x 7 root root 4096 2020-09-29 01:10 ./source/kde/kde/src drwxr-xr-x 2 root root 36864 2021-07-08 18:43 ./source/kde/kde/src/applications -drwxr-xr-x 2 root root 4096 2021-07-11 17:48 ./source/kde/kde/src/applications-extra +drwxr-xr-x 2 root root 4096 2021-08-06 17:26 ./source/kde/kde/src/applications-extra -rw-r--r-- 1 root root 230804 2021-03-03 22:04 ./source/kde/kde/src/applications-extra/alkimia-8.1.0.tar.xz -rw-r--r-- 1 root root 833 2021-03-03 22:04 ./source/kde/kde/src/applications-extra/alkimia-8.1.0.tar.xz.sig -rw-r--r-- 1 root root 55207684 2020-05-23 15:58 ./source/kde/kde/src/applications-extra/calligra-3.2.1.tar.xz @@ -8831,8 +8831,7 @@ drwxr-xr-x 2 root root 4096 2021-07-11 17:48 ./source/kde/kde/src/applica -rw-r--r-- 1 root root 868 2021-06-23 15:55 ./source/kde/kde/src/applications-extra/kmymoney-5.1.2.tar.xz.sig -rw-r--r-- 1 root root 321556 2020-10-05 15:06 ./source/kde/kde/src/applications-extra/krename-5.0.1.tar.xz -rw-r--r-- 1 root root 833 2020-10-05 15:06 ./source/kde/kde/src/applications-extra/krename-5.0.1.tar.xz.sig --rw-r--r-- 1 root root 174217180 2021-06-08 07:34 ./source/kde/kde/src/applications-extra/krita-4.4.5.tar.xz --rw-r--r-- 1 root root 310 2021-06-09 11:11 ./source/kde/kde/src/applications-extra/krita-4.4.5.tar.xz.sig +-rw-r--r-- 1 root root 171839920 2021-08-06 11:40 ./source/kde/kde/src/applications-extra/krita-4.4.7.tar.xz -rw-r--r-- 1 root root 2912396 2019-08-25 06:54 ./source/kde/kde/src/applications-extra/krusader-2.7.2.tar.xz -rw-r--r-- 1 root root 79228112 2021-04-25 19:29 ./source/kde/kde/src/applications-extra/kstars-3.5.3.tar.xz -rw-r--r-- 1 root root 488 2021-04-25 19:29 ./source/kde/kde/src/applications-extra/kstars-3.5.3.tar.xz.sig @@ -10000,8 +9999,8 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/l/giflib -rwxr-xr-x 1 root root 4568 2021-02-13 05:31 ./source/l/giflib/giflib.SlackBuild -rw-r--r-- 1 root root 41 2019-02-13 20:21 ./source/l/giflib/giflib.url -rw-r--r-- 1 root root 773 2018-02-27 06:12 ./source/l/giflib/slack-desc -drwxr-xr-x 2 root root 4096 2021-05-06 17:00 ./source/l/gjs --rw-r--r-- 1 root root 558920 2021-05-06 03:43 ./source/l/gjs/gjs-1.68.1.tar.xz +drwxr-xr-x 2 root root 4096 2021-08-06 17:23 ./source/l/gjs +-rw-r--r-- 1 root root 559432 2021-08-06 05:19 ./source/l/gjs/gjs-1.68.2.tar.xz -rwxr-xr-x 1 root root 4410 2021-03-31 19:10 ./source/l/gjs/gjs.SlackBuild -rw-r--r-- 1 root root 44 2021-03-31 19:10 ./source/l/gjs/gjs.url -rw-r--r-- 1 root root 852 2020-11-25 21:08 ./source/l/gjs/slack-desc @@ -10011,9 +10010,9 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/l/glade -rw-r--r-- 1 root root 71 2020-11-01 08:16 ./source/l/glade/glade.url -rw-r--r-- 1 root root 877 2020-11-26 23:29 ./source/l/glade/slack-desc drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/l/glib -drwxr-xr-x 2 root root 4096 2021-04-23 17:31 ./source/l/glib-networking +drwxr-xr-x 2 root root 4096 2021-08-06 17:24 ./source/l/glib-networking -rw-r--r-- 1 root root 119 2011-11-06 21:59 ./source/l/glib-networking/doinst.sh.gz --rw-r--r-- 1 root root 237876 2021-04-22 18:44 ./source/l/glib-networking/glib-networking-2.68.1.tar.xz +-rw-r--r-- 1 root root 239040 2021-08-05 17:05 ./source/l/glib-networking/glib-networking-2.68.2.tar.xz -rwxr-xr-x 1 root root 4011 2021-03-31 18:43 ./source/l/glib-networking/glib-networking.SlackBuild -rw-r--r-- 1 root root 795 2018-02-27 06:12 ./source/l/glib-networking/slack-desc -rw-r--r-- 1 root root 6408 2017-08-03 05:13 ./source/l/glib/glib-1.2.10-autotools.patch.gz @@ -10997,9 +10996,10 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/l/newt -rwxr-xr-x 1 root root 3967 2021-02-13 05:32 ./source/l/newt/newt.SlackBuild -rw-r--r-- 1 root root 33 2019-05-30 19:09 ./source/l/newt/newt.url -rw-r--r-- 1 root root 907 2018-02-27 06:12 ./source/l/newt/slack-desc -drwxr-xr-x 2 root root 4096 2021-04-08 00:47 ./source/l/ocl-icd +drwxr-xr-x 2 root root 4096 2021-08-05 04:56 ./source/l/ocl-icd +-rw-r--r-- 1 root root 14653 2021-08-05 04:55 ./source/l/ocl-icd/0001-Updated-to-support-latest-Khronos-headers.patch.gz -rw-r--r-- 1 root root 75868 2021-03-30 16:10 ./source/l/ocl-icd/ocl-icd-2.3.0.tar.lz --rwxr-xr-x 1 root root 4009 2021-04-08 00:47 ./source/l/ocl-icd/ocl-icd.SlackBuild +-rwxr-xr-x 1 root root 4108 2021-08-05 04:56 ./source/l/ocl-icd/ocl-icd.SlackBuild -rw-r--r-- 1 root root 35 2020-10-08 17:59 ./source/l/ocl-icd/ocl-icd.url -rw-r--r-- 1 root root 893 2020-10-08 17:59 ./source/l/ocl-icd/slack-desc drwxr-xr-x 2 root root 4096 2021-04-14 16:35 ./source/l/oniguruma @@ -11055,9 +11055,9 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/l/parted -rwxr-xr-x 1 root root 4652 2021-02-13 05:32 ./source/l/parted/parted.SlackBuild -rwxr-xr-x 1 root root 4652 2019-10-11 03:02 ./source/l/parted/parted.SlackBuild.static -rw-r--r-- 1 root root 836 2018-02-27 06:12 ./source/l/parted/slack-desc -drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/l/pcaudiolib --rw-r--r-- 1 root root 29930 2018-02-27 07:23 ./source/l/pcaudiolib/pcaudiolib-1.1.tar.lz --rwxr-xr-x 1 root root 3903 2021-02-13 05:32 ./source/l/pcaudiolib/pcaudiolib.SlackBuild +drwxr-xr-x 2 root root 4096 2021-08-06 17:31 ./source/l/pcaudiolib +-rw-r--r-- 1 root root 30110 2021-07-30 12:10 ./source/l/pcaudiolib/pcaudiolib-1.2.tar.lz +-rwxr-xr-x 1 root root 3903 2021-08-06 17:31 ./source/l/pcaudiolib/pcaudiolib.SlackBuild -rw-r--r-- 1 root root 40 2020-07-29 00:41 ./source/l/pcaudiolib/pcaudiolib.url -rw-r--r-- 1 root root 886 2020-07-29 02:35 ./source/l/pcaudiolib/slack-desc drwxr-xr-x 2 root root 4096 2021-06-16 18:06 ./source/l/pcre @@ -11090,8 +11090,8 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/l/pilot-link -rwxr-xr-x 1 root root 4918 2021-02-13 05:32 ./source/l/pilot-link/pilot-link.SlackBuild -rw-r--r-- 1 root root 645 2010-02-19 18:53 ./source/l/pilot-link/pilot-link.png14.diff.gz -rw-r--r-- 1 root root 873 2018-02-27 06:12 ./source/l/pilot-link/slack-desc -drwxr-xr-x 2 root root 4096 2021-07-20 18:47 ./source/l/pipewire --rw-r--r-- 1 root root 1009644 2021-07-20 18:47 ./source/l/pipewire/pipewire-0.3.32.tar.lz +drwxr-xr-x 2 root root 4096 2021-08-06 17:32 ./source/l/pipewire +-rw-r--r-- 1 root root 1026755 2021-08-06 17:32 ./source/l/pipewire/pipewire-0.3.33.tar.lz -rwxr-xr-- 1 root root 4180 2021-05-19 19:58 ./source/l/pipewire/pipewire.SlackBuild -rw-r--r-- 1 root root 49 2020-09-29 01:53 ./source/l/pipewire/pipewire.url -rw-r--r-- 1 root root 1038 2020-11-01 20:04 ./source/l/pipewire/slack-desc @@ -11247,10 +11247,10 @@ drwxr-xr-x 2 root root 4096 2021-05-03 18:26 ./source/l/python-pygments -rw-r--r-- 1 root root 34 2020-01-06 19:15 ./source/l/python-pygments/Pygments.url -rwxr-xr-x 1 root root 2579 2021-03-07 18:58 ./source/l/python-pygments/python-pygments.SlackBuild -rw-r--r-- 1 root root 976 2020-01-06 19:27 ./source/l/python-pygments/slack-desc -drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/l/python-pysol_cards +drwxr-xr-x 2 root root 4096 2021-08-06 17:33 ./source/l/python-pysol_cards -rw-r--r-- 1 root root 37 2020-11-12 20:15 ./source/l/python-pysol_cards/pysol-cards.url --rw-r--r-- 1 root root 20670 2020-06-14 09:34 ./source/l/python-pysol_cards/pysol_cards-0.10.1.tar.gz --rwxr-xr-x 1 root root 2613 2021-02-13 05:32 ./source/l/python-pysol_cards/python-pysol_cards.SlackBuild +-rw-r--r-- 1 root root 20776 2021-08-06 10:30 ./source/l/python-pysol_cards/pysol_cards-0.10.2.tar.gz +-rwxr-xr-x 1 root root 2613 2021-08-06 17:34 ./source/l/python-pysol_cards/python-pysol_cards.SlackBuild -rw-r--r-- 1 root root 1007 2020-11-12 20:23 ./source/l/python-pysol_cards/slack-desc drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/l/python-random2 -rwxr-xr-x 1 root root 3181 2021-02-13 05:32 ./source/l/python-random2/python-random2.SlackBuild @@ -11875,8 +11875,8 @@ drwxr-xr-x 2 root root 4096 2021-06-30 17:58 ./source/n/iproute2 -rwxr-xr-x 1 root root 4945 2021-02-23 21:51 ./source/n/iproute2/iproute2.SlackBuild -rw-r--r-- 1 root root 53 2017-11-12 22:05 ./source/n/iproute2/iproute2.url -rw-r--r-- 1 root root 932 2018-02-27 06:13 ./source/n/iproute2/slack-desc -drwxr-xr-x 2 root root 4096 2021-07-28 18:23 ./source/n/ipset --rw-r--r-- 1 root root 498249 2021-07-28 14:23 ./source/n/ipset/ipset-7.14.tar.lz +drwxr-xr-x 2 root root 4096 2021-08-06 17:25 ./source/n/ipset +-rw-r--r-- 1 root root 498155 2021-08-04 06:19 ./source/n/ipset/ipset-7.15.tar.lz -rwxr-xr-x 1 root root 3918 2021-02-20 19:19 ./source/n/ipset/ipset.SlackBuild -rw-r--r-- 1 root root 927 2018-02-27 06:13 ./source/n/ipset/slack-desc drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/iptables @@ -12008,9 +12008,9 @@ drwxr-xr-x 2 root root 4096 2021-05-25 17:48 ./source/n/libnftnl -rwxr-xr-x 1 root root 3768 2021-05-25 17:48 ./source/n/libnftnl/libnftnl.SlackBuild -rw-r--r-- 1 root root 46 2020-10-27 17:40 ./source/n/libnftnl/libnftnl.url -rw-r--r-- 1 root root 891 2018-02-27 06:13 ./source/n/libnftnl/slack-desc -drwxr-xr-x 2 root root 4096 2021-06-07 18:16 ./source/n/libqmi --rw-r--r-- 1 root root 1192736 2021-06-04 09:55 ./source/n/libqmi/libqmi-1.28.6.tar.xz --rw-r--r-- 1 root root 195 2021-06-04 09:55 ./source/n/libqmi/libqmi-1.28.6.tar.xz.asc +drwxr-xr-x 2 root root 4096 2021-08-06 17:28 ./source/n/libqmi +-rw-r--r-- 1 root root 1237944 2021-08-05 08:52 ./source/n/libqmi/libqmi-1.30.0.tar.xz +-rw-r--r-- 1 root root 195 2021-08-05 08:52 ./source/n/libqmi/libqmi-1.30.0.tar.xz.asc -rwxr-xr-x 1 root root 4359 2021-02-15 20:14 ./source/n/libqmi/libqmi.SlackBuild -rw-r--r-- 1 root root 785 2018-02-27 06:13 ./source/n/libqmi/slack-desc drwxr-xr-x 2 root root 4096 2021-05-11 18:31 ./source/n/libtirpc @@ -12042,10 +12042,10 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/metamail -rw-r--r-- 1 root root 284 2010-08-12 01:05 ./source/n/metamail/metamail.uue.getline.diff.gz -rw-r--r-- 1 root root 202588 2008-03-08 23:47 ./source/n/metamail/metamail_2.7-54.diff.xz -rw-r--r-- 1 root root 923 2018-02-27 06:13 ./source/n/metamail/slack-desc -drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/mobile-broadband-provider-info +drwxr-xr-x 2 root root 4096 2021-08-06 17:29 ./source/n/mobile-broadband-provider-info -rwxr-xr-x 1 root root 2389 2020-07-09 18:37 ./source/n/mobile-broadband-provider-info/fetch-mobile-broadband-provider-info.sh --rw-r--r-- 1 root root 43576 2020-12-25 15:12 ./source/n/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225_90f3fe2.tar.xz --rwxr-xr-x 1 root root 3959 2021-02-13 05:32 ./source/n/mobile-broadband-provider-info/mobile-broadband-provider-info.SlackBuild +-rw-r--r-- 1 root root 44236 2021-08-05 15:27 ./source/n/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805_11f2247.tar.xz +-rwxr-xr-x 1 root root 3959 2021-08-06 17:29 ./source/n/mobile-broadband-provider-info/mobile-broadband-provider-info.SlackBuild -rw-r--r-- 1 root root 1071 2018-02-27 06:13 ./source/n/mobile-broadband-provider-info/slack-desc drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/mtr -rw-r--r-- 1 root root 207152 2020-09-24 10:27 ./source/n/mtr/mtr-0.94.tar.lz @@ -14306,10 +14306,10 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/xap/audacious-plugin -rwxr-xr-x 1 root root 4636 2020-03-22 18:08 ./source/xap/audacious/audacious.SlackBuild.meson -rw-r--r-- 1 root root 121 2010-04-09 21:15 ./source/xap/audacious/doinst.sh.gz -rw-r--r-- 1 root root 1048 2018-10-24 20:29 ./source/xap/audacious/slack-desc -drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/xap/blackbox +drwxr-xr-x 2 root root 4096 2021-08-05 05:16 ./source/xap/blackbox -rw-r--r-- 1 root root 175764 2009-09-03 11:39 ./source/xap/blackbox/bbkeys-0.9.1.tar.lz --rw-r--r-- 1 root root 558554 2020-02-11 12:50 ./source/xap/blackbox/blackbox-0.76.tar.lz --rwxr-xr-x 1 root root 7034 2021-02-13 05:32 ./source/xap/blackbox/blackbox.SlackBuild +-rw-r--r-- 1 root root 566397 2021-05-12 06:07 ./source/xap/blackbox/blackbox-0.77.tar.lz +-rwxr-xr-x 1 root root 7034 2021-08-05 05:16 ./source/xap/blackbox/blackbox.SlackBuild -rw-r--r-- 1 root root 2199 2018-06-22 21:26 ./source/xap/blackbox/blackbox.menu.gz -rw-r--r-- 1 root root 40 2018-06-22 17:25 ./source/xap/blackbox/blackbox.url -rw-r--r-- 1 root root 271 2018-06-22 21:32 ./source/xap/blackbox/doinst.sh.gz diff --git a/recompress.sh b/recompress.sh index f64445ec7..9de22ef14 100755 --- a/recompress.sh +++ b/recompress.sh @@ -792,6 +792,7 @@ gzip ./source/l/gtk+2/gtk+-2.24.x.icon-compat.diff gzip ./source/l/gtk+2/fix_build_issues_on_tutorial_and_faq.diff gzip ./source/l/libvisual/libvisual.glib.h.diff gzip ./source/l/gegl/gegl.no.runtime.dot.check.diff +gzip ./source/l/ocl-icd/0001-Updated-to-support-latest-Khronos-headers.patch gzip ./source/l/apr-util/apr-util-mariadb-upstream.patch gzip ./source/l/gnome-themes-extra/doinst.sh gzip ./source/l/gtkspell/gtkspell.enchant-2.diff diff --git a/source/a/udisks2/udisks2.SlackBuild b/source/a/udisks2/udisks2.SlackBuild index 734454f56..cb9030bea 100755 --- a/source/a/udisks2/udisks2.SlackBuild +++ b/source/a/udisks2/udisks2.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=udisks2 SRCNAM=udisks VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/d/patchelf/patchelf.SlackBuild b/source/d/patchelf/patchelf.SlackBuild index f61724b3f..f5fcc5704 100755 --- a/source/d/patchelf/patchelf.SlackBuild +++ b/source/d/patchelf/patchelf.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=patchelf VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -2 +1 diff --git a/source/l/ocl-icd/0001-Updated-to-support-latest-Khronos-headers.patch b/source/l/ocl-icd/0001-Updated-to-support-latest-Khronos-headers.patch new file mode 100644 index 000000000..6912d7d2b --- /dev/null +++ b/source/l/ocl-icd/0001-Updated-to-support-latest-Khronos-headers.patch @@ -0,0 +1,2434 @@ +From aed1832c81c0971ea001e12d41e04df834257f94 Mon Sep 17 00:00:00 2001 +From: Brice Videau +Date: Wed, 12 May 2021 10:24:44 -0500 +Subject: [PATCH] Updated to support latest Khronos headers. + +Signed-off-by: Laurent Carlier +--- + icd_generator.rb | 4 +- + khronos-headers/CL/cl.h | 46 +-- + khronos-headers/CL/cl_d3d10.h | 12 +- + khronos-headers/CL/cl_d3d11.h | 12 +- + khronos-headers/CL/cl_dx9_media_sharing.h | 32 +- + khronos-headers/CL/cl_egl.h | 8 +- + khronos-headers/CL/cl_ext.h | 228 +++++++++---- + khronos-headers/CL/cl_gl.h | 22 +- + khronos-headers/CL/cl_gl_ext.h | 26 +- + khronos-headers/CL/cl_icd.h | 316 +++++++++--------- + khronos-headers/CL/cl_layer.h | 4 +- + khronos-headers/CL/cl_platform.h | 125 ++++--- + .../CL/cl_va_api_media_sharing_intel.h | 24 +- + khronos-headers/CL/opencl.h | 3 +- + ocl_interface.yaml | 10 +- + run_dummy_icd.c | 1 - + 16 files changed, 484 insertions(+), 389 deletions(-) + +diff --git a/icd_generator.rb b/icd_generator.rb +index bb0f2e9..ed4217f 100644 +--- a/icd_generator.rb ++++ b/icd_generator.rb +@@ -57,7 +57,7 @@ module IcdGenerator + "clGetGLContextInfoKHR", "clUnloadCompiler", + "clCreateContext", "clCreateContextFromType", "clWaitForEvents"] + $header_files = ["/usr/include/CL/cl.h", "/usr/include/CL/cl_gl.h", "/usr/include/CL/cl_egl.h", +- "/usr/include/CL/cl_ext.h", "/usr/include/CL/cl_gl_ext.h"] ++ "/usr/include/CL/cl_ext.h"] + $windows_header_files = ["/usr/include/CL/cl_dx9_media_sharing.h", "/usr/include/CL/cl_d3d11.h", "/usr/include/CL/cl_d3d10.h"] + $cl_data_type_error = { "cl_platform_id" => "CL_INVALID_PLATFORM", + "cl_device_id" => "CL_INVALID_DEVICE", +@@ -246,7 +246,7 @@ EOF + run_dummy_icd += "\n\n" + $api_entries.each_key { |func_name| + next if $forbidden_funcs.include?(func_name) +- run_dummy_icd += $api_entries[func_name]+";\n" ++ run_dummy_icd += $api_entries[func_name]+"\n" + } + run_dummy_icd += "\n\n" + run_dummy_icd += "void call_all_OpenCL_functions(cl_platform_id chosen_platform) {\n" +diff --git a/khronos-headers/CL/cl.h b/khronos-headers/CL/cl.h +index 3a5aae4..0018a0f 100644 +--- a/khronos-headers/CL/cl.h ++++ b/khronos-headers/CL/cl.h +@@ -1311,11 +1311,11 @@ clLinkProgram(cl_context context, + + #ifdef CL_VERSION_2_2 + +-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_2_2_DEPRECATED cl_int CL_API_CALL ++extern CL_API_ENTRY CL_API_PREFIX__VERSION_2_2_DEPRECATED cl_int CL_API_CALL + clSetProgramReleaseCallback(cl_program program, + void (CL_CALLBACK * pfn_notify)(cl_program program, + void * user_data), +- void * user_data) CL_EXT_SUFFIX__VERSION_2_2_DEPRECATED; ++ void * user_data) CL_API_SUFFIX__VERSION_2_2_DEPRECATED; + + extern CL_API_ENTRY cl_int CL_API_CALL + clSetProgramSpecializationConstant(cl_program program, +@@ -1857,11 +1857,11 @@ clGetExtensionFunctionAddressForPlatform(cl_platform_id platform, + clSetCommandQueueProperty(cl_command_queue command_queue, + cl_command_queue_properties properties, + cl_bool enable, +- cl_command_queue_properties * old_properties) CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED; ++ cl_command_queue_properties * old_properties) CL_API_SUFFIX__VERSION_1_0_DEPRECATED; + #endif /* CL_USE_DEPRECATED_OPENCL_1_0_APIS */ + + /* Deprecated OpenCL 1.1 APIs */ +-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL ++extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL + clCreateImage2D(cl_context context, + cl_mem_flags flags, + const cl_image_format * image_format, +@@ -1869,9 +1869,9 @@ clCreateImage2D(cl_context context, + size_t image_height, + size_t image_row_pitch, + void * host_ptr, +- cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; ++ cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_1_DEPRECATED; + +-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL ++extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL + clCreateImage3D(cl_context context, + cl_mem_flags flags, + const cl_image_format * image_format, +@@ -1881,46 +1881,46 @@ clCreateImage3D(cl_context context, + size_t image_row_pitch, + size_t image_slice_pitch, + void * host_ptr, +- cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; ++ cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_1_DEPRECATED; + +-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL ++extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL + clEnqueueMarker(cl_command_queue command_queue, +- cl_event * event) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; ++ cl_event * event) CL_API_SUFFIX__VERSION_1_1_DEPRECATED; + +-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL ++extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL + clEnqueueWaitForEvents(cl_command_queue command_queue, + cl_uint num_events, +- const cl_event * event_list) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; ++ const cl_event * event_list) CL_API_SUFFIX__VERSION_1_1_DEPRECATED; + +-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL +-clEnqueueBarrier(cl_command_queue command_queue) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; ++extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL ++clEnqueueBarrier(cl_command_queue command_queue) CL_API_SUFFIX__VERSION_1_1_DEPRECATED; + +-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL +-clUnloadCompiler(void) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; ++extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL ++clUnloadCompiler(void) CL_API_SUFFIX__VERSION_1_1_DEPRECATED; + +-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED void * CL_API_CALL +-clGetExtensionFunctionAddress(const char * func_name) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; ++extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED void * CL_API_CALL ++clGetExtensionFunctionAddress(const char * func_name) CL_API_SUFFIX__VERSION_1_1_DEPRECATED; + + /* Deprecated OpenCL 2.0 APIs */ +-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_2_DEPRECATED cl_command_queue CL_API_CALL ++extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_2_DEPRECATED cl_command_queue CL_API_CALL + clCreateCommandQueue(cl_context context, + cl_device_id device, + cl_command_queue_properties properties, +- cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED; ++ cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2_DEPRECATED; + +-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_2_DEPRECATED cl_sampler CL_API_CALL ++extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_2_DEPRECATED cl_sampler CL_API_CALL + clCreateSampler(cl_context context, + cl_bool normalized_coords, + cl_addressing_mode addressing_mode, + cl_filter_mode filter_mode, +- cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED; ++ cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2_DEPRECATED; + +-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_2_DEPRECATED cl_int CL_API_CALL ++extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_2_DEPRECATED cl_int CL_API_CALL + clEnqueueTask(cl_command_queue command_queue, + cl_kernel kernel, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, +- cl_event * event) CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED; ++ cl_event * event) CL_API_SUFFIX__VERSION_1_2_DEPRECATED; + + #ifdef __cplusplus + } +diff --git a/khronos-headers/CL/cl_d3d10.h b/khronos-headers/CL/cl_d3d10.h +index 2b80d90..6adedb0 100644 +--- a/khronos-headers/CL/cl_d3d10.h ++++ b/khronos-headers/CL/cl_d3d10.h +@@ -75,7 +75,7 @@ typedef cl_uint cl_d3d10_device_set_khr; + + /******************************************************************************/ + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromD3D10KHR_fn)( ++typedef cl_int (CL_API_CALL *clGetDeviceIDsFromD3D10KHR_fn)( + cl_platform_id platform, + cl_d3d10_device_source_khr d3d_device_source, + void * d3d_object, +@@ -84,27 +84,27 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromD3D10KHR_fn)( + cl_device_id * devices, + cl_uint * num_devices) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D10BufferKHR_fn)( ++typedef cl_mem (CL_API_CALL *clCreateFromD3D10BufferKHR_fn)( + cl_context context, + cl_mem_flags flags, + ID3D10Buffer * resource, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D10Texture2DKHR_fn)( ++typedef cl_mem (CL_API_CALL *clCreateFromD3D10Texture2DKHR_fn)( + cl_context context, + cl_mem_flags flags, + ID3D10Texture2D * resource, + UINT subresource, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D10Texture3DKHR_fn)( ++typedef cl_mem (CL_API_CALL *clCreateFromD3D10Texture3DKHR_fn)( + cl_context context, + cl_mem_flags flags, + ID3D10Texture3D * resource, + UINT subresource, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireD3D10ObjectsKHR_fn)( ++typedef cl_int (CL_API_CALL *clEnqueueAcquireD3D10ObjectsKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, +@@ -112,7 +112,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireD3D10ObjectsKHR_fn)( + const cl_event * event_wait_list, + cl_event * event) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseD3D10ObjectsKHR_fn)( ++typedef cl_int (CL_API_CALL *clEnqueueReleaseD3D10ObjectsKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, +diff --git a/khronos-headers/CL/cl_d3d11.h b/khronos-headers/CL/cl_d3d11.h +index 10023dd..50ed906 100644 +--- a/khronos-headers/CL/cl_d3d11.h ++++ b/khronos-headers/CL/cl_d3d11.h +@@ -75,7 +75,7 @@ typedef cl_uint cl_d3d11_device_set_khr; + + /******************************************************************************/ + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromD3D11KHR_fn)( ++typedef cl_int (CL_API_CALL *clGetDeviceIDsFromD3D11KHR_fn)( + cl_platform_id platform, + cl_d3d11_device_source_khr d3d_device_source, + void * d3d_object, +@@ -84,27 +84,27 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromD3D11KHR_fn)( + cl_device_id * devices, + cl_uint * num_devices) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11BufferKHR_fn)( ++typedef cl_mem (CL_API_CALL *clCreateFromD3D11BufferKHR_fn)( + cl_context context, + cl_mem_flags flags, + ID3D11Buffer * resource, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11Texture2DKHR_fn)( ++typedef cl_mem (CL_API_CALL *clCreateFromD3D11Texture2DKHR_fn)( + cl_context context, + cl_mem_flags flags, + ID3D11Texture2D * resource, + UINT subresource, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11Texture3DKHR_fn)( ++typedef cl_mem (CL_API_CALL *clCreateFromD3D11Texture3DKHR_fn)( + cl_context context, + cl_mem_flags flags, + ID3D11Texture3D * resource, + UINT subresource, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireD3D11ObjectsKHR_fn)( ++typedef cl_int (CL_API_CALL *clEnqueueAcquireD3D11ObjectsKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, +@@ -112,7 +112,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireD3D11ObjectsKHR_fn)( + const cl_event * event_wait_list, + cl_event * event) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseD3D11ObjectsKHR_fn)( ++typedef cl_int (CL_API_CALL *clEnqueueReleaseD3D11ObjectsKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, +diff --git a/khronos-headers/CL/cl_dx9_media_sharing.h b/khronos-headers/CL/cl_dx9_media_sharing.h +index 4e64b18..b0d2b23 100644 +--- a/khronos-headers/CL/cl_dx9_media_sharing.h ++++ b/khronos-headers/CL/cl_dx9_media_sharing.h +@@ -76,7 +76,7 @@ typedef struct _cl_dx9_surface_info_khr + + /******************************************************************************/ + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromDX9MediaAdapterKHR_fn)( ++typedef cl_int (CL_API_CALL *clGetDeviceIDsFromDX9MediaAdapterKHR_fn)( + cl_platform_id platform, + cl_uint num_media_adapters, + cl_dx9_media_adapter_type_khr * media_adapter_type, +@@ -86,7 +86,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromDX9MediaAdapterKHR_f + cl_device_id * devices, + cl_uint * num_devices) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceKHR_fn)( ++typedef cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceKHR_fn)( + cl_context context, + cl_mem_flags flags, + cl_dx9_media_adapter_type_khr adapter_type, +@@ -94,7 +94,7 @@ typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceKHR_fn)( + cl_uint plane, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireDX9MediaSurfacesKHR_fn)( ++typedef cl_int (CL_API_CALL *clEnqueueAcquireDX9MediaSurfacesKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, +@@ -102,7 +102,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireDX9MediaSurfacesKHR_fn + const cl_event * event_wait_list, + cl_event * event) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseDX9MediaSurfacesKHR_fn)( ++typedef cl_int (CL_API_CALL *clEnqueueReleaseDX9MediaSurfacesKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, +@@ -159,16 +159,16 @@ clGetDeviceIDsFromDX9INTEL( + cl_dx9_device_set_intel dx9_device_set, + cl_uint num_entries, + cl_device_id* devices, +- cl_uint* num_devices) CL_EXT_SUFFIX__VERSION_1_1; ++ cl_uint* num_devices) CL_API_SUFFIX__VERSION_1_1; + +-typedef CL_API_ENTRY cl_int (CL_API_CALL* clGetDeviceIDsFromDX9INTEL_fn)( ++typedef cl_int (CL_API_CALL* clGetDeviceIDsFromDX9INTEL_fn)( + cl_platform_id platform, + cl_dx9_device_source_intel dx9_device_source, + void* dx9_object, + cl_dx9_device_set_intel dx9_device_set, + cl_uint num_entries, + cl_device_id* devices, +- cl_uint* num_devices) CL_EXT_SUFFIX__VERSION_1_1; ++ cl_uint* num_devices) CL_API_SUFFIX__VERSION_1_1; + + extern CL_API_ENTRY cl_mem CL_API_CALL + clCreateFromDX9MediaSurfaceINTEL( +@@ -177,15 +177,15 @@ clCreateFromDX9MediaSurfaceINTEL( + IDirect3DSurface9* resource, + HANDLE sharedHandle, + UINT plane, +- cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_1; ++ cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_1; + +-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceINTEL_fn)( ++typedef cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceINTEL_fn)( + cl_context context, + cl_mem_flags flags, + IDirect3DSurface9* resource, + HANDLE sharedHandle, + UINT plane, +- cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_1; ++ cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_1; + + extern CL_API_ENTRY cl_int CL_API_CALL + clEnqueueAcquireDX9ObjectsINTEL( +@@ -194,15 +194,15 @@ clEnqueueAcquireDX9ObjectsINTEL( + const cl_mem* mem_objects, + cl_uint num_events_in_wait_list, + const cl_event* event_wait_list, +- cl_event* event) CL_EXT_SUFFIX__VERSION_1_1; ++ cl_event* event) CL_API_SUFFIX__VERSION_1_1; + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireDX9ObjectsINTEL_fn)( ++typedef cl_int (CL_API_CALL *clEnqueueAcquireDX9ObjectsINTEL_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem* mem_objects, + cl_uint num_events_in_wait_list, + const cl_event* event_wait_list, +- cl_event* event) CL_EXT_SUFFIX__VERSION_1_1; ++ cl_event* event) CL_API_SUFFIX__VERSION_1_1; + + extern CL_API_ENTRY cl_int CL_API_CALL + clEnqueueReleaseDX9ObjectsINTEL( +@@ -211,15 +211,15 @@ clEnqueueReleaseDX9ObjectsINTEL( + cl_mem* mem_objects, + cl_uint num_events_in_wait_list, + const cl_event* event_wait_list, +- cl_event* event) CL_EXT_SUFFIX__VERSION_1_1; ++ cl_event* event) CL_API_SUFFIX__VERSION_1_1; + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseDX9ObjectsINTEL_fn)( ++typedef cl_int (CL_API_CALL *clEnqueueReleaseDX9ObjectsINTEL_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + cl_mem* mem_objects, + cl_uint num_events_in_wait_list, + const cl_event* event_wait_list, +- cl_event* event) CL_EXT_SUFFIX__VERSION_1_1; ++ cl_event* event) CL_API_SUFFIX__VERSION_1_1; + + #ifdef __cplusplus + } +diff --git a/khronos-headers/CL/cl_egl.h b/khronos-headers/CL/cl_egl.h +index c8bde80..357a37c 100644 +--- a/khronos-headers/CL/cl_egl.h ++++ b/khronos-headers/CL/cl_egl.h +@@ -56,7 +56,7 @@ clCreateFromEGLImageKHR(cl_context context, + const cl_egl_image_properties_khr * properties, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromEGLImageKHR_fn)( ++typedef cl_mem (CL_API_CALL *clCreateFromEGLImageKHR_fn)( + cl_context context, + CLeglDisplayKHR egldisplay, + CLeglImageKHR eglimage, +@@ -73,7 +73,7 @@ clEnqueueAcquireEGLObjectsKHR(cl_command_queue command_queue, + const cl_event * event_wait_list, + cl_event * event) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireEGLObjectsKHR_fn)( ++typedef cl_int (CL_API_CALL *clEnqueueAcquireEGLObjectsKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, +@@ -90,7 +90,7 @@ clEnqueueReleaseEGLObjectsKHR(cl_command_queue command_queue, + const cl_event * event_wait_list, + cl_event * event) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseEGLObjectsKHR_fn)( ++typedef cl_int (CL_API_CALL *clEnqueueReleaseEGLObjectsKHR_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem * mem_objects, +@@ -107,7 +107,7 @@ clCreateEventFromEGLSyncKHR(cl_context context, + CLeglDisplayKHR display, + cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_event (CL_API_CALL *clCreateEventFromEGLSyncKHR_fn)( ++typedef cl_event (CL_API_CALL *clCreateEventFromEGLSyncKHR_fn)( + cl_context context, + CLeglSyncKHR sync, + CLeglDisplayKHR display, +diff --git a/khronos-headers/CL/cl_ext.h b/khronos-headers/CL/cl_ext.h +index 4773061..3015f46 100644 +--- a/khronos-headers/CL/cl_ext.h ++++ b/khronos-headers/CL/cl_ext.h +@@ -54,9 +54,9 @@ extern "C" { + * before using. + */ + #define cl_APPLE_SetMemObjectDestructor 1 +-cl_int CL_API_ENTRY clSetMemObjectDestructorAPPLE( cl_mem memobj, ++extern CL_API_ENTRY cl_int CL_API_CALL clSetMemObjectDestructorAPPLE( cl_mem memobj, + void (* pfn_notify)(cl_mem memobj, void * user_data), +- void * user_data) CL_EXT_SUFFIX__VERSION_1_0; ++ void * user_data) CL_API_SUFFIX__VERSION_1_0; + + + /* Context Logging Functions +@@ -68,22 +68,22 @@ cl_int CL_API_ENTRY clSetMemObjectDestructorAPPLE( cl_mem memobj, + * clLogMessagesToSystemLog forwards on all log messages to the Apple System Logger + */ + #define cl_APPLE_ContextLoggingFunctions 1 +-extern void CL_API_ENTRY clLogMessagesToSystemLogAPPLE( const char * errstr, ++extern CL_API_ENTRY void CL_API_CALL clLogMessagesToSystemLogAPPLE( const char * errstr, + const void * private_info, + size_t cb, +- void * user_data) CL_EXT_SUFFIX__VERSION_1_0; ++ void * user_data) CL_API_SUFFIX__VERSION_1_0; + + /* clLogMessagesToStdout sends all log messages to the file descriptor stdout */ +-extern void CL_API_ENTRY clLogMessagesToStdoutAPPLE( const char * errstr, ++extern CL_API_ENTRY void CL_API_CALL clLogMessagesToStdoutAPPLE( const char * errstr, + const void * private_info, + size_t cb, +- void * user_data) CL_EXT_SUFFIX__VERSION_1_0; ++ void * user_data) CL_API_SUFFIX__VERSION_1_0; + + /* clLogMessagesToStderr sends all log messages to the file descriptor stderr */ +-extern void CL_API_ENTRY clLogMessagesToStderrAPPLE( const char * errstr, ++extern CL_API_ENTRY void CL_API_CALL clLogMessagesToStderrAPPLE( const char * errstr, + const void * private_info, + size_t cb, +- void * user_data) CL_EXT_SUFFIX__VERSION_1_0; ++ void * user_data) CL_API_SUFFIX__VERSION_1_0; + + + /************************ +@@ -102,7 +102,7 @@ clIcdGetPlatformIDsKHR(cl_uint num_entries, + cl_platform_id * platforms, + cl_uint * num_platforms); + +-typedef CL_API_ENTRY cl_int ++typedef cl_int + (CL_API_CALL *clIcdGetPlatformIDsKHR_fn)(cl_uint num_entries, + cl_platform_id * platforms, + cl_uint * num_platforms); +@@ -129,11 +129,11 @@ clCreateProgramWithILKHR(cl_context context, + size_t length, + cl_int * errcode_ret); + +-typedef CL_API_ENTRY cl_program ++typedef cl_program + (CL_API_CALL *clCreateProgramWithILKHR_fn)(cl_context context, + const void * il, + size_t length, +- cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2; + + /* Extension: cl_khr_image2d_from_buffer + * +@@ -176,10 +176,10 @@ typedef CL_API_ENTRY cl_program + + #define cl_khr_terminate_context 1 + extern CL_API_ENTRY cl_int CL_API_CALL +-clTerminateContextKHR(cl_context context) CL_EXT_SUFFIX__VERSION_1_2; ++clTerminateContextKHR(cl_context context) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_int +-(CL_API_CALL *clTerminateContextKHR_fn)(cl_context context) CL_EXT_SUFFIX__VERSION_1_2; ++typedef cl_int ++(CL_API_CALL *clTerminateContextKHR_fn)(cl_context context) CL_API_SUFFIX__VERSION_1_2; + + + /* +@@ -204,13 +204,13 @@ extern CL_API_ENTRY cl_command_queue CL_API_CALL + clCreateCommandQueueWithPropertiesKHR(cl_context context, + cl_device_id device, + const cl_queue_properties_khr* properties, +- cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_command_queue ++typedef cl_command_queue + (CL_API_CALL *clCreateCommandQueueWithPropertiesKHR_fn)(cl_context context, + cl_device_id device, + const cl_queue_properties_khr* properties, +- cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_2; + + + /****************************************** +@@ -268,16 +268,16 @@ typedef CL_API_ENTRY cl_command_queue + #define cl_ext_device_fission 1 + + extern CL_API_ENTRY cl_int CL_API_CALL +-clReleaseDeviceEXT(cl_device_id device) CL_EXT_SUFFIX__VERSION_1_1; ++clReleaseDeviceEXT(cl_device_id device) CL_API_SUFFIX__VERSION_1_1; + +-typedef CL_API_ENTRY cl_int +-(CL_API_CALL *clReleaseDeviceEXT_fn)(cl_device_id device) CL_EXT_SUFFIX__VERSION_1_1; ++typedef cl_int ++(CL_API_CALL *clReleaseDeviceEXT_fn)(cl_device_id device) CL_API_SUFFIX__VERSION_1_1; + + extern CL_API_ENTRY cl_int CL_API_CALL +-clRetainDeviceEXT(cl_device_id device) CL_EXT_SUFFIX__VERSION_1_1; ++clRetainDeviceEXT(cl_device_id device) CL_API_SUFFIX__VERSION_1_1; + +-typedef CL_API_ENTRY cl_int +-(CL_API_CALL *clRetainDeviceEXT_fn)(cl_device_id device) CL_EXT_SUFFIX__VERSION_1_1; ++typedef cl_int ++(CL_API_CALL *clRetainDeviceEXT_fn)(cl_device_id device) CL_API_SUFFIX__VERSION_1_1; + + typedef cl_ulong cl_device_partition_property_ext; + extern CL_API_ENTRY cl_int CL_API_CALL +@@ -285,14 +285,14 @@ clCreateSubDevicesEXT(cl_device_id in_device, + const cl_device_partition_property_ext * properties, + cl_uint num_entries, + cl_device_id * out_devices, +- cl_uint * num_devices) CL_EXT_SUFFIX__VERSION_1_1; ++ cl_uint * num_devices) CL_API_SUFFIX__VERSION_1_1; + +-typedef CL_API_ENTRY cl_int ++typedef cl_int + (CL_API_CALL * clCreateSubDevicesEXT_fn)(cl_device_id in_device, + const cl_device_partition_property_ext * properties, + cl_uint num_entries, + cl_device_id * out_devices, +- cl_uint * num_devices) CL_EXT_SUFFIX__VERSION_1_1; ++ cl_uint * num_devices) CL_API_SUFFIX__VERSION_1_1; + + /* cl_device_partition_property_ext */ + #define CL_DEVICE_PARTITION_EQUALLY_EXT 0x4050 +@@ -346,7 +346,7 @@ clEnqueueMigrateMemObjectEXT(cl_command_queue command_queue, + const cl_event * event_wait_list, + cl_event * event); + +-typedef CL_API_ENTRY cl_int ++typedef cl_int + (CL_API_CALL *clEnqueueMigrateMemObjectEXT_fn)(cl_command_queue command_queue, + cl_uint num_mem_objects, + const cl_mem * mem_objects, +@@ -490,7 +490,7 @@ clEnqueueAcquireGrallocObjectsIMG(cl_command_queue command_queue, + const cl_mem * mem_objects, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, +- cl_event * event) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_event * event) CL_API_SUFFIX__VERSION_1_2; + + extern CL_API_ENTRY cl_int CL_API_CALL + clEnqueueReleaseGrallocObjectsIMG(cl_command_queue command_queue, +@@ -498,7 +498,7 @@ clEnqueueReleaseGrallocObjectsIMG(cl_command_queue command_queue, + const cl_mem * mem_objects, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, +- cl_event * event) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_event * event) CL_API_SUFFIX__VERSION_1_2; + + /****************************************** + * cl_img_generate_mipmap extension * +@@ -523,7 +523,7 @@ clEnqueueGenerateMipmapIMG(cl_command_queue command_queue, + const size_t *mip_region, + cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, +- cl_event *event) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_event *event) CL_API_SUFFIX__VERSION_1_2; + + /****************************************** + * cl_img_mem_properties extension * +@@ -564,9 +564,9 @@ clGetKernelSubGroupInfoKHR(cl_kernel in_kernel, + const void * input_value, + size_t param_value_size, + void * param_value, +- size_t * param_value_size_ret) CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED; ++ size_t * param_value_size_ret) CL_API_SUFFIX__VERSION_2_0_DEPRECATED; + +-typedef CL_API_ENTRY cl_int ++typedef cl_int + (CL_API_CALL * clGetKernelSubGroupInfoKHR_fn)(cl_kernel in_kernel, + cl_device_id in_device, + cl_kernel_sub_group_info param_name, +@@ -574,7 +574,7 @@ typedef CL_API_ENTRY cl_int + const void * input_value, + size_t param_value_size, + void * param_value, +- size_t * param_value_size_ret) CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED; ++ size_t * param_value_size_ret) CL_API_SUFFIX__VERSION_2_0_DEPRECATED; + + + /********************************* +@@ -694,6 +694,46 @@ typedef struct _cl_name_version_khr + #define CL_DEVICE_NODE_MASK_KHR 0x106E + + ++/*************************************************************** ++* cl_khr_pci_bus_info ++***************************************************************/ ++#define cl_khr_pci_bus_info 1 ++ ++typedef struct _cl_device_pci_bus_info_khr { ++ cl_uint pci_domain; ++ cl_uint pci_bus; ++ cl_uint pci_device; ++ cl_uint pci_function; ++} cl_device_pci_bus_info_khr; ++ ++/* cl_device_info */ ++#define CL_DEVICE_PCI_BUS_INFO_KHR 0x410F ++ ++ ++/*************************************************************** ++* cl_khr_suggested_local_work_size ++***************************************************************/ ++#define cl_khr_suggested_local_work_size 1 ++ ++extern CL_API_ENTRY cl_int CL_API_CALL ++clGetKernelSuggestedLocalWorkSizeKHR( ++ cl_command_queue command_queue, ++ cl_kernel kernel, ++ cl_uint work_dim, ++ const size_t* global_work_offset, ++ const size_t* global_work_size, ++ size_t* suggested_local_work_size) CL_API_SUFFIX__VERSION_3_0; ++ ++typedef cl_int (CL_API_CALL * ++clGetKernelSuggestedLocalWorkSizeKHR_fn)( ++ cl_command_queue command_queue, ++ cl_kernel kernel, ++ cl_uint work_dim, ++ const size_t* global_work_offset, ++ const size_t* global_work_size, ++ size_t* suggested_local_work_size) CL_API_SUFFIX__VERSION_3_0; ++ ++ + /********************************** + * cl_arm_import_memory extension * + **********************************/ +@@ -719,6 +759,12 @@ typedef intptr_t cl_import_properties_arm; + /* Data consistency with host property */ + #define CL_IMPORT_DMA_BUF_DATA_CONSISTENCY_WITH_HOST_ARM 0x41E3 + ++/* Index of plane in a multiplanar hardware buffer */ ++#define CL_IMPORT_ANDROID_HARDWARE_BUFFER_PLANE_INDEX_ARM 0x41EF ++ ++/* Index of layer in a multilayer hardware buffer */ ++#define CL_IMPORT_ANDROID_HARDWARE_BUFFER_LAYER_INDEX_ARM 0x41F0 ++ + /* Import memory size value to indicate a size for the whole buffer */ + #define CL_IMPORT_MEMORY_WHOLE_ALLOCATION_ARM SIZE_MAX + +@@ -744,7 +790,7 @@ clImportMemoryARM( cl_context context, + const cl_import_properties_arm *properties, + void *memory, + size_t size, +- cl_int *errcode_ret) CL_EXT_SUFFIX__VERSION_1_0; ++ cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_0; + + + /****************************************** +@@ -787,11 +833,11 @@ extern CL_API_ENTRY void * CL_API_CALL + clSVMAllocARM(cl_context context, + cl_svm_mem_flags_arm flags, + size_t size, +- cl_uint alignment) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_uint alignment) CL_API_SUFFIX__VERSION_1_2; + + extern CL_API_ENTRY void CL_API_CALL + clSVMFreeARM(cl_context context, +- void * svm_pointer) CL_EXT_SUFFIX__VERSION_1_2; ++ void * svm_pointer) CL_API_SUFFIX__VERSION_1_2; + + extern CL_API_ENTRY cl_int CL_API_CALL + clEnqueueSVMFreeARM(cl_command_queue command_queue, +@@ -804,7 +850,7 @@ clEnqueueSVMFreeARM(cl_command_queue command_queue, + void * user_data, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, +- cl_event * event) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_event * event) CL_API_SUFFIX__VERSION_1_2; + + extern CL_API_ENTRY cl_int CL_API_CALL + clEnqueueSVMMemcpyARM(cl_command_queue command_queue, +@@ -814,7 +860,7 @@ clEnqueueSVMMemcpyARM(cl_command_queue command_queue, + size_t size, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, +- cl_event * event) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_event * event) CL_API_SUFFIX__VERSION_1_2; + + extern CL_API_ENTRY cl_int CL_API_CALL + clEnqueueSVMMemFillARM(cl_command_queue command_queue, +@@ -824,7 +870,7 @@ clEnqueueSVMMemFillARM(cl_command_queue command_queue, + size_t size, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, +- cl_event * event) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_event * event) CL_API_SUFFIX__VERSION_1_2; + + extern CL_API_ENTRY cl_int CL_API_CALL + clEnqueueSVMMapARM(cl_command_queue command_queue, +@@ -834,25 +880,25 @@ clEnqueueSVMMapARM(cl_command_queue command_queue, + size_t size, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, +- cl_event * event) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_event * event) CL_API_SUFFIX__VERSION_1_2; + + extern CL_API_ENTRY cl_int CL_API_CALL + clEnqueueSVMUnmapARM(cl_command_queue command_queue, + void * svm_ptr, + cl_uint num_events_in_wait_list, + const cl_event * event_wait_list, +- cl_event * event) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_event * event) CL_API_SUFFIX__VERSION_1_2; + + extern CL_API_ENTRY cl_int CL_API_CALL + clSetKernelArgSVMPointerARM(cl_kernel kernel, + cl_uint arg_index, +- const void * arg_value) CL_EXT_SUFFIX__VERSION_1_2; ++ const void * arg_value) CL_API_SUFFIX__VERSION_1_2; + + extern CL_API_ENTRY cl_int CL_API_CALL + clSetKernelExecInfoARM(cl_kernel kernel, + cl_kernel_exec_info_arm param_name, + size_t param_value_size, +- const void * param_value) CL_EXT_SUFFIX__VERSION_1_2; ++ const void * param_value) CL_API_SUFFIX__VERSION_1_2; + + /******************************** + * cl_arm_get_core_id extension * +@@ -1060,14 +1106,14 @@ clCreateAcceleratorINTEL( + cl_accelerator_type_intel accelerator_type, + size_t descriptor_size, + const void* descriptor, +- cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_accelerator_intel (CL_API_CALL *clCreateAcceleratorINTEL_fn)( ++typedef cl_accelerator_intel (CL_API_CALL *clCreateAcceleratorINTEL_fn)( + cl_context context, + cl_accelerator_type_intel accelerator_type, + size_t descriptor_size, + const void* descriptor, +- cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_2; + + extern CL_API_ENTRY cl_int CL_API_CALL + clGetAcceleratorInfoINTEL( +@@ -1075,28 +1121,28 @@ clGetAcceleratorInfoINTEL( + cl_accelerator_info_intel param_name, + size_t param_value_size, + void* param_value, +- size_t* param_value_size_ret) CL_EXT_SUFFIX__VERSION_1_2; ++ size_t* param_value_size_ret) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetAcceleratorInfoINTEL_fn)( ++typedef cl_int (CL_API_CALL *clGetAcceleratorInfoINTEL_fn)( + cl_accelerator_intel accelerator, + cl_accelerator_info_intel param_name, + size_t param_value_size, + void* param_value, +- size_t* param_value_size_ret) CL_EXT_SUFFIX__VERSION_1_2; ++ size_t* param_value_size_ret) CL_API_SUFFIX__VERSION_1_2; + + extern CL_API_ENTRY cl_int CL_API_CALL + clRetainAcceleratorINTEL( +- cl_accelerator_intel accelerator) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_accelerator_intel accelerator) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clRetainAcceleratorINTEL_fn)( +- cl_accelerator_intel accelerator) CL_EXT_SUFFIX__VERSION_1_2; ++typedef cl_int (CL_API_CALL *clRetainAcceleratorINTEL_fn)( ++ cl_accelerator_intel accelerator) CL_API_SUFFIX__VERSION_1_2; + + extern CL_API_ENTRY cl_int CL_API_CALL + clReleaseAcceleratorINTEL( +- cl_accelerator_intel accelerator) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_accelerator_intel accelerator) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clReleaseAcceleratorINTEL_fn)( +- cl_accelerator_intel accelerator) CL_EXT_SUFFIX__VERSION_1_2; ++typedef cl_int (CL_API_CALL *clReleaseAcceleratorINTEL_fn)( ++ cl_accelerator_intel accelerator) CL_API_SUFFIX__VERSION_1_2; + + /****************************************** + * cl_intel_simultaneous_sharing extension * +@@ -1368,7 +1414,7 @@ clHostMemAllocINTEL( + cl_uint alignment, + cl_int* errcode_ret); + +-typedef CL_API_ENTRY void* (CL_API_CALL * ++typedef void* (CL_API_CALL * + clHostMemAllocINTEL_fn)( + cl_context context, + const cl_mem_properties_intel* properties, +@@ -1385,7 +1431,7 @@ clDeviceMemAllocINTEL( + cl_uint alignment, + cl_int* errcode_ret); + +-typedef CL_API_ENTRY void* (CL_API_CALL * ++typedef void* (CL_API_CALL * + clDeviceMemAllocINTEL_fn)( + cl_context context, + cl_device_id device, +@@ -1403,7 +1449,7 @@ clSharedMemAllocINTEL( + cl_uint alignment, + cl_int* errcode_ret); + +-typedef CL_API_ENTRY void* (CL_API_CALL * ++typedef void* (CL_API_CALL * + clSharedMemAllocINTEL_fn)( + cl_context context, + cl_device_id device, +@@ -1417,7 +1463,7 @@ clMemFreeINTEL( + cl_context context, + void* ptr); + +-typedef CL_API_ENTRY cl_int (CL_API_CALL * ++typedef cl_int (CL_API_CALL * + clMemFreeINTEL_fn)( + cl_context context, + void* ptr); +@@ -1427,7 +1473,7 @@ clMemBlockingFreeINTEL( + cl_context context, + void* ptr); + +-typedef CL_API_ENTRY cl_int (CL_API_CALL * ++typedef cl_int (CL_API_CALL * + clMemBlockingFreeINTEL_fn)( + cl_context context, + void* ptr); +@@ -1441,7 +1487,7 @@ clGetMemAllocInfoINTEL( + void* param_value, + size_t* param_value_size_ret); + +-typedef CL_API_ENTRY cl_int (CL_API_CALL * ++typedef cl_int (CL_API_CALL * + clGetMemAllocInfoINTEL_fn)( + cl_context context, + const void* ptr, +@@ -1456,7 +1502,7 @@ clSetKernelArgMemPointerINTEL( + cl_uint arg_index, + const void* arg_value); + +-typedef CL_API_ENTRY cl_int (CL_API_CALL * ++typedef cl_int (CL_API_CALL * + clSetKernelArgMemPointerINTEL_fn)( + cl_kernel kernel, + cl_uint arg_index, +@@ -1472,7 +1518,7 @@ clEnqueueMemsetINTEL( /* Deprecated */ + const cl_event* event_wait_list, + cl_event* event); + +-typedef CL_API_ENTRY cl_int (CL_API_CALL * ++typedef cl_int (CL_API_CALL * + clEnqueueMemsetINTEL_fn)( /* Deprecated */ + cl_command_queue command_queue, + void* dst_ptr, +@@ -1493,7 +1539,7 @@ clEnqueueMemFillINTEL( + const cl_event* event_wait_list, + cl_event* event); + +-typedef CL_API_ENTRY cl_int (CL_API_CALL * ++typedef cl_int (CL_API_CALL * + clEnqueueMemFillINTEL_fn)( + cl_command_queue command_queue, + void* dst_ptr, +@@ -1515,7 +1561,7 @@ clEnqueueMemcpyINTEL( + const cl_event* event_wait_list, + cl_event* event); + +-typedef CL_API_ENTRY cl_int (CL_API_CALL * ++typedef cl_int (CL_API_CALL * + clEnqueueMemcpyINTEL_fn)( + cl_command_queue command_queue, + cl_bool blocking, +@@ -1541,7 +1587,7 @@ clEnqueueMigrateMemINTEL( + const cl_event* event_wait_list, + cl_event* event); + +-typedef CL_API_ENTRY cl_int (CL_API_CALL * ++typedef cl_int (CL_API_CALL * + clEnqueueMigrateMemINTEL_fn)( + cl_command_queue command_queue, + const void* ptr, +@@ -1563,7 +1609,7 @@ clEnqueueMemAdviseINTEL( + const cl_event* event_wait_list, + cl_event* event); + +-typedef CL_API_ENTRY cl_int (CL_API_CALL * ++typedef cl_int (CL_API_CALL * + clEnqueueMemAdviseINTEL_fn)( + cl_command_queue command_queue, + const void* ptr, +@@ -1586,16 +1632,16 @@ clCreateBufferWithPropertiesINTEL( + cl_mem_flags flags, + size_t size, + void * host_ptr, +- cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_0; ++ cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_mem (CL_API_CALL * ++typedef cl_mem (CL_API_CALL * + clCreateBufferWithPropertiesINTEL_fn)( + cl_context context, + const cl_mem_properties_intel* properties, + cl_mem_flags flags, + size_t size, + void * host_ptr, +- cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_0; ++ cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0; + + /****************************************** + * cl_intel_mem_channel_property extension * +@@ -1612,6 +1658,48 @@ clCreateBufferWithPropertiesINTEL_fn)( + /* cl_mem_flags */ + #define CL_MEM_FORCE_HOST_MEMORY_INTEL (1 << 20) + ++/*************************************************************** ++* cl_intel_command_queue_families ++***************************************************************/ ++#define cl_intel_command_queue_families 1 ++ ++typedef cl_bitfield cl_command_queue_capabilities_intel; ++ ++#define CL_QUEUE_FAMILY_MAX_NAME_SIZE_INTEL 64 ++ ++typedef struct _cl_queue_family_properties_intel { ++ cl_command_queue_properties properties; ++ cl_command_queue_capabilities_intel capabilities; ++ cl_uint count; ++ char name[CL_QUEUE_FAMILY_MAX_NAME_SIZE_INTEL]; ++} cl_queue_family_properties_intel; ++ ++/* cl_device_info */ ++#define CL_DEVICE_QUEUE_FAMILY_PROPERTIES_INTEL 0x418B ++ ++/* cl_queue_properties */ ++#define CL_QUEUE_FAMILY_INTEL 0x418C ++#define CL_QUEUE_INDEX_INTEL 0x418D ++ ++/* cl_command_queue_capabilities_intel */ ++#define CL_QUEUE_DEFAULT_CAPABILITIES_INTEL 0 ++#define CL_QUEUE_CAPABILITY_CREATE_SINGLE_QUEUE_EVENTS_INTEL (1 << 0) ++#define CL_QUEUE_CAPABILITY_CREATE_CROSS_QUEUE_EVENTS_INTEL (1 << 1) ++#define CL_QUEUE_CAPABILITY_SINGLE_QUEUE_EVENT_WAIT_LIST_INTEL (1 << 2) ++#define CL_QUEUE_CAPABILITY_CROSS_QUEUE_EVENT_WAIT_LIST_INTEL (1 << 3) ++#define CL_QUEUE_CAPABILITY_TRANSFER_BUFFER_INTEL (1 << 8) ++#define CL_QUEUE_CAPABILITY_TRANSFER_BUFFER_RECT_INTEL (1 << 9) ++#define CL_QUEUE_CAPABILITY_MAP_BUFFER_INTEL (1 << 10) ++#define CL_QUEUE_CAPABILITY_FILL_BUFFER_INTEL (1 << 11) ++#define CL_QUEUE_CAPABILITY_TRANSFER_IMAGE_INTEL (1 << 12) ++#define CL_QUEUE_CAPABILITY_MAP_IMAGE_INTEL (1 << 13) ++#define CL_QUEUE_CAPABILITY_FILL_IMAGE_INTEL (1 << 14) ++#define CL_QUEUE_CAPABILITY_TRANSFER_BUFFER_IMAGE_INTEL (1 << 15) ++#define CL_QUEUE_CAPABILITY_TRANSFER_IMAGE_BUFFER_INTEL (1 << 16) ++#define CL_QUEUE_CAPABILITY_MARKER_INTEL (1 << 24) ++#define CL_QUEUE_CAPABILITY_BARRIER_INTEL (1 << 25) ++#define CL_QUEUE_CAPABILITY_KERNEL_INTEL (1 << 26) ++ + #ifdef __cplusplus + } + #endif +diff --git a/khronos-headers/CL/cl_gl.h b/khronos-headers/CL/cl_gl.h +index b587f02..5ea0fd8 100644 +--- a/khronos-headers/CL/cl_gl.h ++++ b/khronos-headers/CL/cl_gl.h +@@ -1,5 +1,5 @@ + /******************************************************************************* +- * Copyright (c) 2008-2020 The Khronos Group Inc. ++ * Copyright (c) 2008-2021 The Khronos Group Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. +@@ -102,21 +102,21 @@ clEnqueueReleaseGLObjects(cl_command_queue command_queue, + + + /* Deprecated OpenCL 1.1 APIs */ +-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL ++extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL + clCreateFromGLTexture2D(cl_context context, + cl_mem_flags flags, + cl_GLenum target, + cl_GLint miplevel, + cl_GLuint texture, +- cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; ++ cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_1_DEPRECATED; + +-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL ++extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL + clCreateFromGLTexture3D(cl_context context, + cl_mem_flags flags, + cl_GLenum target, + cl_GLint miplevel, + cl_GLuint texture, +- cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; ++ cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_1_DEPRECATED; + + /* cl_khr_gl_sharing extension */ + +@@ -145,13 +145,23 @@ clGetGLContextInfoKHR(const cl_context_properties * properties, + void * param_value, + size_t * param_value_size_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetGLContextInfoKHR_fn)( ++typedef cl_int (CL_API_CALL *clGetGLContextInfoKHR_fn)( + const cl_context_properties * properties, + cl_gl_context_info param_name, + size_t param_value_size, + void * param_value, + size_t * param_value_size_ret); + ++/* ++ * cl_khr_gl_event extension ++ */ ++#define CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR 0x200D ++ ++extern CL_API_ENTRY cl_event CL_API_CALL ++clCreateEventFromGLsyncKHR(cl_context context, ++ cl_GLsync sync, ++ cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_1; ++ + #ifdef __cplusplus + } + #endif +diff --git a/khronos-headers/CL/cl_gl_ext.h b/khronos-headers/CL/cl_gl_ext.h +index 52107b1..8ec8181 100644 +--- a/khronos-headers/CL/cl_gl_ext.h ++++ b/khronos-headers/CL/cl_gl_ext.h +@@ -1,5 +1,5 @@ + /******************************************************************************* +- * Copyright (c) 2008-2020 The Khronos Group Inc. ++ * Copyright (c) 2008-2021 The Khronos Group Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. +@@ -14,27 +14,5 @@ + * limitations under the License. + ******************************************************************************/ + +-#ifndef __OPENCL_CL_GL_EXT_H +-#define __OPENCL_CL_GL_EXT_H +- +-#ifdef __cplusplus +-extern "C" { +-#endif +- + #include +- +-/* +- * cl_khr_gl_event extension +- */ +-#define CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR 0x200D +- +-extern CL_API_ENTRY cl_event CL_API_CALL +-clCreateEventFromGLsyncKHR(cl_context context, +- cl_GLsync sync, +- cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_1; +- +-#ifdef __cplusplus +-} +-#endif +- +-#endif /* __OPENCL_CL_GL_EXT_H */ ++#pragma message("All OpenGL-related extensions have been moved into cl_gl.h. Please include cl_gl.h directly.") +diff --git a/khronos-headers/CL/cl_icd.h b/khronos-headers/CL/cl_icd.h +index 8ff8b94..d5ac1de 100644 +--- a/khronos-headers/CL/cl_icd.h ++++ b/khronos-headers/CL/cl_icd.h +@@ -41,35 +41,35 @@ extern "C" { + /* API function pointer definitions */ + + // Platform APIs +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetPlatformIDs)( ++typedef cl_int(CL_API_CALL *cl_api_clGetPlatformIDs)( + cl_uint num_entries, cl_platform_id *platforms, + cl_uint *num_platforms) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetPlatformInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clGetPlatformInfo)( + cl_platform_id platform, cl_platform_info param_name, + size_t param_value_size, void *param_value, + size_t *param_value_size_ret) CL_API_SUFFIX__VERSION_1_0; + + // Device APIs +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetDeviceIDs)( ++typedef cl_int(CL_API_CALL *cl_api_clGetDeviceIDs)( + cl_platform_id platform, cl_device_type device_type, cl_uint num_entries, + cl_device_id *devices, cl_uint *num_devices) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetDeviceInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clGetDeviceInfo)( + cl_device_id device, cl_device_info param_name, size_t param_value_size, + void *param_value, size_t *param_value_size_ret) CL_API_SUFFIX__VERSION_1_0; + + #ifdef CL_VERSION_1_2 + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clCreateSubDevices)( ++typedef cl_int(CL_API_CALL *cl_api_clCreateSubDevices)( + cl_device_id in_device, + const cl_device_partition_property *partition_properties, + cl_uint num_entries, cl_device_id *out_devices, cl_uint *num_devices); + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clRetainDevice)( ++typedef cl_int(CL_API_CALL *cl_api_clRetainDevice)( + cl_device_id device) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clReleaseDevice)( ++typedef cl_int(CL_API_CALL *cl_api_clReleaseDevice)( + cl_device_id device) CL_API_SUFFIX__VERSION_1_2; + + #else +@@ -81,36 +81,36 @@ typedef void *cl_api_clReleaseDevice; + #endif + + // Context APIs +-typedef CL_API_ENTRY cl_context(CL_API_CALL *cl_api_clCreateContext)( ++typedef cl_context(CL_API_CALL *cl_api_clCreateContext)( + const cl_context_properties *properties, cl_uint num_devices, + const cl_device_id *devices, + void(CL_CALLBACK *pfn_notify)(const char *, const void *, size_t, void *), + void *user_data, cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_context(CL_API_CALL *cl_api_clCreateContextFromType)( ++typedef cl_context(CL_API_CALL *cl_api_clCreateContextFromType)( + const cl_context_properties *properties, cl_device_type device_type, + void(CL_CALLBACK *pfn_notify)(const char *, const void *, size_t, void *), + void *user_data, cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clRetainContext)( ++typedef cl_int(CL_API_CALL *cl_api_clRetainContext)( + cl_context context) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clReleaseContext)( ++typedef cl_int(CL_API_CALL *cl_api_clReleaseContext)( + cl_context context) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetContextInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clGetContextInfo)( + cl_context context, cl_context_info param_name, size_t param_value_size, + void *param_value, size_t *param_value_size_ret) CL_API_SUFFIX__VERSION_1_0; + + // Command Queue APIs +-typedef CL_API_ENTRY cl_command_queue(CL_API_CALL *cl_api_clCreateCommandQueue)( ++typedef cl_command_queue(CL_API_CALL *cl_api_clCreateCommandQueue)( + cl_context context, cl_device_id device, + cl_command_queue_properties properties, + cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_0; + + #ifdef CL_VERSION_2_0 + +-typedef CL_API_ENTRY ++typedef + cl_command_queue(CL_API_CALL *cl_api_clCreateCommandQueueWithProperties)( + cl_context /* context */, cl_device_id /* device */, + const cl_queue_properties * /* properties */, +@@ -122,25 +122,25 @@ typedef void *cl_api_clCreateCommandQueueWithProperties; + + #endif + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clRetainCommandQueue)( ++typedef cl_int(CL_API_CALL *cl_api_clRetainCommandQueue)( + cl_command_queue command_queue) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clReleaseCommandQueue)( ++typedef cl_int(CL_API_CALL *cl_api_clReleaseCommandQueue)( + cl_command_queue command_queue) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetCommandQueueInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clGetCommandQueueInfo)( + cl_command_queue command_queue, cl_command_queue_info param_name, + size_t param_value_size, void *param_value, + size_t *param_value_size_ret) CL_API_SUFFIX__VERSION_1_0; + + // Memory Object APIs +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateBuffer)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateBuffer)( + cl_context context, cl_mem_flags flags, size_t size, void *host_ptr, + cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_0; + + #ifdef CL_VERSION_1_2 + +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateImage)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateImage)( + cl_context context, cl_mem_flags flags, const cl_image_format *image_format, + const cl_image_desc *image_desc, void *host_ptr, + cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_2; +@@ -153,17 +153,17 @@ typedef void *cl_api_clCreateImage; + + #ifdef CL_VERSION_3_0 + +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateBufferWithProperties)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateBufferWithProperties)( + cl_context context, const cl_mem_properties *properties, cl_mem_flags flags, + size_t size, void *host_ptr, + cl_int *errcode_ret) CL_API_SUFFIX__VERSION_3_0; + +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateImageWithProperties)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateImageWithProperties)( + cl_context context, const cl_mem_properties *properties, cl_mem_flags flags, + const cl_image_format *image_format, const cl_image_desc *image_desc, + void *host_ptr, cl_int *errcode_ret) CL_API_SUFFIX__VERSION_3_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL* cl_api_clSetContextDestructorCallback)( ++typedef cl_int(CL_API_CALL* cl_api_clSetContextDestructorCallback)( + cl_context context, + void(CL_CALLBACK* pfn_notify)(cl_context context, void* user_data), + void* user_data) CL_API_SUFFIX__VERSION_3_0; +@@ -176,43 +176,43 @@ typedef void *cl_api_clSetContextDestructorCallback; + + #endif + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clRetainMemObject)( ++typedef cl_int(CL_API_CALL *cl_api_clRetainMemObject)( + cl_mem memobj) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clReleaseMemObject)( ++typedef cl_int(CL_API_CALL *cl_api_clReleaseMemObject)( + cl_mem memobj) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetSupportedImageFormats)( ++typedef cl_int(CL_API_CALL *cl_api_clGetSupportedImageFormats)( + cl_context context, cl_mem_flags flags, cl_mem_object_type image_type, + cl_uint num_entries, cl_image_format *image_formats, + cl_uint *num_image_formats) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetMemObjectInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clGetMemObjectInfo)( + cl_mem memobj, cl_mem_info param_name, size_t param_value_size, + void *param_value, size_t *param_value_size_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetImageInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clGetImageInfo)( + cl_mem image, cl_image_info param_name, size_t param_value_size, + void *param_value, size_t *param_value_size_ret) CL_API_SUFFIX__VERSION_1_0; + + #ifdef CL_VERSION_2_0 + +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreatePipe)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreatePipe)( + cl_context /* context */, cl_mem_flags /* flags */, + cl_uint /* pipe_packet_size */, cl_uint /* pipe_max_packets */, + const cl_pipe_properties * /* properties */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_2_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetPipeInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clGetPipeInfo)( + cl_mem /* pipe */, cl_pipe_info /* param_name */, + size_t /* param_value_size */, void * /* param_value */, + size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_2_0; + +-typedef CL_API_ENTRY void *(CL_API_CALL *cl_api_clSVMAlloc)( ++typedef void *(CL_API_CALL *cl_api_clSVMAlloc)( + cl_context /* context */, cl_svm_mem_flags /* flags */, size_t /* size */, + unsigned int /* alignment */)CL_API_SUFFIX__VERSION_2_0; + +-typedef CL_API_ENTRY void(CL_API_CALL *cl_api_clSVMFree)( ++typedef void(CL_API_CALL *cl_api_clSVMFree)( + cl_context /* context */, + void * /* svm_pointer */) CL_API_SUFFIX__VERSION_2_0; + +@@ -226,24 +226,24 @@ typedef void *cl_api_clSVMFree; + #endif + + // Sampler APIs +-typedef CL_API_ENTRY cl_sampler(CL_API_CALL *cl_api_clCreateSampler)( ++typedef cl_sampler(CL_API_CALL *cl_api_clCreateSampler)( + cl_context context, cl_bool normalized_coords, + cl_addressing_mode addressing_mode, cl_filter_mode filter_mode, + cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clRetainSampler)( ++typedef cl_int(CL_API_CALL *cl_api_clRetainSampler)( + cl_sampler sampler) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clReleaseSampler)( ++typedef cl_int(CL_API_CALL *cl_api_clReleaseSampler)( + cl_sampler sampler) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetSamplerInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clGetSamplerInfo)( + cl_sampler sampler, cl_sampler_info param_name, size_t param_value_size, + void *param_value, size_t *param_value_size_ret) CL_API_SUFFIX__VERSION_1_0; + + #ifdef CL_VERSION_2_0 + +-typedef CL_API_ENTRY ++typedef + cl_sampler(CL_API_CALL *cl_api_clCreateSamplerWithProperties)( + cl_context /* context */, + const cl_sampler_properties * /* sampler_properties */, +@@ -256,18 +256,18 @@ typedef void *cl_api_clCreateSamplerWithProperties; + #endif + + // Program Object APIs +-typedef CL_API_ENTRY cl_program(CL_API_CALL *cl_api_clCreateProgramWithSource)( ++typedef cl_program(CL_API_CALL *cl_api_clCreateProgramWithSource)( + cl_context context, cl_uint count, const char **strings, + const size_t *lengths, cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_program(CL_API_CALL *cl_api_clCreateProgramWithBinary)( ++typedef cl_program(CL_API_CALL *cl_api_clCreateProgramWithBinary)( + cl_context context, cl_uint num_devices, const cl_device_id *device_list, + const size_t *lengths, const unsigned char **binaries, + cl_int *binary_status, cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_0; + + #ifdef CL_VERSION_1_2 + +-typedef CL_API_ENTRY ++typedef + cl_program(CL_API_CALL *cl_api_clCreateProgramWithBuiltInKernels)( + cl_context context, cl_uint num_devices, const cl_device_id *device_list, + const char *kernel_names, cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_2; +@@ -278,13 +278,13 @@ typedef void *cl_api_clCreateProgramWithBuiltInKernels; + + #endif + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clRetainProgram)( ++typedef cl_int(CL_API_CALL *cl_api_clRetainProgram)( + cl_program program) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clReleaseProgram)( ++typedef cl_int(CL_API_CALL *cl_api_clReleaseProgram)( + cl_program program) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clBuildProgram)( ++typedef cl_int(CL_API_CALL *cl_api_clBuildProgram)( + cl_program program, cl_uint num_devices, const cl_device_id *device_list, + const char *options, + void(CL_CALLBACK *pfn_notify)(cl_program program, void *user_data), +@@ -292,14 +292,14 @@ typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clBuildProgram)( + + #ifdef CL_VERSION_1_2 + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clCompileProgram)( ++typedef cl_int(CL_API_CALL *cl_api_clCompileProgram)( + cl_program program, cl_uint num_devices, const cl_device_id *device_list, + const char *options, cl_uint num_input_headers, + const cl_program *input_headers, const char **header_include_names, + void(CL_CALLBACK *pfn_notify)(cl_program program, void *user_data), + void *user_data) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_program(CL_API_CALL *cl_api_clLinkProgram)( ++typedef cl_program(CL_API_CALL *cl_api_clLinkProgram)( + cl_context context, cl_uint num_devices, const cl_device_id *device_list, + const char *options, cl_uint num_input_programs, + const cl_program *input_programs, +@@ -315,12 +315,12 @@ typedef void *cl_api_clLinkProgram; + + #ifdef CL_VERSION_2_2 + +-typedef CL_API_ENTRY ++typedef + cl_int(CL_API_CALL *cl_api_clSetProgramSpecializationConstant)( + cl_program program, cl_uint spec_id, size_t spec_size, + const void *spec_value) CL_API_SUFFIX__VERSION_2_2; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clSetProgramReleaseCallback)( ++typedef cl_int(CL_API_CALL *cl_api_clSetProgramReleaseCallback)( + cl_program program, + void(CL_CALLBACK *pfn_notify)(cl_program program, void *user_data), + void *user_data) CL_API_SUFFIX__VERSION_2_2; +@@ -334,7 +334,7 @@ typedef void *cl_api_clSetProgramReleaseCallback; + + #ifdef CL_VERSION_1_2 + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clUnloadPlatformCompiler)( ++typedef cl_int(CL_API_CALL *cl_api_clUnloadPlatformCompiler)( + cl_platform_id platform) CL_API_SUFFIX__VERSION_1_2; + + #else +@@ -343,41 +343,41 @@ typedef void *cl_api_clUnloadPlatformCompiler; + + #endif + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetProgramInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clGetProgramInfo)( + cl_program program, cl_program_info param_name, size_t param_value_size, + void *param_value, size_t *param_value_size_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetProgramBuildInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clGetProgramBuildInfo)( + cl_program program, cl_device_id device, cl_program_build_info param_name, + size_t param_value_size, void *param_value, + size_t *param_value_size_ret) CL_API_SUFFIX__VERSION_1_0; + + // Kernel Object APIs +-typedef CL_API_ENTRY cl_kernel(CL_API_CALL *cl_api_clCreateKernel)( ++typedef cl_kernel(CL_API_CALL *cl_api_clCreateKernel)( + cl_program program, const char *kernel_name, + cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clCreateKernelsInProgram)( ++typedef cl_int(CL_API_CALL *cl_api_clCreateKernelsInProgram)( + cl_program program, cl_uint num_kernels, cl_kernel *kernels, + cl_uint *num_kernels_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clRetainKernel)( ++typedef cl_int(CL_API_CALL *cl_api_clRetainKernel)( + cl_kernel kernel) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clReleaseKernel)( ++typedef cl_int(CL_API_CALL *cl_api_clReleaseKernel)( + cl_kernel kernel) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clSetKernelArg)( ++typedef cl_int(CL_API_CALL *cl_api_clSetKernelArg)( + cl_kernel kernel, cl_uint arg_index, size_t arg_size, + const void *arg_value) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetKernelInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clGetKernelInfo)( + cl_kernel kernel, cl_kernel_info param_name, size_t param_value_size, + void *param_value, size_t *param_value_size_ret) CL_API_SUFFIX__VERSION_1_0; + + #ifdef CL_VERSION_1_2 + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetKernelArgInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clGetKernelArgInfo)( + cl_kernel kernel, cl_uint arg_indx, cl_kernel_arg_info param_name, + size_t param_value_size, void *param_value, + size_t *param_value_size_ret) CL_API_SUFFIX__VERSION_1_2; +@@ -388,28 +388,28 @@ typedef void *cl_api_clGetKernelArgInfo; + + #endif + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetKernelWorkGroupInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clGetKernelWorkGroupInfo)( + cl_kernel kernel, cl_device_id device, cl_kernel_work_group_info param_name, + size_t param_value_size, void *param_value, + size_t *param_value_size_ret) CL_API_SUFFIX__VERSION_1_0; + + #ifdef CL_VERSION_2_0 + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clSetKernelArgSVMPointer)( ++typedef cl_int(CL_API_CALL *cl_api_clSetKernelArgSVMPointer)( + cl_kernel /* kernel */, cl_uint /* arg_index */, + const void * /* arg_value */) CL_API_SUFFIX__VERSION_2_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clSetKernelExecInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clSetKernelExecInfo)( + cl_kernel /* kernel */, cl_kernel_exec_info /* param_name */, + size_t /* param_value_size */, + const void * /* param_value */) CL_API_SUFFIX__VERSION_2_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetKernelSubGroupInfoKHR)( ++typedef cl_int(CL_API_CALL *cl_api_clGetKernelSubGroupInfoKHR)( + cl_kernel /* in_kernel */, cl_device_id /*in_device*/, + cl_kernel_sub_group_info /* param_name */, size_t /*input_value_size*/, + const void * /*input_value*/, size_t /*param_value_size*/, + void * /*param_value*/, +- size_t * /*param_value_size_ret*/) CL_EXT_SUFFIX__VERSION_2_0; ++ size_t * /*param_value_size_ret*/) CL_API_SUFFIX__VERSION_2_0; + + #else + +@@ -420,33 +420,33 @@ typedef void *cl_api_clGetKernelSubGroupInfoKHR; + #endif + + // Event Object APIs +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clWaitForEvents)( ++typedef cl_int(CL_API_CALL *cl_api_clWaitForEvents)( + cl_uint num_events, const cl_event *event_list) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetEventInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clGetEventInfo)( + cl_event event, cl_event_info param_name, size_t param_value_size, + void *param_value, size_t *param_value_size_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clRetainEvent)(cl_event event) ++typedef cl_int(CL_API_CALL *cl_api_clRetainEvent)(cl_event event) + CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clReleaseEvent)(cl_event event) ++typedef cl_int(CL_API_CALL *cl_api_clReleaseEvent)(cl_event event) + CL_API_SUFFIX__VERSION_1_0; + + // Profiling APIs +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetEventProfilingInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clGetEventProfilingInfo)( + cl_event event, cl_profiling_info param_name, size_t param_value_size, + void *param_value, size_t *param_value_size_ret) CL_API_SUFFIX__VERSION_1_0; + + // Flush and Finish APIs +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clFlush)( ++typedef cl_int(CL_API_CALL *cl_api_clFlush)( + cl_command_queue command_queue) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clFinish)( ++typedef cl_int(CL_API_CALL *cl_api_clFinish)( + cl_command_queue command_queue) CL_API_SUFFIX__VERSION_1_0; + + // Enqueued Commands APIs +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueReadBuffer)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueReadBuffer)( + cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, + size_t offset, size_t cb, void *ptr, cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, +@@ -454,7 +454,7 @@ typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueReadBuffer)( + + #ifdef CL_VERSION_1_1 + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueReadBufferRect)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueReadBufferRect)( + cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, + const size_t *buffer_origin, const size_t *host_origin, + const size_t *region, size_t buffer_row_pitch, size_t buffer_slice_pitch, +@@ -468,7 +468,7 @@ typedef void *cl_api_clEnqueueReadBufferRect; + + #endif + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueWriteBuffer)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueWriteBuffer)( + cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, + size_t offset, size_t cb, const void *ptr, cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, +@@ -476,7 +476,7 @@ typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueWriteBuffer)( + + #ifdef CL_VERSION_1_1 + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueWriteBufferRect)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueWriteBufferRect)( + cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, + const size_t *buffer_origin, const size_t *host_origin, + const size_t *region, size_t buffer_row_pitch, size_t buffer_slice_pitch, +@@ -492,7 +492,7 @@ typedef void *cl_api_clEnqueueWriteBufferRect; + + #ifdef CL_VERSION_1_2 + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueFillBuffer)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueFillBuffer)( + cl_command_queue command_queue, cl_mem buffer, const void *pattern, + size_t pattern_size, size_t offset, size_t cb, + cl_uint num_events_in_wait_list, const cl_event *event_wait_list, +@@ -504,7 +504,7 @@ typedef void *cl_api_clEnqueueFillBuffer; + + #endif + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueCopyBuffer)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueCopyBuffer)( + cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, + size_t src_offset, size_t dst_offset, size_t cb, + cl_uint num_events_in_wait_list, const cl_event *event_wait_list, +@@ -512,7 +512,7 @@ typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueCopyBuffer)( + + #ifdef CL_VERSION_1_1 + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueCopyBufferRect)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueCopyBufferRect)( + cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, + const size_t *src_origin, const size_t *dst_origin, const size_t *region, + size_t src_row_pitch, size_t src_slice_pitch, size_t dst_row_pitch, +@@ -526,14 +526,14 @@ typedef void *cl_api_clEnqueueCopyBufferRect; + + #endif + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueReadImage)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueReadImage)( + cl_command_queue command_queue, cl_mem image, cl_bool blocking_read, + const size_t *origin, const size_t *region, size_t row_pitch, + size_t slice_pitch, void *ptr, cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, + cl_event *event) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueWriteImage)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueWriteImage)( + cl_command_queue command_queue, cl_mem image, cl_bool blocking_write, + const size_t *origin, const size_t *region, size_t input_row_pitch, + size_t input_slice_pitch, const void *ptr, cl_uint num_events_in_wait_list, +@@ -542,7 +542,7 @@ typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueWriteImage)( + + #ifdef CL_VERSION_1_2 + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueFillImage)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueFillImage)( + cl_command_queue command_queue, cl_mem image, const void *fill_color, + const size_t origin[3], const size_t region[3], + cl_uint num_events_in_wait_list, const cl_event *event_wait_list, +@@ -554,45 +554,45 @@ typedef void *cl_api_clEnqueueFillImage; + + #endif + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueCopyImage)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueCopyImage)( + cl_command_queue command_queue, cl_mem src_image, cl_mem dst_image, + const size_t *src_origin, const size_t *dst_origin, const size_t *region, + cl_uint num_events_in_wait_list, const cl_event *event_wait_list, + cl_event *event) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueCopyImageToBuffer)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueCopyImageToBuffer)( + cl_command_queue command_queue, cl_mem src_image, cl_mem dst_buffer, + const size_t *src_origin, const size_t *region, size_t dst_offset, + cl_uint num_events_in_wait_list, const cl_event *event_wait_list, + cl_event *event) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueCopyBufferToImage)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueCopyBufferToImage)( + cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_image, + size_t src_offset, const size_t *dst_origin, const size_t *region, + cl_uint num_events_in_wait_list, const cl_event *event_wait_list, + cl_event *event) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY void *(CL_API_CALL *cl_api_clEnqueueMapBuffer)( ++typedef void *(CL_API_CALL *cl_api_clEnqueueMapBuffer)( + cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_map, + cl_map_flags map_flags, size_t offset, size_t cb, + cl_uint num_events_in_wait_list, const cl_event *event_wait_list, + cl_event *event, cl_int *errcode_ret)CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY void *(CL_API_CALL *cl_api_clEnqueueMapImage)( ++typedef void *(CL_API_CALL *cl_api_clEnqueueMapImage)( + cl_command_queue command_queue, cl_mem image, cl_bool blocking_map, + cl_map_flags map_flags, const size_t *origin, const size_t *region, + size_t *image_row_pitch, size_t *image_slice_pitch, + cl_uint num_events_in_wait_list, const cl_event *event_wait_list, + cl_event *event, cl_int *errcode_ret)CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueUnmapMemObject)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueUnmapMemObject)( + cl_command_queue command_queue, cl_mem memobj, void *mapped_ptr, + cl_uint num_events_in_wait_list, const cl_event *event_wait_list, + cl_event *event) CL_API_SUFFIX__VERSION_1_0; + + #ifdef CL_VERSION_1_2 + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueMigrateMemObjects)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueMigrateMemObjects)( + cl_command_queue command_queue, cl_uint num_mem_objects, + const cl_mem *mem_objects, cl_mem_migration_flags flags, + cl_uint num_events_in_wait_list, const cl_event *event_wait_list, +@@ -604,19 +604,19 @@ typedef void *cl_api_clEnqueueMigrateMemObjects; + + #endif + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueNDRangeKernel)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueNDRangeKernel)( + cl_command_queue command_queue, cl_kernel kernel, cl_uint work_dim, + const size_t *global_work_offset, const size_t *global_work_size, + const size_t *local_work_size, cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, + cl_event *event) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueTask)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueTask)( + cl_command_queue command_queue, cl_kernel kernel, + cl_uint num_events_in_wait_list, const cl_event *event_wait_list, + cl_event *event) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueNativeKernel)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueNativeKernel)( + cl_command_queue command_queue, void(CL_CALLBACK *user_func)(void *), + void *args, size_t cb_args, cl_uint num_mem_objects, const cl_mem *mem_list, + const void **args_mem_loc, cl_uint num_events_in_wait_list, +@@ -625,17 +625,17 @@ typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueNativeKernel)( + + #ifdef CL_VERSION_1_2 + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueMarkerWithWaitList)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueMarkerWithWaitList)( + cl_command_queue command_queue, cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, + cl_event *event) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueBarrierWithWaitList)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueBarrierWithWaitList)( + cl_command_queue command_queue, cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, + cl_event *event) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY void *( ++typedef void *( + CL_API_CALL *cl_api_clGetExtensionFunctionAddressForPlatform)( + cl_platform_id platform, + const char *function_name)CL_API_SUFFIX__VERSION_1_2; +@@ -652,7 +652,7 @@ typedef void *cl_api_clGetExtensionFunctionAddressForPlatform; + + #ifdef CL_VERSION_2_0 + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueSVMFree)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueSVMFree)( + cl_command_queue /* command_queue */, cl_uint /* num_svm_pointers */, + void ** /* svm_pointers */, + void(CL_CALLBACK *pfn_free_func)(cl_command_queue /* queue */, +@@ -663,28 +663,28 @@ typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueSVMFree)( + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_2_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueSVMMemcpy)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueSVMMemcpy)( + cl_command_queue /* command_queue */, cl_bool /* blocking_copy */, + void * /* dst_ptr */, const void * /* src_ptr */, size_t /* size */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_2_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueSVMMemFill)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueSVMMemFill)( + cl_command_queue /* command_queue */, void * /* svm_ptr */, + const void * /* pattern */, size_t /* pattern_size */, size_t /* size */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_2_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueSVMMap)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueSVMMap)( + cl_command_queue /* command_queue */, cl_bool /* blocking_map */, + cl_map_flags /* map_flags */, void * /* svm_ptr */, size_t /* size */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, + cl_event * /* event */) CL_API_SUFFIX__VERSION_2_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueSVMUnmap)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueSVMUnmap)( + cl_command_queue /* command_queue */, void * /* svm_ptr */, + cl_uint /* num_events_in_wait_list */, + const cl_event * /* event_wait_list */, +@@ -701,119 +701,119 @@ typedef void *cl_api_clEnqueueSVMUnmap; + #endif + + // Deprecated APIs +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clSetCommandQueueProperty)( ++typedef cl_int(CL_API_CALL *cl_api_clSetCommandQueueProperty)( + cl_command_queue command_queue, cl_command_queue_properties properties, + cl_bool enable, cl_command_queue_properties *old_properties) +- CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED; ++ CL_API_SUFFIX__VERSION_1_0_DEPRECATED; + +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateImage2D)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateImage2D)( + cl_context context, cl_mem_flags flags, const cl_image_format *image_format, + size_t image_width, size_t image_height, size_t image_row_pitch, +- void *host_ptr, cl_int *errcode_ret) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; ++ void *host_ptr, cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_1_DEPRECATED; + +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateImage3D)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateImage3D)( + cl_context context, cl_mem_flags flags, const cl_image_format *image_format, + size_t image_width, size_t image_height, size_t image_depth, + size_t image_row_pitch, size_t image_slice_pitch, void *host_ptr, +- cl_int *errcode_ret) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; ++ cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_1_DEPRECATED; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clUnloadCompiler)(void) +- CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; ++typedef cl_int(CL_API_CALL *cl_api_clUnloadCompiler)(void) ++ CL_API_SUFFIX__VERSION_1_1_DEPRECATED; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueMarker)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueMarker)( + cl_command_queue command_queue, +- cl_event *event) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; ++ cl_event *event) CL_API_SUFFIX__VERSION_1_1_DEPRECATED; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueWaitForEvents)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueWaitForEvents)( + cl_command_queue command_queue, cl_uint num_events, +- const cl_event *event_list) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; ++ const cl_event *event_list) CL_API_SUFFIX__VERSION_1_1_DEPRECATED; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueBarrier)( +- cl_command_queue command_queue) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueBarrier)( ++ cl_command_queue command_queue) CL_API_SUFFIX__VERSION_1_1_DEPRECATED; + +-typedef CL_API_ENTRY void *(CL_API_CALL *cl_api_clGetExtensionFunctionAddress)( +- const char *function_name)CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; ++typedef void *(CL_API_CALL *cl_api_clGetExtensionFunctionAddress)( ++ const char *function_name)CL_API_SUFFIX__VERSION_1_1_DEPRECATED; + + // GL and other APIs +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateFromGLBuffer)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateFromGLBuffer)( + cl_context context, cl_mem_flags flags, cl_GLuint bufobj, + int *errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateFromGLTexture)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateFromGLTexture)( + cl_context context, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, + cl_GLuint texture, cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateFromGLTexture2D)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateFromGLTexture2D)( + cl_context context, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, + cl_GLuint texture, cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateFromGLTexture3D)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateFromGLTexture3D)( + cl_context context, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, + cl_GLuint texture, cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateFromGLRenderbuffer)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateFromGLRenderbuffer)( + cl_context context, cl_mem_flags flags, cl_GLuint renderbuffer, + cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetGLObjectInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clGetGLObjectInfo)( + cl_mem memobj, cl_gl_object_type *gl_object_type, + cl_GLuint *gl_object_name) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetGLTextureInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clGetGLTextureInfo)( + cl_mem memobj, cl_gl_texture_info param_name, size_t param_value_size, + void *param_value, size_t *param_value_size_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueAcquireGLObjects)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueAcquireGLObjects)( + cl_command_queue command_queue, cl_uint num_objects, + const cl_mem *mem_objects, cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, + cl_event *event) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueReleaseGLObjects)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueReleaseGLObjects)( + cl_command_queue command_queue, cl_uint num_objects, + const cl_mem *mem_objects, cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, + cl_event *event) CL_API_SUFFIX__VERSION_1_0; + + /* cl_khr_gl_sharing */ +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetGLContextInfoKHR)( ++typedef cl_int(CL_API_CALL *cl_api_clGetGLContextInfoKHR)( + const cl_context_properties *properties, cl_gl_context_info param_name, + size_t param_value_size, void *param_value, size_t *param_value_size_ret); + + /* cl_khr_gl_event */ +-typedef CL_API_ENTRY cl_event(CL_API_CALL *cl_api_clCreateEventFromGLsyncKHR)( ++typedef cl_event(CL_API_CALL *cl_api_clCreateEventFromGLsyncKHR)( + cl_context context, cl_GLsync sync, cl_int *errcode_ret); + + #if defined(_WIN32) + + /* cl_khr_d3d10_sharing */ + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetDeviceIDsFromD3D10KHR)( ++typedef cl_int(CL_API_CALL *cl_api_clGetDeviceIDsFromD3D10KHR)( + cl_platform_id platform, cl_d3d10_device_source_khr d3d_device_source, + void *d3d_object, cl_d3d10_device_set_khr d3d_device_set, + cl_uint num_entries, cl_device_id *devices, + cl_uint *num_devices) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateFromD3D10BufferKHR)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateFromD3D10BufferKHR)( + cl_context context, cl_mem_flags flags, ID3D10Buffer *resource, + cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateFromD3D10Texture2DKHR)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateFromD3D10Texture2DKHR)( + cl_context context, cl_mem_flags flags, ID3D10Texture2D *resource, + UINT subresource, cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateFromD3D10Texture3DKHR)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateFromD3D10Texture3DKHR)( + cl_context context, cl_mem_flags flags, ID3D10Texture3D *resource, + UINT subresource, cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY ++typedef + cl_int(CL_API_CALL *cl_api_clEnqueueAcquireD3D10ObjectsKHR)( + cl_command_queue command_queue, cl_uint num_objects, + const cl_mem *mem_objects, cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, + cl_event *event) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY ++typedef + cl_int(CL_API_CALL *cl_api_clEnqueueReleaseD3D10ObjectsKHR)( + cl_command_queue command_queue, cl_uint num_objects, + const cl_mem *mem_objects, cl_uint num_events_in_wait_list, +@@ -848,32 +848,32 @@ extern CL_API_ENTRY cl_int CL_API_CALL clEnqueueReleaseD3D10ObjectsKHR( + const cl_event *event_wait_list, cl_event *event); + + /* cl_khr_d3d11_sharing */ +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetDeviceIDsFromD3D11KHR)( ++typedef cl_int(CL_API_CALL *cl_api_clGetDeviceIDsFromD3D11KHR)( + cl_platform_id platform, cl_d3d11_device_source_khr d3d_device_source, + void *d3d_object, cl_d3d11_device_set_khr d3d_device_set, + cl_uint num_entries, cl_device_id *devices, + cl_uint *num_devices) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateFromD3D11BufferKHR)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateFromD3D11BufferKHR)( + cl_context context, cl_mem_flags flags, ID3D11Buffer *resource, + cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateFromD3D11Texture2DKHR)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateFromD3D11Texture2DKHR)( + cl_context context, cl_mem_flags flags, ID3D11Texture2D *resource, + UINT subresource, cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateFromD3D11Texture3DKHR)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateFromD3D11Texture3DKHR)( + cl_context context, cl_mem_flags flags, ID3D11Texture3D *resource, + UINT subresource, cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY ++typedef + cl_int(CL_API_CALL *cl_api_clEnqueueAcquireD3D11ObjectsKHR)( + cl_command_queue command_queue, cl_uint num_objects, + const cl_mem *mem_objects, cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, + cl_event *event) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY ++typedef + cl_int(CL_API_CALL *cl_api_clEnqueueReleaseD3D11ObjectsKHR)( + cl_command_queue command_queue, cl_uint num_objects, + const cl_mem *mem_objects, cl_uint num_events_in_wait_list, +@@ -881,26 +881,26 @@ cl_int(CL_API_CALL *cl_api_clEnqueueReleaseD3D11ObjectsKHR)( + cl_event *event) CL_API_SUFFIX__VERSION_1_2; + + /* cl_khr_dx9_media_sharing */ +-typedef CL_API_ENTRY ++typedef + cl_int(CL_API_CALL *cl_api_clGetDeviceIDsFromDX9MediaAdapterKHR)( + cl_platform_id platform, cl_uint num_media_adapters, + cl_dx9_media_adapter_type_khr *media_adapters_type, void *media_adapters, + cl_dx9_media_adapter_set_khr media_adapter_set, cl_uint num_entries, + cl_device_id *devices, cl_uint *num_devices) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateFromDX9MediaSurfaceKHR)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateFromDX9MediaSurfaceKHR)( + cl_context context, cl_mem_flags flags, + cl_dx9_media_adapter_type_khr adapter_type, void *surface_info, + cl_uint plane, cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY ++typedef + cl_int(CL_API_CALL *cl_api_clEnqueueAcquireDX9MediaSurfacesKHR)( + cl_command_queue command_queue, cl_uint num_objects, + const cl_mem *mem_objects, cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, + cl_event *event) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY ++typedef + cl_int(CL_API_CALL *cl_api_clEnqueueReleaseDX9MediaSurfacesKHR)( + cl_command_queue command_queue, cl_uint num_objects, + const cl_mem *mem_objects, cl_uint num_events_in_wait_list, +@@ -987,29 +987,29 @@ typedef void *cl_api_clGetDeviceIDsFromDX9MediaAdapterKHR; + + #ifdef CL_VERSION_1_1 + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clSetEventCallback)( ++typedef cl_int(CL_API_CALL *cl_api_clSetEventCallback)( + cl_event /* event */, cl_int /* command_exec_callback_type */, + void(CL_CALLBACK * /* pfn_notify */)(cl_event, cl_int, void *), + void * /* user_data */) CL_API_SUFFIX__VERSION_1_1; + +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateSubBuffer)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateSubBuffer)( + cl_mem /* buffer */, cl_mem_flags /* flags */, + cl_buffer_create_type /* buffer_create_type */, + const void * /* buffer_create_info */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1; + +-typedef CL_API_ENTRY ++typedef + cl_int(CL_API_CALL *cl_api_clSetMemObjectDestructorCallback)( + cl_mem /* memobj */, + void(CL_CALLBACK * /*pfn_notify*/)(cl_mem /* memobj */, + void * /*user_data*/), + void * /*user_data */) CL_API_SUFFIX__VERSION_1_1; + +-typedef CL_API_ENTRY cl_event(CL_API_CALL *cl_api_clCreateUserEvent)( ++typedef cl_event(CL_API_CALL *cl_api_clCreateUserEvent)( + cl_context /* context */, + cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clSetUserEventStatus)( ++typedef cl_int(CL_API_CALL *cl_api_clSetUserEventStatus)( + cl_event /* event */, + cl_int /* execution_status */) CL_API_SUFFIX__VERSION_1_1; + +@@ -1023,68 +1023,68 @@ typedef void *cl_api_clSetUserEventStatus; + + #endif + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clCreateSubDevicesEXT)( ++typedef cl_int(CL_API_CALL *cl_api_clCreateSubDevicesEXT)( + cl_device_id in_device, + const cl_device_partition_property_ext *partition_properties, + cl_uint num_entries, cl_device_id *out_devices, cl_uint *num_devices); + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clRetainDeviceEXT)( ++typedef cl_int(CL_API_CALL *cl_api_clRetainDeviceEXT)( + cl_device_id device) CL_API_SUFFIX__VERSION_1_0; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clReleaseDeviceEXT)( ++typedef cl_int(CL_API_CALL *cl_api_clReleaseDeviceEXT)( + cl_device_id device) CL_API_SUFFIX__VERSION_1_0; + + /* cl_khr_egl_image */ +-typedef CL_API_ENTRY cl_mem(CL_API_CALL *cl_api_clCreateFromEGLImageKHR)( ++typedef cl_mem(CL_API_CALL *cl_api_clCreateFromEGLImageKHR)( + cl_context context, CLeglDisplayKHR display, CLeglImageKHR image, + cl_mem_flags flags, const cl_egl_image_properties_khr *properties, + cl_int *errcode_ret); + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueAcquireEGLObjectsKHR)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueAcquireEGLObjectsKHR)( + cl_command_queue command_queue, cl_uint num_objects, + const cl_mem *mem_objects, cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, cl_event *event); + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueReleaseEGLObjectsKHR)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueReleaseEGLObjectsKHR)( + cl_command_queue command_queue, cl_uint num_objects, + const cl_mem *mem_objects, cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, cl_event *event); + + /* cl_khr_egl_event */ +-typedef CL_API_ENTRY cl_event(CL_API_CALL *cl_api_clCreateEventFromEGLSyncKHR)( ++typedef cl_event(CL_API_CALL *cl_api_clCreateEventFromEGLSyncKHR)( + cl_context context, CLeglSyncKHR sync, CLeglDisplayKHR display, + cl_int *errcode_ret); + + #ifdef CL_VERSION_2_1 + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clSetDefaultDeviceCommandQueue)( ++typedef cl_int(CL_API_CALL *cl_api_clSetDefaultDeviceCommandQueue)( + cl_context context, cl_device_id device, + cl_command_queue command_queue) CL_API_SUFFIX__VERSION_2_1; + +-typedef CL_API_ENTRY cl_program(CL_API_CALL *cl_api_clCreateProgramWithIL)( ++typedef cl_program(CL_API_CALL *cl_api_clCreateProgramWithIL)( + cl_context context, const void *il, size_t length, + cl_int *errcode_ret) CL_API_SUFFIX__VERSION_2_1; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetKernelSubGroupInfo)( ++typedef cl_int(CL_API_CALL *cl_api_clGetKernelSubGroupInfo)( + cl_kernel kernel, cl_device_id device, cl_kernel_sub_group_info param_name, + size_t input_value_size, const void *input_value, size_t param_value_size, + void *param_value, size_t *param_value_size_ret) CL_API_SUFFIX__VERSION_2_1; + +-typedef CL_API_ENTRY cl_kernel(CL_API_CALL *cl_api_clCloneKernel)( ++typedef cl_kernel(CL_API_CALL *cl_api_clCloneKernel)( + cl_kernel source_kernel, cl_int *errcode_ret) CL_API_SUFFIX__VERSION_2_1; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clEnqueueSVMMigrateMem)( ++typedef cl_int(CL_API_CALL *cl_api_clEnqueueSVMMigrateMem)( + cl_command_queue command_queue, cl_uint num_svm_pointers, + const void **svm_pointers, const size_t *sizes, + cl_mem_migration_flags flags, cl_uint num_events_in_wait_list, + const cl_event *event_wait_list, + cl_event *event) CL_API_SUFFIX__VERSION_2_1; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetDeviceAndHostTimer)( ++typedef cl_int(CL_API_CALL *cl_api_clGetDeviceAndHostTimer)( + cl_device_id device, cl_ulong *device_timestamp, + cl_ulong *host_timestamp) CL_API_SUFFIX__VERSION_2_1; + +-typedef CL_API_ENTRY cl_int(CL_API_CALL *cl_api_clGetHostTimer)( ++typedef cl_int(CL_API_CALL *cl_api_clGetHostTimer)( + cl_device_id device, cl_ulong *host_timestamp) CL_API_SUFFIX__VERSION_2_1; + + #else +diff --git a/khronos-headers/CL/cl_layer.h b/khronos-headers/CL/cl_layer.h +index b75e6bc..59dae75 100644 +--- a/khronos-headers/CL/cl_layer.h ++++ b/khronos-headers/CL/cl_layer.h +@@ -36,7 +36,7 @@ clGetLayerInfo(cl_layer_info param_name, + void *param_value, + size_t *param_value_size_ret); + +-CL_API_ENTRY typedef cl_int ++typedef cl_int + (CL_API_CALL *pfn_clGetLayerInfo)(cl_layer_info param_name, + size_t param_value_size, + void *param_value, +@@ -48,7 +48,7 @@ clInitLayer(cl_uint num_entries, + cl_uint *num_entries_ret, + const cl_icd_dispatch **layer_dispatch_ret); + +-CL_API_ENTRY typedef cl_int ++typedef cl_int + (CL_API_CALL *pfn_clInitLayer)(cl_uint num_entries, + const cl_icd_dispatch *target_dispatch, + cl_uint *num_entries_ret, +diff --git a/khronos-headers/CL/cl_platform.h b/khronos-headers/CL/cl_platform.h +index bed2370..8ae655d 100644 +--- a/khronos-headers/CL/cl_platform.h ++++ b/khronos-headers/CL/cl_platform.h +@@ -24,13 +24,25 @@ extern "C" { + #endif + + #if defined(_WIN32) +- #define CL_API_ENTRY +- #define CL_API_CALL __stdcall +- #define CL_CALLBACK __stdcall ++ #if !defined(CL_API_ENTRY) ++ #define CL_API_ENTRY ++ #endif ++ #if !defined(CL_API_CALL) ++ #define CL_API_CALL __stdcall ++ #endif ++ #if !defined(CL_CALLBACK) ++ #define CL_CALLBACK __stdcall ++ #endif + #else +- #define CL_API_ENTRY +- #define CL_API_CALL +- #define CL_CALLBACK ++ #if !defined(CL_API_ENTRY) ++ #define CL_API_ENTRY ++ #endif ++ #if !defined(CL_API_CALL) ++ #define CL_API_CALL ++ #endif ++ #if !defined(CL_CALLBACK) ++ #define CL_CALLBACK ++ #endif + #endif + + /* +@@ -41,85 +53,94 @@ extern "C" { + * deprecation but is deprecated in versions later than 1.1. + */ + +-#define CL_API_SUFFIX__VERSION_1_0 +-#define CL_EXT_SUFFIX__VERSION_1_0 +-#define CL_API_SUFFIX__VERSION_1_1 +-#define CL_EXT_SUFFIX__VERSION_1_1 +-#define CL_API_SUFFIX__VERSION_1_2 +-#define CL_EXT_SUFFIX__VERSION_1_2 +-#define CL_API_SUFFIX__VERSION_2_0 +-#define CL_EXT_SUFFIX__VERSION_2_0 +-#define CL_API_SUFFIX__VERSION_2_1 +-#define CL_EXT_SUFFIX__VERSION_2_1 +-#define CL_API_SUFFIX__VERSION_2_2 +-#define CL_EXT_SUFFIX__VERSION_2_2 +-#define CL_API_SUFFIX__VERSION_3_0 +-#define CL_EXT_SUFFIX__VERSION_3_0 +-#define CL_API_SUFFIX__EXPERIMENTAL +-#define CL_EXT_SUFFIX__EXPERIMENTAL ++#ifndef CL_API_SUFFIX_USER ++#define CL_API_SUFFIX_USER ++#endif ++ ++#ifndef CL_API_PREFIX_USER ++#define CL_API_PREFIX_USER ++#endif ++ ++#define CL_API_SUFFIX_COMMON CL_API_SUFFIX_USER ++#define CL_API_PREFIX_COMMON CL_API_PREFIX_USER ++ ++#define CL_API_SUFFIX__VERSION_1_0 CL_API_SUFFIX_COMMON ++#define CL_API_SUFFIX__VERSION_1_1 CL_API_SUFFIX_COMMON ++#define CL_API_SUFFIX__VERSION_1_2 CL_API_SUFFIX_COMMON ++#define CL_API_SUFFIX__VERSION_2_0 CL_API_SUFFIX_COMMON ++#define CL_API_SUFFIX__VERSION_2_1 CL_API_SUFFIX_COMMON ++#define CL_API_SUFFIX__VERSION_2_2 CL_API_SUFFIX_COMMON ++#define CL_API_SUFFIX__VERSION_3_0 CL_API_SUFFIX_COMMON ++#define CL_API_SUFFIX__EXPERIMENTAL CL_API_SUFFIX_COMMON + + + #ifdef __GNUC__ +- #define CL_EXT_SUFFIX_DEPRECATED __attribute__((deprecated)) +- #define CL_EXT_PREFIX_DEPRECATED ++ #define CL_API_SUFFIX_DEPRECATED __attribute__((deprecated)) ++ #define CL_API_PREFIX_DEPRECATED + #elif defined(_WIN32) +- #define CL_EXT_SUFFIX_DEPRECATED +- #define CL_EXT_PREFIX_DEPRECATED __declspec(deprecated) ++ #define CL_API_SUFFIX_DEPRECATED ++ #define CL_API_PREFIX_DEPRECATED __declspec(deprecated) + #else +- #define CL_EXT_SUFFIX_DEPRECATED +- #define CL_EXT_PREFIX_DEPRECATED ++ #define CL_API_SUFFIX_DEPRECATED ++ #define CL_API_PREFIX_DEPRECATED + #endif + + #ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS +- #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED +- #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED ++ #define CL_API_SUFFIX__VERSION_1_0_DEPRECATED CL_API_SUFFIX_COMMON ++ #define CL_API_PREFIX__VERSION_1_0_DEPRECATED CL_API_PREFIX_COMMON + #else +- #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED CL_EXT_SUFFIX_DEPRECATED +- #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED CL_EXT_PREFIX_DEPRECATED ++ #define CL_API_SUFFIX__VERSION_1_0_DEPRECATED CL_API_SUFFIX_COMMON CL_API_SUFFIX_DEPRECATED ++ #define CL_API_PREFIX__VERSION_1_0_DEPRECATED CL_API_PREFIX_COMMON CL_API_PREFIX_DEPRECATED + #endif + + #ifdef CL_USE_DEPRECATED_OPENCL_1_1_APIS +- #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED +- #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED ++ #define CL_API_SUFFIX__VERSION_1_1_DEPRECATED CL_API_SUFFIX_COMMON ++ #define CL_API_PREFIX__VERSION_1_1_DEPRECATED CL_API_PREFIX_COMMON + #else +- #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED CL_EXT_SUFFIX_DEPRECATED +- #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED CL_EXT_PREFIX_DEPRECATED ++ #define CL_API_SUFFIX__VERSION_1_1_DEPRECATED CL_API_SUFFIX_COMMON CL_API_SUFFIX_DEPRECATED ++ #define CL_API_PREFIX__VERSION_1_1_DEPRECATED CL_API_PREFIX_COMMON CL_API_PREFIX_DEPRECATED + #endif + + #ifdef CL_USE_DEPRECATED_OPENCL_1_2_APIS +- #define CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED +- #define CL_EXT_PREFIX__VERSION_1_2_DEPRECATED ++ #define CL_API_SUFFIX__VERSION_1_2_DEPRECATED CL_API_SUFFIX_COMMON ++ #define CL_API_PREFIX__VERSION_1_2_DEPRECATED CL_API_PREFIX_COMMON + #else +- #define CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED CL_EXT_SUFFIX_DEPRECATED +- #define CL_EXT_PREFIX__VERSION_1_2_DEPRECATED CL_EXT_PREFIX_DEPRECATED ++ #define CL_API_SUFFIX__VERSION_1_2_DEPRECATED CL_API_SUFFIX_COMMON CL_API_SUFFIX_DEPRECATED ++ #define CL_API_PREFIX__VERSION_1_2_DEPRECATED CL_API_PREFIX_COMMON CL_API_PREFIX_DEPRECATED + #endif + + #ifdef CL_USE_DEPRECATED_OPENCL_2_0_APIS +- #define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED +- #define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED ++ #define CL_API_SUFFIX__VERSION_2_0_DEPRECATED CL_API_SUFFIX_COMMON ++ #define CL_API_PREFIX__VERSION_2_0_DEPRECATED CL_API_PREFIX_COMMON + #else +- #define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED CL_EXT_SUFFIX_DEPRECATED +- #define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED CL_EXT_PREFIX_DEPRECATED ++ #define CL_API_SUFFIX__VERSION_2_0_DEPRECATED CL_API_SUFFIX_COMMON CL_API_SUFFIX_DEPRECATED ++ #define CL_API_PREFIX__VERSION_2_0_DEPRECATED CL_API_PREFIX_COMMON CL_API_PREFIX_DEPRECATED + #endif + + #ifdef CL_USE_DEPRECATED_OPENCL_2_1_APIS +- #define CL_EXT_SUFFIX__VERSION_2_1_DEPRECATED +- #define CL_EXT_PREFIX__VERSION_2_1_DEPRECATED ++ #define CL_API_SUFFIX__VERSION_2_1_DEPRECATED CL_API_SUFFIX_COMMON ++ #define CL_API_PREFIX__VERSION_2_1_DEPRECATED CL_API_PREFIX_COMMON + #else +- #define CL_EXT_SUFFIX__VERSION_2_1_DEPRECATED CL_EXT_SUFFIX_DEPRECATED +- #define CL_EXT_PREFIX__VERSION_2_1_DEPRECATED CL_EXT_PREFIX_DEPRECATED ++ #define CL_API_SUFFIX__VERSION_2_1_DEPRECATED CL_API_SUFFIX_COMMON CL_API_SUFFIX_DEPRECATED ++ #define CL_API_PREFIX__VERSION_2_1_DEPRECATED CL_API_PREFIX_COMMON CL_API_PREFIX_DEPRECATED + #endif + + #ifdef CL_USE_DEPRECATED_OPENCL_2_2_APIS +- #define CL_EXT_SUFFIX__VERSION_2_2_DEPRECATED +- #define CL_EXT_PREFIX__VERSION_2_2_DEPRECATED ++ #define CL_API_SUFFIX__VERSION_2_2_DEPRECATED CL_API_SUFFIX_COMMON ++ #define CL_API_PREFIX__VERSION_2_2_DEPRECATED CL_API_PREFIX_COMMON + #else +- #define CL_EXT_SUFFIX__VERSION_2_2_DEPRECATED CL_EXT_SUFFIX_DEPRECATED +- #define CL_EXT_PREFIX__VERSION_2_2_DEPRECATED CL_EXT_PREFIX_DEPRECATED ++ #define CL_API_SUFFIX__VERSION_2_2_DEPRECATED CL_API_SUFFIX_COMMON CL_API_SUFFIX_DEPRECATED ++ #define CL_API_PREFIX__VERSION_2_2_DEPRECATED CL_API_PREFIX_COMMON CL_API_PREFIX_DEPRECATED + #endif + + #if (defined (_WIN32) && defined(_MSC_VER)) + ++/* intptr_t is used in cl.h and provided by stddef.h in Visual C++, but not in clang */ ++/* stdint.h was missing before Visual Studio 2010, include it for later versions and for clang */ ++#if defined(__clang__) || _MSC_VER >= 1600 ++ #include ++#endif ++ + /* scalar types */ + typedef signed __int8 cl_char; + typedef unsigned __int8 cl_uchar; +diff --git a/khronos-headers/CL/cl_va_api_media_sharing_intel.h b/khronos-headers/CL/cl_va_api_media_sharing_intel.h +index 7c4a4ba..7ba2ec8 100644 +--- a/khronos-headers/CL/cl_va_api_media_sharing_intel.h ++++ b/khronos-headers/CL/cl_va_api_media_sharing_intel.h +@@ -68,16 +68,16 @@ clGetDeviceIDsFromVA_APIMediaAdapterINTEL( + cl_va_api_device_set_intel media_adapter_set, + cl_uint num_entries, + cl_device_id* devices, +- cl_uint* num_devices) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_uint* num_devices) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_int (CL_API_CALL * clGetDeviceIDsFromVA_APIMediaAdapterINTEL_fn)( ++typedef cl_int (CL_API_CALL * clGetDeviceIDsFromVA_APIMediaAdapterINTEL_fn)( + cl_platform_id platform, + cl_va_api_device_source_intel media_adapter_type, + void* media_adapter, + cl_va_api_device_set_intel media_adapter_set, + cl_uint num_entries, + cl_device_id* devices, +- cl_uint* num_devices) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_uint* num_devices) CL_API_SUFFIX__VERSION_1_2; + + extern CL_API_ENTRY cl_mem CL_API_CALL + clCreateFromVA_APIMediaSurfaceINTEL( +@@ -85,14 +85,14 @@ clCreateFromVA_APIMediaSurfaceINTEL( + cl_mem_flags flags, + VASurfaceID* surface, + cl_uint plane, +- cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_mem (CL_API_CALL * clCreateFromVA_APIMediaSurfaceINTEL_fn)( ++typedef cl_mem (CL_API_CALL * clCreateFromVA_APIMediaSurfaceINTEL_fn)( + cl_context context, + cl_mem_flags flags, + VASurfaceID* surface, + cl_uint plane, +- cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_2; + + extern CL_API_ENTRY cl_int CL_API_CALL + clEnqueueAcquireVA_APIMediaSurfacesINTEL( +@@ -101,15 +101,15 @@ clEnqueueAcquireVA_APIMediaSurfacesINTEL( + const cl_mem* mem_objects, + cl_uint num_events_in_wait_list, + const cl_event* event_wait_list, +- cl_event* event) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_event* event) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireVA_APIMediaSurfacesINTEL_fn)( ++typedef cl_int (CL_API_CALL *clEnqueueAcquireVA_APIMediaSurfacesINTEL_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem* mem_objects, + cl_uint num_events_in_wait_list, + const cl_event* event_wait_list, +- cl_event* event) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_event* event) CL_API_SUFFIX__VERSION_1_2; + + extern CL_API_ENTRY cl_int CL_API_CALL + clEnqueueReleaseVA_APIMediaSurfacesINTEL( +@@ -118,15 +118,15 @@ clEnqueueReleaseVA_APIMediaSurfacesINTEL( + const cl_mem* mem_objects, + cl_uint num_events_in_wait_list, + const cl_event* event_wait_list, +- cl_event* event) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_event* event) CL_API_SUFFIX__VERSION_1_2; + +-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseVA_APIMediaSurfacesINTEL_fn)( ++typedef cl_int (CL_API_CALL *clEnqueueReleaseVA_APIMediaSurfacesINTEL_fn)( + cl_command_queue command_queue, + cl_uint num_objects, + const cl_mem* mem_objects, + cl_uint num_events_in_wait_list, + const cl_event* event_wait_list, +- cl_event* event) CL_EXT_SUFFIX__VERSION_1_2; ++ cl_event* event) CL_API_SUFFIX__VERSION_1_2; + + #ifdef __cplusplus + } +diff --git a/khronos-headers/CL/opencl.h b/khronos-headers/CL/opencl.h +index 1c4e10c..ef8dd1e 100644 +--- a/khronos-headers/CL/opencl.h ++++ b/khronos-headers/CL/opencl.h +@@ -1,5 +1,5 @@ + /******************************************************************************* +- * Copyright (c) 2008-2020 The Khronos Group Inc. ++ * Copyright (c) 2008-2021 The Khronos Group Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. +@@ -23,7 +23,6 @@ extern "C" { + + #include + #include +-#include + #include + + #ifdef __cplusplus +diff --git a/ocl_interface.yaml b/ocl_interface.yaml +index 1e80f16..43a0e59 100644 +--- a/ocl_interface.yaml ++++ b/ocl_interface.yaml +@@ -674,18 +674,18 @@ + const cl_device_partition_property_ext * /* properties */, + cl_uint /*num_entries*/, + cl_device_id * /*out_devices*/, +- cl_uint * /*num_devices*/ ) CL_EXT_SUFFIX__VERSION_1_1; ++ cl_uint * /*num_devices*/ ) CL_API_SUFFIX__VERSION_1_1; + 90: |- + CL_API_ENTRY cl_int CL_API_CALL +- clRetainDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1; ++ clRetainDeviceEXT( cl_device_id /*device*/ ) CL_API_SUFFIX__VERSION_1_1; + 91: |- + CL_API_ENTRY cl_int CL_API_CALL +- clReleaseDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1; ++ clReleaseDeviceEXT( cl_device_id /*device*/ ) CL_API_SUFFIX__VERSION_1_1; + 92: |- + CL_API_ENTRY cl_event CL_API_CALL + clCreateEventFromGLsyncKHR(cl_context /* context */, + cl_GLsync /* cl_GLsync */, +- cl_int * /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1; ++ cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1; + 93: |- + CL_API_ENTRY cl_int CL_API_CALL + clCreateSubDevices(cl_device_id /* in_device */, +@@ -1016,7 +1016,7 @@ + const void * /*input_value*/, + size_t /*param_value_size*/, + void* /*param_value*/, +- size_t* /*param_value_size_ret*/ ) CL_EXT_SUFFIX__VERSION_2_0; ++ size_t* /*param_value_size_ret*/ ) CL_API_SUFFIX__VERSION_2_0; + 137: |- + CL_API_ENTRY cl_kernel CL_API_CALL + clCloneKernel(cl_kernel /* source_kernel */, +diff --git a/run_dummy_icd.c b/run_dummy_icd.c +index 400c1b0..c064b19 100644 +--- a/run_dummy_icd.c ++++ b/run_dummy_icd.c +@@ -39,7 +39,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + # include + # include + # include +-# include + #pragma GCC diagnostic pop + #include + #include "ocl_icd_debug.h" +-- +2.31.1 + diff --git a/source/l/ocl-icd/ocl-icd.SlackBuild b/source/l/ocl-icd/ocl-icd.SlackBuild index 255da5964..c133142da 100755 --- a/source/l/ocl-icd/ocl-icd.SlackBuild +++ b/source/l/ocl-icd/ocl-icd.SlackBuild @@ -82,6 +82,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +zcat $CWD/0001-Updated-to-support-latest-Khronos-headers.patch.gz | patch -p1 --verbose || exit 1 + if [ ! -r configure ]; then if [ -x ./autogen.sh ]; then NOCONFIGURE=1 ./autogen.sh diff --git a/source/l/pcaudiolib/pcaudiolib.SlackBuild b/source/l/pcaudiolib/pcaudiolib.SlackBuild index 6a69f0559..3412d8439 100755 --- a/source/l/pcaudiolib/pcaudiolib.SlackBuild +++ b/source/l/pcaudiolib/pcaudiolib.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pcaudiolib VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/python-pysol_cards/python-pysol_cards.SlackBuild b/source/l/python-pysol_cards/python-pysol_cards.SlackBuild index 28f5e69b9..1f88863a0 100755 --- a/source/l/python-pysol_cards/python-pysol_cards.SlackBuild +++ b/source/l/python-pysol_cards/python-pysol_cards.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-pysol_cards SRCNAM=pysol_cards VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then diff --git a/source/n/mobile-broadband-provider-info/mobile-broadband-provider-info.SlackBuild b/source/n/mobile-broadband-provider-info/mobile-broadband-provider-info.SlackBuild index 355cf48b5..10c0eb654 100755 --- a/source/n/mobile-broadband-provider-info/mobile-broadband-provider-info.SlackBuild +++ b/source/n/mobile-broadband-provider-info/mobile-broadband-provider-info.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mobile-broadband-provider-info VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} DATE=$(echo $VERSION | cut -f 1 -d _) diff --git a/source/xap/blackbox/blackbox.SlackBuild b/source/xap/blackbox/blackbox.SlackBuild index 3cfaffb4f..8f99f5c60 100755 --- a/source/xap/blackbox/blackbox.SlackBuild +++ b/source/xap/blackbox/blackbox.SlackBuild @@ -27,9 +27,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=blackbox SRCNAM=blackbox -VERSION=${VERSION:-0.76} +VERSION=${VERSION:-0.77} BBKEYSVER=${BBKEYSVER:-0.9.1} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then -- cgit v1.2.3