Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Jun 2013 19:49:36 GMT
From:      "O. Hartmann" <ohartman@zedat.fu-berlin.de>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/179180: devel/freeocl: Minor changes regarding upcoming POCL port and ICD loader
Message-ID:  <201306011949.r51JnaAs009170@oldred.FreeBSD.org>
Resent-Message-ID: <201306011950.r51Jo05H005341@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         179180
>Category:       ports
>Synopsis:       devel/freeocl: Minor changes regarding upcoming POCL port and ICD loader
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 01 19:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     O. Hartmann
>Release:        FreeBSD 10..0-CURRENT/amd64 FreeBSD 9.1-STABLE/amd64
>Organization:
FU Berlin
>Environment:
>Description:
Changed some minorities regarding upcoming new OpenCL ICD loader ports and POCL, the POrtable OpenCL port.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -Nur freeocl/.svn/entries freeocl.trunk/.svn/entries
--- freeocl/.svn/entries	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/.svn/entries	2013-06-01 20:18:26.000000000 +0200
@@ -0,0 +1 @@
+12
diff -Nur freeocl/.svn/format freeocl.trunk/.svn/format
--- freeocl/.svn/format	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/.svn/format	2013-06-01 20:18:26.000000000 +0200
@@ -0,0 +1 @@
+12
diff -Nur freeocl/.svn/pristine/0d/0d916aae86543a7a4d3d3b001ebcaa53f218c658.svn-base freeocl.trunk/.svn/pristine/0d/0d916aae86543a7a4d3d3b001ebcaa53f218c658.svn-base
--- freeocl/.svn/pristine/0d/0d916aae86543a7a4d3d3b001ebcaa53f218c658.svn-base	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/.svn/pristine/0d/0d916aae86543a7a4d3d3b001ebcaa53f218c658.svn-base	2013-06-01 20:18:27.000000000 +0200
@@ -0,0 +1,11 @@
+--- src/parser/parser.h.orig	2013-05-18 20:29:20.184081422 +0200
++++ src/parser/parser.h	2013-05-18 20:29:39.327297281 +0200
+@@ -115,7 +115,7 @@
+ 		inline std::istream &get(char &c)
+ 		{
+ 			c = 0;
+-			const bool ok = in.get(c);
++			const bool ok = (bool) in.get(c);
+ 			if (c == '\n')
+ 				++line;
+ 			if (!current_line.empty() && *current_line.rbegin() == '\n')
diff -Nur freeocl/.svn/pristine/32/32e38c6fa2f6a7638101164c3d16d5bbe0bbcbfd.svn-base freeocl.trunk/.svn/pristine/32/32e38c6fa2f6a7638101164c3d16d5bbe0bbcbfd.svn-base
--- freeocl/.svn/pristine/32/32e38c6fa2f6a7638101164c3d16d5bbe0bbcbfd.svn-base	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/.svn/pristine/32/32e38c6fa2f6a7638101164c3d16d5bbe0bbcbfd.svn-base	2013-06-01 21:04:23.000000000 +0200
@@ -0,0 +1,35 @@
+# Created by: Oliver Hartmann <ohartman@zedat.fu-berlin.de>
+# $FreeBSD: head/devel/freeocl/Makefile 314960 2013-03-22 20:06:14Z makc $
+
+PORTNAME=	freeocl
+PORTVERSION=	0.3.6
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+DISTNAME=	FreeOCL-${PORTVERSION}-src
+
+MAINTAINER=	ohartman@zedat.fu-berlin.de
+COMMENT=	Free Open Computing Language (OpenCL) implementation for CPU
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:${PORTSDIR}/devel/libatomic_ops \
+		${LOCALBASE}/include/CL/opencl.h:${PORTSDIR}/devel/opencl
+
+LICENSE=	LGPL3
+
+CONFLICTS=	ocl-icd opencl-icd
+
+WRKSRC=		${WRKDIR}/FreeOCL-${PORTVERSION}-Source
+
+USE_GCC=	4.6+
+USES=		cmake
+USE_LDCONFIG=	yes
+CMAKE_BUILD_TYPE=Release
+
+post-patch:
+	${REINPLACE_CMD} -e 's:%%PREFIX%%:${PREFIX}:g' ${WRKSRC}/src/icd/icd_loader.cpp \
+		${WRKSRC}/CMakeLists.txt ${WRKSRC}/INSTALL
+
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 800000
+BROKEN=		this port does not compile at 7.x: "src/program.cpp:531:37: error: 'RTLD_NOLOAD' was not declared in this scope"
+.endif
+.include <bsd.port.post.mk>
diff -Nur freeocl/.svn/pristine/48/48d519f188e36d14ae9ada81a5324b94a842fd8b.svn-base freeocl.trunk/.svn/pristine/48/48d519f188e36d14ae9ada81a5324b94a842fd8b.svn-base
--- freeocl/.svn/pristine/48/48d519f188e36d14ae9ada81a5324b94a842fd8b.svn-base	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/.svn/pristine/48/48d519f188e36d14ae9ada81a5324b94a842fd8b.svn-base	2013-06-01 20:18:27.000000000 +0200
@@ -0,0 +1,14 @@
+--- src/device.cpp.orig	2013-05-18 20:12:03.000000000 +0200
++++ src/device.cpp	2013-05-18 20:13:30.000000000 +0200
+@@ -345,7 +345,11 @@
+ 
+ 	pool = new FreeOCL::threadpool();
+ 
++#ifdef	__FreeBSD__
++	std::string ostype = trim(run_command("/sbin/sysctl -e kern.ostype | awk '{ print $NF }'"));
++#else
+ 	std::string ostype = trim(run_command("/sbin/sysctl -e kernel.ostype | awk '{ print $NF }'"));
++#endif
+ 	if (ostype.empty())
+ 		ostype = trim(run_command("/sbin/sysctl -e kern.ostype | awk '{ print $NF }'"));
+ 	if (ostype.empty())
diff -Nur freeocl/.svn/pristine/58/5866f1acf449d93c7a87c715b6b605c29bb22245.svn-base freeocl.trunk/.svn/pristine/58/5866f1acf449d93c7a87c715b6b605c29bb22245.svn-base
--- freeocl/.svn/pristine/58/5866f1acf449d93c7a87c715b6b605c29bb22245.svn-base	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/.svn/pristine/58/5866f1acf449d93c7a87c715b6b605c29bb22245.svn-base	2013-06-01 20:18:27.000000000 +0200
@@ -0,0 +1,37 @@
+# Created by: Oliver Hartmann <ohartman@zedat.fu-berlin.de>
+# $FreeBSD: head/devel/freeocl/Makefile 314960 2013-03-22 20:06:14Z makc $
+
+PORTNAME=	freeocl
+PORTVERSION=	0.3.6
+PORTREVISION=	2
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+DISTNAME=	FreeOCL-${PORTVERSION}-src
+
+MAINTAINER=	ohartman@zedat.fu-berlin.de
+COMMENT=	Free Open Computing Language 1.1 (OpenCL) implementation for CPU
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:${PORTSDIR}/devel/libatomic_ops \
+		${LOCALBASE}/include/CL/opencl.h:${PORTSDIR}/devel/opencl
+
+LICENSE=	LGPL3
+
+WRKSRC=		${WRKDIR}/FreeOCL-${PORTVERSION}-Source
+
+CXXFLAGS+=	-I/usr/local/include -stdlib=libc++ -std=c++11
+
+USES=		cmake
+USE_LDCONFIG=	yes
+CMAKE_BUILD_TYPE=Release
+
+post-patch:
+	${REINPLACE_CMD} -e 's:%%PREFIX%%:${PREFIX}:g' ${WRKSRC}/src/icd/icd_loader.cpp \
+		${WRKSRC}/CMakeLists.txt
+pre-install:
+	${MKDIR} ${PREFIX}/etc/OpenCL/vendors
+
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 800000
+BROKEN=		this port does not compile at 7.x: "src/program.cpp:531:37: error: 'RTLD_NOLOAD' was not declared in this scope"
+.endif
+.include <bsd.port.post.mk>
diff -Nur freeocl/.svn/pristine/5a/5a7f3b407e94400db60ceb1f04d9124f24c3dcc8.svn-base freeocl.trunk/.svn/pristine/5a/5a7f3b407e94400db60ceb1f04d9124f24c3dcc8.svn-base
--- freeocl/.svn/pristine/5a/5a7f3b407e94400db60ceb1f04d9124f24c3dcc8.svn-base	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/.svn/pristine/5a/5a7f3b407e94400db60ceb1f04d9124f24c3dcc8.svn-base	2013-06-01 20:18:27.000000000 +0200
@@ -0,0 +1,13 @@
+--- src/icd/icd_loader.cpp.orig	2012-09-22 13:14:12.000000000 +0400
++++ src/icd/icd_loader.cpp	2012-09-22 13:15:03.000000000 +0400
+@@ -53,8 +53,8 @@ namespace FreeOCL
+ 
+ 	icd_loader::icd_loader()
+ 	{
+-		// Get the list of all *.icd files in /etc/OpenCL/vendors/
+-		const std::deque<std::string> &files = list_files("/etc/OpenCL/vendors/", ".icd");
++		// Get the list of all *.icd files in %%PREFIX%%/etc/OpenCL/vendors/
++		const std::deque<std::string> &files = list_files("%%PREFIX%%/etc/OpenCL/vendors/", ".icd");
+ 		// For each file
+ 		for(std::deque<std::string>::const_iterator i = files.begin() ; i != files.end() ; ++i)
+ 		{
diff -Nur freeocl/.svn/pristine/70/705f6bb4e61d6de907db180fffec9953558e8616.svn-base freeocl.trunk/.svn/pristine/70/705f6bb4e61d6de907db180fffec9953558e8616.svn-base
--- freeocl/.svn/pristine/70/705f6bb4e61d6de907db180fffec9953558e8616.svn-base	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/.svn/pristine/70/705f6bb4e61d6de907db180fffec9953558e8616.svn-base	2013-06-01 21:10:09.000000000 +0200
@@ -0,0 +1,33 @@
+etc/OpenCL/vendors/freeocl.icd
+include/FreeOCL/asyncmemop.h
+include/FreeOCL/atomic.h
+include/FreeOCL/common.h
+include/FreeOCL/config.h
+include/FreeOCL/converters.h
+include/FreeOCL/geometric.h
+include/FreeOCL/image1d_array_t.h
+include/FreeOCL/image1d_buffer_t.h
+include/FreeOCL/image1d_t.h
+include/FreeOCL/image2d_array_t.h
+include/FreeOCL/image2d_t.h
+include/FreeOCL/image3d_t.h
+include/FreeOCL/imgreadwrite.h
+include/FreeOCL/integer.h
+include/FreeOCL/math.h
+include/FreeOCL/memfence.h
+include/FreeOCL/opencl_c.h
+include/FreeOCL/printf.h
+include/FreeOCL/relational.h
+include/FreeOCL/simdopts.h
+include/FreeOCL/sync.h
+include/FreeOCL/vectors.h
+include/FreeOCL/vloadstore.h
+include/FreeOCL/vmisc.h
+include/FreeOCL/workitem.h
+lib/libFreeOCL.so
+lib/libOpenCL.so
+lib/libOpenCL.so.1
+lib/libOpenCL.so.1.2
+@dirrm include/FreeOCL
+@dirrm etc/OpenCL/vendors
+@dirrm etc/OpenCL
diff -Nur freeocl/.svn/pristine/74/74092777ddb2bd31d83c689d0a5a80d8384c98b3.svn-base freeocl.trunk/.svn/pristine/74/74092777ddb2bd31d83c689d0a5a80d8384c98b3.svn-base
--- freeocl/.svn/pristine/74/74092777ddb2bd31d83c689d0a5a80d8384c98b3.svn-base	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/.svn/pristine/74/74092777ddb2bd31d83c689d0a5a80d8384c98b3.svn-base	2013-06-01 20:55:47.000000000 +0200
@@ -0,0 +1,35 @@
+# Created by: Oliver Hartmann <ohartman@zedat.fu-berlin.de>
+# $FreeBSD: head/devel/freeocl/Makefile 314960 2013-03-22 20:06:14Z makc $
+
+PORTNAME=	freeocl
+PORTVERSION=	0.3.6
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+DISTNAME=	FreeOCL-${PORTVERSION}-src
+
+MAINTAINER=	ohartman@zedat.fu-berlin.de
+COMMENT=	Free Open Computing Language (OpenCL) implementation for CPU
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:${PORTSDIR}/devel/libatomic_ops \
+		${LOCALBASE}/include/CL/opencl.h:${PORTSDIR}/devel/opencl
+
+LICENSE=	LGPL3
+
+WRKSRC=		${WRKDIR}/FreeOCL-${PORTVERSION}-Source
+
+#CONFLICTS=	pocl-*
+
+USE_GCC=	4.6+
+USES=		cmake
+USE_LDCONFIG=	yes
+CMAKE_BUILD_TYPE=Release
+
+post-patch:
+	${REINPLACE_CMD} -e 's:%%PREFIX%%:${PREFIX}:g' ${WRKSRC}/src/icd/icd_loader.cpp \
+		${WRKSRC}/CMakeLists.txt
+
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 800000
+BROKEN=		this port does not compile at 7.x: "src/program.cpp:531:37: error: 'RTLD_NOLOAD' was not declared in this scope"
+.endif
+.include <bsd.port.post.mk>
diff -Nur freeocl/.svn/pristine/91/91898ed8d83044494f456b84f6618a0d6e58f9b7.svn-base freeocl.trunk/.svn/pristine/91/91898ed8d83044494f456b84f6618a0d6e58f9b7.svn-base
--- freeocl/.svn/pristine/91/91898ed8d83044494f456b84f6618a0d6e58f9b7.svn-base	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/.svn/pristine/91/91898ed8d83044494f456b84f6618a0d6e58f9b7.svn-base	2013-06-01 20:18:27.000000000 +0200
@@ -0,0 +1,13 @@
+FreeOCL - a free OpenCL implementation for CPU
+Copyright (C) 2011  Roland Brochard
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+You should have received a copy of the GNU Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>;
diff -Nur freeocl/.svn/pristine/a4/a4dd71d255aac5f62a71e08ec726cf2d86babcbd.svn-base freeocl.trunk/.svn/pristine/a4/a4dd71d255aac5f62a71e08ec726cf2d86babcbd.svn-base
--- freeocl/.svn/pristine/a4/a4dd71d255aac5f62a71e08ec726cf2d86babcbd.svn-base	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/.svn/pristine/a4/a4dd71d255aac5f62a71e08ec726cf2d86babcbd.svn-base	2013-06-01 20:18:27.000000000 +0200
@@ -0,0 +1,32 @@
+etc/OpenCL/vendors/freeocl.icd
+include/FreeOCL/asyncmemop.h
+include/FreeOCL/atomic.h
+include/FreeOCL/common.h
+include/FreeOCL/config.h
+include/FreeOCL/converters.h
+include/FreeOCL/geometric.h
+include/FreeOCL/image1d_array_t.h
+include/FreeOCL/image1d_buffer_t.h
+include/FreeOCL/image1d_t.h
+include/FreeOCL/image2d_array_t.h
+include/FreeOCL/image2d_t.h
+include/FreeOCL/image3d_t.h
+include/FreeOCL/imgreadwrite.h
+include/FreeOCL/integer.h
+include/FreeOCL/math.h
+include/FreeOCL/memfence.h
+include/FreeOCL/opencl_c.h
+include/FreeOCL/printf.h
+include/FreeOCL/relational.h
+include/FreeOCL/simdopts.h
+include/FreeOCL/sync.h
+include/FreeOCL/vectors.h
+include/FreeOCL/vloadstore.h
+include/FreeOCL/vmisc.h
+include/FreeOCL/workitem.h
+lib/libFreeOCL.so
+lib/libOpenCL.so
+lib/libOpenCL.so.1
+@dirrm include/FreeOCL
+@dirrm etc/OpenCL/vendors
+@dirrm etc/OpenCL
diff -Nur freeocl/.svn/pristine/af/afba76dbabfdf6d93296809431aabe22e3419ea0.svn-base freeocl.trunk/.svn/pristine/af/afba76dbabfdf6d93296809431aabe22e3419ea0.svn-base
--- freeocl/.svn/pristine/af/afba76dbabfdf6d93296809431aabe22e3419ea0.svn-base	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/.svn/pristine/af/afba76dbabfdf6d93296809431aabe22e3419ea0.svn-base	2013-06-01 20:55:47.000000000 +0200
@@ -0,0 +1,33 @@
+etc/OpenCL/vendors/freeocl.icd
+include/FreeOCL/asyncmemop.h
+include/FreeOCL/atomic.h
+include/FreeOCL/common.h
+include/FreeOCL/config.h
+include/FreeOCL/converters.h
+include/FreeOCL/geometric.h
+include/FreeOCL/image1d_array_t.h
+include/FreeOCL/image1d_buffer_t.h
+include/FreeOCL/image1d_t.h
+include/FreeOCL/image2d_array_t.h
+include/FreeOCL/image2d_t.h
+include/FreeOCL/image3d_t.h
+include/FreeOCL/imgreadwrite.h
+include/FreeOCL/integer.h
+include/FreeOCL/math.h
+include/FreeOCL/memfence.h
+include/FreeOCL/opencl_c.h
+include/FreeOCL/printf.h
+include/FreeOCL/relational.h
+include/FreeOCL/simdopts.h
+include/FreeOCL/sync.h
+include/FreeOCL/vectors.h
+include/FreeOCL/vloadstore.h
+include/FreeOCL/vmisc.h
+include/FreeOCL/workitem.h
+lib/libFreeOCL.so
+lib/libOpenCL.so
+lib/libOpenCL.so.1
+lib/libOpenCL.so.1
+@dirrm include/FreeOCL
+@dirrm etc/OpenCL/vendors
+@dirrm etc/OpenCL
diff -Nur freeocl/.svn/pristine/d1/d1cf0d4eb0d6bc9025ef2a675933976fd9fa59d1.svn-base freeocl.trunk/.svn/pristine/d1/d1cf0d4eb0d6bc9025ef2a675933976fd9fa59d1.svn-base
--- freeocl/.svn/pristine/d1/d1cf0d4eb0d6bc9025ef2a675933976fd9fa59d1.svn-base	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/.svn/pristine/d1/d1cf0d4eb0d6bc9025ef2a675933976fd9fa59d1.svn-base	2013-06-01 20:18:27.000000000 +0200
@@ -0,0 +1,2 @@
+SHA256 (FreeOCL-0.3.6-src.tar.gz) = d1eea6d6214781a67efee6b691f06407780fb51f8dd742a83324478a6cfb8f1a
+SIZE (FreeOCL-0.3.6-src.tar.gz) = 216517
diff -Nur freeocl/.svn/pristine/f6/f61f103e05858a06371f122dc68afdddb2922337.svn-base freeocl.trunk/.svn/pristine/f6/f61f103e05858a06371f122dc68afdddb2922337.svn-base
--- freeocl/.svn/pristine/f6/f61f103e05858a06371f122dc68afdddb2922337.svn-base	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/.svn/pristine/f6/f61f103e05858a06371f122dc68afdddb2922337.svn-base	2013-06-01 20:18:27.000000000 +0200
@@ -0,0 +1,19 @@
+--- CMakeLists.txt.orig	2012-09-02 19:00:41.000000000 +0200
++++ CMakeLists.txt	2013-05-18 21:41:36.907149619 +0200
+@@ -69,6 +69,7 @@
+ 
+ include_directories(.)
+ include_directories(include)
++include_directories(/usr/local/include)
+ include_directories(src)
+ link_libraries(${CMAKE_THREAD_LIBS_INIT})
+ find_library(LIBDL dl)
+@@ -83,7 +84,7 @@
+ add_subdirectory(samples)
+ add_subdirectory(src)
+ 
+-install(FILES icd/freeocl.icd DESTINATION /etc/OpenCL/vendors/)
++install(FILES icd/freeocl.icd DESTINATION etc/OpenCL/vendors/)
+ # OpenCL headers shouldn't be needed in the runtime package
+ # install(DIRECTORY include/CL/ DESTINATION include/CL/ FILES_MATCHING PATTERN "*.h")
+ install(DIRECTORY include/FreeOCL/ DESTINATION include/FreeOCL/ FILES_MATCHING PATTERN "*.h")
diff -Nur freeocl/.svn/pristine/f7/f796f164dbe194e88f37c4c5d5e93d0aac306e77.svn-base freeocl.trunk/.svn/pristine/f7/f796f164dbe194e88f37c4c5d5e93d0aac306e77.svn-base
--- freeocl/.svn/pristine/f7/f796f164dbe194e88f37c4c5d5e93d0aac306e77.svn-base	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/.svn/pristine/f7/f796f164dbe194e88f37c4c5d5e93d0aac306e77.svn-base	2013-06-01 20:18:27.000000000 +0200
@@ -0,0 +1 @@
+FreeOCL - a free OpenCL implementation for CPU
Files freeocl/.svn/wc.db and freeocl.trunk/.svn/wc.db differ
diff -Nur freeocl/Makefile freeocl.trunk/Makefile
--- freeocl/Makefile	2013-06-01 20:17:53.000000000 +0200
+++ freeocl.trunk/Makefile	2013-06-01 21:29:29.000000000 +0200
@@ -15,6 +15,8 @@
 
 LICENSE=	LGPL3
 
+CONFLICTS=	ocl-icd opencl-icd
+
 WRKSRC=		${WRKDIR}/FreeOCL-${PORTVERSION}-Source
 
 USE_GCC=	4.6+
@@ -24,7 +26,7 @@
 
 post-patch:
 	${REINPLACE_CMD} -e 's:%%PREFIX%%:${PREFIX}:g' ${WRKSRC}/src/icd/icd_loader.cpp \
-		${WRKSRC}/CMakeLists.txt
+		${WRKSRC}/CMakeLists.txt ${WRKSRC}/INSTALL
 
 .include <bsd.port.pre.mk>
 .if ${OSVERSION} < 800000
diff -Nur freeocl/files/patch-CMakeLists.txt freeocl.trunk/files/patch-CMakeLists.txt
--- freeocl/files/patch-CMakeLists.txt	2013-06-01 20:17:53.000000000 +0200
+++ freeocl.trunk/files/patch-CMakeLists.txt	2013-06-01 20:18:27.000000000 +0200
@@ -1,11 +1,19 @@
---- CMakeLists.txt.orig	2012-09-22 12:55:02.000000000 +0400
-+++ CMakeLists.txt	2012-09-22 12:55:27.000000000 +0400
-@@ -83,7 +83,7 @@ endif(LIBRT)
+--- CMakeLists.txt.orig	2012-09-02 19:00:41.000000000 +0200
++++ CMakeLists.txt	2013-05-18 21:41:36.907149619 +0200
+@@ -69,6 +69,7 @@
+ 
+ include_directories(.)
+ include_directories(include)
++include_directories(/usr/local/include)
+ include_directories(src)
+ link_libraries(${CMAKE_THREAD_LIBS_INIT})
+ find_library(LIBDL dl)
+@@ -83,7 +84,7 @@
  add_subdirectory(samples)
  add_subdirectory(src)
  
 -install(FILES icd/freeocl.icd DESTINATION /etc/OpenCL/vendors/)
-+install(FILES icd/freeocl.icd DESTINATION %%PREFIX%%/etc/OpenCL/vendors/)
++install(FILES icd/freeocl.icd DESTINATION etc/OpenCL/vendors/)
  # OpenCL headers shouldn't be needed in the runtime package
  # install(DIRECTORY include/CL/ DESTINATION include/CL/ FILES_MATCHING PATTERN "*.h")
  install(DIRECTORY include/FreeOCL/ DESTINATION include/FreeOCL/ FILES_MATCHING PATTERN "*.h")
diff -Nur freeocl/files/patch-INSTALL freeocl.trunk/files/patch-INSTALL
--- freeocl/files/patch-INSTALL	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/files/patch-INSTALL	2013-06-01 21:02:48.000000000 +0200
@@ -0,0 +1,11 @@
+--- INSTALL.orig	2013-06-01 21:01:48.000000000 +0200
++++ INSTALL	2013-06-01 21:02:19.000000000 +0200
+@@ -20,7 +20,7 @@
+ When using "make install" or an autogenerated package, all files
+ should by installed properly (including FreeOCL headers and icd).
+ If you want to run FreeOCL without installing it you must copy
+-the icd file to /etc/OpenCL/vendors/ and make sure FreeOCL lib
++the icd file to %%PREFIX%%/etc/OpenCL/vendors/ and make sure FreeOCL lib
+ can be found by ld (alternatively you can edit the icd file and
+ give an absolute path to libFreeOCL.so). FreeOCL headers must be
+ in a compiler default path otherwise they won't be found when
diff -Nur freeocl/files/patch-src-device.cpp freeocl.trunk/files/patch-src-device.cpp
--- freeocl/files/patch-src-device.cpp	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/files/patch-src-device.cpp	2013-06-01 20:18:27.000000000 +0200
@@ -0,0 +1,14 @@
+--- src/device.cpp.orig	2013-05-18 20:12:03.000000000 +0200
++++ src/device.cpp	2013-05-18 20:13:30.000000000 +0200
+@@ -345,7 +345,11 @@
+ 
+ 	pool = new FreeOCL::threadpool();
+ 
++#ifdef	__FreeBSD__
++	std::string ostype = trim(run_command("/sbin/sysctl -e kern.ostype | awk '{ print $NF }'"));
++#else
+ 	std::string ostype = trim(run_command("/sbin/sysctl -e kernel.ostype | awk '{ print $NF }'"));
++#endif
+ 	if (ostype.empty())
+ 		ostype = trim(run_command("/sbin/sysctl -e kern.ostype | awk '{ print $NF }'"));
+ 	if (ostype.empty())
diff -Nur freeocl/files/patch-src-icd-icd_loader.cpp freeocl.trunk/files/patch-src-icd-icd_loader.cpp
--- freeocl/files/patch-src-icd-icd_loader.cpp	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/files/patch-src-icd-icd_loader.cpp	2013-06-01 20:54:24.000000000 +0200
@@ -0,0 +1,13 @@
+--- src/icd/icd_loader.cpp.orig	2012-09-22 13:14:12.000000000 +0400
++++ src/icd/icd_loader.cpp	2012-09-22 13:15:03.000000000 +0400
+@@ -53,8 +53,8 @@ namespace FreeOCL
+ 
+ 	icd_loader::icd_loader()
+ 	{
+-		// Get the list of all *.icd files in /etc/OpenCL/vendors/
+-		const std::deque<std::string> &files = list_files("/etc/OpenCL/vendors/", ".icd");
++		// Get the list of all *.icd files in %%PREFIX%%/etc/OpenCL/vendors/
++		const std::deque<std::string> &files = list_files("%%PREFIX%%/etc/OpenCL/vendors/", ".icd");
+ 		// For each file
+ 		for(std::deque<std::string>::const_iterator i = files.begin() ; i != files.end() ; ++i)
+ 		{
diff -Nur freeocl/files/patch-src-parser-parser.h freeocl.trunk/files/patch-src-parser-parser.h
--- freeocl/files/patch-src-parser-parser.h	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/files/patch-src-parser-parser.h	2013-06-01 20:18:27.000000000 +0200
@@ -0,0 +1,11 @@
+--- src/parser/parser.h.orig	2013-05-18 20:29:20.184081422 +0200
++++ src/parser/parser.h	2013-05-18 20:29:39.327297281 +0200
+@@ -115,7 +115,7 @@
+ 		inline std::istream &get(char &c)
+ 		{
+ 			c = 0;
+-			const bool ok = in.get(c);
++			const bool ok = (bool) in.get(c);
+ 			if (c == '\n')
+ 				++line;
+ 			if (!current_line.empty() && *current_line.rbegin() == '\n')
diff -Nur freeocl/files/patch-src_icd_icd_loader.cpp freeocl.trunk/files/patch-src_icd_icd_loader.cpp
--- freeocl/files/patch-src_icd_icd_loader.cpp	2013-06-01 20:17:53.000000000 +0200
+++ freeocl.trunk/files/patch-src_icd_icd_loader.cpp	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
---- src/icd/icd_loader.cpp.orig	2012-09-22 13:14:12.000000000 +0400
-+++ src/icd/icd_loader.cpp	2012-09-22 13:15:03.000000000 +0400
-@@ -53,8 +53,8 @@ namespace FreeOCL
- 
- 	icd_loader::icd_loader()
- 	{
--		// Get the list of all *.icd files in /etc/OpenCL/vendors/
--		const std::deque<std::string> &files = list_files("/etc/OpenCL/vendors/", ".icd");
-+		// Get the list of all *.icd files in %%PREFIX%%/etc/OpenCL/vendors/
-+		const std::deque<std::string> &files = list_files("%%PREFIX%%/etc/OpenCL/vendors/", ".icd");
- 		// For each file
- 		for(std::deque<std::string>::const_iterator i = files.begin() ; i != files.end() ; ++i)
- 		{
diff -Nur freeocl/pkg-message freeocl.trunk/pkg-message
--- freeocl/pkg-message	1970-01-01 01:00:00.000000000 +0100
+++ freeocl.trunk/pkg-message	2013-06-01 20:18:27.000000000 +0200
@@ -0,0 +1,13 @@
+FreeOCL - a free OpenCL implementation for CPU
+Copyright (C) 2011  Roland Brochard
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+You should have received a copy of the GNU Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>;


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306011949.r51JnaAs009170>