From nobody Wed Oct 19 16:06:00 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MswZJ5nvsz4gJDC; Wed, 19 Oct 2022 16:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MswZJ5Hxjz3YBJ; Wed, 19 Oct 2022 16:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666195560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YYh+5/DnY/nQepH4R4GJBwJcxqhnkPKEsbw8xEuKShI=; b=GqXe+SAQbA1TYf3LCERroYY22F6/g93+HxYuJvloiIfxBRpOTkq6wTQsHVtUfIf6qvCOpK kjuS3ofXzn2sn7I5XO4xvWaeup6hfbCUvcl6FzyQQ4u3/gJBLOZO8WKvDDtRg1TslHhD07 bOlziQ1XToPikZWtLH8C17xtnVz5US2Pn1ez2FUngICI4Zf2T9+CHU/Vk9Geey6dLzx0MB WuIrFmeZoWkYcTWjgbpClPX13Z5CeQOd4jOIdX7eZBeRB9LSBprY0XXkC7Tq2zC+nbRSrL Fzogl0P4XRGJNJwyeSy00D70KB3OOtYwuTorgA1sEro1v8gOds+VaBR+uB3F6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MswZJ4Lj3zb2h; Wed, 19 Oct 2022 16:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29JG60Kr073352; Wed, 19 Oct 2022 16:06:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29JG607M073351; Wed, 19 Oct 2022 16:06:00 GMT (envelope-from git) Date: Wed, 19 Oct 2022 16:06:00 GMT Message-Id: <202210191606.29JG607M073351@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 77a55dca0e97 - main - graphics/opensubdiv: pet OpenMP handling (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77a55dca0e97b714e3cf768945031732284664ac Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666195560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YYh+5/DnY/nQepH4R4GJBwJcxqhnkPKEsbw8xEuKShI=; b=LeT0u4MkEb+o3NyOaDUN+oH/MW5K6o+Pn4vUZxCSDeJ50YqtjZAC2w7UmPLC0dZIe7Kjqs LmJwcOqx9I9x6toq3csJROhxOkVttUTI2RUsc2EZSjQRj0inMDbY8HScouLK6R495zdWXo h+/oOjCC8WZVsfdezsIjO4TaLQ155P2ukdmMPazfAUokumLuadrAFYXOdSQiBiqd2rvD19 KxdZE4FjGYC0kgrORqwoKnCUxBr/xBgQgm8ilp3dQGrQmU5aTOezfJwGqvhCaaMRxyBolG ZS7J8Ndc0VS/hwcVdSGPOK3tdep26nkMuOuusNM6okdzmFwAiz4yK6id5O4mlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666195560; a=rsa-sha256; cv=none; b=jbR11sVzzUETjjF4Hf9W0w3LYDwwCcPKAD5kl35d+fzdlaKcH5t0tnJDxzZzIgeik2uHBB FXpWQW4XQrFx8Qrqg+MJtHC4yRmCQ0HzwdmeorKXEg2pvINXL8SWvSEt29M0V2wuFi7OKd 46/JiD1KGlGUgvs8/mlvdR2/jUv8V2RH4nEnfrGMxP9WdLknACKMOLjBNzYNUJBnKVtz4Y AF8kxYhqivYbRGh6yzGZNzAYoos/HSqWAP5AfnP80IZWX3VRuKOICoJddIZ6BunBDSREY0 Xz5/N+VsG4jgauP51ij3gvkzxiDDtx+0I+55+5QZ8ObXeVVexjHkPWIadn3ZiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=77a55dca0e97b714e3cf768945031732284664ac commit 77a55dca0e97b714e3cf768945031732284664ac Author: Dima Panov AuthorDate: 2022-10-19 15:56:56 +0000 Commit: Dima Panov CommitDate: 2022-10-19 16:05:01 +0000 graphics/opensubdiv: pet OpenMP handling (+) Make OpenMP suppport OPTIONal Add patches to pass OpenMP flags to consumers if enabled [1] Mark OPENCL option as prevented to build examples Bump PORTREVISION to force rebuild consumers with new flags Submitted by: Tatsuki Makino via ports ml Approved by: maintainer (implicit) --- graphics/opensubdiv/Makefile | 10 ++++++++-- .../files/patch-opensubdiv_CMakeLists.txt | 11 +++++++++++ .../files/patch-opensubdiv_osd_CMakeLists.txt | 22 ++++++++++++++++++++++ .../files/patch-regression_CMakeLists.txt | 6 +++--- 4 files changed, 44 insertions(+), 5 deletions(-) diff --git a/graphics/opensubdiv/Makefile b/graphics/opensubdiv/Makefile index beeada4c14f8..a299dd239333 100644 --- a/graphics/opensubdiv/Makefile +++ b/graphics/opensubdiv/Makefile @@ -1,6 +1,7 @@ PORTNAME= opensubdiv DISTVERSIONPREFIX= v DISTVERSION= 3_5_0 +PORTREVISION= 1 CATEGORIES?= graphics MAINTAINER= FreeBSD@Shaneware.biz @@ -22,8 +23,9 @@ USE_GL= egl gl glu glew USE_LDCONFIG= yes CMAKE_ON= NO_CLEW NO_CUDA NO_DX -OPTIONS_DEFINE= DOCS EXAMPLES OPENCL PTEX TBB TEST TUTORIALS +OPTIONS_DEFINE= DOCS EXAMPLES OPENCL OPENMP PTEX TBB TEST TUTORIALS OPTIONS_DEFAULT= TBB +#OPTIONS_EXCLUDE= EXAMPLES OPTIONS_SUB= yes DOCS_CMAKE_BOOL_OFF= NO_DOC @@ -32,7 +34,8 @@ DOCS_BUILD_DEPENDS= rst2html.py:textproc/py-docutils \ DOCS_USES= python:build DOCS_PORTDOCS= * -EXAMPLES_BROKEN= ld: error: undefined symbol: glXGetCurrentContext +#EXAMPLES_BROKEN= ld: error: undefined symbol: glXGetCurrentContext +#Examples cannot utilize the latest opencl headers EXAMPLES_CMAKE_BOOL_OFF= NO_EXAMPLES EXAMPLES_USES= xorg EXAMPLES_USE= xorg=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm @@ -42,6 +45,9 @@ OPENCL_CMAKE_BOOL_OFF= NO_OPENCL OPENCL_CFLAGS= -pthread OPENCL_BUILD_DEPENDS= ${LOCALBASE}/include/CL/cl.h:devel/opencl OPENCL_LIB_DEPENDS= libOpenCL.so:devel/ocl-icd +OPENCL_PREVENTS= EXAMPLES + +OPENMP_CMAKE_BOOL_OFF= NO_OMP PTEX_DESC= ptex support PTEX_CMAKE_BOOL_OFF= NO_PTEX diff --git a/graphics/opensubdiv/files/patch-opensubdiv_CMakeLists.txt b/graphics/opensubdiv/files/patch-opensubdiv_CMakeLists.txt new file mode 100644 index 000000000000..b47916caa6bb --- /dev/null +++ b/graphics/opensubdiv/files/patch-opensubdiv_CMakeLists.txt @@ -0,0 +1,11 @@ +--- opensubdiv/CMakeLists.txt.orig 2022-09-26 18:17:44 UTC ++++ opensubdiv/CMakeLists.txt +@@ -45,6 +45,8 @@ if (NOT NO_LIB) + if( OPENMP_FOUND ) + if (CMAKE_COMPILER_IS_GNUCXX) + list(APPEND PLATFORM_CPU_LIBRARIES gomp) ++ else() ++ list(APPEND PLATFORM_CPU_LIBRARIES OpenMP::OpenMP_CXX) + endif() + endif() + diff --git a/graphics/opensubdiv/files/patch-opensubdiv_osd_CMakeLists.txt b/graphics/opensubdiv/files/patch-opensubdiv_osd_CMakeLists.txt new file mode 100644 index 000000000000..8b02e0d7f6a0 --- /dev/null +++ b/graphics/opensubdiv/files/patch-opensubdiv_osd_CMakeLists.txt @@ -0,0 +1,22 @@ +--- opensubdiv/osd/CMakeLists.txt.orig 2022-09-26 18:17:44 UTC ++++ opensubdiv/osd/CMakeLists.txt +@@ -76,6 +76,8 @@ if(OPENMP_FOUND ) + + if (CMAKE_COMPILER_IS_GNUCXX) + list(APPEND PLATFORM_CPU_LIBRARIES gomp) ++ else() ++ list(APPEND PLATFORM_CPU_LIBRARIES OpenMP::OpenMP_CXX) + endif() + endif() + +@@ -96,10 +98,6 @@ if( TBB_FOUND ) + ) + + list(APPEND PUBLIC_HEADER_FILES ${TBB_PUBLIC_HEADERS}) +- +- if (CMAKE_COMPILER_IS_GNUCXX) +- list(APPEND PLATFORM_CPU_LIBRARIES gomp) +- endif() + + list(APPEND PLATFORM_CPU_LIBRARIES + ${TBB_LIBRARIES} diff --git a/graphics/opensubdiv/files/patch-regression_CMakeLists.txt b/graphics/opensubdiv/files/patch-regression_CMakeLists.txt index 903aa9619672..f43ec0abe32f 100644 --- a/graphics/opensubdiv/files/patch-regression_CMakeLists.txt +++ b/graphics/opensubdiv/files/patch-regression_CMakeLists.txt @@ -1,8 +1,8 @@ ---- regression/CMakeLists.txt.orig 2020-06-30 16:02:18 UTC +--- regression/CMakeLists.txt.orig 2022-09-26 18:17:44 UTC +++ regression/CMakeLists.txt -@@ -26,14 +26,16 @@ add_subdirectory(common) +@@ -28,14 +28,16 @@ if (NOT NO_REGRESSION) - if (NOT NO_REGRESSION) + add_subdirectory(bfr_evaluate) - add_subdirectory(hbr_regression) +# uses deprecated api