Update to version 11.2.1

5 files changed, 16 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56da184043ca..d23c0dc1c25b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = substance-designer
 	pkgdesc = Node-based, non-destructive PBR material authoring tool.
-	pkgver = 11.1.1
+	pkgver = 11.2.1
 	pkgrel = 1
 	url = https://www.allegorithmic.com/products/substance-designer
 	arch = x86_64
@@ -11,14 +11,7 @@ pkgbase = substance-designer
 	depends = hicolor-icon-theme
 	depends = libtiff4
 	options = !strip
-	source = https://download.substance3d.com/substance-designer/11.x/Substance_Designer-11.1.1-4469-linux-x64-standard.rpm
-	source = substance-designer-icon.png
-	source = substance-designer.desktop
-	source = substance-designer
-	sha256sums = 45d0cf42f72a4deea6d28fa7fc4f38fadd18b5d0724936e162dfb771fcbfd91e
-	sha256sums = 8f7f090d96dbb3535747d2c09c32970343c8887df610bc7ef92b59871a9bfb35
-	sha256sums = 7df45269060736a7ae8dcf89abcbcd27371567a5730bdba2a66abf24c90a7157
-	sha256sums = 714d4484f5ca6d1ac0de77729ab60fc6aee53a7dc217fda5a6401fb6f8eee156
+	source = https://download.substance3d.com/adobe-substance-3d-designer/11.x/Adobe_Substance_3D_Designer-11.2.1-4934-linux-x64-standard.rpm
+	sha256sums = c8b3c925a9c8c7aa639c5c80ab4fe5bf023bc97506f595ec12a8b1e4a38a48f2
 
 pkgname = substance-designer
-
diff --git a/PKGBUILD b/PKGBUILD
index 3709978b75ad..09f3116acbe1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,38 +3,28 @@
 # Co-maintainer: Dragoon Aethis <dragoon@dragonic.eu>
 
 pkgname=substance-designer
-pkgver=11.1.1
+pkgver=11.2.1
 pkgrel=1
-_build=4469
+_build=4934
 pkgdesc="Node-based, non-destructive PBR material authoring tool."
 arch=('x86_64')
 url='https://www.allegorithmic.com/products/substance-designer'
 license=('custom')
 depends=('fontconfig' 'gcc-libs-multilib' 'glu' 'hicolor-icon-theme' 'libtiff4')
-options=('!strip')
-source=("https://download.substance3d.com/substance-designer/11.x/Substance_Designer-${pkgver}-${_build}-linux-x64-standard.rpm"
-        'substance-designer-icon.png'
-        'substance-designer.desktop'
-        'substance-designer')
-noextract=()
-sha256sums=('45d0cf42f72a4deea6d28fa7fc4f38fadd18b5d0724936e162dfb771fcbfd91e'
-            '8f7f090d96dbb3535747d2c09c32970343c8887df610bc7ef92b59871a9bfb35'
-            '7df45269060736a7ae8dcf89abcbcd27371567a5730bdba2a66abf24c90a7157'
-            '714d4484f5ca6d1ac0de77729ab60fc6aee53a7dc217fda5a6401fb6f8eee156')
+options=('!strip') # PNG assets here should be left untouched!
+source=("https://download.substance3d.com/adobe-substance-3d-designer/11.x/Adobe_Substance_3D_Designer-${pkgver}-${_build}-linux-x64-standard.rpm")
+
+sha256sums=('c8b3c925a9c8c7aa639c5c80ab4fe5bf023bc97506f595ec12a8b1e4a38a48f2')
+
 validpgpkeys=()
 
 package() {
-  mkdir -p ${pkgdir}/opt/Allegorithmic
-  mv ${srcdir}/opt/Allegorithmic/Substance_Designer ${pkgdir}/opt/Allegorithmic
-
-  install -Dm644 ${pkgdir}/opt/Allegorithmic/Substance_Designer/eula.txt \
-                 ${pkgdir}/usr/share/licenses/${pkgname}/eula.txt
-  rm ${pkgdir}/opt/Allegorithmic/Substance_Designer/eula.txt
+  mkdir -p "${pkgdir}/opt/Adobe"
 
-  # Workaround for https://forum.substance3d.com/index.php/topic,29285.0.html
-  # rm ${pkgdir}/opt/Allegorithmic/Substance_Designer/libfreetype.so.6
+  install -Dm644 -t "${pkgdir}/usr/share/applications" "${srcdir}/opt/Adobe/Adobe_Substance_3D_Designer/resources/adobe-Adobe_Substance_3D_Designer.desktop"
+  install -Dm644 -t "${pkgdir}/usr/share/mime/packages" "${srcdir}/opt/Adobe/Adobe_Substance_3D_Designer/resources/adobe-x.adobe.substance3d.designer.xml"
+  install -Dm644 -t "${pkgdir}/usr/share/icons" "${srcdir}/opt/Adobe/Adobe_Substance_3D_Designer/resources/icons/substance-256x256.png"
 
-  install -Dm644 -t "${pkgdir}/usr/share/applications" "${srcdir}/substance-designer.desktop"
-  install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/256x256/apps" "${srcdir}/substance-designer-icon.png"
-  install -Dm755 -t "${pkgdir}/usr/bin" "${srcdir}/substance-designer"
+  mv "${pkgdir}/usr/share/icons/substance-256x256.png" "${pkgdir}/usr/share/icons/adobe-Adobe_Substance_3D_Designer.png"
+  mv "${srcdir}/opt/Adobe/Adobe_Substance_3D_Designer" "${pkgdir}/opt/Adobe/"
 }
diff --git a/substance-designer b/substance-designer
deleted file mode 100644
index c21e60358e01..000000000000
--- a/substance-designer
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# If the interface is too small/big, uncomment the following line and tweak the value accordingly.
-#export QT_SCALE_FACTOR=0.75
-
-# If you're using a Nvidia Optimus setup, uncomment the line below and comment the final line to
-# always use the Nvidia GPU for this software (which is often too heavy for integrated GPUs).
-#exec primusrun /opt/Allegorithmic/Substance_Designer/Substance\ Designer "$@"
-
-exec /opt/Allegorithmic/Substance_Designer/Substance\ Designer "$@"
-
diff --git a/substance-designer-icon.png b/substance-designer-icon.png
deleted file mode 100644
index e8eda35bbf1e..000000000000
--- a/substance-designer-icon.png
+++ /dev/null
diff --git a/substance-designer.desktop b/substance-designer.desktop
deleted file mode 100644
index 2da1f370e71a..000000000000
--- a/substance-designer.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Name=Substance Designer
-GenericName=Material Authoring Software
-Description=PBR material design and authoring tool
-Exec=/usr/bin/substance-designer
-Icon=substance-designer-icon
-<<<<<<< HEAD
-Version=2019.3.3
-=======
->>>>>>> 0fc27b16760674840c8092911263cf2cc924d9ec
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Utility;Graphics
-MimeType=application/x.allegorithmic.package+xml;application/x.allegorithmic.substance