CVS commit: pkgsrc/parallel/ocl-icd

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Apr 22 10:43:30 UTC 2024

Modified Files:
        pkgsrc/parallel/ocl-icd: Makefile PLIST distinfo
        pkgsrc/parallel/ocl-icd/patches: patch-OpenCL.pc.in patch-ocl-icd.pc.in
Added Files:
        pkgsrc/parallel/ocl-icd/patches: patch-configure.ac
Removed Files:
        pkgsrc/parallel/ocl-icd/patches: patch-icd__generator.rb
            patch-khronos-headers_CL_cl.h patch-khronos-headers_CL_cl__d3d10.h
            patch-khronos-headers_CL_cl__d3d11.h
            patch-khronos-headers_CL_cl__dx9__media__sharing.h
            patch-khronos-headers_CL_cl__egl.h
            patch-khronos-headers_CL_cl__ext.h
            patch-khronos-headers_CL_cl__gl.h
            patch-khronos-headers_CL_cl__gl__ext.h
            patch-khronos-headers_CL_cl__icd.h
            patch-khronos-headers_CL_cl__layer.h
            patch-khronos-headers_CL_cl__platform.h
            patch-khronos-headers_CL_cl__va__api__media__sharing__intel.h
            patch-khronos-headers_CL_opencl.h patch-ocl__interface.yaml
            patch-run__dummy__icd.c

Log Message:
ocl-icd: updated to 2.3.2

v2.3.2

pkconfig support depends on OpenCL-Headers.pc being installed (since Khronos OpenCL Headers v2023.02.06)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/parallel/ocl-icd/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/parallel/ocl-icd/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/parallel/ocl-icd/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/parallel/ocl-icd/patches/patch-OpenCL.pc.in \
    pkgsrc/parallel/ocl-icd/patches/patch-ocl-icd.pc.in
cvs rdiff -u -r0 -r1.1 pkgsrc/parallel/ocl-icd/patches/patch-configure.ac
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/parallel/ocl-icd/patches/patch-icd__generator.rb \
    pkgsrc/parallel/ocl-icd/patches/patch-khronos-headers_CL_cl.h \
    pkgsrc/parallel/ocl-icd/patches/patch-khronos-headers_CL_cl__d3d10.h \
    pkgsrc/parallel/ocl-icd/patches/patch-khronos-headers_CL_cl__d3d11.h \
    pkgsrc/parallel/ocl-icd/patches/patch-khronos-headers_CL_cl__dx9__media__sharing.h \
    pkgsrc/parallel/ocl-icd/patches/patch-khronos-headers_CL_cl__egl.h \
    pkgsrc/parallel/ocl-icd/patches/patch-khronos-headers_CL_cl__ext.h \
    pkgsrc/parallel/ocl-icd/patches/patch-khronos-headers_CL_cl__gl.h \
    pkgsrc/parallel/ocl-icd/patches/patch-khronos-headers_CL_cl__gl__ext.h \
    pkgsrc/parallel/ocl-icd/patches/patch-khronos-headers_CL_cl__icd.h \
    pkgsrc/parallel/ocl-icd/patches/patch-khronos-headers_CL_cl__layer.h \
    pkgsrc/parallel/ocl-icd/patches/patch-khronos-headers_CL_cl__platform.h \
    pkgsrc/parallel/ocl-icd/patches/patch-khronos-headers_CL_cl__va__api__media__sharing__intel.h \
    pkgsrc/parallel/ocl-icd/patches/patch-khronos-headers_CL_opencl.h \
    pkgsrc/parallel/ocl-icd/patches/patch-ocl__interface.yaml \
    pkgsrc/parallel/ocl-icd/patches/patch-run__dummy__icd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/parallel/ocl-icd/Makefile
diff -u pkgsrc/parallel/ocl-icd/Makefile:1.5 pkgsrc/parallel/ocl-icd/Makefile:1.6
--- pkgsrc/parallel/ocl-icd/Makefile:1.5        Fri Jul  9 18:30:29 2021
+++ pkgsrc/parallel/ocl-icd/Makefile    Mon Apr 22 10:43:29 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2021/07/09 18:30:29 nia Exp $
+# $NetBSD: Makefile,v 1.6 2024/04/22 10:43:29 adam Exp $
 
-DISTNAME=      ocl-icd-2.3.0
-PKGREVISION=   2
+DISTNAME=      ocl-icd-2.3.2
 CATEGORIES=    parallel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=OCL-dev/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -11,11 +10,10 @@ HOMEPAGE=   https://github.com/OCL-dev/ocl
 COMMENT=       OpenCL ICD Loader
 LICENSE=       2-clause-bsd
 
-GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
-
-USE_TOOLS+=    autoconf autoreconf automake
-USE_TOOLS+=    gmake
+USE_TOOLS+=    autoconf autoreconf automake gmake
+GNU_CONFIGURE= yes
+TEST_TARGET=   check
 
 TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
 TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto

Index: pkgsrc/parallel/ocl-icd/PLIST
diff -u pkgsrc/parallel/ocl-icd/PLIST:1.1 pkgsrc/parallel/ocl-icd/PLIST:1.2
--- pkgsrc/parallel/ocl-icd/PLIST:1.1   Thu Jun 10 05:55:42 2021
+++ pkgsrc/parallel/ocl-icd/PLIST       Mon Apr 22 10:43:29 2024
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2021/06/10 05:55:42 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/04/22 10:43:29 adam Exp $
+bin/cllayerinfo
 include/ocl_icd.h
 lib/libOpenCL.la
 lib/pkgconfig/OpenCL.pc

Index: pkgsrc/parallel/ocl-icd/distinfo
diff -u pkgsrc/parallel/ocl-icd/distinfo:1.4 pkgsrc/parallel/ocl-icd/distinfo:1.5
--- pkgsrc/parallel/ocl-icd/distinfo:1.4        Tue Oct 26 11:10:36 2021
+++ pkgsrc/parallel/ocl-icd/distinfo    Mon Apr 22 10:43:29 2024
@@ -1,23 +1,8 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:10:36 nia Exp $
+$NetBSD: distinfo,v 1.5 2024/04/22 10:43:29 adam Exp $
 
-BLAKE2s (ocl-icd-2.3.0.tar.gz) = caa35152919bc104a2b53d01f63d0901a57858f0fc728ddcafc58bfd3159a187
-SHA512 (ocl-icd-2.3.0.tar.gz) = 003f3661b7086a7364e79d1058591f12a7095aa2c3decfc4b496f00a0863a91cd81080f33b9308e3948045f8aca5856868ed2725f478654230e51a60d654e613
-Size (ocl-icd-2.3.0.tar.gz) = 100848 bytes
-SHA1 (patch-OpenCL.pc.in) = 4cef1fd6d976b4953e7afc8a53d26ce27ef5530b
-SHA1 (patch-icd__generator.rb) = d4522e8b264a3eb944f019e7139598e3ac6dc371
-SHA1 (patch-khronos-headers_CL_cl.h) = 016b3e07fc529b104530d29826b1375e8b0c4745
-SHA1 (patch-khronos-headers_CL_cl__d3d10.h) = efbd00d2ffae3e24a2d5671835d474f7c813da20
-SHA1 (patch-khronos-headers_CL_cl__d3d11.h) = 8865f5e4fafbf7216a212fc91e372a0f76772025
-SHA1 (patch-khronos-headers_CL_cl__dx9__media__sharing.h) = c70eec07f90db0b034c4c8e8761051a6967606c3
-SHA1 (patch-khronos-headers_CL_cl__egl.h) = 2426e022486e39f5e418d7d509fb7fe98c3c8697
-SHA1 (patch-khronos-headers_CL_cl__ext.h) = aa19f68954d390348dc4c85058d8b78e91d943c3
-SHA1 (patch-khronos-headers_CL_cl__gl.h) = 21707229aea5e2268af6ff49e5fc9ac834f7579b
-SHA1 (patch-khronos-headers_CL_cl__gl__ext.h) = 6daced51363b5157f66025c119ec9a08d68bfb2d
-SHA1 (patch-khronos-headers_CL_cl__icd.h) = ed0a46b8c1260b43f1578e07e34e0a5dbe53b5e6
-SHA1 (patch-khronos-headers_CL_cl__layer.h) = d1b0ae935c4eed12076d7e4da956626e38e93841
-SHA1 (patch-khronos-headers_CL_cl__platform.h) = 4010d874b9c25a8701c52460c8de822cf579c8c2
-SHA1 (patch-khronos-headers_CL_cl__va__api__media__sharing__intel.h) = 98a6605f15a7e583eacae59fd522f94ca01a51e6
-SHA1 (patch-khronos-headers_CL_opencl.h) = 2aa2d9b484252906f0ed82d176a95bb86614c617
-SHA1 (patch-ocl-icd.pc.in) = b484d17599ab9025f027191f10d6e56d2c015772
-SHA1 (patch-ocl__interface.yaml) = 41a400fdb541220de5a296e099bb646b00f189a3
-SHA1 (patch-run__dummy__icd.c) = b60c3b48730402ed8434dd2434e013dd1c26388e
+BLAKE2s (ocl-icd-2.3.2.tar.gz) = cd01c51dbc9f8cc795bde6d2bd97f4c0f0dfb2a877cef5d10273836b2000f8c2
+SHA512 (ocl-icd-2.3.2.tar.gz) = 5129975a10ffade76d20444345a59c82506914347391ad6c0b4c3826f51dcc641924b4a5abcc65c41766597af9cc7a76b9e5821f41898ff0251a05963e117796
+Size (ocl-icd-2.3.2.tar.gz) = 108988 bytes
+SHA1 (patch-OpenCL.pc.in) = 05579dc8147032d68ad9f95f6463bca61615025c
+SHA1 (patch-configure.ac) = d9f65968ef8b527108737856a43e1965a7ea0443
+SHA1 (patch-ocl-icd.pc.in) = 1db18536653335c095f34d34794dee9f82087e22

