Date: Tuesday, August 17, 2021 @ 00:26:45 Author: svenstaro Revision: 1001098
archrelease: copy trunk to community-x86_64 Added: usd/repos/community-x86_64/PKGBUILD (from rev 1001097, usd/trunk/PKGBUILD) usd/repos/community-x86_64/demangle-fix.patch (from rev 1001097, usd/trunk/demangle-fix.patch) usd/repos/community-x86_64/gcc11.patch (from rev 1001097, usd/trunk/gcc11.patch) usd/repos/community-x86_64/pyside2-uic (from rev 1001097, usd/trunk/pyside2-uic) Deleted: usd/repos/community-x86_64/PKGBUILD usd/repos/community-x86_64/demangle-fix.patch usd/repos/community-x86_64/gcc11.patch usd/repos/community-x86_64/pyside2-uic --------------------+ PKGBUILD | 95 ++++++++++++++++++++++++--------------------------- demangle-fix.patch | 36 +++++++++---------- gcc11.patch | 24 ++++++------ pyside2-uic | 4 +- 4 files changed, 78 insertions(+), 81 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-08-17 00:26:32 UTC (rev 1001097) +++ PKGBUILD 2021-08-17 00:26:45 UTC (rev 1001098) @@ -1,49 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <svenst...@gmail.com> -# Contributor: bartus <arch-user-repoᘓbartus.33mail.com> -pkgname=usd -pkgver=21.05 -pkgrel=6 -pkgdesc="3D VFX pipeline interchange file format" -arch=('x86_64') -url="https://graphics.pixar.com/usd/docs/index.html" -license=('Apache') -depends=('boost-libs' 'glew' 'opensubdiv' 'python' 'pyside2' 'python-opengl' 'ptex') -makedepends=('boost' 'cmake' 'intel-tbb' 'ninja' 'qt5-base') -provides=("usd=${pkgver}") -source=("$pkgname-$pkgver.tar.gz::https://github.com/PixarAnimationStudios/USD/archive/v${pkgver}.tar.gz" - 'demangle-fix.patch' - 'gcc11.patch' - 'pyside2-uic') -sha256sums=('165d0e1e45385076121268eba0da2a0ba4a7e5c2b8eab9ab26fb2fcd81a1a478' - '99ea5fba92842d0215e5188662a066e0cc714ed4dea9c8663cb6239f6c1afbd0' - '663352c8932a0b48230087284f4f5c540876f6a5adab3d4d1a7ee7b3a4ad6462' - 'bf2d902eddd24d4c3498f05a89f0d867df8a6cbd921214131c14a28152e4ffbe') - -prepare() { - cd USD-${pkgver} - patch -Np1 -i ../demangle-fix.patch - patch -Np1 -i ../gcc11.patch -} - -build() { - cd USD-${pkgver} - cmake \ - -B build \ - -G Ninja \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPXR_USE_PYTHON_3=ON \ - -DPXR_BUILD_IMAGING=ON \ - -DPXR_BUILD_TESTS=OFF \ - -DPXR_BUILD_MONOLITHIC=ON \ - -DPYSIDE_BIN_DIR="$srcdir" - ninja -C build -} - -package() { - cd USD-${pkgver} - DESTDIR="$pkgdir" ninja -C build install - - mv "$pkgdir"/usr/lib/python "$pkgdir"/usr/lib/python3.9 -} - -# vim:set ts=2 sw=2 et: Copied: usd/repos/community-x86_64/PKGBUILD (from rev 1001097, usd/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-08-17 00:26:45 UTC (rev 1001098) @@ -0,0 +1,46 @@ +# Maintainer: Sven-Hendrik Haase <svenst...@gmail.com> +# Contributor: bartus <arch-user-repoᘓbartus.33mail.com> +pkgname=usd +pkgver=21.08 +pkgrel=1 +pkgdesc="3D VFX pipeline interchange file format" +arch=('x86_64') +url="https://graphics.pixar.com/usd/docs/index.html" +license=('Apache') +depends=('boost-libs' 'glew' 'opensubdiv' 'python' 'pyside2' 'python-opengl' 'ptex') +makedepends=('boost' 'cmake' 'intel-tbb' 'ninja' 'qt5-base') +provides=("usd=${pkgver}") +source=("$pkgname-$pkgver.tar.gz::https://github.com/PixarAnimationStudios/USD/archive/v${pkgver}.tar.gz" + 'gcc11.patch' + 'pyside2-uic') +sha256sums=('c124c2d99922800f82dcbd0765d38a4f79443880e550ecb1e0532a334f359526' + '663352c8932a0b48230087284f4f5c540876f6a5adab3d4d1a7ee7b3a4ad6462' + 'bf2d902eddd24d4c3498f05a89f0d867df8a6cbd921214131c14a28152e4ffbe') + +prepare() { + cd USD-${pkgver} + patch -Np1 -i ../gcc11.patch +} + +build() { + cd USD-${pkgver} + cmake \ + -B build \ + -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPXR_USE_PYTHON_3=ON \ + -DPXR_BUILD_IMAGING=ON \ + -DPXR_BUILD_TESTS=OFF \ + -DPXR_BUILD_MONOLITHIC=ON \ + -DPYSIDE_BIN_DIR="$srcdir" + ninja -C build +} + +package() { + cd USD-${pkgver} + DESTDIR="$pkgdir" ninja -C build install + + mv "$pkgdir"/usr/lib/python "$pkgdir"/usr/lib/python3.9 +} + +# vim:set ts=2 sw=2 et: Deleted: demangle-fix.patch =================================================================== --- demangle-fix.patch 2021-08-17 00:26:32 UTC (rev 1001097) +++ demangle-fix.patch 2021-08-17 00:26:45 UTC (rev 1001098) @@ -1,18 +0,0 @@ ---- USD-21.02/pxr/base/arch/demangle.cpp.orig 2021-01-20 09:13:57.000000000 +0900 -+++ USD-21.02/pxr/base/arch/demangle.cpp 2021-02-05 16:37:27.154126908 +0900 -@@ -36,6 +36,7 @@ using std::string; - #if (ARCH_COMPILER_GCC_MAJOR == 3 && ARCH_COMPILER_GCC_MINOR >= 1) || \ - ARCH_COMPILER_GCC_MAJOR > 3 || defined(ARCH_COMPILER_CLANG) - #define _AT_LEAST_GCC_THREE_ONE_OR_CLANG -+#include <cxxabi.h> - #endif - - PXR_NAMESPACE_OPEN_SCOPE -@@ -138,7 +139,6 @@ _StripPxrInternalNamespace(string* name) - #endif - - #if defined(_AT_LEAST_GCC_THREE_ONE_OR_CLANG) --#include <cxxabi.h> - - /* - * This routine doesn't work when you get to gcc3.4. Copied: usd/repos/community-x86_64/demangle-fix.patch (from rev 1001097, usd/trunk/demangle-fix.patch) =================================================================== --- demangle-fix.patch (rev 0) +++ demangle-fix.patch 2021-08-17 00:26:45 UTC (rev 1001098) @@ -0,0 +1,18 @@ +--- USD-21.02/pxr/base/arch/demangle.cpp.orig 2021-01-20 09:13:57.000000000 +0900 ++++ USD-21.02/pxr/base/arch/demangle.cpp 2021-02-05 16:37:27.154126908 +0900 +@@ -36,6 +36,7 @@ using std::string; + #if (ARCH_COMPILER_GCC_MAJOR == 3 && ARCH_COMPILER_GCC_MINOR >= 1) || \ + ARCH_COMPILER_GCC_MAJOR > 3 || defined(ARCH_COMPILER_CLANG) + #define _AT_LEAST_GCC_THREE_ONE_OR_CLANG ++#include <cxxabi.h> + #endif + + PXR_NAMESPACE_OPEN_SCOPE +@@ -138,7 +139,6 @@ _StripPxrInternalNamespace(string* name) + #endif + + #if defined(_AT_LEAST_GCC_THREE_ONE_OR_CLANG) +-#include <cxxabi.h> + + /* + * This routine doesn't work when you get to gcc3.4. Deleted: gcc11.patch =================================================================== --- gcc11.patch 2021-08-17 00:26:32 UTC (rev 1001097) +++ gcc11.patch 2021-08-17 00:26:45 UTC (rev 1001098) @@ -1,12 +0,0 @@ -diff -upr USD-21.05.orig/pxr/base/work/singularTask.h USD-21.05/pxr/base/work/singularTask.h ---- USD-21.05.orig/pxr/base/work/singularTask.h 2021-04-13 01:09:41.000000000 +0300 -+++ USD-21.05/pxr/base/work/singularTask.h 2021-06-08 23:53:13.343073026 +0300 -@@ -120,7 +120,7 @@ private: - // case we go again to ensure the task can do whatever it - // was awakened to do. Once we successfully take the count - // to zero, we stop. -- size_t old = count; -+ std::size_t old = count; - do { _fn(); } while ( - !count.compare_exchange_strong(old, 0)); - }); Copied: usd/repos/community-x86_64/gcc11.patch (from rev 1001097, usd/trunk/gcc11.patch) =================================================================== --- gcc11.patch (rev 0) +++ gcc11.patch 2021-08-17 00:26:45 UTC (rev 1001098) @@ -0,0 +1,12 @@ +diff -upr USD-21.05.orig/pxr/base/work/singularTask.h USD-21.05/pxr/base/work/singularTask.h +--- USD-21.05.orig/pxr/base/work/singularTask.h 2021-04-13 01:09:41.000000000 +0300 ++++ USD-21.05/pxr/base/work/singularTask.h 2021-06-08 23:53:13.343073026 +0300 +@@ -120,7 +120,7 @@ private: + // case we go again to ensure the task can do whatever it + // was awakened to do. Once we successfully take the count + // to zero, we stop. +- size_t old = count; ++ std::size_t old = count; + do { _fn(); } while ( + !count.compare_exchange_strong(old, 0)); + }); Deleted: pyside2-uic =================================================================== --- pyside2-uic 2021-08-17 00:26:32 UTC (rev 1001097) +++ pyside2-uic 2021-08-17 00:26:45 UTC (rev 1001098) @@ -1,2 +0,0 @@ -#!/bin/sh -exec uic-qt5 -g python "$@" Copied: usd/repos/community-x86_64/pyside2-uic (from rev 1001097, usd/trunk/pyside2-uic) =================================================================== --- pyside2-uic (rev 0) +++ pyside2-uic 2021-08-17 00:26:45 UTC (rev 1001098) @@ -0,0 +1,2 @@ +#!/bin/sh +exec uic-qt5 -g python "$@"