Index: head/lang/beignet/Makefile =================================================================== --- head/lang/beignet/Makefile (revision 451412) +++ head/lang/beignet/Makefile (revision 451413) @@ -1,67 +1,67 @@ # Created by: Koop Mast # $FreeBSD$ PORTNAME= beignet -PORTVERSION= 1.3.1 -PORTREVISION= 2 -DISTVERSIONSUFFIX= -source +DISTVERSIONPREFIX= Release_v +DISTVERSION= 1.3.1-52 +DISTVERSIONSUFFIX= -ga97fcb17 CATEGORIES= lang -MASTER_SITES= https://01.org/sites/default/files/ MAINTAINER= x11@FreeBSD.org COMMENT= OpenCL library for Intel GPUs LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= clang${LLVMVER}:devel/llvm${LLVMVER} \ opencl>=0:devel/opencl LIB_DEPENDS= libOpenCL.so:devel/ocl-icd \ libdrm.so:graphics/libdrm RUN_DEPENDS= opencl>=0:devel/opencl \ clang${LLVMVER}:devel/llvm${LLVMVER} -WRKSRC= ${WRKDIR}/Beignet-${PORTVERSION}-Source +USE_GITHUB= yes +GH_ACCOUNT= intel USES= cmake ncurses pkgconfig shebangfix USE_XORG= sm ice x11 xext xfixes USE_GL= gl egl USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME} SHEBANG_FILES= src/git_sha1.sh backend/kernels/compile.sh ALL_TARGET= all LLVMVER= ${MESA_LLVM_VER:U39} CMAKE_ARGS+= -DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config${LLVMVER} ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= Beignet needs a graphics driver supported by the Intel KMS driver OPTIONS_DEFINE= FP64 OCL20 TEST OPTIONS_DEFAULT= OCL20 OPTIONS_EXCLUDE_i386= OCL20 OPTIONS_SUB= yes FP64_DESC= Double precision (experimental) FP64_CMAKE_BOOL= EXPERIMENTAL_DOUBLE OCL20_DESC= OpenCL 2.0 support OCL20_CMAKE_BOOL= ENABLE_OPENCL_20 TEST_ALL_TARGET= flat_address_space utest_run post-patch: @${REINPLACE_CMD} -e 's|llvm-dis|llvm-dis${LLVMVER}|g; \ s|clang |clang${LLVMVER} |g' \ ${WRKSRC}/backend/kernels/compile.sh -# XXX bug 213732: compiler_fill_gl_image() [FAILED] +# XXX bug 213732: compiler_device_enqueue() Interrupt signal (SIGSEGV) received. do-test-TEST-on: -@(cd ${TEST_WRKSRC}/utests; . ./setenv.sh; \ ./flat_address_space; ./utest_run; ) pre-install-TEST-on: do-test-TEST-on post-install: @${RM} -r ${STAGEDIR}${PREFIX}/include/CL .include Index: head/lang/beignet/distinfo =================================================================== --- head/lang/beignet/distinfo (revision 451412) +++ head/lang/beignet/distinfo (revision 451413) @@ -1,3 +1,3 @@ -TIMESTAMP = 1489436686 -SHA256 (beignet-1.3.1-source.tar.gz) = 399b7bc64d674b3092683263f7c085c5592686b9d837817e77857248e5cb561f -SIZE (beignet-1.3.1-source.tar.gz) = 1136608 +TIMESTAMP = 1506070792 +SHA256 (intel-beignet-Release_v1.3.1-52-ga97fcb17_GH0.tar.gz) = 36ad538ac54cfbcaf8309a03b3187d6020b2977992a2cd40f4bd54f9c0b87f34 +SIZE (intel-beignet-Release_v1.3.1-52-ga97fcb17_GH0.tar.gz) = 1094243 Property changes on: head/lang/beignet/distinfo ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -1 \ No newline at end of property +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/beignet/files/patch-src_cl__program.c =================================================================== --- head/lang/beignet/files/patch-src_cl__program.c (revision 451412) +++ head/lang/beignet/files/patch-src_cl__program.c (nonexistent) @@ -1,13 +0,0 @@ ---- src/cl_program.c.orig 2017-09-22 08:59:52 UTC -+++ src/cl_program.c -@@ -861,9 +861,8 @@ cl_program_compile(cl_program p, - p->opaque = compiler_program_compile_from_source(p->ctx->devices[0]->device_id, p->source, temp_header_path, - p->build_log_max_sz, options, p->build_log, &p->build_log_sz); - -- char rm_path[255]="rm "; -+ char rm_path[255]="rm -rf "; - strncat(rm_path, temp_header_path, strlen(temp_header_path)); -- strncat(rm_path, " -rf", 4); - int temp = system(rm_path); - - if(temp){ Property changes on: head/lang/beignet/files/patch-src_cl__program.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lang/beignet/files/patch-utests_CMakeLists.txt =================================================================== --- head/lang/beignet/files/patch-utests_CMakeLists.txt (revision 451412) +++ head/lang/beignet/files/patch-utests_CMakeLists.txt (revision 451413) @@ -1,35 +1,17 @@ --- utests/CMakeLists.txt.orig 2017-01-20 10:40:51 UTC +++ utests/CMakeLists.txt -@@ -46,7 +46,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} - - - ##### Math Function Part: --EXECUTE_PROCESS(COMMAND mkdir generated -p WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) -+EXECUTE_PROCESS(COMMAND mkdir -p generated WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} utest_math_gen.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE GEN_MATH_STRING) - string(REGEX REPLACE " " ";" ADDMATHFUNC ${GEN_MATH_STRING}) - -@@ -332,12 +332,12 @@ list (GET GBE_BIN_GENERATER -1 GBE_BIN_FILE) +@@ -333,12 +333,12 @@ list (GET GBE_BIN_GENERATER -1 GBE_BIN_F if(GEN_PCI_ID) ADD_CUSTOM_COMMAND( OUTPUT ${kernel_bin}.bin - COMMAND ${GBE_BIN_GENERATER} ${kernel_bin}.cl -o${kernel_bin}.bin -t${GEN_PCI_ID} + COMMAND ${GBE_BIN_GENERATER} -o${kernel_bin}.bin -t${GEN_PCI_ID} ${kernel_bin}.cl DEPENDS ${GBE_BIN_FILE} ${kernel_bin}.cl) else(GEN_PCI_ID) ADD_CUSTOM_COMMAND( OUTPUT ${kernel_bin}.bin - COMMAND ${GBE_BIN_GENERATER} ${kernel_bin}.cl -o${kernel_bin}.bin + COMMAND ${GBE_BIN_GENERATER} -o${kernel_bin}.bin ${kernel_bin}.cl DEPENDS ${GBE_BIN_FILE} ${kernel_bin}.cl) endif(GEN_PCI_ID) -@@ -346,7 +346,7 @@ if (NOT_BUILD_STAND_ALONE_UTEST) - endif (NOT_BUILD_STAND_ALONE_UTEST) - - add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/generated -- COMMAND mkdir ${CMAKE_CURRENT_SOURCE_DIR}/generated -p -+ COMMAND mkdir -p ${CMAKE_CURRENT_SOURCE_DIR}/generated - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utest_math_gen.py > /dev/null 2>&1 - COMMAND echo ${KERNEL_GITIGNORE_LIST} |sed 's/ /\\n/g' > ${CMAKE_CURRENT_SOURCE_DIR}/../kernels/.gitignore - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}