~alpine/aports

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
10 8

[PATCH v3] testing/wiimms-szs-tools: new aport

Details
Message ID
<20211225003914.7336-1-sebastian@sebsite.pw>
DKIM signature
missing
Download raw message
Patch: +109 -0
https://szs.wiimm.de/
Set of command-line tools to work with Mario Kart Wii files

Signed-off-by: Sebastian <sebastian@sebsite.pw>
---
 testing/wiimms-szs-tools/APKBUILD             | 32 ++++++++
 .../wiimms-szs-tools/wiimms-szs-tools.patch   | 77 +++++++++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 testing/wiimms-szs-tools/APKBUILD
 create mode 100644 testing/wiimms-szs-tools/wiimms-szs-tools.patch

diff --git a/testing/wiimms-szs-tools/APKBUILD b/testing/wiimms-szs-tools/APKBUILD
new file mode 100644
index 00000000..a03decf3
--- /dev/null
+++ b/testing/wiimms-szs-tools/APKBUILD
@@ -0,0 +1,32 @@
# Contributor: Sebastian Hudak <sebastian@sebsite.pw>
# Maintainer: Sebastian Hudak <sebastian@sebsite.pw>
pkgname=wiimms-szs-tools
pkgver=2.26a
pkgrel=0
pkgdesc="Set of command-line tools to work with Mario Kart Wii files"
# releases aren't tagged; this commit matches version 2.26a
_commit=9ae8841ec4720e74173e2f72fac33f0848bbf435
url="https://szs.wiimm.de/"
arch="x86 x86_64"
license="GPL-2.0-or-later"
makedepends="bash binutils gcc libpng-dev linux-headers make ncurses-dev"
subpackages="$pkgname-doc"
source="$pkgname-$_commit.tar.gz::https://github.com/Wiimm/wiimms-szs-tools/archive/$_commit.tar.gz
	$pkgname.patch"
builddir="$srcdir/$pkgname-$_commit"
options="!check" # No tests

build() {
	make -C project INSTALL_PATH="$pkgdir/usr" all doc
}

