Update to 0.22.0

3 files changed, 12 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8d2b4fb42b8..154b86a60e1f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,14 @@
 pkgbase = maya-usd
 	pkgdesc = Autodesk Maya Universal Scene Discription Plugin
-	pkgver = 0.20.0
+	pkgver = 0.22.0
 	pkgrel = 1
 	url = https://github.com/Autodesk/maya-usd
 	arch = x86_64
 	license = custom
-	depends = maya>=2023.0
-	depends = maya<2024.0
+	depends = maya>=2024.0
+	depends = maya<2025.0
 	options = !strip
-	source = manual://MayaUSD2023-202211021008-b68700b-0.20.0-1.x86_64.rpm
-	source = updateSchemaWithSdrNode-onload-SyntaxError.patch
-	sha256sums = dfa10f772743172bb42770cb14bef8858b49121bf33585e635264d7b6b2be83c
-	sha256sums = 3a0be2176751dd51933d7ac6896324f674fa3c3120d520c21f51257d7c1c7c1e
+	source = manual://MayaUSD2024-202302171358-7c7ac33-0.22.0-1.x86_64.rpm
+	sha256sums = f22407fd7539aedda2a0088dd6f389d4afb33a8f10a34f04bd082246fd927ed5
 
 pkgname = maya-usd
diff --git a/PKGBUILD b/PKGBUILD
index 9809bd9e8910..225e390dddd6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,30 @@
 # Maintainer: William Tang <galaxyking0419@gmail.com>
+# Co-Maintainer: Robert Zhou <meep (dot) aur (at) meepzh (dot) com>
 
-_mayaver=2023
+_mayaver=2024
 
 pkgname=maya-usd
-pkgver=0.20.0
+pkgver=0.22.0
 pkgrel=1
 pkgdesc='Autodesk Maya Universal Scene Discription Plugin'
 arch=('x86_64')
 url='https://github.com/Autodesk/maya-usd'
 license=('custom')
-depends=('maya>=2023.0' 'maya<2024.0')
+depends=('maya>=2024.0' 'maya<2025.0')
 
 DLAGENTS+=('manual::/usr/bin/echo \ \ Note: Please download the package manually from the official website')
-source=("manual://MayaUSD$_mayaver-202211021008-b68700b-$pkgver-1.x86_64.rpm"
-        "updateSchemaWithSdrNode-onload-SyntaxError.patch")
-sha256sums=('dfa10f772743172bb42770cb14bef8858b49121bf33585e635264d7b6b2be83c'
-            '3a0be2176751dd51933d7ac6896324f674fa3c3120d520c21f51257d7c1c7c1e')
+source=("manual://MayaUSD$_mayaver-202302171358-7c7ac33-$pkgver-1.x86_64.rpm")
+sha256sums=('f22407fd7539aedda2a0088dd6f389d4afb33a8f10a34f04bd082246fd927ed5')
 
 options=(!strip)
 
 prepare() {
     sed -i "s|<PLUGIN_DIR>|/usr/autodesk/maya$_mayaver/plug-ins/mayausd|g" usr/autodesk/modules/maya/$_mayaver/mayausd.mod
     sed -i 's/\$MAYA_PYTHON_VERSION/3/g' usr/autodesk/modules/maya/$_mayaver/mayausd.mod
-    patch --directory="usr" --forward --strip=1 --input="${srcdir}/updateSchemaWithSdrNode-onload-SyntaxError.patch"
 }
 
 package() {
     mkdir -p $pkgdir/usr/autodesk/maya$_mayaver/{modules,plug-ins/mayausd}
     mv usr/autodesk/modules/maya/$_mayaver/mayausd.mod $pkgdir/usr/autodesk/maya$_mayaver/modules/
-    mv usr/autodesk/mayausd/maya$_mayaver/${pkgver}_202211021008-b68700b/mayausd/* $pkgdir/usr/autodesk/maya$_mayaver/plug-ins/mayausd/
+    mv usr/autodesk/mayausd/maya$_mayaver/${pkgver}_202302171358-7c7ac33/mayausd/* $pkgdir/usr/autodesk/maya$_mayaver/plug-ins/mayausd/
 }
diff --git a/updateSchemaWithSdrNode-onload-SyntaxError.patch b/updateSchemaWithSdrNode-onload-SyntaxError.patch
deleted file mode 100644
index 842ad41b84f6..000000000000
--- a/updateSchemaWithSdrNode-onload-SyntaxError.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --unified --recursive --text usr.orig/autodesk/mayausd/maya2023/0.20.0_202211021008-b68700b/mayausd/USD/lib/python/pxr/UsdUtils/updateSchemaWithSdrNode.py usr.new/autodesk/mayausd/maya2023/0.20.0_202211021008-b68700b/mayausd/USD/lib/python/pxr/UsdUtils/updateSchemaWithSdrNode.py
---- usr.orig/autodesk/mayausd/maya2023/0.20.0_202211021008-b68700b/mayausd/USD/lib/python/pxr/UsdUtils/updateSchemaWithSdrNode.py	2022-11-02 10:13:29.000000000 -0700
-+++ usr.new/autodesk/mayausd/maya2023/0.20.0_202211021008-b68700b/mayausd/USD/lib/python/pxr/UsdUtils/updateSchemaWithSdrNode.py	2022-12-18 02:02:18.304276565 -0800
-@@ -369,7 +369,7 @@
-                         sdrNode.GetContext(), PropertyDefiningKeys.SHADER_ID)
-                 sdrIdentifier = primDef.GetAttributeFallbackValue(
-                         shaderIdAttrName)
--                if sdrIdentifier is not "":
-+                if sdrIdentifier != "":
-                     usdSchemaNode = reg.GetNodeByIdentifierAndType(
-                             sdrIdentifier,
-                             SchemaDefiningMiscConstants.USD_SOURCE_TYPE)