Re: [PR PATCH] [Updated] New package: alexvsbus

[M374LX <M374LX@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1049 bytes --]

There is an updated pull request by M374LX against master on the void-packages repository

https://github.com/M374LX/void-packages alexvsbus
https://github.com/void-linux/void-packages/pull/48682

New package: alexvsbus
Closes #48647

#### Testing the changes
- I tested the changes in this PR: **yes**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)

#### More information
Tested and confirmed to run on my x86_64-glibc host system and also on x86_64 (both glibc and musl) virtual machines containing a newly installed Void system and an X server, even without a window manager.

The game can run without ``alsa-lib``, albeit without audio.

Some tasks are pending, like installing the documentation and license files.


A patch file from https://github.com/void-linux/void-packages/pull/48682.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-alexvsbus-48682.patch --]
[-- Type: text/x-diff, Size: 10271 bytes --]

From 2d7830fdf15758bfe84be7fe33c3e060942855a5 Mon Sep 17 00:00:00 2001
From: M374LX <wilsalx@gmail.com>
Date: Mon, 12 Feb 2024 22:22:26 -0300
Subject: [PATCH 1/9] New package: alexvsbus (WIP)

---
 srcpkgs/alexvsbus/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/alexvsbus/template

diff --git a/srcpkgs/alexvsbus/template b/srcpkgs/alexvsbus/template
new file mode 100644
index 0000000000000..d059866726b86
--- /dev/null
+++ b/srcpkgs/alexvsbus/template
@@ -0,0 +1,22 @@
+# Template file for 'alexvsbus'
+pkgname=alexvsbus
+version=2024.02.10.0
+revision=1
+archs="i686 x86_64"
+#build_wrksrc=
+build_style=gnu-makefile
+#make_build_args=""
+make_install_args="PREFIX=/usr"
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="alsa-lib-devel libX11-devel libXrandr-devel libXi-devel 
+ MesaLib-devel glu-devel libXcursor-devel libXinerama-devel"
+makedepends=""
+depends=""
+short_desc="A platform runner game"
+maintainer="M374LX <wilsalx@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/M374LX/alexvsbus"
+#changelog=""
+distfiles="https://github.com/M374LX/alexvsbus/archive/${version}.tar.gz"
+checksum=3568a9d02aa044c948cb32d3b291f2218f95b38af810870b8315ecbd15f2f76e

From 20ae3fb07410341cb426fe8b6b5da7e47acd16e1 Mon Sep 17 00:00:00 2001
From: M374LX <wilsalx@gmail.com>
Date: Tue, 13 Feb 2024 16:45:01 -0300
Subject: [PATCH 2/9] alexvsbus: Update to 2024.02.13.0

---
 srcpkgs/alexvsbus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/alexvsbus/template b/srcpkgs/alexvsbus/template
index d059866726b86..1a7a253de2ba6 100644
--- a/srcpkgs/alexvsbus/template
+++ b/srcpkgs/alexvsbus/template
@@ -1,6 +1,6 @@
 # Template file for 'alexvsbus'
 pkgname=alexvsbus
-version=2024.02.10.0
+version=2024.02.13.0
 revision=1
 archs="i686 x86_64"
 #build_wrksrc=
@@ -19,4 +19,4 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/M374LX/alexvsbus"
 #changelog=""
 distfiles="https://github.com/M374LX/alexvsbus/archive/${version}.tar.gz"
-checksum=3568a9d02aa044c948cb32d3b291f2218f95b38af810870b8315ecbd15f2f76e
+checksum=bff47cd864098be89ca941123776b2c0bde6a6456cfefb6df8f38fae102c507b

From 0120eee8d252c26a2d9e03c72440a804ce5e8d3e Mon Sep 17 00:00:00 2001
From: M374LX <wilsalx@gmail.com>
Date: Tue, 13 Feb 2024 17:03:59 -0300
Subject: [PATCH 3/9] alexvsbus: Add do_build()

---
 srcpkgs/alexvsbus/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/alexvsbus/template b/srcpkgs/alexvsbus/template
index 1a7a253de2ba6..358fa09180770 100644
--- a/srcpkgs/alexvsbus/template
+++ b/srcpkgs/alexvsbus/template
@@ -20,3 +20,7 @@ homepage="https://github.com/M374LX/alexvsbus"
 #changelog=""
 distfiles="https://github.com/M374LX/alexvsbus/archive/${version}.tar.gz"
 checksum=bff47cd864098be89ca941123776b2c0bde6a6456cfefb6df8f38fae102c507b
+
+do_build() {
+	make
+}

From 81fddbff9efb30831c5e30fc1d374f123c0b7544 Mon Sep 17 00:00:00 2001
From: M374LX <wilsalx@gmail.com>
Date: Tue, 13 Feb 2024 20:03:14 -0300
Subject: [PATCH 4/9] alexvsus: Add do_install()