package() {
	make -C project INSTALL_PATH="$pkgdir/usr" install
	mkdir -p "$pkgdir"/usr/share/doc/szs/
	install -m644 project/doc/*.txt "$pkgdir"/usr/share/doc/szs/
}

sha512sums="
3e4f3555e53012096a64f9d4dba4bae2b4284ca185a2c9e732b022734558bddc6f040ad180d1074906c9fdc91750a37b5883fd902db0da65d816dd46c79c3d1e  wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435.tar.gz
570f0bfa2f72d87a485e3a6a27f7b5ab2925cad4f100c43723e4ba0d1ef6fc7a6c34c4572d7b1ae4d95b862edf142b2ad276e9563106dd09ee6569bbe82e4aa4  wiimms-szs-tools.patch
"
diff --git a/testing/wiimms-szs-tools/wiimms-szs-tools.patch b/testing/wiimms-szs-tools/wiimms-szs-tools.patch
new file mode 100644
index 00000000..cfcc9368
--- /dev/null
+++ b/testing/wiimms-szs-tools/wiimms-szs-tools.patch
@@ -0,0 +1,77 @@
Manually linking tinfo is unnecessary and results in a linker error.

diff -Naur wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435/project/Makefile wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435-alpine/project/Makefile
--- wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435/project/Makefile	2021-12-22 16:40:12.263507617 +0000
+++ wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435-alpine/project/Makefile	2021-12-22 16:40:41.880175306 +0000
@@ -161,7 +161,6 @@
  CFLAGS		+= -ffunction-sections -fdata-sections
  LDFLAGS	+= -Xlinker --gc-sections
  #LDFLAGS	+= -Xlinker --print-gc-sections
- LIBS		+= -ltinfo
  LDFLAGS	+= -static-libgcc
 endif

wiimms-szs-tools assumes that the global variables stdin, stdout, and stderr
are mutable. This is true in glibc, but false in musl. This patch removes code
which attempts to mutate standard streams.
 
diff -Naur wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435/project/dclib/dclib-color.c wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435-alpine/project/dclib/dclib-color.c
--- wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435/project/dclib/dclib-color.c	2021-12-22 16:40:12.266840951 +0000
+++ wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435-alpine/project/dclib/dclib-color.c	2021-12-22 16:40:41.883508639 +0000
@@ -4848,8 +4848,6 @@
 {
     DASSERT(ssf);
 
-    stdout = ssf->std_out;
-    stderr = ssf->std_err;
     stdlog = ssf->std_log;
     stdmsg = ssf->std_msg;
     stdwrn = ssf->std_wrn;
@@ -4877,7 +4875,7 @@
     if (ssf)
 	SaveStdFiles(ssf);
 
-    stdout = stdwrn = stdmsg = f;
+    stdwrn = stdmsg = f;
     colout = colwrn = colmsg = colset ? colset : GetFileColorSet(f);
 
     // special handling for stdlog
@@ -4889,7 +4887,6 @@
 
     if (err_too)
     {
-	stderr = stdout;
 	colerr = colout;
     }
 }

Don't define non-static global variable in header file. (This variable is only
ever used in one source file, so having it in the header is pointless.)

diff -Naur wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435/project/dclib/lib-mkw.h wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435-alpine/project/dclib/lib-mkw.h
--- wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435/project/dclib/lib-mkw.h	2021-12-22 16:40:12.266840951 +0000
+++ wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435-alpine/project/dclib/lib-mkw.h	2021-12-22 16:41:03.896842729 +0000
@@ -198,8 +198,6 @@
 
 //-----------------------------------------------------------------------------
 
-const MkwPointInfo_t MkwPointInfo[MPI__N+1];
-
 // [[24P--]] all tables
 
 extern u8 MkwPointsTab[MKW_STD_MAX_PLAYER2];

Add missing semicolon.

diff -Naur wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435/project/src/lib-staticr.c wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435-alpine/project/src/lib-staticr.c
--- wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435/project/src/lib-staticr.c	2021-12-22 16:40:12.270174285 +0000
+++ wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435-alpine/project/src/lib-staticr.c	2021-12-22 16:40:41.886841972 +0000
@@ -1922,7 +1922,7 @@
 	default:	return 0;
     }
 
-    DASSERT(ri)
+    DASSERT(ri);
     if (!ri->sect[0].addr)
     {
 	for ( dol_sect_info_t *ptr = ri->sect; ptr->section >= 0; ptr++ )
-- 
2.34.1
Details
Message ID
<164044239419.14324.3602997914350481658.gitlab.28829.cd3dc180fd1ae43b7553d6945ce2e38e124583e3@listserv.local>
In-Reply-To
<20211225003914.7336-1-sebastian@sebsite.pw> (view parent)
DKIM signature
missing
Download raw message
@Leo Why did you close this?

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28829#note_201101
Details
Message ID
<164073451200.24590.7432368201704465089.gitlab.28829.cd3dc180fd1ae43b7553d6945ce2e38e124583e3@listserv.local>
In-Reply-To
<164044239419.14324.3602997914350481658.gitlab.28829.cd3dc180fd1ae43b7553d6945ce2e38e124583e3@listserv.local> (view parent)
DKIM signature
missing
Download raw message
Sebastian <sebastian@sebsite.pw> replied via email:

```
Hi, I have the same question for @Leo that Kevin Daudt brought up. I'd
appreciate some information on why this was closed. By the way, if there
is a genuine reason for this to be closed, you'll probably also want to
close MR !28830, since it is very similar to this one. Though if you do,
please give me some feedback on why the patches were rejected.

(Actually, on that note, is that other MR still waiting to be reviewed
and maybe merged? No rush; I don't know how long it usually takes for
new aports to be merged, and even so it's around the holidays, it'd just
be nice to know the state of things.)

Thanks in advance!
- Sebastian

```

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28829#note_201934
Details
Message ID
<164109076652.985.2443897001475847940.gitlab.28829.8ddb2d802335073c9ac240a96cc406005896b72f@listserv.local>
In-Reply-To
<20211225003914.7336-1-sebastian@sebsite.pw> (view parent)
DKIM signature
missing
Download raw message
@kdaudt because every patch version sent to the mailing list creates a NEW merge request

!28830 is https://lists.alpinelinux.org/~alpine/aports/patches/3839

This one, !28829 is https://lists.alpinelinux.org/~alpine/aports/patches/3838

There are also these merge requests created by different patch versions, !28763, !28764, !28765 (They correspond to some patch in the image below)

![image](https://gitlab.alpinelinux.org/alpine/aports/uploads/949bf8b5820928be2bcebc824eb773b8/image.png)

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28829#note_202911
Details
Message ID
<164109087378.985.13912340167956162257.gitlab.28829.8ddb2d802335073c9ac240a96cc406005896b72f@listserv.local>
In-Reply-To
<164109076652.985.2443897001475847940.gitlab.28829.8ddb2d802335073c9ac240a96cc406005896b72f@listserv.local> (view parent)
DKIM signature
missing
Download raw message
!28830 is -iso-tools, this is -szs-tools, and both are the latest revision of each

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28829#note_202916
Details
Message ID
<164112979514.985.6201271594014097274.gitlab.28829.aa6c583461b1b56eb2b911670091b6d3bf5eb910@listserv.local>
In-Reply-To
<20211225003914.7336-1-sebastian@sebsite.pw> (view parent)
DKIM signature
missing
Download raw message
Hey this looks awesome. If I may ask, what need do you have for these tools? I'm a big emulator player myself and have patched Mario Kart Wii to be able to play online still and stuff, but I wonder what else you would use these tools for.

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28829#note_203015
Details
Message ID
<164117973222.985.726817037883054491.gitlab.28829.aa6c583461b1b56eb2b911670091b6d3bf5eb910@listserv.local>
In-Reply-To
<164112979514.985.6201271594014097274.gitlab.28829.aa6c583461b1b56eb2b911670091b6d3bf5eb910@listserv.local> (view parent)
DKIM signature
missing
Download raw message
Sebastian <sebastian@sebsite.pw> replied via email:

```
On Sun Jan 2, 2022 at 8:23 AM EST, Bart Ribbers wrote:
> Hey this looks awesome. If I may ask, what need do you have for these
> tools? I'm a big emulator player myself and have patched Mario Kart Wii
> to be able to play online still and stuff, but I wonder what else you
> would use these tools for.

I mainly use them for modifying textures and models, but they can also
be used to encode/decode track files and to create custom track
distributions. The homepage[1] has lots of documentation, and the Custom
Mario Kart Wiiki also has a useful overview[2] and tutorial[3].

Since you're using emulator, the easiest way to use this is probably in
junction with Wiimms ISO Tools. That way, you can use `wit extract` to
extract the contents of the Mario Kart Wii ISO/WBFS, the various SZS
tools to view and modify game files, then `wit copy` to create the new
patched ISO. Though note that if you're just downloading custom assets
online and not creating your own or making changes, you likely don't
need to use the SZS tools.

Happy to see I'm not the only Alpine user who plays Mario Kart Wii. :)

[1]: https://szs.wiimm.de/
[2]: http://wiki.tockdom.com/w/index.php?title=Wiimms_SZS_Tools
[3]: http://wiki.tockdom.com/w/index.php?title=Wiimms_SZS_Tools/How_To

- Sebastian

```

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28829#note_203180
Details
Message ID
<164119716919.985.7953632551539982557.gitlab.28829.aa6c583461b1b56eb2b911670091b6d3bf5eb910@listserv.local>
In-Reply-To
<164117973222.985.726817037883054491.gitlab.28829.aa6c583461b1b56eb2b911670091b6d3bf5eb910@listserv.local> (view parent)
DKIM signature
missing
Download raw message
> Happy to see I'm not the only Alpine user who plays Mario Kart Wii. :)

Not at all!

In fact, I recently requested ncopa to enable some kernel options related to playing Wii games using Wiimotes, https://gitlab.alpinelinux.org/alpine/aports/-/issues/13360.

I've also been working on a program to translate Wiimote presses into keyboard presses intended for some other things, so in general you're not the only one doing anything Wii related on Alpine :wink: 

I didn't realize Mario Kart Wii had custom tracks though! I've already patched my game with Wiimmfi but currently I don't have access to a real Wii to get a legit NAND, and that's the only modding I've done so far. Looks fun, I'll give it a shot!

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28829#note_203214
Details
Message ID
<164146587451.985.321497341407192125.gitlab.28829.fb0f021c452ee66acc5a63ae15368b073d29bd20@listserv.local>
In-Reply-To
<20211225003914.7336-1-sebastian@sebsite.pw> (view parent)
DKIM signature
missing
Download raw message
On Fri, 24 Dec 2021 19:39:14 -0500, Sebastian wrote:
> +arch="x86 x86_64"
> +license="GPL-2.0-or-later"
> +makedepends="bash binutils gcc libpng-dev linux-headers make ncurses-dev"

binutils, gcc, and make are installed with build-base, i.e. these are the default build dependencies that shouldn't be specified in makedepends.

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28829#note_203975
Details
Message ID
<164405880399.985.6779030918357736875.gitlab.28829.6ef8c7491cb157a869352a2448133cef355110ee@listserv.local>
In-Reply-To
<20211225003914.7336-1-sebastian@sebsite.pw> (view parent)
DKIM signature
missing
Download raw message
Sorry to bother you @mailinglist-bot,

but we've detected that this merge request hasn't seen any recent activity. If you need help or want to discuss your approach with developers you can ping `@team/mentors`. You can also ask on IRC on `#alpine-devel` on irc.oftc.net. If no further activity occurs in this MR, Alpine developers may close it in the future.

Thanks for your contribution.

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28829#note_212659
Details
Message ID
<164505538090.985.4177076102139731724.gitlab.28829.9970c7c18251d18dbdc32ac7ee64f9b97227ba2b@listserv.local>
In-Reply-To
<20211225003914.7336-1-sebastian@sebsite.pw> (view parent)
DKIM signature
missing
Download raw message
merged in https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/29261

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28829#note_216107
Reply to thread Export thread (mbox)