From f02f8a51b57fffcced85bdd5c04253129431ac8f Mon Sep 17 00:00:00 2001 From: Fervi Date: Tue, 12 Aug 2025 14:18:00 +0200 Subject: [PATCH 1/4] Newpkg: megaglest --- tur/megaglest/build.sh | 32 +++ tur/megaglest/linker.patch | 88 +++++++ tur/megaglest/use-sdl2-config.cmake.patch | 303 ++++++++++++++++++++++ 3 files changed, 423 insertions(+) create mode 100644 tur/megaglest/build.sh create mode 100644 tur/megaglest/linker.patch create mode 100644 tur/megaglest/use-sdl2-config.cmake.patch diff --git a/tur/megaglest/build.sh b/tur/megaglest/build.sh new file mode 100644 index 0000000000..3d1edf7cc7 --- /dev/null +++ b/tur/megaglest/build.sh @@ -0,0 +1,32 @@ +TERMUX_PKG_HOMEPAGE=https://megaglest.org/ +TERMUX_PKG_DESCRIPTION="A free and open source 3D real-time strategy game" +TERMUX_PKG_LICENSE="GPL-3.0" +TERMUX_PKG_MAINTAINER="@IntinteDAO" +TERMUX_PKG_VERSION=3.13.0 +TERMUX_PKG_SRCURL=https://github.com/MegaGlest/megaglest-source/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_SHA256=e02e58c2329558cc5d67374b5e5f9b3cfaafc300b96feff71df8d4b0d39e1eaa +TERMUX_PKG_DEPENDS="glib, openal-soft, sdl2, libvorbis, libjpeg-turbo, libpng, freetype, curl, libxml2, wxwidgets, lua52, fribidi, libandroid-glob, libftgl2" + +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DCMAKE_POLICY_VERSION_MINIMUM=3.5 +-DLUA_LIBRARIES=${TERMUX_PREFIX}/lib/liblua5.2.so +-DLUA_INCLUDE_DIR=${TERMUX_PREFIX}/include/lua5.2 +-DLUA_MATH_LIBRARY=/system/lib64/libm.so +-DWANT_STATIC_LIBS=OFF +-DBUILD_SHARED_LIBS=ON +-DBUILD_MEGAGLEST_MAP_EDITOR=OFF +-DCMAKE_SYSTEM_NAME=OpenBSD +-DBUILD_MEGAGLEST_MODEL_VIEWER=OFF +-DMEGAGLEST_DATA_INSTALL_PATH=share/games/megaglest/ +-DWANT_DEV_OUTPATH=ON +" + +termux_step_pre_configure() { + export LDFLAGS+=" -landroid-glob -Wl,--no-as-needed,-lOpenSLES,--as-needed" + export CFLAGS+=" -D__OpenBSD__" + export CXXFLAGS+=" -D__OpenBSD__" +} + +termux_step_post_make_install() { + echo "POST INSTALL for Menu entries" +} \ No newline at end of file diff --git a/tur/megaglest/linker.patch b/tur/megaglest/linker.patch new file mode 100644 index 0000000000..436a76f9aa --- /dev/null +++ b/tur/megaglest/linker.patch @@ -0,0 +1,88 @@ +diff -ur orig/source/shared_lib/include/feathery_ftp/ftpTypes.h mod/source/shared_lib/include/feathery_ftp/ftpTypes.h +--- orig/source/shared_lib/include/feathery_ftp/ftpTypes.h 2017-03-08 21:39:12.000000000 +0100 ++++ mod/source/shared_lib/include/feathery_ftp/ftpTypes.h 2025-07-17 11:03:14.934302633 +0200 +@@ -69,7 +69,7 @@ + extern "C" { + #endif + +-int VERBOSE_MODE_ENABLED; ++extern int VERBOSE_MODE_ENABLED; + + typedef ip_t (*ftpFindExternalFTPServerIpType)(ip_t clientIp); + typedef void (*ftpAddUPNPPortForwardType)(int internalPort, int externalPort); +@@ -77,11 +77,11 @@ + typedef int (*ftpIsValidClientType)(ip_t clientIp); + typedef int (*ftpIsClientAllowedToGetFileType)(ip_t clientIp, const char *username, const char *filename); + +-ftpFindExternalFTPServerIpType ftpFindExternalFTPServerIp; +-ftpAddUPNPPortForwardType ftpAddUPNPPortForward; +-ftpRemoveUPNPPortForwardType ftpRemoveUPNPPortForward; +-ftpIsValidClientType ftpIsValidClient; +-ftpIsClientAllowedToGetFileType ftpIsClientAllowedToGetFile; ++extern ftpFindExternalFTPServerIpType ftpFindExternalFTPServerIp; ++extern ftpAddUPNPPortForwardType ftpAddUPNPPortForward; ++extern ftpRemoveUPNPPortForwardType ftpRemoveUPNPPortForward; ++extern ftpIsValidClientType ftpIsValidClient; ++extern ftpIsClientAllowedToGetFileType ftpIsClientAllowedToGetFile; + + #ifdef __cplusplus + } +diff -ur orig/source/shared_lib/sources/feathery_ftp/ftpRuntime.c mod/source/shared_lib/sources/feathery_ftp/ftpRuntime.c +--- orig/source/shared_lib/sources/feathery_ftp/ftpRuntime.c 2017-03-08 21:39:12.000000000 +0100 ++++ mod/source/shared_lib/sources/feathery_ftp/ftpRuntime.c 2025-07-17 11:04:27.524309864 +0200 +@@ -30,6 +30,13 @@ + #include "ftp.h" + #include "ftpMessages.h" + ++int VERBOSE_MODE_ENABLED = 0; ++ftpFindExternalFTPServerIpType ftpFindExternalFTPServerIp = NULL; ++ftpAddUPNPPortForwardType ftpAddUPNPPortForward = NULL; ++ftpRemoveUPNPPortForwardType ftpRemoveUPNPPortForward = NULL; ++ftpIsValidClientType ftpIsValidClient = NULL; ++ftpIsClientAllowedToGetFileType ftpIsClientAllowedToGetFile = NULL; ++ + + /** + * @brief server-sockets that listens for incoming connections +diff -ur orig/source/shared_lib/sources/platform/posix/miniftpserver.cpp mod/source/shared_lib/sources/platform/posix/miniftpserver.cpp +--- orig/source/shared_lib/sources/platform/posix/miniftpserver.cpp 2017-03-08 21:39:12.000000000 +0100 ++++ mod/source/shared_lib/sources/platform/posix/miniftpserver.cpp 2025-07-17 11:06:54.287657818 +0200 +@@ -40,7 +40,7 @@ + static std::map clientToFTPServerList; + FTPClientValidationInterface * FTPServerThread::ftpValidationIntf = NULL; + +-ip_t FindExternalFTPServerIp(ip_t clientIp) { ++static ip_t FindExternalFTPServerIp(ip_t clientIp) { + ip_t result = clientToFTPServerList[clientIp]; + + if(SystemFlags::VERBOSE_MODE_ENABLED) printf("===> FTP Server thread clientIp = %u, result = %u\n",clientIp,result); +@@ -49,7 +49,7 @@ + return result; + } + +-int isValidClientType(ip_t clientIp) { ++static int isValidClientType(ip_t clientIp) { + int result = 0; + if(FTPServerThread::getFtpValidationIntf() != NULL) { + result = FTPServerThread::getFtpValidationIntf()->isValidClientType(clientIp); +@@ -57,7 +57,7 @@ + return result; + } + +-int isClientAllowedToGetFile(ip_t clientIp, const char *username, const char *filename) { ++static int isClientAllowedToGetFile(ip_t clientIp, const char *username, const char *filename) { + int result = 1; + + //printf("In [%s::%s] Line: %d username [%s] file [%s]\n",__FILE__,__FUNCTION__,__LINE__,username,filename); +@@ -87,9 +87,9 @@ + this->ftpValidationIntf = ftpValidationIntf; + this->tempFilesPath = tempFilesPath; + +- ftpInit(&FindExternalFTPServerIp,&UPNP_Tools::AddUPNPPortForward,&UPNP_Tools::RemoveUPNPPortForward, ++ ftpInit(&FindExternalFTPServerIp, &UPNP_Tools::AddUPNPPortForward, &UPNP_Tools::RemoveUPNPPortForward, + &isValidClientType, &isClientAllowedToGetFile); +- VERBOSE_MODE_ENABLED = SystemFlags::VERBOSE_MODE_ENABLED; ++ //VERBOSE_MODE_ENABLED = SystemFlags::VERBOSE_MODE_ENABLED; + + if(SystemFlags::VERBOSE_MODE_ENABLED) printf("***FTP SERVER STARTED [%p]\n",this); + } diff --git a/tur/megaglest/use-sdl2-config.cmake.patch b/tur/megaglest/use-sdl2-config.cmake.patch new file mode 100644 index 0000000000..14c5418512 --- /dev/null +++ b/tur/megaglest/use-sdl2-config.cmake.patch @@ -0,0 +1,303 @@ +From: Markus Koschany +Date: Fri, 28 Feb 2020 13:19:34 +0100 +Subject: use sdl2 config.cmake + +--- + CMakeLists.txt | 3 + + mk/cmake/Modules/FindSDL2.cmake | 180 --------------------------------- + source/g3d_viewer/CMakeLists.txt | 6 +- + source/glest_game/CMakeLists.txt | 6 +- + source/glest_map_editor/CMakeLists.txt | 6 +- + source/shared_lib/CMakeLists.txt | 6 +- + source/tests/CMakeLists.txt | 6 +- + 7 files changed, 18 insertions(+), 195 deletions(-) + delete mode 100644 mk/cmake/Modules/FindSDL2.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e23a572..fe56a98 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -447,6 +447,9 @@ endforeach() + #MESSAGE( STATUS "=====> DirDefs: " ${DirDefs} ) + #MESSAGE(STATUS "*** Compiler definitions are [${COMPILE_DEFINITIONS}]") + ++FIND_PACKAGE(SDL2 REQUIRED CONFIG) ++INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIRS}) ++ + MARK_AS_ADVANCED(${SDL_VERSION_NAME}MAIN_LIBRARY) + MARK_AS_ADVANCED(${SDL_VERSION_NAME}_INCLUDE_DIR) + MARK_AS_ADVANCED(${SDL_VERSION_NAME}_LIBRARY) +diff --git a/mk/cmake/Modules/FindSDL2.cmake b/mk/cmake/Modules/FindSDL2.cmake +deleted file mode 100644 +index d1bc1fe..0000000 +--- a/mk/cmake/Modules/FindSDL2.cmake ++++ /dev/null +@@ -1,180 +0,0 @@ +-# Locate SDL2 library +-# This module defines +-# SDL2_LIBRARY, the name of the library to link against +-# SDL2_FOUND, if false, do not try to link to SDL2 +-# SDL2_INCLUDE_DIR, where to find SDL.h +-# +-# This module responds to the the flag: +-# SDL2_BUILDING_LIBRARY +-# If this is defined, then no SDL2_main will be linked in because +-# only applications need main(). +-# Otherwise, it is assumed you are building an application and this +-# module will attempt to locate and set the the proper link flags +-# as part of the returned SDL2_LIBRARY variable. +-# +-# Don't forget to include SDL2main.h and SDL2main.m your project for the +-# OS X framework based version. (Other versions link to -lSDL2main which +-# this module will try to find on your behalf.) Also for OS X, this +-# module will automatically add the -framework Cocoa on your behalf. +-# +-# +-# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration +-# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library +-# (SDL2.dll, libsdl2.so, SDL2.framework, etc). +-# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again. +-# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value +-# as appropriate. These values are used to generate the final SDL2_LIBRARY +-# variable, but when these values are unset, SDL2_LIBRARY does not get created. +-# +-# +-# $SDL2DIR is an environment variable that would +-# correspond to the ./configure --prefix=$SDL2DIR +-# used in building SDL2. +-# l.e.galup 9-20-02 +-# +-# Modified by Eric Wing. +-# Added code to assist with automated building by using environmental variables +-# and providing a more controlled/consistent search behavior. +-# Added new modifications to recognize OS X frameworks and +-# additional Unix paths (FreeBSD, etc). +-# Also corrected the header search path to follow "proper" SDL2 guidelines. +-# Added a search for SDL2main which is needed by some platforms. +-# Added a search for threads which is needed by some platforms. +-# Added needed compile switches for MinGW. +-# +-# On OSX, this will prefer the Framework version (if found) over others. +-# People will have to manually change the cache values of +-# SDL2_LIBRARY to override this selection or set the CMake environment +-# CMAKE_INCLUDE_PATH to modify the search paths. +-# +-# Note that the header path has changed from SDL2/SDL.h to just SDL.h +-# This needed to change because "proper" SDL2 convention +-# is #include "SDL.h", not . This is done for portability +-# reasons because not all systems place things in SDL2/ (see FreeBSD). +-# +-# Ported by Johnny Patterson. This is a literal port for SDL2 of the FindSDL.cmake +-# module with the minor edit of changing "SDL" to "SDL2" where necessary. This +-# was not created for redistribution, and exists temporarily pending official +-# SDL2 CMake modules. +- +-#============================================================================= +-# Copyright 2003-2009 Kitware, Inc. +-# +-# Distributed under the OSI-approved BSD License (the "License"); +-# see accompanying file Copyright.txt for details. +-# +-# This software is distributed WITHOUT ANY WARRANTY; without even the +-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +-# See the License for more information. +-#============================================================================= +-# (To distribute this file outside of CMake, substitute the full +-# License text for the above reference.) +- +-FIND_PATH(SDL2_INCLUDE_DIR SDL.h +- HINTS +- $ENV{SDL2DIR} +- PATH_SUFFIXES include/SDL2 include +- PATHS +- ~/Library/Frameworks +- /Library/Frameworks +- /usr/local/include/SDL2 +- /usr/include/SDL2 +- /sw # Fink +- /opt/local # DarwinPorts +- /opt/csw # Blastwave +- /opt +-) +-#MESSAGE("SDL2_INCLUDE_DIR is ${SDL2_INCLUDE_DIR}") +- +-FIND_LIBRARY(SDL2_LIBRARY_TEMP +- NAMES SDL2 +- HINTS +- $ENV{SDL2DIR} +- PATH_SUFFIXES lib64 lib +- PATHS +- /sw +- /opt/local +- /opt/csw +- /opt +-) +-#MESSAGE("SDL2_LIBRARY_TEMP is ${SDL2_LIBRARY_TEMP}") +- +-IF(NOT SDL2_BUILDING_LIBRARY) +- IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework") +- # Non-OS X framework versions expect you to also dynamically link to +- # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms +- # seem to provide SDL2main for compatibility even though they don't +- # necessarily need it. +- FIND_LIBRARY(SDL2MAIN_LIBRARY +- NAMES SDL2main +- HINTS +- $ENV{SDL2DIR} +- PATH_SUFFIXES lib64 lib +- PATHS +- /sw +- /opt/local +- /opt/csw +- /opt +- ) +- ENDIF() +-ENDIF() +- +-# SDL2 may require threads on your system. +-# The Apple build may not need an explicit flag because one of the +-# frameworks may already provide it. +-# But for non-OSX systems, I will use the CMake Threads package. +-IF(NOT APPLE) +- FIND_PACKAGE(Threads) +-ENDIF() +- +-# MinGW needs an additional library, mwindows +-# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows +-# (Actually on second look, I think it only needs one of the m* libraries.) +-IF(MINGW) +- SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW") +-ENDIF() +- +-SET(SDL2_FOUND "NO") +-IF(SDL2_LIBRARY_TEMP) +- # For SDL2main +- IF(NOT SDL2_BUILDING_LIBRARY) +- IF(SDL2MAIN_LIBRARY) +- SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP}) +- ENDIF() +- ENDIF() +- +- # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa. +- # CMake doesn't display the -framework Cocoa string in the UI even +- # though it actually is there if I modify a pre-used variable. +- # I think it has something to do with the CACHE STRING. +- # So I use a temporary variable until the end so I can set the +- # "real" variable in one-shot. +- IF(APPLE) +- SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa") +- ENDIF() +- +- # For threads, as mentioned Apple doesn't need this. +- # In fact, there seems to be a problem if I used the Threads package +- # and try using this line, so I'm just skipping it entirely for OS X. +- IF(NOT APPLE) +- SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT}) +- ENDIF() +- +- # For MinGW library +- IF(MINGW) +- SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP}) +- ENDIF() +- +- # Set the final string here so the GUI reflects the final state. +- SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found") +- # Set the temp variable to INTERNAL so it is not seen in the CMake GUI +- SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "") +- #MESSAGE("SDL2_LIBRARY is ${SDL2_LIBRARY}") +- +- SET(SDL2_FOUND "YES") +-ENDIF() +- +-INCLUDE(FindPackageHandleStandardArgs) +- +-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 +- REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR) +diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt +index 9099589..bb85da8 100644 +--- a/source/g3d_viewer/CMakeLists.txt ++++ b/source/g3d_viewer/CMakeLists.txt +@@ -16,9 +16,9 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) + # Was required at least on bsd and macos. + ENDIF() + +- FIND_PACKAGE(${SDL_VERSION_NAME} REQUIRED) +- INCLUDE_DIRECTORIES(${${SDL_VERSION_NAME}_INCLUDE_DIR}) +- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${${SDL_VERSION_NAME}_LIBRARY}) ++ FIND_PACKAGE(${SDL_VERSION_NAME} REQUIRED CONFIG) ++ INCLUDE_DIRECTORIES(${${SDL_VERSION_NAME}_INCLUDE_DIRS}) ++ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${${SDL_VERSION_NAME}_LIBRARIES}) + + FIND_PACKAGE(OpenGL REQUIRED) + INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) +diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt +index 42656bd..aa5ed1c 100644 +--- a/source/glest_game/CMakeLists.txt ++++ b/source/glest_game/CMakeLists.txt +@@ -29,10 +29,10 @@ IF(BUILD_MEGAGLEST) + link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib) + ENDIF() + +- FIND_PACKAGE(${SDL_VERSION_NAME} REQUIRED) +- INCLUDE_DIRECTORIES(${${SDL_VERSION_NAME}_INCLUDE_DIR}) ++ FIND_PACKAGE(${SDL_VERSION_NAME} REQUIRED CONFIG) ++ INCLUDE_DIRECTORIES(${${SDL_VERSION_NAME}_INCLUDE_DIRS}) + IF(UNIX) +- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${${SDL_VERSION_NAME}_LIBRARY}) ++ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${${SDL_VERSION_NAME}_LIBRARIES}) + ENDIF() + + FIND_PACKAGE(OpenGL REQUIRED) +diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt +index 378a3ac..df2d0ec 100644 +--- a/source/glest_map_editor/CMakeLists.txt ++++ b/source/glest_map_editor/CMakeLists.txt +@@ -16,9 +16,9 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) + # Was required at least on bsd and macos. + ENDIF() + +- FIND_PACKAGE(${SDL_VERSION_NAME} REQUIRED) +- INCLUDE_DIRECTORIES(${${SDL_VERSION_NAME}_INCLUDE_DIR}) +- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${${SDL_VERSION_NAME}_LIBRARY}) ++ FIND_PACKAGE(${SDL_VERSION_NAME} REQUIRED CONFIG) ++ INCLUDE_DIRECTORIES(${${SDL_VERSION_NAME}_INCLUDE_DIRS}) ++ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${${SDL_VERSION_NAME}_LIBRARIES}) + + FIND_PACKAGE(OpenGL REQUIRED) + INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) +diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt +index afb03c1..67c60e1 100644 +--- a/source/shared_lib/CMakeLists.txt ++++ b/source/shared_lib/CMakeLists.txt +@@ -100,10 +100,10 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST + ENDIF() + ENDIF() + +- FIND_PACKAGE(${SDL_VERSION_NAME} REQUIRED) +- INCLUDE_DIRECTORIES(${${SDL_VERSION_NAME}_INCLUDE_DIR}) ++ FIND_PACKAGE(${SDL_VERSION_NAME} REQUIRED CONFIG) ++ INCLUDE_DIRECTORIES(${${SDL_VERSION_NAME}_INCLUDE_DIRS}) + IF(UNIX) +- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${${SDL_VERSION_NAME}_LIBRARY}) ++ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${${SDL_VERSION_NAME}_LIBRARIES}) + ENDIF() + + FIND_PACKAGE(OpenGL REQUIRED) +diff --git a/source/tests/CMakeLists.txt b/source/tests/CMakeLists.txt +index 820b696..044366b 100644 +--- a/source/tests/CMakeLists.txt ++++ b/source/tests/CMakeLists.txt +@@ -15,10 +15,10 @@ IF(BUILD_MEGAGLEST_TESTS) + SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CPPUNIT_LIBRARY}) + ENDIF() + +- FIND_PACKAGE(${SDL_VERSION_NAME} REQUIRED) +- INCLUDE_DIRECTORIES(${${SDL_VERSION_NAME}_INCLUDE_DIR}) ++ FIND_PACKAGE(${SDL_VERSION_NAME} REQUIRED CONFIG) ++ INCLUDE_DIRECTORIES(${${SDL_VERSION_NAME}_INCLUDE_DIRS}) + IF(UNIX) +- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${${SDL_VERSION_NAME}_LIBRARY}) ++ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${${SDL_VERSION_NAME}_LIBRARIES}) + ENDIF() + + if(WANT_USE_FriBiDi) From 58d8ad716dae3ba6ec35e2e602f9ac27c4f5b81c Mon Sep 17 00:00:00 2001 From: Fervi Date: Tue, 12 Aug 2025 14:24:34 +0200 Subject: [PATCH 2/4] Fix new line --- tur/megaglest/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tur/megaglest/build.sh b/tur/megaglest/build.sh index 3d1edf7cc7..e6b3344d19 100644 --- a/tur/megaglest/build.sh +++ b/tur/megaglest/build.sh @@ -29,4 +29,4 @@ termux_step_pre_configure() { termux_step_post_make_install() { echo "POST INSTALL for Menu entries" -} \ No newline at end of file +} From 71a842e56d5246826f24883fa7dc1c6dc291ab9e Mon Sep 17 00:00:00 2001 From: Fervi Date: Tue, 12 Aug 2025 14:34:44 +0200 Subject: [PATCH 3/4] Fixpkg: Add glew dependency --- tur/megaglest/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tur/megaglest/build.sh b/tur/megaglest/build.sh index e6b3344d19..7d9c642f24 100644 --- a/tur/megaglest/build.sh +++ b/tur/megaglest/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_MAINTAINER="@IntinteDAO" TERMUX_PKG_VERSION=3.13.0 TERMUX_PKG_SRCURL=https://github.com/MegaGlest/megaglest-source/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e02e58c2329558cc5d67374b5e5f9b3cfaafc300b96feff71df8d4b0d39e1eaa -TERMUX_PKG_DEPENDS="glib, openal-soft, sdl2, libvorbis, libjpeg-turbo, libpng, freetype, curl, libxml2, wxwidgets, lua52, fribidi, libandroid-glob, libftgl2" +TERMUX_PKG_DEPENDS="glib, openal-soft, sdl2, libvorbis, libjpeg-turbo, libpng, freetype, curl, libxml2, wxwidgets, lua52, fribidi, libandroid-glob, libftgl2, glew" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DCMAKE_POLICY_VERSION_MINIMUM=3.5 From 1bbe9b172c7e2890954b5628541fea01df51e509 Mon Sep 17 00:00:00 2001 From: IntinteDAO Date: Wed, 13 Aug 2025 09:35:18 +0200 Subject: [PATCH 4/4] Megaglest: Fix libm.so --- tur/megaglest/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tur/megaglest/build.sh b/tur/megaglest/build.sh index 7d9c642f24..80a2622e20 100644 --- a/tur/megaglest/build.sh +++ b/tur/megaglest/build.sh @@ -11,7 +11,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DLUA_LIBRARIES=${TERMUX_PREFIX}/lib/liblua5.2.so -DLUA_INCLUDE_DIR=${TERMUX_PREFIX}/include/lua5.2 --DLUA_MATH_LIBRARY=/system/lib64/libm.so +-DLUA_MATH_LIBRARY=$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/libm.so -DWANT_STATIC_LIBS=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_MEGAGLEST_MAP_EDITOR=OFF