-
Notifications
You must be signed in to change notification settings - Fork 136
Newpkg: Lugaru #1811
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
IntinteDAO
wants to merge
5
commits into
termux-user-repository:master
Choose a base branch
from
IntinteDAO:lugaru
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+104
−0
Open
Newpkg: Lugaru #1811
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
53 changes: 53 additions & 0 deletions
53
tur/lugaru/Fix-mismatched-usage-length-build-fail-on-g.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| From dd685fe9080c2853422d8272792691358ea07dfc Mon Sep 17 00:00:00 2001 | ||
| From: Martin Erik Werner <[email protected]> | ||
| Date: Wed, 8 Mar 2017 22:51:16 +0100 | ||
| Subject: [PATCH] Fix mismatched usage length, build fail on g++ | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| The length of const option::Descriptor usage[] is intended to be | ||
| inferred based on the initialisation in Source/main.cpp, however, the | ||
| extern declaration in Source/Game.hpp hard-codes it to 13. | ||
|
|
||
| Remove the hard-coded 13 in the extern declaration, in favour of the | ||
| inferred length. | ||
|
|
||
| This also fixes the following build failure with g++ (Debian 4.9.2-10) | ||
| 4.9.2: | ||
| (...)/Source/main.cpp:602:5: error: uninitialized const member ‘option::Descriptor::index’ | ||
| }; | ||
| ^ | ||
| (...)/Source/main.cpp:602:5: warning: missing initializer for member ‘option::Descriptor::index’ [-Wmissing-field-initializers] | ||
| (...)/Source/main.cpp:602:5: error: uninitialized const member ‘option::Descriptor::type’ | ||
| (...)/Source/main.cpp:602:5: warning: missing initializer for member ‘option::Descriptor::type’ [-Wmissing-field-initializers] | ||
| (...)/Source/main.cpp:602:5: error: uninitialized const member ‘option::Descriptor::shortopt’ | ||
| (...)/Source/main.cpp:602:5: warning: missing initializer for member ‘option::Descriptor::shortopt’ [-Wmissing-field-initializers] | ||
| (...)/Source/main.cpp:602:5: error: uninitialized const member ‘option::Descriptor::longopt’ | ||
| (...)/Source/main.cpp:602:5: warning: missing initializer for member ‘option::Descriptor::longopt’ [-Wmissing-field-initializers] | ||
| (...)/Source/main.cpp:602:5: error: uninitialized const member ‘option::Descriptor::check_arg’ | ||
| (...)/Source/main.cpp:602:5: warning: missing initializer for member ‘option::Descriptor::check_arg’ [-Wmissing-field-initializers] | ||
| (...)/Source/main.cpp:602:5: warning: missing initializer for member ‘option::Descriptor::help’ [-Wmissing-field-initializers] | ||
| CMakeFiles/lugaru.dir/build.make:54: recipe for target 'CMakeFiles/lugaru.dir/Source/main.cpp.o' failed | ||
|
|
||
| Signed-off-by: Martin Erik Werner <[email protected]> | ||
| --- | ||
| Source/Game.hpp | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/Source/Game.hpp b/Source/Game.hpp | ||
| index 51232cc..9bb6adb 100644 | ||
| --- a/Source/Game.hpp | ||
| +++ b/Source/Game.hpp | ||
| @@ -234,7 +234,7 @@ enum optionIndex | ||
| /* Number of options + 1 */ | ||
| const int commandLineOptionsNumber = 10; | ||
|
|
||
| -extern const option::Descriptor usage[13]; | ||
| +extern const option::Descriptor usage[]; | ||
|
|
||
| extern option::Option commandLineOptions[commandLineOptionsNumber]; | ||
| extern option::Option* commandLineOptionsBuffer; | ||
| -- | ||
| 2.1.4 | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| TERMUX_PKG_HOMEPAGE=https://osslugaru.gitlab.io | ||
| TERMUX_PKG_DESCRIPTION="Lugaru HD, free and open source ninja rabbit fighting game" | ||
| TERMUX_PKG_LICENSE="GPL-2.0" | ||
| TERMUX_PKG_MAINTAINER="@termux-user-repository" | ||
| TERMUX_PKG_VERSION="1.2" | ||
| TERMUX_PKG_SRCURL=https://github.com/osslugaru/lugaru/releases/download/${TERMUX_PKG_VERSION}/lugaru-${TERMUX_PKG_VERSION}.tar.xz | ||
| TERMUX_PKG_SHA256=f3ea477caf78911c69939fbdc163f9f6517c7ef2267e716a0e050be1a166ef97 | ||
| TERMUX_PKG_DEPENDS="sdl2, glu, openal-soft, lugaru-data" | ||
| TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" | ||
| -DCMAKE_INSTALL_PREFIX=$TERMUX_PREFIX | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This line is automatically applied by |
||
| -DSYSTEM_INSTALL=ON | ||
| -DCMAKE_INSTALL_BINDIR=bin | ||
| -DCMAKE_INSTALL_DATADIR=share/games | ||
| " | ||
|
|
||
| termux_step_pre_configure() { | ||
| export LDFLAGS+=" -Wl,--no-as-needed,-lOpenSLES,--as-needed" | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff -ur orig/Source/Audio/openal_wrapper.cpp mod/Source/Audio/openal_wrapper.cpp | ||
| --- orig/Source/Audio/openal_wrapper.cpp 2017-02-11 20:09:37.000000000 +0100 | ||
| +++ mod/Source/Audio/openal_wrapper.cpp 2025-07-06 10:30:30.359535461 +0200 | ||
| @@ -316,7 +316,7 @@ | ||
| // !!! FIXME: if it's not Ogg, we don't have a decoder. I'm lazy. :/ | ||
| char* fname = (char*)alloca(strlen(_fname) + 16); | ||
| strcpy(fname, _fname); | ||
| - char* ptr = strchr(fname, '.'); | ||
| + char* ptr = strrchr(fname, '.'); | ||
| if (ptr) { | ||
| *ptr = '\0'; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| Author: Vincent Prat <[email protected]> | ||
| Description: Change the destination of AppData files from /usr/share/metadata to /usr/share/metainfo | ||
| Forwarded: not-needed | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -306,7 +306,7 @@ | ||
| install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/lugaru DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
| # Trailing '/' is significant, it installs and _renames_ Data/ as the destination folder | ||
| install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data/ DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}) | ||
| - install(FILES ${CMAKE_SOURCE_DIR}/Dist/Linux/lugaru.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata) | ||
| + install(FILES ${CMAKE_SOURCE_DIR}/Dist/Linux/lugaru.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo) | ||
| install(FILES ${CMAKE_SOURCE_DIR}/Dist/Linux/lugaru.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) | ||
| install(FILES ${CMAKE_SOURCE_DIR}/Dist/Linux/lugaru.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps) | ||
| install(FILES ${CMAKE_SOURCE_DIR}/Dist/Linux/lugaru.6 DESTINATION ${CMAKE_INSTALL_MANDIR}/man6) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| TERMUX_SUBPKG_DESCRIPTION="Data files for Lugaru" | ||
| TERMUX_SUBPKG_PLATFORM_INDEPENDENT=true | ||
| TERMUX_SUBPKG_DEPEND_ON_PARENT=no | ||
| TERMUX_SUBPKG_INCLUDE=" | ||
| share/games/lugaru | ||
| " |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is better to set yourself as maintainer.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@licy183
Thanks for reply. Should that be the Github nickname or the actual nickname? Probably the github one due to the fact that the bot will call me if the package doesn't work, but I prefer to inquire
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should be the nickname on GitHub.