mirror of
https://github.com/void-linux/void-packages.git
synced 2025-08-02 10:52:57 +02:00
parent
416127d5b5
commit
c3947a98e8
3 changed files with 78 additions and 16 deletions
|
@ -1,13 +1,17 @@
|
|||
diff --git a/desktop_version/src/FileSystemUtils.cpp b/desktop_version/src/FileSystemUtils.cpp
|
||||
index 5643182d..3a1a8c68 100644
|
||||
--- a/desktop_version/src/FileSystemUtils.cpp
|
||||
+++ b/desktop_version/src/FileSystemUtils.cpp
|
||||
@@ -283,7 +283,7 @@ int FILESYSTEM_init(char *argvZero, char* baseDir, char *assetsPath, char* langD
|
||||
mkdir(temp, 0777);
|
||||
}
|
||||
|
||||
- basePath = SDL_GetBasePath();
|
||||
+ basePath = SDL_strdup("/usr/share/vvvvvv/");
|
||||
|
||||
if (basePath == NULL)
|
||||
diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp
|
||||
index 4b87dbff..a00ff58f 100644
|
||||
--- a/desktop_version/src/main.cpp
|
||||
+++ b/desktop_version/src/main.cpp
|
||||
@@ -383,9 +383,9 @@ static void keep_console_open(const bool open_console)
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
char* baseDir = NULL;
|
||||
- char* assetsPath = NULL;
|
||||
- char* langDir = NULL;
|
||||
- char* fontsDir = NULL;
|
||||
+ char* assetsPath = (char *)"/usr/share/vvvvvv/data.zip";
|
||||
+ char* langDir = (char *)"/usr/share/vvvvvv/lang";
|
||||
+ char* fontsDir = (char *)"/usr/share/vvvvvv/fonts";
|
||||
bool seed_use_sdl_getticks = false;
|
||||
bool open_console = false;
|
||||
bool print_version = false;
|
||||
|
|
57
srcpkgs/VVVVVV/patches/fix-musl-build.patch
Normal file
57
srcpkgs/VVVVVV/patches/fix-musl-build.patch
Normal file
|
@ -0,0 +1,57 @@
|
|||
From f439598036842212b7a886095ff1c85e9a3cbf22 Mon Sep 17 00:00:00 2001
|
||||
From: Violet Purcell <vimproved@inventati.org>
|
||||
Date: Thu, 8 Jun 2023 14:57:30 +0000
|
||||
Subject: [PATCH] Remove LFS64 calls and set _FILE_OFFSET_BITS=64
|
||||
|
||||
Musl 1.2.4 made the LFS64 interfaces only available when
|
||||
_LARGEFILE64_SOURCE is defined, and they will be removed altogether in
|
||||
Musl 1.2.5. This commit replaces the LFS64 calls with their non-LFS64
|
||||
versions and defines _FILE_OFFSET_BITS=64, which makes all interfaces
|
||||
64-bit.
|
||||
|
||||
Bug: https://bugs.gentoo.org/905999
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
Makefile | 2 +-
|
||||
tinyxml2.cpp | 3 ---
|
||||
3 files changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/third_party/tinyxml2/CMakeLists.txt b/third_party/tinyxml2/CMakeLists.txt
|
||||
index 8802fb81..2a45e459 100644
|
||||
--- a/third_party/tinyxml2/CMakeLists.txt
|
||||
+++ b/third_party/tinyxml2/CMakeLists.txt
|
||||
@@ -31,6 +31,7 @@ target_compile_definitions(
|
||||
PUBLIC $<$<CONFIG:Debug>:TINYXML2_DEBUG>
|
||||
INTERFACE $<$<BOOL:${BUILD_SHARED_LIBS}>:TINYXML2_IMPORT>
|
||||
PRIVATE $<$<CXX_COMPILER_ID:MSVC>:_CRT_SECURE_NO_WARNINGS>
|
||||
+ PUBLIC _FILE_OFFSET_BITS=64
|
||||
)
|
||||
|
||||
set_target_properties(
|
||||
diff --git a/third_party/tinyxml2/Makefile b/third_party/tinyxml2/Makefile
|
||||
index e76d8ec0..6ca8544e 100644
|
||||
--- a/third_party/tinyxml2/Makefile
|
||||
+++ b/third_party/tinyxml2/Makefile
|
||||
@@ -10,7 +10,7 @@ ARFLAGS = cr
|
||||
RM = rm -f
|
||||
RANLIB = ranlib
|
||||
MKDIR = mkdir -p
|
||||
-CXXFLAGS = -fPIC
|
||||
+CXXFLAGS = -D_FILE_OFFSET_BITS=64 -fPIC
|
||||
|
||||
INSTALL = install
|
||||
INSTALL_PROGRAM = $(INSTALL)
|
||||
diff --git a/third_party/tinyxml2/tinyxml2.cpp b/third_party/tinyxml2/tinyxml2.cpp
|
||||
index 4b561b3d..e3618180 100755
|
||||
--- a/third_party/tinyxml2/tinyxml2.cpp
|
||||
+++ b/third_party/tinyxml2/tinyxml2.cpp
|
||||
@@ -114,9 +114,6 @@ distribution.
|
||||
#define TIXML_FSEEK fseeko
|
||||
#define TIXML_FTELL ftello
|
||||
#endif
|
||||
-#elif defined(__unix__) && defined(__x86_64__)
|
||||
- #define TIXML_FSEEK fseeko64
|
||||
- #define TIXML_FTELL ftello64
|
||||
#else
|
||||
#define TIXML_FSEEK fseek
|
||||
#define TIXML_FTELL ftell
|
|
@ -1,10 +1,10 @@
|
|||
# Template file for 'VVVVVV'
|
||||
pkgname=VVVVVV
|
||||
version=2.4.1
|
||||
version=2.4.3
|
||||
revision=1
|
||||
build_wrksrc=desktop_version
|
||||
build_style=cmake
|
||||
configure_args="$(vopt_bool makeandplay MAKEANDPLAY)"
|
||||
configure_args="-DOFFICIAL_BUILD=ON $(vopt_bool makeandplay MAKEANDPLAY)"
|
||||
makedepends="SDL2-devel SDL2_mixer-devel"
|
||||
short_desc="Platformer exploring what if you reversed gravity instead of jumping?"
|
||||
maintainer="Luca Matei Pintilie <luca@lucamatei.com>"
|
||||
|
@ -13,7 +13,7 @@ homepage="https://thelettervsixtim.es/"
|
|||
changelog="https://github.com/TerryCavanagh/VVVVVV/releases"
|
||||
distfiles="https://github.com/TerryCavanagh/VVVVVV/releases/download/$version/VVVVVV-$version.zip
|
||||
https://thelettervsixtim.es/makeandplay/data.zip>data_${version}.zip"
|
||||
checksum="c453373cfa29456318c2ece7d452b2e971595004c1b353cd7073f6912b3c3d12
|
||||
checksum="72128cc6aa9f3aad1aa01f4f45cb48bd940856675f0cc30704dab80239871e9b
|
||||
c767809594f6472da9f56136e76657e38640d584164a46112250ac6293ecc0ea"
|
||||
repository=nonfree
|
||||
skip_extraction="data_${version}.zip"
|
||||
|
@ -29,6 +29,7 @@ fi
|
|||
do_install() {
|
||||
vbin build/VVVVVV
|
||||
vinstall "$XBPS_SRCDISTDIR/$pkgname-$version/data_${version}.zip" 644 usr/share/vvvvvv data.zip
|
||||
cp -r fonts lang $DESTDIR/usr/share/vvvvvv/
|
||||
}
|
||||
|
||||
post_install() {
|
||||
|
|
Loading…
Add table
Reference in a new issue