Date: Thursday, September 29, 2022 @ 12:56:18 Author: svenstaro Revision: 1316070
upgpkg: opensubdiv 3.5.0-1 Modified: opensubdiv/trunk/PKGBUILD Deleted: opensubdiv/trunk/python3.patch ---------------+ PKGBUILD | 35 ++++++-------- python3.patch | 139 -------------------------------------------------------- 2 files changed, 15 insertions(+), 159 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-09-29 12:34:10 UTC (rev 1316069) +++ PKGBUILD 2022-09-29 12:56:18 UTC (rev 1316070) @@ -1,19 +1,17 @@ -# Maintainer: Sven-Hendrik Haase <[email protected]> +# Maintainer: Sven-Hendrik Haase <[email protected]> pkgname=opensubdiv -pkgver=3.4.4 -pkgrel=11 +pkgver=3.5.0 +pkgrel=1 pkgdesc="An Open-Source subdivision surface library" arch=(x86_64) url="http://graphics.pixar.com/opensubdiv"; license=('APACHE') -depends=('ptex' 'intel-tbb' 'libxcursor' 'xorg-xrandr' 'libxinerama') -makedepends=('cmake' 'doxygen' 'glfw' 'glew' 'python' 'python-pygments' 'python-docutils' 'opencl-headers' 'cuda') +depends=('ptex' 'intel-tbb' 'libxcursor' 'xorg-xrandr' 'libxinerama' 'libxi') +makedepends=('cmake' 'doxygen' 'glfw' 'glew' 'python' 'python-pygments' 'python-docutils' 'opencl-headers' 'cuda' 'libglvnd') source=("https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${pkgver//./_}.tar.gz"; - python3.patch cuda11.patch opensubdiv-tbb2021.patch::https://github.com/PixarAnimationStudios/OpenSubdiv/commit/9079a517.patch) -sha512sums=('fc8f28b79347015c8991150535c1339e695d96947c72fadd4fa27b546a0813c1125cd175ee03bed5aacdb3609f74c4e526ef70103d1195ba9f7df041e73ea9fb' - '10f1f63e07d59deb4d91ba04448bb360efff0e41202bb6737caffbce09ba244efb349fe25b24880420b80fdadb268aed84923464af0d66ee1a36e4ba8f96cfd5' +sha512sums=('7ede8f3f335a6306486d649199117401ab4285d360a3b53a536f25046d94741b5e7eacbc06a55d8a0bd5798c810c1b3cfd7964859f04f95363ad26411310b320' '9006762976c15a57d30607189d52d0e620b5024da478dcd41a79a88b350740144a88c1a4f455bfb1b79a9f605e0587c1c828a9b0813301acec8bbb516c2bb292' 'c65770d3e65a63c88aa1061e10c5dd6be8616a2479bd5f6d3928c97a5895cfa7d0aac455121db7ee610b9731bfbf07c3f8a26e9cd47623cd1baa046d9aa68cdf') options=(!lto) @@ -21,31 +19,28 @@ prepare() { cd "OpenSubdiv-${pkgver//./_}" - patch -Np1 -i "${srcdir}"/python3.patch patch -Np1 -i "${srcdir}"/cuda11.patch patch -Np1 -i "${srcdir}"/opensubdiv-tbb2021.patch # Support TBB 2021 - mkdir build } build() { - cd "OpenSubdiv-${pkgver//./_}"/build + cd "OpenSubdiv-${pkgver//./_}" - # wtf - mkdir -p CMakeFiles/osd_static_gpu.dir/osd - - cmake .. \ + cmake \ + -Bbuild \ + -DNO_EXAMPLES=ON \ + -DNO_REGRESSION=ON \ + -DNO_TUTORIALS=ON \ -DCMAKE_BUILD_TYPE=Release \ -DOSD_CUDA_NVCC_FLAGS='--gpu-architecture=compute_53' \ -DCUDA_HOST_COMPILER=/usr/bin/g++ \ -DCMAKE_INSTALL_PREFIX=/usr - make + make -C build } package() { - cd "OpenSubdiv-${pkgver//./_}"/build + cd "OpenSubdiv-${pkgver//./_}" - DESTDIR="$pkgdir/" make install - - rm -rf "${pkgdir}"/usr/bin + DESTDIR="$pkgdir/" make -C build install } Deleted: python3.patch =================================================================== --- python3.patch 2022-09-29 12:34:10 UTC (rev 1316069) +++ python3.patch 2022-09-29 12:56:18 UTC (rev 1316070) @@ -1,139 +0,0 @@ -diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt -index 32b12a3d..581159ca 100644 ---- a/documentation/CMakeLists.txt -+++ b/documentation/CMakeLists.txt -@@ -54,7 +54,7 @@ else() - - endif() - --find_package(PythonInterp 2.6) -+find_package(PythonInterp 3.8) - - # ReST - HTML documentation - if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND) -diff --git a/documentation/processHtml.py b/documentation/processHtml.py -index 1a81df59..5e610ea8 100755 ---- a/documentation/processHtml.py -+++ b/documentation/processHtml.py -@@ -25,9 +25,8 @@ - - import os - import sys --import string - import re --import HTMLParser -+import html.parser as HTMLParser - - class HtmlToTextParser(HTMLParser.HTMLParser): - def __init__(self): -@@ -89,10 +88,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 +108,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 +116,7 @@ def WriteIndexFile( outputFile, content ): - - #------------------------------------------------------------------------------- - def Usage(): -- print str(sys.argv[0])+" <input directory> <output directory> <html template>" -+ print(str(sys.argv[0])+" <input directory> <output directory> <html template>") - exit(1); - - -@@ -132,7 +131,7 @@ navTemplate = str(sys.argv[2]) - - navHtml = ReadNavigationTemplate( navTemplate ) - --print "Scanning : \'"+rootDir+"\'" -+print("Scanning : \'"+rootDir+"\'") - - searchIndex = 'var tipuesearch = { "pages": [ ' - -@@ -172,22 +171,22 @@ for root, dirs, files in os.walk(rootDir): - - # if necessary, insert navigation html - if (not parser.HasNavigationSection()): -- loc = string.find(html,"<body>") -+ loc = html.find("<body>") - 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/documentation/processTutorials.py b/documentation/processTutorials.py -index e6329152..30d3e714 100755 ---- a/documentation/processTutorials.py -+++ b/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])+" <input file> <output file> <title>" -+ print(str(sys.argv[0])+" <input file> <output file> <title>") - exit(1); - - -diff --git a/regression/far_regression/example_createMesh.py b/regression/far_regression/example_createMesh.py -index 86bfcb37..ba1c6cf7 100644 ---- a/regression/far_regression/example_createMesh.py -+++ b/regression/far_regression/example_createMesh.py -@@ -121,7 +121,7 @@ def readPolyFile(path): - for line in f.readlines(): - polys += line.rstrip() - except: -- print 'Cannot read '+str(path) -+ print('Cannot read '+str(path)) - - polys = eval(polys) -
