From nobody Sun Oct 9 19:43:31 2022 X-Original-To: dev-commits-ports-all@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 4Mlssv3Hhkz4fNpn; Sun, 9 Oct 2022 19:43:31 +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 4Mlssv2ntLz3MlQ; Sun, 9 Oct 2022 19:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665344611; 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=Q7hRZjQDZzK0ElsublpN7HKSyCYXiUC2r99WIfWch5I=; b=mo+8i8f6U+0cfHe93Gdjf4Gl4U+ZvrTQu0Ac8Bb+gYW5TQ8WcjFp2htqmf1ulBba72XxUK aG2UWOWgpyrDvyRu/Of+dhRlipOSCcBP42BBMz8W1N6sNrNRPiY/7uHUp84Ju0PG8wttvD WjvnI1SEc2CLkDVxzNAxmqnkdr4zIBzgCFAXfdXQwssaI7YmoBOkJBFv4+L87POAH6o007 M7OuP9WFh3RPQef53lunRoDSW75NPd0ERkw9zBGifmoistHGjuxxOJTsVW2zpZc5vdn5NE GPAOHYSdAkWEVe0hKFHRClznNRH7mltBsBaXEYi3qfeGIUGWbZBJOrX0eEcnuQ== 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 4Mlssv1rY7zNVC; Sun, 9 Oct 2022 19:43:31 +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 299JhVEn055874; Sun, 9 Oct 2022 19:43:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 299JhVuI055873; Sun, 9 Oct 2022 19:43:31 GMT (envelope-from git) Date: Sun, 9 Oct 2022 19:43:31 GMT Message-Id: <202210091943.299JhVuI055873@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: 161039e32b88 - main - graphics/opensubdiv: update to 3.5.0 release tag (+) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 161039e32b880280cc0fb7b478bfc2a0181ba8fc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665344611; 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=Q7hRZjQDZzK0ElsublpN7HKSyCYXiUC2r99WIfWch5I=; b=c4gq41sapl1I89aPEVZlqO3E9R5dZocVhd0nW8gRjJwSXJw0pGUg3kUzlY20JHV3Bpef7M g7TE8IbZBDETF5kaRH6BKp6wmRe7o1o187x0F9RIt9iJOgvg5H+bI5SnEgopx4YqjY2o2v b8dhF7O9BOluc0p8nuB1FSKCrq8Ys8w7+Ii3HnRkDnesoWLSF1pT/5jK7271VF4+H9p758 6htDWvaiDn6Og203trGixswu1NlsRj9i+o7bFuBYpT5iko35WlviFqBpeAbuTJ8Rm1XkKx fOrNDeEkO5sTpQ6CUGIgqknVoPjRKIBfBjyO+cQBamGXBCA5024R2vBpt69+cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665344611; a=rsa-sha256; cv=none; b=FGk2cQfeiRAOoZgnGLP/kG1zNy9deGqrZ5m36xOmX4GcIElEL1bsdZ/r+FjzHHOMFmip4T 680255WJFdYSyOeznYk/LYaEBKvX7Ilf4zqkuLvd4poczYstepWmS5b/gJxVbHpPpgQaI4 FRSHllUrx1FUxiJ9hLShKmpK94jERdCF1CpFko/Wrc7aMxw5t5zHcnyAimcA+nnfAtCfZC Y1Q3dy0MiUUg8DyL0rA4fx+wj/t0R5ANa7BhwevBsgEB5Gy0oa8hBmbExgQZLItskFYF9P sm3YE4er6l0pYuxfOusoAT565ltSjTmwmW8r4nc6BuNQy3r5IWPLD4SJ8DCHQg== 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=161039e32b880280cc0fb7b478bfc2a0181ba8fc commit 161039e32b880280cc0fb7b478bfc2a0181ba8fc Author: Dima Panov AuthorDate: 2022-10-09 19:30:00 +0000 Commit: Dima Panov CommitDate: 2022-10-09 19:30:00 +0000 graphics/opensubdiv: update to 3.5.0 release tag (+) NOTE: EXAMPLES option is broken yet (OFF by default) Changelog: https://graphics.pixar.com/opensubdiv/docs/release_notes.html#release-3-5-0-sep-2022 Approved by: maintainer (implicit) --- graphics/opensubdiv/Makefile | 10 +-- graphics/opensubdiv/distinfo | 6 +- .../files/patch-documentation_processHtml.py | 83 ---------------------- .../files/patch-documentation_processTutorials.py | 29 -------- graphics/opensubdiv/pkg-plist | 16 ++++- 5 files changed, 23 insertions(+), 121 deletions(-) diff --git a/graphics/opensubdiv/Makefile b/graphics/opensubdiv/Makefile index 3ebc3b204798..beeada4c14f8 100644 --- a/graphics/opensubdiv/Makefile +++ b/graphics/opensubdiv/Makefile @@ -1,7 +1,6 @@ PORTNAME= opensubdiv DISTVERSIONPREFIX= v -DISTVERSION= 3_4_4 -PORTREVISION= 2 +DISTVERSION= 3_5_0 CATEGORIES?= graphics MAINTAINER= FreeBSD@Shaneware.biz @@ -11,7 +10,7 @@ WWW= https://graphics.pixar.com/opensubdiv LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= glfw>2.7.0:graphics/glfw +BUILD_DEPENDS= glfw>3.0.0:graphics/glfw USES= cmake gl @@ -19,9 +18,9 @@ USE_GITHUB= yes GH_ACCOUNT= PixarAnimationStudios GH_PROJECT= OpenSubdiv -USE_GL= gl glu glew +USE_GL= egl gl glu glew USE_LDCONFIG= yes -CMAKE_ON= NO_CUDA NO_DX NO_OMP +CMAKE_ON= NO_CLEW NO_CUDA NO_DX OPTIONS_DEFINE= DOCS EXAMPLES OPENCL PTEX TBB TEST TUTORIALS OPTIONS_DEFAULT= TBB @@ -33,6 +32,7 @@ DOCS_BUILD_DEPENDS= rst2html.py:textproc/py-docutils \ DOCS_USES= python:build DOCS_PORTDOCS= * +EXAMPLES_BROKEN= ld: error: undefined symbol: glXGetCurrentContext EXAMPLES_CMAKE_BOOL_OFF= NO_EXAMPLES EXAMPLES_USES= xorg EXAMPLES_USE= xorg=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm diff --git a/graphics/opensubdiv/distinfo b/graphics/opensubdiv/distinfo index c3ef78ae2fca..1fe4346efc27 100644 --- a/graphics/opensubdiv/distinfo +++ b/graphics/opensubdiv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1620802135 -SHA256 (PixarAnimationStudios-OpenSubdiv-v3_4_4_GH0.tar.gz) = 20d49f80a2b778ad4d01f091ad88d8c2f91cf6c7363940c6213241ce6f1048fb -SIZE (PixarAnimationStudios-OpenSubdiv-v3_4_4_GH0.tar.gz) = 39228037 +TIMESTAMP = 1665071456 +SHA256 (PixarAnimationStudios-OpenSubdiv-v3_5_0_GH0.tar.gz) = 8f5044f453b94162755131f77c08069004f25306fd6dc2192b6d49889efb8095 +SIZE (PixarAnimationStudios-OpenSubdiv-v3_5_0_GH0.tar.gz) = 40740801 diff --git a/graphics/opensubdiv/files/patch-documentation_processHtml.py b/graphics/opensubdiv/files/patch-documentation_processHtml.py deleted file mode 100644 index db6d0f742171..000000000000 --- a/graphics/opensubdiv/files/patch-documentation_processHtml.py +++ /dev/null @@ -1,83 +0,0 @@ ---- documentation/processHtml.py.orig 2018-07-18 02:17:49 UTC -+++ documentation/processHtml.py -@@ -25,9 +25,11 @@ - - import os - import sys --import string - import re --import HTMLParser -+try: -+ import HTMLParser -+except: -+ import html.parser as HTMLParser - - class HtmlToTextParser(HTMLParser.HTMLParser): - def __init__(self): -@@ -89,10 +91,10 @@ def ReadNavigationTemplate( filePath ): - try: - navFile = open( filePath, "r") - except IOError: -- print "Could not open file \'"+filePath+"\'" -+ print("Could not open file \'"+filePath+"\'") - - with navFile: -- print "Navigation template: \'"+filePath+"\'" -+ print("Navigation template: \'"+filePath+"\'") - navHtml = navFile.read() - navHtml = StripHTMLComments(navHtml) - navFile.close() -@@ -109,7 +111,7 @@ def WriteIndexFile( outputFile, content ): - except: - pass - -- print "Creating Search-Index File : \""+outputFile+"\"" -+ print("Creating Search-Index File : \""+outputFile+"\"") - - f = open(outputFile, "w") - f.write(content) -@@ -117,7 +119,7 @@ def WriteIndexFile( outputFile, content ): - - #------------------------------------------------------------------------------- - def Usage(): -- print str(sys.argv[0])+" " -+ print(str(sys.argv[0])+" ") - exit(1); - - -@@ -132,7 +134,7 @@ navTemplate = str(sys.argv[2]) - - navHtml = ReadNavigationTemplate( navTemplate ) - --print "Scanning : \'"+rootDir+"\'" -+print("Scanning : \'"+rootDir+"\'") - - searchIndex = 'var tipuesearch = { "pages": [ ' - -@@ -172,22 +174,22 @@ for root, dirs, files in os.walk(rootDir): - - # if necessary, insert navigation html - if (not parser.HasNavigationSection()): -- loc = string.find(html,"") -+ loc = html.find("") - html = html[:loc+6] + navHtml + html[loc+6:] - - msg += "added navigation" - - # replace the article title placeholder with the real title - if title: -- html = string.replace(html,"OSD_ARTICLE_TITLE", title) -+ html = html.replace("OSD_ARTICLE_TITLE", title) - else: -- html = string.replace(html,"OSD_ARTICLE_TITLE", "") -+ html = html.replace("OSD_ARTICLE_TITLE", "") - - f.seek(0) - f.write(html) - f.close() - -- print msg -+ print(msg) - - searchIndex = searchIndex + "]};" - diff --git a/graphics/opensubdiv/files/patch-documentation_processTutorials.py b/graphics/opensubdiv/files/patch-documentation_processTutorials.py deleted file mode 100644 index dff628e399ca..000000000000 --- a/graphics/opensubdiv/files/patch-documentation_processTutorials.py +++ /dev/null @@ -1,29 +0,0 @@ ---- documentation/processTutorials.py.orig 2019-01-13 21:35:49 UTC -+++ documentation/processTutorials.py -@@ -33,7 +33,7 @@ def ReadFile(inputfile): - try: - f = open( inputfile, "r") - except IOError: -- print "Could not read file \'"+inputfile+"\'" -+ print("Could not read file \'"+inputfile+"\'") - content = f.read() - f.close() - return content -@@ -48,7 +48,7 @@ def WriteToFile(outputfile, content): - try: - f = open(outputfile, "w") - except IOError: -- print "Could not write file \'"+outputfile+"\'" -+ print("Could not write file \'"+outputfile+"\'") - f.write(content) - f.close() - -@@ -85,7 +85,7 @@ def Process(srcfile, title): - - #------------------------------------------------------------------------------- - def Usage(): -- print str(sys.argv[0])+" " -+ print(str(sys.argv[0])+" <input file> <output file> <title>") - exit(1); - - diff --git a/graphics/opensubdiv/pkg-plist b/graphics/opensubdiv/pkg-plist index 9fddf0383485..9fb8e05a77b1 100644 --- a/graphics/opensubdiv/pkg-plist +++ b/graphics/opensubdiv/pkg-plist @@ -1,4 +1,14 @@ -bin/stringify +include/opensubdiv/bfr/irregularPatchType.h +include/opensubdiv/bfr/limits.h +include/opensubdiv/bfr/parameterization.h +include/opensubdiv/bfr/refinerSurfaceFactory.h +include/opensubdiv/bfr/surface.h +include/opensubdiv/bfr/surfaceData.h +include/opensubdiv/bfr/surfaceFactory.h +include/opensubdiv/bfr/surfaceFactoryCache.h +include/opensubdiv/bfr/surfaceFactoryMeshAdapter.h +include/opensubdiv/bfr/tessellation.h +include/opensubdiv/bfr/vertexDescriptor.h include/opensubdiv/far/error.h include/opensubdiv/far/patchDescriptor.h include/opensubdiv/far/patchMap.h @@ -73,6 +83,10 @@ include/opensubdiv/vtr/refinement.h include/opensubdiv/vtr/sparseSelector.h include/opensubdiv/vtr/stackBuffer.h include/opensubdiv/vtr/types.h +lib/cmake/OpenSubdiv/OpenSubdivConfig.cmake +lib/cmake/OpenSubdiv/OpenSubdivConfigVersion.cmake +lib/cmake/OpenSubdiv/OpenSubdivTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/OpenSubdiv/OpenSubdivTargets.cmake lib/libosdCPU.a lib/libosdCPU.so lib/libosdCPU.so.%%LIBVERS%%