Index: pkgsrc/parallel/ocl-icd/patches/patch-OpenCL.pc.in
diff -u pkgsrc/parallel/ocl-icd/patches/patch-OpenCL.pc.in:1.1 pkgsrc/parallel/ocl-icd/patches/patch-OpenCL.pc.in:1.2
--- pkgsrc/parallel/ocl-icd/patches/patch-OpenCL.pc.in:1.1      Fri Jul  9 18:30:29 2021
+++ pkgsrc/parallel/ocl-icd/patches/patch-OpenCL.pc.in  Mon Apr 22 10:43:29 2024
@@ -1,13 +1,12 @@
-$NetBSD: patch-OpenCL.pc.in,v 1.1 2021/07/09 18:30:29 nia Exp $
+$NetBSD: patch-OpenCL.pc.in,v 1.2 2024/04/22 10:43:29 adam Exp $
 
 Link with libpthread in order to unbreak pocl on NetBSD.
 
---- OpenCL.pc.in.orig  2021-03-30 16:10:38.000000000 +0000
+--- OpenCL.pc.in.orig  2023-06-02 21:36:20.000000000 +0000
 +++ OpenCL.pc.in
-@@ -6,5 +6,5 @@ includedir=@includedir@
- Name: OpenCL
+@@ -7,4 +7,4 @@ Name: OpenCL
  Description: Open Computing Language generic Installable Client Driver Loader
+ Requires: OpenCL-Headers
  Version: @OPENCL_VERSION@
 -Libs: -L${libdir} -lOpenCL
 +Libs: -L${libdir} -lOpenCL -pthread
- Cflags: -I${includedir}
Index: pkgsrc/parallel/ocl-icd/patches/patch-ocl-icd.pc.in
diff -u pkgsrc/parallel/ocl-icd/patches/patch-ocl-icd.pc.in:1.1 pkgsrc/parallel/ocl-icd/patches/patch-ocl-icd.pc.in:1.2
--- pkgsrc/parallel/ocl-icd/patches/patch-ocl-icd.pc.in:1.1     Fri Jul  9 18:30:29 2021
+++ pkgsrc/parallel/ocl-icd/patches/patch-ocl-icd.pc.in Mon Apr 22 10:43:30 2024
@@ -1,12 +1,12 @@
-$NetBSD: patch-ocl-icd.pc.in,v 1.1 2021/07/09 18:30:29 nia Exp $
+$NetBSD: patch-ocl-icd.pc.in,v 1.2 2024/04/22 10:43:30 adam Exp $
 
 Link with libpthread in order to unbreak pocl on NetBSD.
 
---- ocl-icd.pc.in.orig 2021-03-30 16:10:38.000000000 +0000
+--- ocl-icd.pc.in.orig 2023-06-02 21:36:20.000000000 +0000
 +++ ocl-icd.pc.in
-@@ -6,5 +6,5 @@ includedir=@includedir@
- Name: ocl-icd
+@@ -7,5 +7,5 @@ Name: ocl-icd
  Description: Open Computing Language generic Installable Client Driver support
+ Requires: OpenCL-Headers
  Version: @VERSION@
 -Libs: -L${libdir}
 +Libs: -L${libdir} -pthread

Added files:

Index: pkgsrc/parallel/ocl-icd/patches/patch-configure.ac
diff -u /dev/null pkgsrc/parallel/ocl-icd/patches/patch-configure.ac:1.1
--- /dev/null   Mon Apr 22 10:43:30 2024
+++ pkgsrc/parallel/ocl-icd/patches/patch-configure.ac  Mon Apr 22 10:43:29 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.ac,v 1.1 2024/04/22 10:43:29 adam Exp $
+
+Portability fix.
+
+--- configure.ac.orig  2024-04-22 09:53:57.568809574 +0000
++++ configure.ac
+@@ -196,7 +196,7 @@ AS_IF([test x"$OCL_ICD_LAYERDIR" = x"/et
+ ])
+ 
+ # always use versionned symbols (check required for MacOSX)
+-if test "x$macos" == xyes ; then
++if test "x$macos" = xyes ; then
+ AM_CONDITIONAL([USE_MAP], [false])
+ else
+ AM_CONDITIONAL([USE_MAP], [true])