---
 srcpkgs/alexvsbus/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/alexvsbus/template b/srcpkgs/alexvsbus/template
index 358fa09180770..271cc5aaa6550 100644
--- a/srcpkgs/alexvsbus/template
+++ b/srcpkgs/alexvsbus/template
@@ -4,7 +4,7 @@ version=2024.02.13.0
 revision=1
 archs="i686 x86_64"
 #build_wrksrc=
-build_style=gnu-makefile
+#build_style=gnu-makefile
 #make_build_args=""
 make_install_args="PREFIX=/usr"
 #conf_files=""
@@ -24,3 +24,7 @@ checksum=bff47cd864098be89ca941123776b2c0bde6a6456cfefb6df8f38fae102c507b
 do_build() {
 	make
 }
+
+do_install() {
+	make install PREFIX=$DESTDIR/usr
+}

From 8516ec7171c5657c1146fdf6790c5ecd91589345 Mon Sep 17 00:00:00 2001
From: M374LX <wilsalx@gmail.com>
Date: Tue, 13 Feb 2024 20:46:40 -0300
Subject: [PATCH 5/9] alexvsbus: Remove unused template variables

---
 srcpkgs/alexvsbus/template | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/srcpkgs/alexvsbus/template b/srcpkgs/alexvsbus/template
index 271cc5aaa6550..039b165220749 100644
--- a/srcpkgs/alexvsbus/template
+++ b/srcpkgs/alexvsbus/template
@@ -3,12 +3,6 @@ pkgname=alexvsbus
 version=2024.02.13.0
 revision=1
 archs="i686 x86_64"
-#build_wrksrc=
-#build_style=gnu-makefile
-#make_build_args=""
-make_install_args="PREFIX=/usr"
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
 hostmakedepends="alsa-lib-devel libX11-devel libXrandr-devel libXi-devel 
  MesaLib-devel glu-devel libXcursor-devel libXinerama-devel"
 makedepends=""

From 51a9539e709d9aaf2fc14183a89ac265158b44f1 Mon Sep 17 00:00:00 2001
From: M374LX <wilsalx@gmail.com>
Date: Thu, 15 Feb 2024 18:09:55 -0300
Subject: [PATCH 6/9] Update template

---
 srcpkgs/alexvsbus/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/alexvsbus/template b/srcpkgs/alexvsbus/template
index 039b165220749..0ad594fde56c4 100644
--- a/srcpkgs/alexvsbus/template
+++ b/srcpkgs/alexvsbus/template
@@ -2,16 +2,14 @@
 pkgname=alexvsbus
 version=2024.02.13.0
 revision=1
-archs="i686 x86_64"
-hostmakedepends="alsa-lib-devel libX11-devel libXrandr-devel libXi-devel 
+makedepends="alsa-lib-devel libX11-devel libXrandr-devel libXi-devel
  MesaLib-devel glu-devel libXcursor-devel libXinerama-devel"
-makedepends=""
 depends=""
-short_desc="A platform runner game"
+short_desc="A platform runner game in which you need to catch the bus on time"
 maintainer="M374LX <wilsalx@gmail.com>"
-license="GPL-3.0-or-later"
+license="GPL-3.0-or-later, CC-BY-SA-4.0"
 homepage="https://github.com/M374LX/alexvsbus"
-#changelog=""
+changelog="https://raw.githubusercontent.com/M374LX/alexvsbus/main/docs/News.md"
 distfiles="https://github.com/M374LX/alexvsbus/archive/${version}.tar.gz"
 checksum=bff47cd864098be89ca941123776b2c0bde6a6456cfefb6df8f38fae102c507b
 

From 83a0a5bc119be215d619342fc61621813e2ce067 Mon Sep 17 00:00:00 2001
From: M374LX <wilsalx@gmail.com>
Date: Thu, 15 Feb 2024 18:48:14 -0300
Subject: [PATCH 7/9] Avoid "games" directories

---
 srcpkgs/alexvsbus/patches/assets-main.diff     | 11 +++++++++++
 srcpkgs/alexvsbus/patches/assets-makefile.diff | 15 +++++++++++++++
 srcpkgs/alexvsbus/template                     |  2 +-
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/alexvsbus/patches/assets-main.diff
 create mode 100644 srcpkgs/alexvsbus/patches/assets-makefile.diff

