makedeb
makedeb
A retro-styled 2D platformer
Click here to go back to the commit logs for vvvvvv.
Hash: dcba800a3f81fa45803d9c28361aab392c6c1108
Message: 2.4
diff --git a/.SRCINFO b/.SRCINFO
index b283c0e..4a51ccc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,24 +2,31 @@ generated-by = makedeb
pkgname = vvvvvv
pkgbase = vvvvvv
pkgdesc = A retro-styled 2D platformer
-pkgrel = 1
-pkgver = 2.3.6
+pkgrel = 0
+pkgver = 2.4
url = https://thelettervsixtim.es/
arch = i386
arch = amd64
depends = libsdl2-mixer-2.0-0
-groups = humblebundle3
-groups = humblebundle4
-groups = humblebundles
license = custom
makedepends = cmake
makedepends = libsdl2-mixer-dev
noextract = data.zip
-source = VVVVVV-2.3.6.tar.gz::https://github.com/TerryCavanagh/VVVVVV/archive/refs/tags/2.3.6.tar.gz
+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
source = https://thelettervsixtim.es/makeandplay/data.zip
-source = rm-srcdir-in-bin.patch
-sha256sums = a3366aab9e8462d330044ab1ec63927e9f5c3801c0ed96b24f08c553dcb911e9
+sha256sums = ff4443dc9b993f882e5a7aec15ee33ba472a8ccbdcc13bb462f202d4c06df70d
+sha256sums = acfbf0c5c053cd6e49873a1b75a9fec5b30b00ffc2b42dd053a347fd4dbf66ec
+sha256sums = 5fb5a944671dd4e518a1da449f4c98e40698a9b2a467355734abe28bdd42cae6
+sha256sums = 23100b3c4e3b2d528fdf9b490d68b1fd39ad91c5306d804d4fd2c2a5ef959471
+sha256sums = 9a9f12ce7e3915d766db1ed8df450ef8ef85a2ad59b0d5aac93c5c01075c761f
+sha256sums = 8c97e1ec008d3ef23e7dea50f5eeb81e502b549c08fca6daf437d411befe2be3
+sha256sums = 13193f1cfa65e59963c17dc932368bb65b9e5d40e9dc9d33952210776d1a8df9
sha256sums = c767809594f6472da9f56136e76657e38640d584164a46112250ac6293ecc0ea
-sha256sums = 0f0d1dd00b23e36a615dfc214a572c38365f8ba3d746da6cd80ea58da6e5aea9
makedepends = cmake
makedepends = libsdl2-mixer-dev
diff --git a/.gitignore b/.gitignore
index 841efa1..a2ffc01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-data.zip
+*.zip
src/
pkg/
vvvvvv*
diff --git a/PKGBUILD b/PKGBUILD
index 8118a24..d68fb43 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,26 +5,44 @@
pkgname=vvvvvv
_pkgname=VVVVVV
-pkgver=2.3.6
-pkgrel=1
+pkgver=2.4
+pkgrel=0
pkgdesc='A retro-styled 2D platformer'
arch=('i386' 'amd64')
url='https://thelettervsixtim.es/'
-groups=('humblebundle3' 'humblebundle4' 'humblebundles')
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"
- "rm-srcdir-in-bin.patch")
-sha256sums=('a3366aab9e8462d330044ab1ec63927e9f5c3801c0ed96b24f08c553dcb911e9'
- 'c767809594f6472da9f56136e76657e38640d584164a46112250ac6293ecc0ea'
- '0f0d1dd00b23e36a615dfc214a572c38365f8ba3d746da6cd80ea58da6e5aea9')
+)
+sha256sums=('ff4443dc9b993f882e5a7aec15ee33ba472a8ccbdcc13bb462f202d4c06df70d'
+ 'acfbf0c5c053cd6e49873a1b75a9fec5b30b00ffc2b42dd053a347fd4dbf66ec'
+ '5fb5a944671dd4e518a1da449f4c98e40698a9b2a467355734abe28bdd42cae6'
+ '23100b3c4e3b2d528fdf9b490d68b1fd39ad91c5306d804d4fd2c2a5ef959471'
+ '9a9f12ce7e3915d766db1ed8df450ef8ef85a2ad59b0d5aac93c5c01075c761f'
+ '8c97e1ec008d3ef23e7dea50f5eeb81e502b549c08fca6daf437d411befe2be3'
+ '13193f1cfa65e59963c17dc932368bb65b9e5d40e9dc9d33952210776d1a8df9'
+ 'c767809594f6472da9f56136e76657e38640d584164a46112250ac6293ecc0ea')
noextract=("data.zip")
prepare() {
cd "${srcdir}"
- patch -p1 -i "${srcdir}/rm-srcdir-in-bin.patch" -d "${_pkgname}-${pkgver}"
+ # 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 icon
mkdir -p data
cd data
bsdtar -xf ../data.zip VVVVVV.png
@@ -32,14 +50,13 @@ prepare() {
build() {
cd "${srcdir}/${_pkgname}-${pkgver}/desktop_version"
-
+ # build
mkdir -p build
cd build
cmake -DOFFICIAL_BUILD=ON ..
make
-
+ # data license
cd "${srcdir}/data"
-
cat >> LICENSE <<EOF
Please note that the game was compiled with the original levels, so game assets
data.zip and vvvvvv.png are not redistributable. Only for personal use.
@@ -65,11 +82,11 @@ package() {
install -d "${pkgdir}/usr/games"
ln -s "../libexec/${pkgname}/${_pkgname}" "${pkgdir}/usr/games/${pkgname}"
- ln -fs "../../share/games/${pkgname}/data.zip" "${pkgdir}/usr/libexec/${pkgname}/data.zip"
+ ln -s "../../share/games/${pkgname}/data.zip" "${pkgdir}/usr/libexec/${pkgname}/data.zip"
-install -d -m644 "${pkgdir}/usr/share/applications"
+ install -d -m644 "${pkgdir}/usr/share/applications"
-echo "[Desktop Entry]
+ echo "[Desktop Entry]
Version=1.0
Type=Application
Name=$_pkgname
diff --git a/rm-srcdir-in-bin.patch b/rm-srcdir-in-bin.patch
deleted file mode 100644
index 0069204..0000000
--- a/rm-srcdir-in-bin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/desktop_version/CMakeLists.txt
-+++ b/desktop_version/CMakeLists.txt
-@@ -293,6 +293,8 @@
- endif()
-
- target_link_libraries(VVVVVV physfs-static tinyxml2-static lodepng-static)
-+ get_filename_component(REPO_DIR ../ ABSOLUTE)
-+ target_compile_options(physfs-static PRIVATE "-ffile-prefix-map=${REPO_DIR}=.")
- else()
- find_package(utf8cpp CONFIG)
-