Update license and music addons source

1 files changed, 10 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 49b2019726ec..82e93a6725f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,29 +7,24 @@
 #
 # Yamaha YMF262 OPL3 (opl3): for a nostalgic gaming experience
 
-_music='sc55' # (sc55/opl3) - update checksums if you change
+_music='sc55' # (sc55/opl3)
 
 pkgbase=dxx-rebirth-git
 pkgname=('d1x-rebirth-git' 'd2x-rebirth-git')
-pkgver=0.60.0.beta2.r2022.g25688635b
+pkgver=0.60.0.beta2.r2890.g67c506e39
 pkgrel=1
 pkgdesc='A source port of the Descent and Descent 2 engines (git version)'
 arch=('x86_64')
 url='https://www.dxx-rebirth.com/'
-license=('GPL3' 'custom:Parallax')
+license=('GPL-3.0-only' 'LicenseRef-Parallax-License')
 depends=('glu' 'libgl' 'libpng' 'sdl2' 'sdl2_image' 'sdl2_mixer' 'physfs')
 makedepends=('git' 'scons')
 source=('git+https://github.com/dxx-rebirth/dxx-rebirth.git'
-        'https://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa'
-        "https://www.dxx-rebirth.com/download/dxx/res/d1xr-${_music}-music.dxa"
-        "https://www.dxx-rebirth.com/download/dxx/res/d2xr-${_music}-music.dxa")
-noextract=('d1xr-hires.dxa'
-           "d1xr-${_music}-music.dxa"
-           "d2xr-${_music}-music.dxa")
+        'https://www.dxx-rebirth.com/d1x-rebirth_addons.zip'
+        'https://www.dxx-rebirth.com/d2x-rebirth_addons.zip')
 sha256sums=('SKIP'
-            'b30a164fa9c6dff05eda6d50f777777df843968d32053f5cc9453fe89d5bed19'
-            'b27f7b9dc5f9c2744402c56c9499dfd9503c17e73a2a5223e745529d7867962f'
-            'ace152182c70b9a7ae6f911bddbc239566220a287ab5419cab260d5af739bf16')
+            '68eab65a757c060e4588acd7d1cb72ef96505f5b0c86d27c546a4a7bb6113b97'
+            '6b70773148f6241901e1b7831e1044cfb734c53095570c9c96bb994362a6fa6b')
 
 pkgver() {
     git -C dxx-rebirth describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
@@ -59,8 +54,8 @@ package_d1x-rebirth-git() {
     conflicts=('d1x-rebirth')
     
     install -D -m755 dxx-rebirth/build/d1x-rebirth/d1x-rebirth -t "${pkgdir}/usr/bin"
-    install -D -m644 d1xr-hires.dxa -t "${pkgdir}/usr/share/d1x-rebirth"
-    install -D -m644 "d1xr-${_music}-music.dxa" -t "${pkgdir}/usr/share/d1x-rebirth"
+    install -D -m644 'd1x-rebirth addons'/d1xr-hires.dxa -t "${pkgdir}/usr/share/d1x-rebirth"
+    install -D -m644 'd1x-rebirth addons'/"d1xr-${_music}-music.dxa" -t "${pkgdir}/usr/share/d1x-rebirth"
     install -D -m644 dxx-rebirth/d1x-rebirth/d1x-rebirth.desktop -t "${pkgdir}/usr/share/applications"
     install -D -m644 dxx-rebirth/d1x-rebirth/d1x-rebirth.xpm -t "${pkgdir}/usr/share/pixmaps"
     install -D -m644 dxx-rebirth/COPYING.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
@@ -72,7 +67,7 @@ package_d2x-rebirth-git() {
     conflicts=('d2x-rebirth')
     
     install -D -m755 dxx-rebirth/build/d2x-rebirth/d2x-rebirth -t "${pkgdir}/usr/bin"
-    install -D -m644 "d2xr-${_music}-music.dxa" -t "${pkgdir}/usr/share/d2x-rebirth"
+    install -D -m644 'd2x-rebirth addons'/"d2xr-${_music}-music.dxa" -t "${pkgdir}/usr/share/d2x-rebirth"
     install -D -m644 dxx-rebirth/d2x-rebirth/d2x-rebirth.desktop -t "${pkgdir}/usr/share/applications"
     install -D -m644 dxx-rebirth/d2x-rebirth/d2x-rebirth.xpm -t "${pkgdir}/usr/share/pixmaps"
     install -D -m644 dxx-rebirth/COPYING.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"