mindustry: new, 146 by BenderBlog · Pull Request #9156 · AOSC-Dev/aosc-os-abbs

BenderBlog · 2025-01-03T15:53:56Z

Topic Description

mindustry: new, 146

Package(s) Affected

None.

Security Update?

No.

Test Build(s) Done

Primary Architectures

Architecture-independent noarch

Secondary Architectures

Architectural progress for secondary ports does not impede on merging of this topic.

Loongson 3 loongson3
PowerPC 64-bit (Little Endian) ppc64el
RISC-V 64-bit riscv64

Note: Per Anuken/Arc#181, it may not that "noarch" since sdl2 compiled...

OriginCode · 2025-01-03T16:03:02Z

+install -Dm755 "$SRCDIR/desktop/build/libs/Mindustry.jar" "$PKGDIR/usr/share/java/mindustry/mindustry.jar"
+install -Dm755 "$SRCDIR/server/build/libs/server-release.jar" "$PKGDIR/usr/share/java/mindustry/mindustry_server.jar"


Add some verbosity.

OriginCode · 2025-01-03T16:03:07Z

+install -Dm755 "$SRCDIR/server/build/libs/server-release.jar" "$PKGDIR/usr/share/java/mindustry/mindustry_server.jar"
+local icon_size
+for icon_size in 256 512 1024; do
+    install -Dm644 "$SRCDIR/core/assets/icons/icon_${icon_size}x${icon_size}x32.png" \


OriginCode · 2025-01-03T16:03:43Z

@@ -0,0 +1,5 @@
+PKGNAME=mindustry
+PKGSEC=games
+PKGDEP="openjdk-17 alsa-lib libicns hicolor-icon-theme"


You might want to depend on openjdk instead of depending on a specific version of openjdk, unless otherwise specified by the upstream.

Upstream https://github.com/Anuken/Mindustry said:

If you'd rather compile on your own, follow these instructions. First, make sure you have JDK 17 installed. Other JDK versions will not work. Open a terminal in the Mindustry directory and run the following commands:

Well, I need to mark openjdk 17 as builddep?

Upstream https://github.com/Anuken/Mindustry said:

If you'd rather compile on your own, follow these instructions. First, make sure you have JDK 17 installed. Other JDK versions will not work. Open a terminal in the Mindustry directory and run the following commands:

Well, I need to mark openjdk 17 as builddep?

I see. You might want to make sure other OpenJDK versions can run the game then, otherwise we can still make it a PKGDEP as requested by the upstream.

OriginCode · 2025-01-03T16:05:18Z

@@ -0,0 +1,2 @@
+patch -Np1 -d ../Arc -i ../mindustry/autobuild/patches/fix-arc-build-in-gradle.patch
+patch -Np1 -i autobuild/patches/always-use-local-arc.patch


No need to write a patch file. Patches inside the patch/ directory will be applied automatically during the building process.

Two patches are patched separately.
First file patches to the Arc folder.
Second file patches to the mindustry folder, which is the default...

correction: patches directory

Two patches are patched separately. First file patches to the Arc folder. Second file patches to the mindustry folder, which is the default...

One way to do that is set SUBDIR=., where the parent folder of both SRCS would be the SRCDIR. And then you can have patch files corresponding to two sources.

OriginCode · 2025-01-04T00:24:39Z

@@ -0,0 +1,2 @@
+patch -Np1 -d ../Arc -i ../mindustry/autobuild/patches/fix-arc-build-in-gradle.patch
+patch -Np1 -i autobuild/patches/always-use-local-arc.patch


Two patches are patched separately. First file patches to the Arc folder. Second file patches to the mindustry folder, which is the default...

One way to do that is set SUBDIR=., where the parent folder of both SRCS would be the SRCDIR. And then you can have patch files corresponding to two sources.

OriginCode · 2025-01-04T00:27:28Z

+abinfo "Installing client jar file..."
+install -Dm755 "$SRCDIR/desktop/build/libs/Mindustry.jar" "$PKGDIR/usr/share/java/mindustry/mindustry.jar"
+
+abinfo "Installing server jar file..."
+install -Dm755 "$SRCDIR/server/build/libs/server-release.jar" "$PKGDIR/usr/share/java/mindustry/mindustry_server.jar"


Add some verbosity here (i.e. Supply -v argument for install.)

