summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoah2021-05-01 13:30:58 -0500
committerNoah2021-05-01 13:31:33 -0500
commitf1379dc65cbf286cef7f5f30ec66bb2b687069a9 (patch)
tree62679a5877c17bf818d618e63d614416b1302a1e
parent29e4f768da6f4deade1cd85bd0c9b8a2a5259a3b (diff)
downloadaur-f1379dc65cbf286cef7f5f30ec66bb2b687069a9.tar.gz
Remove patch now that it's merged
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD10
-rw-r--r--sm64plus.patch101
3 files changed, 4 insertions, 112 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 568445efb92..906af4d5c95 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
pkgbase = sm64plus-git
pkgdesc = A standalone fork of the Super Mario 64 PC Port with quality of life improvements
- pkgver = 1.1.3.1
+ pkgver = 1.1.3.2
pkgrel = 1
url = https://github.com/MorsGames/sm64plus
arch = x86_64
+ license = reverse-engineered and unlicensed
makedepends = git
makedepends = python
makedepends = imagemagick
@@ -12,12 +13,10 @@ pkgbase = sm64plus-git
provides = sm64plus
conflicts = sm64plus
source = sm64plus::git+https://github.com/MorsGames/sm64plus
- source = sm64plus.patch
source = sm64plus-wrapper.sh
source = sm64plus.desktop
source = file://baserom.us.z64
sha1sums = SKIP
- sha1sums = 5ca99550d893044d6f7c915ec5dfc0fa2a958d6f
sha1sums = 1d5610570e9a715f08b3024db84b55c0f46d064e
sha1sums = d8b8b8065fac319ac095ec2248c0200a9b9d6eb4
sha1sums = 9bef1128717f958171a4afac3ed78ee2bb4e86ce
diff --git a/PKGBUILD b/PKGBUILD
index c60eb523248..d7dc096fc14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@
# The sha1 should be: 9bef1128717f958171a4afac3ed78ee2bb4e86ce
pkgname=sm64plus-git
-pkgver=1.1.3.1
+pkgver=1.1.3.2
pkgrel=1
pkgdesc="A standalone fork of the Super Mario 64 PC Port with quality of life improvements"
arch=(x86_64)
@@ -29,10 +29,9 @@ replaces=()
backup=()
options=()
install=
-source=('sm64plus::git+https://github.com/MorsGames/sm64plus' sm64plus.patch sm64plus-wrapper.sh sm64plus.desktop file://baserom.us.z64)
+source=('sm64plus::git+https://github.com/MorsGames/sm64plus' sm64plus-wrapper.sh sm64plus.desktop file://baserom.us.z64)
noextract=()
sha1sums=('SKIP'
- '5ca99550d893044d6f7c915ec5dfc0fa2a958d6f'
'1d5610570e9a715f08b3024db84b55c0f46d064e'
'd8b8b8065fac319ac095ec2248c0200a9b9d6eb4'
'9bef1128717f958171a4afac3ed78ee2bb4e86ce')
@@ -46,11 +45,6 @@ pkgver() {
printf "%s" "$(cat README.md | grep -Po '### v\K[0-9\.]+' | head -n1)"
}
-prepare() {
- cd "$srcdir/sm64plus"
- patch -p1 -i "$srcdir/sm64plus.patch"
-}
-
build() {
cd "$srcdir/sm64plus"
SM64PLUS_BASEROM_us="$srcdir/baserom.us.z64" make -j4
diff --git a/sm64plus.patch b/sm64plus.patch
deleted file mode 100644
index 0e98958f985..00000000000
--- a/sm64plus.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/FAQ.md b/FAQ.md
-index eddd059..99d5501 100644
---- a/FAQ.md
-+++ b/FAQ.md
-@@ -32,7 +32,7 @@ Also please remember that most of the time these issues are caused by MSYS2, so
-
- ## **Q:** Some of the textures appear black and purple, how do I fix this?
-
--**A:** Hold "left", "right", and "backspace" keys down for 5 seconds in the title screen.
-+**A:** Hold "left", "right", and "backspace" keys down for 5 seconds in the title screen. On non-windows platforms, you can also try passing the path to the `gfx` directory as the first argument to the executable; by default it's generated at `build/us_pc/gfx`.
-
- <br>
-
-diff --git a/extract_assets.py b/extract_assets.py
-index 00d72bf..1218018 100755
---- a/extract_assets.py
-+++ b/extract_assets.py
-@@ -55,6 +55,8 @@ def clean_assets(local_asset_file):
- except FileNotFoundError:
- pass
-
-+def get_baserom_path(lang):
-+ return os.environ.get("SM64PLUS_BASEROM_" + lang) or "baserom." + lang + ".z64"
-
- def main():
- # In case we ever need to change formats of generated files, we keep a
-@@ -132,7 +134,7 @@ def main():
- # Load ROMs
- roms = {}
- for lang in langs:
-- fname = "baserom." + lang + ".z64"
-+ fname = get_baserom_path(lang)
- try:
- with open(fname, "rb") as f:
- roms[lang] = f.read()
-@@ -207,7 +209,7 @@ def main():
- "-d",
- "-o",
- str(mio0),
-- "baserom." + lang + ".z64",
-+ get_baserom_path(lang),
- "-",
- ],
- check=True,
-diff --git a/src/pc/gfx/gfx_pc.c b/src/pc/gfx/gfx_pc.c
-index 2dc2ba0..1e69898 100644
---- a/src/pc/gfx/gfx_pc.c
-+++ b/src/pc/gfx/gfx_pc.c
-@@ -663,6 +663,9 @@ static bool import_texture_custom(const char *path) {
- return TRUE;
- }
-
-+// defined in pc_main.c
-+extern const char* GFX_DIR_PATH;
-+
- static void import_texture(int tile) {
- uint8_t fmt = rdp.texture_tile.fmt;
- uint8_t siz = rdp.texture_tile.siz;
-@@ -673,7 +676,8 @@ static void import_texture(int tile) {
-
- // Load the textures
- char path[1024];
-- snprintf(path, sizeof(path), "gfx/%s.png", (const char*)rdp.loaded_texture[tile].addr);
-+ const char* gfx_dir = GFX_DIR_PATH == NULL ? "gfx" : GFX_DIR_PATH;
-+ snprintf(path, sizeof(path), "%s/%s.png", gfx_dir, (const char*)rdp.loaded_texture[tile].addr);
-
- import_texture_custom(path);
-
-diff --git a/src/pc/pc_main.c b/src/pc/pc_main.c
-index bf101e2..a44cbae 100644
---- a/src/pc/pc_main.c
-+++ b/src/pc/pc_main.c
-@@ -184,7 +184,11 @@ static void on_fullscreen_changed(bool is_now_fullscreen) {
- configFullscreen = is_now_fullscreen;
- }
-
--void main_func(void) {
-+// used primarily in gfx_pc.c
-+const char* GFX_DIR_PATH = NULL;
-+
-+void main_func(const char* gfx_dir) {
-+ GFX_DIR_PATH = gfx_dir;
- #ifdef USE_SYSTEM_MALLOC
- main_pool_init();
- gGfxAllocOnlyPool = alloc_only_pool_init();
-@@ -303,12 +307,12 @@ void main_func(void) {
-
- #if defined(_WIN32) || defined(_WIN64)
- int WINAPI WinMain(UNUSED HINSTANCE hInstance, UNUSED HINSTANCE hPrevInstance, UNUSED LPSTR pCmdLine, UNUSED int nCmdShow) {
-- main_func();
-+ main_func(NULL);
- return 0;
- }
- #else
--int main(UNUSED int argc, UNUSED char *argv[]) {
-- main_func();
-+int main(int argc, const char *argv[]) {
-+ main_func(argc > 1 ? argv[1] : NULL);
- return 0;
- }
- #endif