Skip to content
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.

Sign up for GitHub

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

global update pkgs #178

Merged
merged 1 commit into from
Jan 6, 2024
+697 −193
Merged

global update pkgs #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 30 additions & 19 deletions gpkg/box64/CMakeLists.txt.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,34 @@
--- box64-0.2.4/CMakeLists.txt 2023-08-19 18:22:35.000000000 +0300
+++ box64-0.2.4/CMakeLists.txt.patch 2023-09-24 14:31:20.336353618 +0300
@@ -765,14 +765,14 @@
RUNTIME DESTINATION bin)
--- src/CMakeLists.txt 2023-12-15 21:26:45.000000000 +0300
+++ src/CMakeLists.txt.patch 2024-01-04 22:11:28.138578365 +0300
@@ -872,8 +872,8 @@
if(NOT NO_CONF_INSTALL)
configure_file(system/box64.conf.cmake system/box64.conf)
- install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION /etc/binfmt.d/)
- install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION /etc/)
+ install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION @TERMUX_PREFIX@/etc/binfmt.d/)
+ install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION @TERMUX_PREFIX@/etc/)
if(NOT TERMUX)
- install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION /etc/binfmt.d/)
- install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION /etc/)
+ install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION @TERMUX_PREFIX@/etc/binfmt.d/)
+ install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION @TERMUX_PREFIX@/etc/)
else()
#install(FILES ${CMAKE_BINARY_DIR}/system/box64.conf DESTINATION ${TERMUX_PATH}/usr/etc/binfmt.d/)
install(FILES ${CMAKE_SOURCE_DIR}/system/box64.box64rc DESTINATION ${TERMUX_PATH}/usr/etc/)
@@ -882,13 +882,13 @@
endif()
if(NOT NO_LIB_INSTALL)
- install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.5 DESTINATION /usr/lib/x86_64-linux-gnu/)
- install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.6 DESTINATION /usr/lib/x86_64-linux-gnu/)
- install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libgcc_s.so.1 DESTINATION /usr/lib/x86_64-linux-gnu/)
- install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libpng12.so.0 DESTINATION /usr/lib/x86_64-linux-gnu/)
+ install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.5 DESTINATION @TERMUX_PREFIX@/lib/x86_64-linux-gnu/)
+ install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.6 DESTINATION @TERMUX_PREFIX@/lib/x86_64-linux-gnu/)
+ install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libgcc_s.so.1 DESTINATION @TERMUX_PREFIX@/lib/x86_64-linux-gnu/)
+ install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libpng12.so.0 DESTINATION @TERMUX_PREFIX@/lib/x86_64-linux-gnu/)
endif()
endif()

