Index: lang/beignet/Makefile =================================================================== --- lang/beignet/Makefile +++ lang/beignet/Makefile @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= beignet -PORTVERSION= 1.3.1 -PORTREVISION= 1 -DISTVERSIONSUFFIX= -source +DISTVERSIONPREFIX= Release_v +DISTVERSION= 1.3.1-218 +DISTVERSIONSUFFIX= -gd6193320 CATEGORIES= lang -MASTER_SITES= https://01.org/sites/default/files/ MAINTAINER= x11@FreeBSD.org COMMENT= OpenCL library for Intel GPUs @@ -21,7 +20,8 @@ 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 @@ -29,7 +29,7 @@ USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME} SHEBANG_FILES= src/git_sha1.sh backend/kernels/compile.sh ALL_TARGET= all -LLVMVER= ${MESA_LLVM_VER:U39} +LLVMVER= ${MESA_LLVM_VER:U40} CMAKE_ARGS+= -DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config${LLVMVER} @@ -48,8 +48,11 @@ @${REINPLACE_CMD} -e 's|llvm-dis|llvm-dis${LLVMVER}|g; \ s|clang |clang${LLVMVER} |g' \ ${WRKSRC}/backend/kernels/compile.sh +# BSD mkdir(1) doesn't support -p flag after arguments + @${REINPLACE_CMD} -e 's/\(mkdir\)\(.*\)\( -p\)/\1\3\2/' \ + ${WRKSRC}/utests/CMakeLists.txt -# 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; ) Index: lang/beignet/distinfo =================================================================== --- lang/beignet/distinfo +++ 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 = 1499855384 +SHA256 (intel-beignet-Release_v1.3.1-218-gd6193320_GH0.tar.gz) = 717eb495007dff537885973bfb21bf8ebed27cc72e2f05e3bd7bf83779205754 +SIZE (intel-beignet-Release_v1.3.1-218-gd6193320_GH0.tar.gz) = 1155785 Index: lang/beignet/files/patch-backend_src_backend_gen__insn__selection__optimize.cpp =================================================================== --- /dev/null +++ lang/beignet/files/patch-backend_src_backend_gen__insn__selection__optimize.cpp @@ -0,0 +1,40 @@ +backend/src/backend/gen_insn_selection_optimize.cpp:462:22: error: call to 'abs' is ambiguous + s0 = abs(s0); + ^~~ +/usr/include/stdlib.h:85:6: note: candidate function +int abs(int) __pure2; + ^ +/usr/include/c++/v1/stdlib.h:115:44: note: candidate function +inline _LIBCPP_INLINE_VISIBILITY long abs( long __x) _NOEXCEPT {return labs(__x);} + ^ +/usr/include/c++/v1/stdlib.h:117:44: note: candidate function +inline _LIBCPP_INLINE_VISIBILITY long long abs(long long __x) _NOEXCEPT {return llabs(__x);} + ^ +/usr/include/c++/v1/math.h:640:1: note: candidate function +abs(float __lcpp_x) _NOEXCEPT {return fabsf(__lcpp_x);} +^ +/usr/include/c++/v1/math.h:644:1: note: candidate function +abs(double __lcpp_x) _NOEXCEPT {return fabs(__lcpp_x);} +^ +/usr/include/c++/v1/math.h:648:1: note: candidate function +abs(long double __lcpp_x) _NOEXCEPT {return fabsl(__lcpp_x);} +^ + +--- backend/src/backend/gen_insn_selection_optimize.cpp.orig 2017-06-23 08:05:54 UTC ++++ backend/src/backend/gen_insn_selection_optimize.cpp +@@ -459,13 +459,13 @@ namespace gbe + { + unsigned int s0 = src0.value.ud; + if (src0.absolute) +- s0 = abs(s0); ++ s0 = s0; + if (src0.negation) + s0 = -s0; + + unsigned int s1 = src1.value.ud; + if (src1.absolute) +- s1 = abs(s1); ++ s1 = s1; + if (src1.negation) + s1 = -s1; + Index: lang/beignet/files/patch-utests_image__planar__yuv.cpp =================================================================== --- /dev/null +++ lang/beignet/files/patch-utests_image__planar__yuv.cpp @@ -0,0 +1,24 @@ +--- utests/image_planar_yuv.cpp.orig 2017-06-23 08:05:54 UTC ++++ utests/image_planar_yuv.cpp +@@ -1,6 +1,6 @@ + #include + #include "utest_helper.hpp" +-#include ++#include + #include + + static void image_planar_yuv(void) +@@ -28,10 +28,9 @@ static void image_planar_yuv(void) + uint8_t* src_data; + uint8_t* yplane_data; + uint8_t* uvplane_data; +- src_data = (uint8_t*)memalign(base_address_alignment, buffer_sz); +- yplane_data = (uint8_t*)memalign(base_address_alignment, yplane_sz); +- uvplane_data = (uint8_t*)memalign(base_address_alignment, uvplane_sz); +- if (!src_data || !yplane_data || !uvplane_data) { ++ if (posix_memalign((void **)&src_data, base_address_alignment, buffer_sz) || ++ posix_memalign((void **)&yplane_data, base_address_alignment, yplane_sz) || ++ posix_memalign((void **)&uvplane_data, base_address_alignment, uvplane_sz)) { + fprintf(stderr, "run out of memory\n"); + return; + } Index: lang/beignet/pkg-plist =================================================================== --- lang/beignet/pkg-plist +++ lang/beignet/pkg-plist @@ -18,6 +18,7 @@ lib/beignet/include/ocl_integer.h lib/beignet/include/ocl_math.h lib/beignet/include/ocl_math_20.h +lib/beignet/include/ocl_math_common.h lib/beignet/include/ocl_memcpy.h lib/beignet/include/ocl_memset.h lib/beignet/include/ocl_misc.h @@ -34,3 +35,4 @@ lib/beignet/libcl.so lib/beignet/libgbe.so lib/beignet/libgbeinterp.so +share/metainfo/com.intel.beignet.metainfo.xml