OriginCode · 2025-01-04T00:29:32Z

@@ -0,0 +1,5 @@
+PKGNAME=mindustry
+PKGSEC=games
+PKGDEP="openjdk-17 alsa-lib libicns hicolor-icon-theme"


Upstream https://github.com/Anuken/Mindustry said:

If you'd rather compile on your own, follow these instructions. First, make sure you have JDK 17 installed. Other JDK versions will not work. Open a terminal in the Mindustry directory and run the following commands:

Well, I need to mark openjdk 17 as builddep?

I see. You might want to make sure other OpenJDK versions can run the game then, otherwise we can still make it a PKGDEP as requested by the upstream.

OriginCode · 2025-01-04T00:32:21Z

@@ -1,18 +1,8 @@
 [Desktop Entry]
-Categories=Game;
-Comment[zh_CN]=A sandbox tower defense game


Don't just remove it, try to leave a clear and correct zh_CN description :)

xtexx · 2025-01-04T09:55:52Z

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+exec /usr/bin/java -jar /usr/share/java/mindustry/mindustry.jar "\$@"


why "\$@"?

idk but seems useless

use $@ to pass arguments.

OriginCode · 2025-01-04T10:02:28Z

@@ -0,0 +1,24 @@
+abinfo "Entering mindustry folder..."
+cd ./mindustry


Use absolute path (i.e. "$SRCDIR"/mindustry).

OriginCode · 2025-01-04T10:04:16Z

+patch -Np1 -d ./Arc -i ../autobuild/patches/fix-arc-build-in-gradle.patch
+patch -Np1 -d ./mindustry -i ../autobuild/patches/always-use-local-arc.patch


You can prepend the directory names to your patches to avoid writing a patch file.

I still cannot figure out what you're saying:P

stdmnpkg · 2025-01-05T19:58:28Z

works on my x86-64 machine, although definitely not noarch, either port it (tedious) or mark it as amd64 only.

aosc-buildit-bot · 2025-01-06T03:30:49Z

Dickens-topic report:

BenderBlog · 2025-01-19T13:04:34Z

Will be continued in this repo, closed...

mindustry: new, 146

50032b5

OriginCode requested changes Jan 3, 2025

View reviewed changes

BenderBlog added 3 commits January 4, 2025 00:15

fix: mess desktop file

b56eef8

fix: not marking abhost=noarch

82a1df3

fix: dep

561f3c2

OriginCode requested changes Jan 4, 2025

View reviewed changes

chore: add server and change srcdir

7cfebe9

xtexx reviewed Jan 4, 2025

View reviewed changes

OriginCode requested changes Jan 4, 2025

View reviewed changes

MingcongBai added the new-package New AOSC OS package label Jan 4, 2025

BenderBlog closed this Jan 19, 2025

		install -Dm755 "$SRCDIR/desktop/build/libs/Mindustry.jar" "$PKGDIR/usr/share/java/mindustry/mindustry.jar"
		install -Dm755 "$SRCDIR/server/build/libs/server-release.jar" "$PKGDIR/usr/share/java/mindustry/mindustry_server.jar"

		@@ -0,0 +1,2 @@
		patch -Np1 -d ../Arc -i ../mindustry/autobuild/patches/fix-arc-build-in-gradle.patch
		patch -Np1 -i autobuild/patches/always-use-local-arc.patch

		@@ -0,0 +1,2 @@
		#!/usr/bin/env sh
		exec /usr/bin/java -jar /usr/share/java/mindustry/mindustry.jar "\$@"

		@@ -0,0 +1,24 @@
		abinfo "Entering mindustry folder..."
		cd ./mindustry

		patch -Np1 -d ./Arc -i ../autobuild/patches/fix-arc-build-in-gradle.patch
		patch -Np1 -d ./mindustry -i ../autobuild/patches/always-use-local-arc.patch

Conversation

BenderBlog commented Jan 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Topic Description

Package(s) Affected

Security Update?

Test Build(s) Done

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

BenderBlog Jan 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

stdmnpkg commented Jan 5, 2025

Uh oh!

aosc-buildit-bot commented Jan 6, 2025

Uh oh!

BenderBlog commented Jan 19, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

BenderBlog commented Jan 3, 2025 •

edited

Loading

BenderBlog Jan 3, 2025 •

edited

Loading