if(NOT TERMUX)
- install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.5 DESTINATION /usr/lib/x86_64-linux-gnu/)
- install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.6 DESTINATION /usr/lib/x86_64-linux-gnu/)
- install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libgcc_s.so.1 DESTINATION /usr/lib/x86_64-linux-gnu/)
- install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libpng12.so.0 DESTINATION /usr/lib/x86_64-linux-gnu/)
- install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libcrypto.so.1.1 DESTINATION /usr/lib/x86_64-linux-gnu/)
- install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libssl.so.1.1 DESTINATION /usr/lib/x86_64-linux-gnu/)
- install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libunwind.so.8 DESTINATION /usr/lib/x86_64-linux-gnu/)
+ install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.5 DESTINATION @TERMUX_PREFIX@/lib/x86_64-linux-gnu/)
+ install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.6 DESTINATION @TERMUX_PREFIX@/lib/x86_64-linux-gnu/)
+ install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libgcc_s.so.1 DESTINATION @TERMUX_PREFIX@/lib/x86_64-linux-gnu/)
+ install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libpng12.so.0 DESTINATION @TERMUX_PREFIX@/lib/x86_64-linux-gnu/)
+ install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libcrypto.so.1.1 DESTINATION @TERMUX_PREFIX@/lib/x86_64-linux-gnu/)
+ install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libssl.so.1.1 DESTINATION @TERMUX_PREFIX@/lib/x86_64-linux-gnu/)
+ install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libunwind.so.8 DESTINATION @TERMUX_PREFIX@/lib/x86_64-linux-gnu/)
else()
install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.5 DESTINATION ${TERMUX_PATH}/usr/lib/x86_64-linux-gnu/)
install(FILES ${CMAKE_SOURCE_DIR}/x64lib/libstdc++.so.6 DESTINATION ${TERMUX_PATH}/usr/lib/x86_64-linux-gnu/)
4 changes: 2 additions & 2 deletions gpkg/box64/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/ptitSeb/box64
TERMUX_PKG_DESCRIPTION="Linux Userspace x86_64 Emulator with a twist"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux-pacman"
TERMUX_PKG_VERSION=0.2.4
TERMUX_PKG_VERSION=0.2.6
TERMUX_PKG_SRCURL=https://github.com/ptitSeb/box64/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=92234fff92a1871e685a030e76d5be9f5a3746b96131913ecf001ef8e3064781
TERMUX_PKG_SHA256=ef002041aeefec49efb9a2cb276ab4a99d048df0be06416b93b22e507e263f61
TERMUX_PKG_DEPENDS="gcc-libs-glibc"
TERMUX_PKG_BLACKLISTED_ARCHES="arm, i686"
TERMUX_CMAKE_BUILD="Unix Makefiles"
Expand Down
122 changes: 57 additions & 65 deletions gpkg/box64/setdirs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff --git a/src/main.c b/src/main.c
index 14e04d1..b9f676a 100644
--- box64-0.2.4/src/main.c
+++ box64-0.2.4/src/main.c
@@ -1023,12 +1023,10 @@ void LoadEnvVars(box64context_t *context)
}
index db33d9a..1870884 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1161,12 +1161,10 @@ void LoadEnvVars(box64context_t *context)
// check BOX64_LD_LIBRARY_PATH and load it
LoadEnvPath(&context->box64_ld_lib, ".:lib:lib64:x86_64:bin64:libs64", "BOX64_LD_LIBRARY_PATH");
#ifndef TERMUX
- if(FileExist("/lib/x86_64-linux-gnu", 0))
- AddPath("/lib/x86_64-linux-gnu", &context->box64_ld_lib, 1);
- if(FileExist("/usr/lib/x86_64-linux-gnu", 0))
Expand All @@ -16,73 +16,60 @@ index 14e04d1..b9f676a 100644
+ AddPath("@TERMUX_PREFIX@/lib/x86_64-linux-gnu", &context->box64_ld_lib, 1);
+ if(FileExist("@TERMUX_PREFIX@/x86_64-linux-gnu/lib", 0))
+ AddPath("@TERMUX_PREFIX@/x86_64-linux-gnu/lib", &context->box64_ld_lib, 1);
if(getenv("LD_LIBRARY_PATH"))
PrependList(&context->box64_ld_lib, getenv("LD_LIBRARY_PATH"), 1); // in case some of the path are for x86 world
if(getenv("BOX64_EMULATED_LIBS")) {
@@ -1272,8 +1270,8 @@ static void free_contextargv()

#else
//TODO: Add Termux Library Path - Lily
if(FileExist("/data/data/com.termux/files/usr/lib/x86_64-linux-gnu", 0))
@@ -1426,8 +1424,8 @@ static void free_contextargv()
static void load_rcfiles()
{
#ifndef TERMUX
- if(FileExist("/etc/box64.box64rc", IS_FILE))
- LoadRCFile("/etc/box64.box64rc");
+ if(FileExist("@TERMUX_PREFIX@/etc/box64.box64rc", IS_FILE))
+ LoadRCFile("@TERMUX_PREFIX@/etc/box64.box64rc");
else
LoadRCFile(NULL); // load default rcfile
char* p = getenv("HOME");
@@ -1297,7 +1295,7 @@ int main(int argc, const char **argv, char **env) {
PrintHelp();
return 1;
#else
if(FileExist("/data/data/com.termux/files/usr/etc/box64.box64rc", IS_FILE))
LoadRCFile("/data/data/com.termux/files/usr/etc/box64.box64rc");
@@ -1459,7 +1457,7 @@ int main(int argc, const char **argv, char **env) {
printf("See 'box64 --help' for more information.\n");
exit(0);
}
- if(argc>1 && !strcmp(argv[1], "/usr/bin/gdb") && getenv("BOX64_TRACE_FILE"))
+ if(argc>1 && !strcmp(argv[1], "@TERMUX_PREFIX@/bin/gdb") && getenv("BOX64_TRACE_FILE"))
exit(0);
// uname -m is redirected to box64 -m
if(argc==2 && (!strcmp(argv[1], "-m") || !strcmp(argv[1], "-p") || !strcmp(argv[1], "-i")))
diff --git a/src/steam.c b/src/steam.c
index 4d48cae..27d94ac 100644
--- box64-0.2.4/src/steam.c
+++ box64-0.2.4/src/steam.c
@@ -26,13 +26,13 @@ void pressure_vessel(int argc, const char** argv, int nextarg)
} else if(strstr(argv[nextarg], "--env-if-host=STEAM_RUNTIME_LIBRARY_PATH=")==argv[nextarg]) {
// transform RESSURE_VESSEL_APP_LD_LIBRARY_PATH to BOX86_ / BOX64_ LD_LIBRARY_PATH
char tmp[strlen(argv[nextarg])+150];
- strcpy(tmp, "BOX86_LD_LIBRARY_PATH=/lib/box86:/usr/lib/box86:/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu:/usr/lib/i686-pc-linux-gnu:/usr/lib32:");
+ strcpy(tmp, "BOX86_LD_LIBRARY_PATH=@TERMUX_PREFIX@/lib/box86:@TERMUX_PREFIX@/lib/i386-linux-gnu:@TERMUX_PREFIX@/lib/i686-pc-linux-gnu:@TERMUX_PREFIX@/lib32:");
strcat(tmp, argv[nextarg]+strlen("--env-if-host=STEAM_RUNTIME_LIBRARY_PATH="));
char *p = strchr(tmp, '=');
*p ='\0'; ++p;
setenv(tmp, p, 1);
printf_log(LOG_DEBUG, "setenv(%s, %s, 1)\n", tmp, p);
- strcpy(tmp, "BOX64_LD_LIBRARY_PATH=/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:");
+ strcpy(tmp, "BOX64_LD_LIBRARY_PATH=@TERMUX_PREFIX@/lib/x86_64-linux-gnu:");
strcat(tmp, argv[nextarg]+strlen("--env-if-host=STEAM_RUNTIME_LIBRARY_PATH="));
p = strchr(tmp, '=');
*p ='\0'; ++p;
@@ -95,4 +95,4 @@ void pressure_vessel(int argc, const char** argv, int nextarg)
waitpid(v, &wstatus, 0);
index b221b54..d0af6e4 100644
--- a/src/steam.c
+++ b/src/steam.c
@@ -41,13 +41,13 @@ void pressure_vessel(int argc, const char** argv, int nextarg, const char* prog)
if(is_usr) {
// transform RESSURE_VESSEL_APP_LD_LIBRARY_PATH to BOX86_ / BOX64_ LD_LIBRARY_PATH
char tmp[strlen(argv[nextarg])+150];
- strcpy(tmp, "BOX86_LD_LIBRARY_PATH=/lib/box86:/usr/lib/box86:/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu:/usr/lib/i686-pc-linux-gnu:/usr/lib32:");
+ strcpy(tmp, "BOX86_LD_LIBRARY_PATH=@TERMUX_PREFIX@/lib/box86:@TERMUX_PREFIX@/lib/i386-linux-gnu:@TERMUX_PREFIX@/lib/i686-pc-linux-gnu:@TERMUX_PREFIX@/lib32:");
strcat(tmp, argv[nextarg]+strlen("--env-if-host=STEAM_RUNTIME_LIBRARY_PATH="));
char *p = strchr(tmp, '=');
*p ='\0'; ++p;
setenv(tmp, p, 1);
printf_log(LOG_DEBUG, "setenv(%s, %s, 1)\n", tmp, p);
- strcpy(tmp, "BOX64_LD_LIBRARY_PATH=/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:");
+ strcpy(tmp, "BOX64_LD_LIBRARY_PATH=@TERMUX_PREFIX@/lib/x86_64-linux-gnu:");
strcat(tmp, argv[nextarg]+strlen("--env-if-host=STEAM_RUNTIME_LIBRARY_PATH="));
p = strchr(tmp, '=');
*p ='\0'; ++p;
@@ -173,4 +173,4 @@ void pressure_vessel(int argc, const char** argv, int nextarg, const char* prog)
//waitpid(v, &wstatus, 0);
exit(0);
}
-}
\ No newline at end of file
+}
diff --git a/src/tools/fileutils.c b/src/tools/fileutils.c
index d6d1556..565354f 100644
--- box64-0.2.4/src/tools/fileutils.c
+++ box64-0.2.4/src/tools/fileutils.c
@@ -17,9 +17,9 @@

static const char* x86lib = "\x7f" "ELF" "\x01" "\x01" "\x01" "\x03" "\x00" "\x00" "\x00" "\x00" "\x00" "\x00" "\x00" "\x00" "\x02" "\x00" "\x03" "\x00";
static const char* x64lib = "\x7f" "ELF" "\x02" "\x01" "\x01" "\x03" "\x00" "\x00" "\x00" "\x00" "\x00" "\x00" "\x00" "\x00" "\x02" "\x00" "\x3e" "\x00";
-static const char* bashsign= "#!/bin/bash";
-static const char* shsign = "#!/bin/sh";
-static const char* bashsign2="#!/usr/bin/env bash";
+static const char* bashsign= "#!@TERMUX_PREFIX@/bin/bash";
+static const char* shsign = "#!@TERMUX_PREFIX@/bin/sh";
+static const char* bashsign2="#!@TERMUX_PREFIX@/bin/env bash";

int FileExist(const char* filename, int flags)
{
index d6d1556..f272a9c 100644
--- a/src/tools/fileutils.c
+++ b/src/tools/fileutils.c
@@ -127,11 +127,8 @@ const char* GetTmpDir() {
if ((tmpdir = getenv ("TMPDIR")) != NULL) return tmpdir;
if ((tmpdir = getenv ("TEMP")) != NULL) return tmpdir;
Expand All @@ -96,11 +83,24 @@ index d6d1556..565354f 100644
}

char* LowerCase(const char* s) {
diff --git a/src/wrapped/wrappedd3dadapter9.c b/src/wrapped/wrappedd3dadapter9.c
index 3701bba..50161fb 100644
--- a/src/wrapped/wrappedd3dadapter9.c
+++ b/src/wrapped/wrappedd3dadapter9.c
@@ -98,7 +98,7 @@ static int my_GetDirect3D(x64emu_t* emu, void* This, void*** ppD3D9);

const char* d3dadapter9Name = "d3dadapter9.so.1";
#define LIBNAME d3dadapter9
-#define ALTNAME "/usr/lib/aarch64-linux-gnu/d3d/d3dadapter9.so.1"
+#define ALTNAME "@TERMUX_PREFIX@/lib/aarch64-linux-gnu/d3d/d3dadapter9.so.1"

typedef void* (*pFp_t)(void*);

diff --git a/src/wrapped/wrappedlibdl.c b/src/wrapped/wrappedlibdl.c
index 47c47c6..7bdd357 100644
--- box64-0.2.4/src/wrapped/wrappedlibdl.c
+++ box64-0.2.4/src/wrapped/wrappedlibdl.c
@@ -95,7 +95,7 @@ void* my_dlopen(x64emu_t* emu, void *filename, int flag)
index 217ae01..d83d1f5 100644
--- a/src/wrapped/wrappedlibdl.c
+++ b/src/wrapped/wrappedlibdl.c
@@ -99,7 +99,7 @@ void* my_dlopen(x64emu_t* emu, void *filename, int flag)
if(sys)
return sys;
}
Expand All @@ -109,11 +109,3 @@ index 47c47c6..7bdd357 100644
void* sys = my_dlopen(emu, "d3dadapter9.so.1", flag);
if(sys)
return sys;
diff --git a/system/box64.conf.cmake b/system/box64.conf.cmake
index 7dbdc5d..340aa0c 100644
--- box64-0.2.4/system/box64.conf.cmake
+++ box64-0.2.4/system/box64.conf.cmake
@@ -1,2 +1,2 @@
-# /etc/binfmt.d/box64.conf
+# @TERMUX_PREFIX@/etc/binfmt.d/box64.conf
:x86_64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00:\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff\xff\xff\xfe\xff\xff\xff:${CMAKE_INSTALL_PREFIX}/bin/${BOX64}:
4 changes: 2 additions & 2 deletions gpkg/box86/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/ptitSeb/box86
TERMUX_PKG_DESCRIPTION="Linux Userspace x86 Emulator with a twist"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux-pacman"
TERMUX_PKG_VERSION=0.3.2
TERMUX_PKG_VERSION=0.3.4
TERMUX_PKG_SRCURL=https://github.com/ptitSeb/box86/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=468e887002706705bf003411fa47adb035e04e1cbeda3372405fed93f33fe8f4
TERMUX_PKG_SHA256=226532793a6f991c456f792bc416490a5461df3831a8dd58c7db3a1e5d79456d
TERMUX_PKG_DEPENDS="gcc-libs-glibc"
TERMUX_PKG_BLACKLISTED_ARCHES="aarch64, x86_64, i686"
TERMUX_CMAKE_BUILD="Unix Makefiles"
Expand Down
Loading