diff --git a/srcpkgs/alexvsbus/patches/assets-main.diff b/srcpkgs/alexvsbus/patches/assets-main.diff
new file mode 100644
index 0000000000000..6d1c6349898bb
--- /dev/null
+++ b/srcpkgs/alexvsbus/patches/assets-main.diff
@@ -0,0 +1,11 @@
+--- a/src/main.c	2024-02-15 18:35:19.620710155 -0300
++++ b/src/main.c	2024-02-15 18:35:53.310708991 -0300
+@@ -1030,7 +1030,7 @@
+ 		}
+ 
+ #ifndef _WIN32
+-		snprintf(path, 512, "%s/%s", base_path, "../share/games/alexvsbus/");
++		snprintf(path, 512, "%s/%s", base_path, "../share/alexvsbus/");
+ 		if (readable_dir(path)) {
+ 			snprintf(config.assets_dir, 512, "%s", path);
+ 
diff --git a/srcpkgs/alexvsbus/patches/assets-makefile.diff b/srcpkgs/alexvsbus/patches/assets-makefile.diff
new file mode 100644
index 0000000000000..de254c06543fd
--- /dev/null
+++ b/srcpkgs/alexvsbus/patches/assets-makefile.diff
@@ -0,0 +1,15 @@
+--- a/Makefile	2024-02-13 15:37:10.490011066 -0300
++++ b/Makefile	2024-02-15 18:42:58.568694290 -0300
+@@ -85,9 +85,9 @@
+ install_unix:
+ 	mkdir -p $(EXECPREFIX)
+ 	cp $(EXECNAME) $(EXECPREFIX)/$(EXECNAME)
+-	rm -rf $(PREFIX)/share/games/$(PROGNAME)
+-	mkdir -p $(PREFIX)/share/games
+-	cp -r assets $(PREFIX)/share/games/$(PROGNAME)
++	rm -rf $(PREFIX)/share/$(PROGNAME)
++	mkdir -p $(PREFIX)/share
++	cp -r assets $(PREFIX)/share/$(PROGNAME)
+ 	mkdir -p $(PREFIX)/share/pixmaps
+ 	cp icons/icon128.png $(PREFIX)/share/pixmaps/$(PROGNAME).png
+ 	mkdir -p $(PREFIX)/share/applications
diff --git a/srcpkgs/alexvsbus/template b/srcpkgs/alexvsbus/template
index 0ad594fde56c4..37fa304cbd20a 100644
--- a/srcpkgs/alexvsbus/template
+++ b/srcpkgs/alexvsbus/template
@@ -18,5 +18,5 @@ do_build() {
 }
 
 do_install() {
-	make install PREFIX=$DESTDIR/usr
+	make install PREFIX=$DESTDIR/usr EXECPREFIX=$DESTDIR/usr/bin
 }

From 0f6130b10c94e7ef724947add2c45596c2849d12 Mon Sep 17 00:00:00 2001
From: M374LX <wilsalx@gmail.com>
Date: Sat, 17 Feb 2024 19:35:40 -0300
Subject: [PATCH 8/9] Update dependencies

---
 srcpkgs/alexvsbus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/alexvsbus/template b/srcpkgs/alexvsbus/template
index 37fa304cbd20a..e6f17793822c8 100644
--- a/srcpkgs/alexvsbus/template
+++ b/srcpkgs/alexvsbus/template
@@ -2,9 +2,9 @@
 pkgname=alexvsbus
 version=2024.02.13.0
 revision=1
-makedepends="alsa-lib-devel libX11-devel libXrandr-devel libXi-devel
- MesaLib-devel glu-devel libXcursor-devel libXinerama-devel"
-depends=""
+makedepends="libX11-devel libXcursor-devel libXi-devel libXinerama-devel
+ libXrandr-devel"
+depends="alsa-lib mesa"
 short_desc="A platform runner game in which you need to catch the bus on time"
 maintainer="M374LX <wilsalx@gmail.com>"
 license="GPL-3.0-or-later, CC-BY-SA-4.0"

From 82d1d091019ad850cc666d506121bf6a8e892329 Mon Sep 17 00:00:00 2001
From: M374LX <wilsalx@gmail.com>
Date: Sun, 18 Feb 2024 16:22:04 -0300
Subject: [PATCH 9/9] Update template

---
 srcpkgs/alexvsbus/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/alexvsbus/template b/srcpkgs/alexvsbus/template
index e6f17793822c8..fa2d4a24f0286 100644
--- a/srcpkgs/alexvsbus/template
+++ b/srcpkgs/alexvsbus/template
@@ -5,7 +5,7 @@ revision=1
 makedepends="libX11-devel libXcursor-devel libXi-devel libXinerama-devel
  libXrandr-devel"
 depends="alsa-lib mesa"
-short_desc="A platform runner game in which you need to catch the bus on time"
+short_desc="A platform runner game in which Alex needs to catch the bus on time"
 maintainer="M374LX <wilsalx@gmail.com>"
 license="GPL-3.0-or-later, CC-BY-SA-4.0"
 homepage="https://github.com/M374LX/alexvsbus"
@@ -19,4 +19,5 @@ do_build() {
 
 do_install() {
 	make install PREFIX=$DESTDIR/usr EXECPREFIX=$DESTDIR/usr/bin
+	vdoc docs/manual/manual.pdf
 }