~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
3 2

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

Details
Message ID
<20211224115751.7782-1-sebastian@sebsite.pw>
DKIM signature
missing
Download raw message
Patch: +97 -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             | 33 ++++++++++
 .../wiimms-szs-tools/wiimms-szs-tools.patch   | 64 +++++++++++++++++++
 2 files changed, 97 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..e940da57
--- /dev/null
+++ b/testing/wiimms-szs-tools/APKBUILD
@@ -0,0 +1,33 @@
# 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"
depends="ncurses libpng"
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
dba4f42704d0ecdb4c6e9f03bc48c6e17800e077358cc04c7f453c8fad4fcd4658c473e9dc2acd8484da2efe286c47655a4f689b0ab76b12ca0ce708cfada086  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..c21b3880
--- /dev/null
+++ b/testing/wiimms-szs-tools/wiimms-szs-tools.patch
@@ -0,0 +1,64 @@
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
 
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;
     }
 }
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];
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
<164038144682.14324.9412773663354332279.gitlab.28813.079019a504a874789f63740bff1b7d0dda7212af@listserv.local>
In-Reply-To
<20211224115751.7782-1-sebastian@sebsite.pw> (view parent)
DKIM signature
missing
Download raw message
On Fri, 24 Dec 2021 06:57:51 -0500, Sebastian wrote:
> +arch="x86 x86_64"
> +license="GPL-2.0-or-later"
> +depends="ncurses libpng"

these get automatically detected, so you can remove this (note the .so)  
```
>>> wiimms-szs-tools*: Tracing dependencies...
	ncurses
	libpng
	so:libc.musl-x86_64.so.1
	so:libncursesw.so.6
	so:libpng16.so.16
```

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28813#note_200989
Details
Message ID
<164038147351.14324.9507525610316704166.gitlab.28813.d8e3f6f8f99bc322ba8723c2734e1bded2cd98dd@listserv.local>
In-Reply-To
<20211224115751.7782-1-sebastian@sebsite.pw> (view parent)
DKIM signature
missing
Download raw message
On Fri, 24 Dec 2021 06:57:51 -0500, Sebastian wrote:
> +++ b/testing/wiimms-szs-tools/wiimms-szs-tools.patch
> @@ -0,0 +1,64 @@
> +diff -Naur wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435/project/Makefile wiimms-szs-tools-9ae8841ec4720e74173e2f72fac33f0848bbf435-alpine/project/Makefile

what does this patch do? you should add a comment

-- 
via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/28813#note_200990
Details
Message ID
<164043737161.14324.9436122618419772838.gitlab.28813.36737a13028b4dfd71ee868d5a66cfb8edfefdc7@listserv.local>
In-Reply-To
<20211224115751.7782-1-sebastian@sebsite.pw> (view parent)
DKIM signature
missing
Download raw message
superseded by !28829

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