diff options
author | jbeich <jbeich@FreeBSD.org> | 2017-10-07 06:05:14 +0800 |
---|---|---|
committer | jbeich <jbeich@FreeBSD.org> | 2017-10-07 06:05:14 +0800 |
commit | 8d5687330040aa4a6cfaef88c309ce213d497ebd (patch) | |
tree | cd6a1c595a86862175e18d80c30e2d9e2ea11d89 | |
parent | 5a3ff89ac7c847ff84b3fae0d7b6b39c19c25d5e (diff) | |
download | freebsd-ports-gnome-8d5687330040aa4a6cfaef88c309ce213d497ebd.tar.gz freebsd-ports-gnome-8d5687330040aa4a6cfaef88c309ce213d497ebd.tar.zst freebsd-ports-gnome-8d5687330040aa4a6cfaef88c309ce213d497ebd.zip |
lang/beignet: update to 1.3.1.52 (Release_v1.3 branch snapshot)
Changes: https://github.com/intel/beignet/compare/be0ae74...afd050f6
PR: 217635 218644
Approved by: maintainer timeout (2 months)
MFH: 2017Q2 (requires r437953), 2017Q3 (regression fix for r435144)
Differential Revision: https://reviews.freebsd.org/D11377
-rw-r--r-- | lang/beignet/Makefile | 12 | ||||
-rw-r--r-- | lang/beignet/distinfo | 6 | ||||
-rw-r--r-- | lang/beignet/files/patch-src_cl__program.c | 13 | ||||
-rw-r--r-- | lang/beignet/files/patch-utests_CMakeLists.txt | 20 |
4 files changed, 10 insertions, 41 deletions
diff --git a/lang/beignet/Makefile b/lang/beignet/Makefile index 30ac7b605798..6393f6d6ab22 100644 --- a/lang/beignet/Makefile +++ b/lang/beignet/Makefile @@ -2,11 +2,10 @@ # $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 @@ -21,7 +20,8 @@ LIB_DEPENDS= libOpenCL.so:devel/ocl-icd \ 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 @@ -54,7 +54,7 @@ post-patch: 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; ) diff --git a/lang/beignet/distinfo b/lang/beignet/distinfo index bfaca81c3d13..48927a0f4729 100644 --- a/lang/beignet/distinfo +++ b/lang/beignet/distinfo @@ -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 diff --git a/lang/beignet/files/patch-src_cl__program.c b/lang/beignet/files/patch-src_cl__program.c deleted file mode 100644 index 67514ced7dee..000000000000 --- a/lang/beignet/files/patch-src_cl__program.c +++ /dev/null @@ -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){ diff --git a/lang/beignet/files/patch-utests_CMakeLists.txt b/lang/beignet/files/patch-utests_CMakeLists.txt index 82e74a90f948..e3649c4adedd 100644 --- a/lang/beignet/files/patch-utests_CMakeLists.txt +++ b/lang/beignet/files/patch-utests_CMakeLists.txt @@ -1,15 +1,6 @@ --- 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 @@ -24,12 +15,3 @@ 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} |