Click here to go back to the commit logs for vvvvvv.

Commit:

---

Hash: d33ba8d92a90b885d553a6f0c8b6dec1cc777a71

Message: use archive with full source

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index 4a51ccc..a0efc5d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,7 +2,7 @@ generated-by = makedeb
 pkgname = vvvvvv
 pkgbase = vvvvvv
 pkgdesc = A retro-styled 2D platformer
-pkgrel = 0
+pkgrel = 1
 pkgver = 2.4
 url = https://thelettervsixtim.es/
 arch = i386
@@ -12,21 +12,10 @@ license = custom
 makedepends = cmake
 makedepends = libsdl2-mixer-dev
 noextract = data.zip
-source = VVVVVV-2.4.tar.gz::https://github.com/TerryCavanagh/VVVVVV/archive/refs/tags/2.4.tar.gz
-source = lodepng-d398e0f.zip::https://github.com/lvandeve/lodepng/archive/d398e0f10d152a5d17fa30463474dc9f56523f9c.zip
-source = physfs-7931b9b.zip::https://github.com/icculus/physfs/archive/7931b9b3f4ca3b0685fe35f105a3e5c2a1e0d1ed.zip
-source = tinyxml2-321ea88.zip::https://github.com/leethomason/tinyxml2/archive/321ea883b7190d4e85cae5512a12e5eaa8f8731f.zip
-source = FAudio-fc47ca1.zip::https://github.com/FNA-XNA/FAudio/archive/fc47ca1f5f489f30e634cdd0af02d80b8a915bf4.zip
-source = c-hashmap-dedf70e.zip::https://github.com/Mashpoe/c-hashmap/archive/dedf70e0a769bc52a17a36da840d96770fc26d12.zip
-source = SheenBidi-e667eb3.zip::https://github.com/Tehreer/SheenBidi/archive/e667eb3a63ee704194f8d94834d8e12b18db5b21.zip
+noextract = VVVVVV-2.4.zip
+source = VVVVVV-2.4.zip::https://github.com/TerryCavanagh/VVVVVV/releases/download/2.4/VVVVVV-2.4.zip
 source = https://thelettervsixtim.es/makeandplay/data.zip
-sha256sums = ff4443dc9b993f882e5a7aec15ee33ba472a8ccbdcc13bb462f202d4c06df70d
-sha256sums = acfbf0c5c053cd6e49873a1b75a9fec5b30b00ffc2b42dd053a347fd4dbf66ec
-sha256sums = 5fb5a944671dd4e518a1da449f4c98e40698a9b2a467355734abe28bdd42cae6
-sha256sums = 23100b3c4e3b2d528fdf9b490d68b1fd39ad91c5306d804d4fd2c2a5ef959471
-sha256sums = 9a9f12ce7e3915d766db1ed8df450ef8ef85a2ad59b0d5aac93c5c01075c761f
-sha256sums = 8c97e1ec008d3ef23e7dea50f5eeb81e502b549c08fca6daf437d411befe2be3
-sha256sums = 13193f1cfa65e59963c17dc932368bb65b9e5d40e9dc9d33952210776d1a8df9
+sha256sums = e470599e0e46f7a5e0df224eefb1fa7ea8e36af80f8dd2f453e4a404ab547a8c
 sha256sums = c767809594f6472da9f56136e76657e38640d584164a46112250ac6293ecc0ea
 makedepends = cmake
 makedepends = libsdl2-mixer-dev
diff --git a/.gitignore b/.gitignore
index a2ffc01..841efa1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-*.zip
+data.zip
 src/
 pkg/
 vvvvvv*
diff --git a/PKGBUILD b/PKGBUILD
index d68fb43..8db4d0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,42 +6,24 @@
 pkgname=vvvvvv
 _pkgname=VVVVVV
 pkgver=2.4
-pkgrel=0
+pkgrel=1
 pkgdesc='A retro-styled 2D platformer'
 arch=('i386' 'amd64')
 url='https://thelettervsixtim.es/'
 license=('custom')
 depends=('libsdl2-mixer-2.0-0')
 makedepends=('cmake' 'libsdl2-mixer-dev')
