Attachment #179544 for bug #216739

View | Details | Raw Unified | Return to bug 216739
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	ocl-icd
PORTVERSION=	2.2.11
CATEGORIES=	devel
MASTER_SITES=	https://forge.imag.fr/frs/download.php/${REVID}/
REVID=		814

MAINTAINER=	ohartman@zedat.fu-berlin.de
COMMENT=	OpenCL Installable Client Driver


post-patch:
	@${REINPLACE_CMD} -e 's|/etc/|${LOCALBASE}/etc/|g' \
		${WRKSRC}/doc/libOpenCL.7.txt.in

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)devel/ocl-icd/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1472594572	1	TIMESTAMP = 1486067287
2	SHA256 (ocl-icd-2.2.9.tar.gz) = 0c8ac13e2c5b737c34de49f9aca6cad3c4d33dd0bbb149b01238d76e798feae5	2	SHA256 (ocl-icd-2.2.11.tar.gz) = 02fa41da98ae2807e92742196831d320e3fc2f4cb1118d0061d9f51dda867730
3	SIZE (ocl-icd-2.2.9.tar.gz) = 453477	3	SIZE (ocl-icd-2.2.11.tar.gz) = 455800




--- ocl_icd_debug.h.orig	2016-04-24 12:11:57 UTC
+++ ocl_icd_debug.h
@@ -61,9 +61,9 @@ extern int debug_ocl_icd_mask;
 	return ret; \
    } while(0)
 #  define RETURN_STR(val) do { \
-	char* _ret=(char*)(val);		\
-	debug(D_TRACE, "return: %s", _ret);	\
-	return _ret; \
+	char* _return_str=(char*)(val);		\
+	debug(D_TRACE, "return: %s", _return_str);	\
+	return _return_str; \
    } while(0)




--- ocl_icd_loader.c.orig	2017-01-19 13:55:12 UTC
+++ ocl_icd_loader.c
@@ -53,7 +53,7 @@ int debug_ocl_icd_mask=0;
 #define DEBUG_OCL_ICD_PROVIDE_DUMP_FIELD
 #include "ocl_icd_debug.h"
 
-#define ETC_OPENCL_VENDORS "/etc/OpenCL/vendors"
+#define ETC_OPENCL_VENDORS "/usr/local/etc/OpenCL/vendors"
 
 int debug_ocl_icd_mask=0;
 
 typedef __typeof__(clGetPlatformInfo) *clGetPlatformInfo_fn;
 
-inline void dump_vendor_icd(const char* info, const struct vendor_icd *v) {

Return to bug 216739

Lines 2-11 Link Here

(-)devel/ocl-icd/Makefile (-3 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= ocl-icd	4	PORTNAME= ocl-icd
5	PORTVERSION= 2.2.9	5	PORTVERSION= 2.2.11
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= https://forge.imag.fr/frs/download.php/${REVID}/	7	MASTER_SITES= https://forge.imag.fr/frs/download.php/${REVID}/
8	REVID= 716	8	REVID= 814
9		9
10	MAINTAINER= ohartman@zedat.fu-berlin.de	10	MAINTAINER= ohartman@zedat.fu-berlin.de
11	COMMENT= OpenCL Installable Client Driver	11	COMMENT= OpenCL Installable Client Driver
Lines 34-39 Link Here
34		34
35	post-patch:	35	post-patch:
36	@${REINPLACE_CMD} -e 's\|/etc/\|${LOCALBASE}/etc/\|g' \	36	@${REINPLACE_CMD} -e 's\|/etc/\|${LOCALBASE}/etc/\|g' \
37	${WRKSRC}/doc/libOpenCL.7.txt	37	${WRKSRC}/doc/libOpenCL.7.txt.in
38		38
39	.include <bsd.port.mk>	39	.include <bsd.port.mk>

Lines 1-13 Link Here

(-)devel/ocl-icd/files/patch-ocl__icd__debug.h (-5 / +5 lines)
1	--- ocl_icd_debug.h.orig 2015-08-06 20:54:47 UTC	1	--- ocl_icd_debug.h.orig 2016-04-24 12:11:57 UTC
2	+++ ocl_icd_debug.h	2	+++ ocl_icd_debug.h
3	@@ -61,9 +61,9 @@ extern int debug_ocl_icd_mask;	3	@@ -61,9 +61,9 @@ extern int debug_ocl_icd_mask;
4	return ret; \	4	return ret; \
5	} while(0)	5	} while(0)
6	# define RETURN_STR(val) do { \	6	# define RETURN_STR(val) do { \
7	- char* ret=(char*)(val); \	7	- char* _ret=(char*)(val); \
8	- debug(D_TRACE, "return: %s", ret); \	8	- debug(D_TRACE, "return: %s", _ret); \
9	- return ret; \	9	- return _ret; \
10	+ char* _return_str=(char*)(val); \	10	+ char* _return_str=(char*)(val); \
11	+ debug(D_TRACE, "return: %s", _return_str); \	11	+ debug(D_TRACE, "return: %s", _return_str); \
12	+ return _return_str; \	12	+ return _return_str; \
13	} while(0)	13	} while(0)

Lines 1-14 Link Here

(-)devel/ocl-icd/files/patch-ocl__icd__loader.c (-9 / +2 lines)
1	--- ocl_icd_loader.c.orig 2015-06-08 18:29:52 UTC	1	--- ocl_icd_loader.c.orig 2017-01-19 13:55:12 UTC
2	+++ ocl_icd_loader.c	2	+++ ocl_icd_loader.c
3	@@ -49,13 +49,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI	3	@@ -53,7 +53,7 @@ int debug_ocl_icd_mask=0;
4	#define DEBUG_OCL_ICD_PROVIDE_DUMP_FIELD
5	#include "ocl_icd_debug.h"
6		4
7	-#define ETC_OPENCL_VENDORS "/etc/OpenCL/vendors"
8	+#define ETC_OPENCL_VENDORS "/usr/local/etc/OpenCL/vendors"
9
10	int debug_ocl_icd_mask=0;
11
12	typedef __typeof__(clGetPlatformInfo) *clGetPlatformInfo_fn;	5	typedef __typeof__(clGetPlatformInfo) *clGetPlatformInfo_fn;
13		6
14	-inline void dump_vendor_icd(const char* info, const struct vendor_icd *v) {	7	-inline void dump_vendor_icd(const char* info, const struct vendor_icd *v) {