-source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/TerryCavanagh/${_pkgname}/archive/refs/tags/${pkgver}.tar.gz"
-        "lodepng-d398e0f.zip::https://github.com/lvandeve/lodepng/archive/d398e0f10d152a5d17fa30463474dc9f56523f9c.zip"
-        "physfs-7931b9b.zip::https://github.com/icculus/physfs/archive/7931b9b3f4ca3b0685fe35f105a3e5c2a1e0d1ed.zip"
-        "tinyxml2-321ea88.zip::https://github.com/leethomason/tinyxml2/archive/321ea883b7190d4e85cae5512a12e5eaa8f8731f.zip"
-        "FAudio-fc47ca1.zip::https://github.com/FNA-XNA/FAudio/archive/fc47ca1f5f489f30e634cdd0af02d80b8a915bf4.zip"
-        "c-hashmap-dedf70e.zip::https://github.com/Mashpoe/c-hashmap/archive/dedf70e0a769bc52a17a36da840d96770fc26d12.zip"
-        "SheenBidi-e667eb3.zip::https://github.com/Tehreer/SheenBidi/archive/e667eb3a63ee704194f8d94834d8e12b18db5b21.zip"
-        "https://thelettervsixtim.es/makeandplay/data.zip"
-)
-sha256sums=('ff4443dc9b993f882e5a7aec15ee33ba472a8ccbdcc13bb462f202d4c06df70d'
-            'acfbf0c5c053cd6e49873a1b75a9fec5b30b00ffc2b42dd053a347fd4dbf66ec'
-            '5fb5a944671dd4e518a1da449f4c98e40698a9b2a467355734abe28bdd42cae6'
-            '23100b3c4e3b2d528fdf9b490d68b1fd39ad91c5306d804d4fd2c2a5ef959471'
-            '9a9f12ce7e3915d766db1ed8df450ef8ef85a2ad59b0d5aac93c5c01075c761f'
-            '8c97e1ec008d3ef23e7dea50f5eeb81e502b549c08fca6daf437d411befe2be3'
-            '13193f1cfa65e59963c17dc932368bb65b9e5d40e9dc9d33952210776d1a8df9'
+source=("${_pkgname}-${pkgver}.zip::https://github.com/TerryCavanagh/${_pkgname}/releases/download/${pkgver}/${_pkgname}-${pkgver}.zip"
+        "https://thelettervsixtim.es/makeandplay/data.zip")
+sha256sums=('e470599e0e46f7a5e0df224eefb1fa7ea8e36af80f8dd2f453e4a404ab547a8c'
             'c767809594f6472da9f56136e76657e38640d584164a46112250ac6293ecc0ea')
-noextract=("data.zip")
+noextract=("data.zip" "${_pkgname}-${pkgver}.zip")
 
 prepare() {
   cd "${srcdir}"
-  # mv to place extra libraries
-  rm -R "${_pkgname}-${pkgver}/third_party/"*
-  mv c-hashmap-dedf70e0a769bc52a17a36da840d96770fc26d12 ${_pkgname}-${pkgver}/third_party/c-hashmap
-  mv physfs-7931b9b3f4ca3b0685fe35f105a3e5c2a1e0d1ed ${_pkgname}-${pkgver}/third_party/physfs
-  mv FAudio-fc47ca1f5f489f30e634cdd0af02d80b8a915bf4 ${_pkgname}-${pkgver}/third_party/FAudio        
-  mv tinyxml2-321ea883b7190d4e85cae5512a12e5eaa8f8731f ${_pkgname}-${pkgver}/third_party/tinyxml2         
-  mv SheenBidi-e667eb3a63ee704194f8d94834d8e12b18db5b21 ${_pkgname}-${pkgver}/third_party/SheenBidi
-  mv lodepng-d398e0f10d152a5d17fa30463474dc9f56523f9c ${_pkgname}-${pkgver}/third_party/lodepng
+  # extract archive
+  mkdir -p "${_pkgname}-${pkgver}"
+  bsdtar -xf "${_pkgname}-${pkgver}.zip" -C "${_pkgname}-${pkgver}"
   # extract icon 
   mkdir -p data
   cd data
@@ -49,7 +31,7 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}/desktop_version"
+  cd "${srcdir}/${_pkgname}-${pkgver}/${_pkgname}/desktop_version"
   # build
   mkdir -p build
   cd build
@@ -64,7 +46,7 @@ EOF
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}/${_pkgname}"
 
   install -D -m755 "desktop_version/build/${_pkgname}" \
       "${pkgdir}/usr/libexec/${pkgname}/${_pkgname}"