From b5824446f0d0b55fa1fd0aec3d28e94d243a6f1d Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Thu, 16 Sep 2021 21:51:29 +0200 Subject: [PATCH 01/29] Update to use android-ndk r23 --- ndk-patches/linux-fcntl.h.patch | 16 ------- ndk-patches/paths.h.patch | 6 +-- ndk-patches/stdio.h.patch | 16 +++---- ndk-patches/stdlib.h.patch | 7 ++- ndk-patches/sys-cdefs.h.patch | 6 +-- ndk-patches/unistd.h.patch | 8 ++-- ndk-patches/utmp.h.patch | 6 +-- scripts/build/termux_step_setup_toolchain.sh | 45 +++++++------------- scripts/build/termux_step_start_build.sh | 2 +- scripts/properties.sh | 4 +- scripts/setup-android-sdk.sh | 17 +++++--- 11 files changed, 52 insertions(+), 81 deletions(-) delete mode 100644 ndk-patches/linux-fcntl.h.patch diff --git a/ndk-patches/linux-fcntl.h.patch b/ndk-patches/linux-fcntl.h.patch deleted file mode 100644 index a3472b35db4955..00000000000000 --- a/ndk-patches/linux-fcntl.h.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -uNr sysroot.orig/usr/include/linux/fcntl.h sysroot/usr/include/linux/fcntl.h ---- sysroot.orig/usr/include/linux/fcntl.h 2019-02-12 16:12:24.000000000 +0000 -+++ sysroot/usr/include/linux/fcntl.h 2019-03-20 13:22:32.823142545 +0000 -@@ -51,6 +51,12 @@ - #define DN_ATTRIB 0x00000020 - #define DN_MULTISHOT 0x80000000 - #define AT_FDCWD - 100 -+/* Termux patch: This flag is not supported on Android 6.0+, and should not -+ be needed since there are not setuid binaries. Define AT_EACCESS to 0 to -+ avoid packages defining their own AT_EACCESS (which e.g. coreutil does) -+ since that will only result in errors. See: -+ https://android.googlesource.com/platform/bionic/+/3577825%5E!/ */ -+#define AT_EACCESS 0 - #define AT_SYMLINK_NOFOLLOW 0x100 - #define AT_REMOVEDIR 0x200 - #define AT_SYMLINK_FOLLOW 0x400 diff --git a/ndk-patches/paths.h.patch b/ndk-patches/paths.h.patch index f6fb17b92880c2..b5c2684da46d7d 100644 --- a/ndk-patches/paths.h.patch +++ b/ndk-patches/paths.h.patch @@ -1,5 +1,5 @@ ---- ./usr/include/paths.h.orig 2020-07-10 21:50:03.778299300 +0000 -+++ ./usr/include/paths.h 2020-07-10 21:51:03.127602196 +0000 +--- ./usr/include/paths.h.orig 2021-08-16 11:55:04.492150066 +0200 ++++ ./usr/include/paths.h 2021-08-16 11:55:42.498804733 +0200 @@ -40,14 +40,14 @@ #ifndef _PATH_BSHELL @@ -12,7 +12,7 @@ #define _PATH_CONSOLE "/dev/console" /** Default shell search path. */ --#define _PATH_DEFPATH "/product/bin:/apex/com.android.runtime/bin:/apex/com.android.art/bin:/system/bin:/system/xbin:/odm/bin:/vendor/bin:/vendor/xbin" +-#define _PATH_DEFPATH "/product/bin:/apex/com.android.runtime/bin:/apex/com.android.art/bin:/system_ext/bin:/system/bin:/system/xbin:/odm/bin:/vendor/bin:/vendor/xbin" +#define _PATH_DEFPATH "@TERMUX_PREFIX@/bin" /** Path to the directory containing device files. */ diff --git a/ndk-patches/stdio.h.patch b/ndk-patches/stdio.h.patch index 64a267a41c5d55..ee509b8d8bbeb9 100644 --- a/ndk-patches/stdio.h.patch +++ b/ndk-patches/stdio.h.patch @@ -1,7 +1,6 @@ -diff -uNr ./usr.old/include/stdio.h ./usr/include/stdio.h ---- ./usr.old/include/stdio.h 2019-05-22 12:49:28.000000000 +0300 -+++ ./usr/include/stdio.h 2019-12-13 21:50:02.765565736 +0200 -@@ -44,11 +44,12 @@ +--- ./usr/include/stdio.h.orig 2021-08-16 11:48:44.308954400 +0200 ++++ ./usr/include/stdio.h 2021-08-16 11:50:00.438924014 +0200 +@@ -44,6 +44,9 @@ #include #include @@ -10,16 +9,11 @@ diff -uNr ./usr.old/include/stdio.h ./usr/include/stdio.h + #include --#if __ANDROID_API__ < __ANDROID_API_N__ - #include --#endif - - __BEGIN_DECLS - + #if __ANDROID_API__ < 24 @@ -165,7 +166,7 @@ __printflike(2, 0) __warnattr_strict("vsprintf is often misused; please use vsnprintf"); char* tmpnam(char* __s) - __warnattr("tempnam is unsafe, use mkstemp or tmpfile instead"); + __warnattr("tmpnam is unsafe, use mkstemp or tmpfile instead"); -#define P_tmpdir "/tmp/" /* deprecated */ +#define P_tmpdir "@TERMUX_PREFIX@/tmp/" /* deprecated */ char* tempnam(const char* __dir, const char* __prefix) diff --git a/ndk-patches/stdlib.h.patch b/ndk-patches/stdlib.h.patch index 9ef1371c28b675..bb16db856c6baa 100644 --- a/ndk-patches/stdlib.h.patch +++ b/ndk-patches/stdlib.h.patch @@ -1,6 +1,5 @@ -diff -uNr sysroot.orig/usr/include/stdlib.h sysroot/usr/include/stdlib.h ---- sysroot.orig/usr/include/stdlib.h 2019-02-12 16:12:24.000000000 +0000 -+++ sysroot/usr/include/stdlib.h 2019-03-20 13:23:48.870108924 +0000 +--- ./usr/include/stdlib.h.orig 2021-08-16 11:50:47.432239182 +0200 ++++ ./usr/include/stdlib.h 2021-08-16 11:51:31.102222894 +0200 @@ -33,6 +33,7 @@ #include #include @@ -12,7 +11,7 @@ diff -uNr sysroot.orig/usr/include/stdlib.h sysroot/usr/include/stdlib.h @@ -224,8 +225,7 @@ size_t wcstombs(char* __dst, const wchar_t* __src, size_t __n); - #if __ANDROID_API__ >= __ANDROID_API_L__ + #if __ANDROID_API__ >= 21 -size_t __ctype_get_mb_cur_max(void) __INTRODUCED_IN(21); -#define MB_CUR_MAX __ctype_get_mb_cur_max() +#define MB_CUR_MAX 4 diff --git a/ndk-patches/sys-cdefs.h.patch b/ndk-patches/sys-cdefs.h.patch index f4e558f4230a5a..35508ca4444a20 100644 --- a/ndk-patches/sys-cdefs.h.patch +++ b/ndk-patches/sys-cdefs.h.patch @@ -1,6 +1,6 @@ ---- ./usr/include/sys/cdefs.h.orig 2020-01-18 00:06:05.760188085 +0000 -+++ ./usr/include/sys/cdefs.h 2020-01-18 00:09:52.363968728 +0000 -@@ -358,3 +358,6 @@ +--- ./usr/include/sys/cdefs.h.orig 2021-08-16 11:52:08.128876161 +0200 ++++ ./usr/include/sys/cdefs.h 2021-08-16 11:52:08.555542676 +0200 +@@ -372,3 +372,6 @@ #if __has_include() #include #endif diff --git a/ndk-patches/unistd.h.patch b/ndk-patches/unistd.h.patch index 4b7a4ce566ac3d..37ea0a2fe20c7a 100644 --- a/ndk-patches/unistd.h.patch +++ b/ndk-patches/unistd.h.patch @@ -1,6 +1,6 @@ ---- sysroot/usr/include/unistd.h 2018-04-30 19:24:22.000000000 +0000 -+++ usr/include/unistd.h 2018-08-16 10:42:51.158596753 +0000 -@@ -377,4 +377,72 @@ +--- ./usr/include/unistd.h.orig 2021-08-16 11:52:08.095542840 +0200 ++++ ./usr/include/unistd.h 2021-08-16 11:52:08.565542673 +0200 +@@ -375,6 +375,74 @@ #undef _UNISTD_H_ #endif @@ -73,3 +73,5 @@ +#endif + __END_DECLS + + #include diff --git a/ndk-patches/utmp.h.patch b/ndk-patches/utmp.h.patch index 45cc642e2786e2..51932dd25f870d 100644 --- a/ndk-patches/utmp.h.patch +++ b/ndk-patches/utmp.h.patch @@ -1,6 +1,6 @@ ---- sysroot/usr/include/utmp.h 2021-05-07 05:45:33.518467959 +0000 -+++ usr/include/utmp.h 2021-05-07 05:46:25.195022662 +0000 -@@ -32,9 +32,9 @@ +--- ./usr/include/utmp.h.orig 2021-08-16 11:52:08.095542840 +0200 ++++ ./usr/include/utmp.h 2021-08-16 11:52:08.565542673 +0200 +@@ -37,9 +37,9 @@ #include #include diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index b729df1e91a8be..dec2e0627e884e 100644 --- a/scripts/build/termux_step_setup_toolchain.sh +++ b/scripts/build/termux_step_setup_toolchain.sh @@ -8,14 +8,14 @@ termux_step_setup_toolchain() { export AS=$TERMUX_HOST_PLATFORM-clang export CC=$TERMUX_HOST_PLATFORM-clang export CXX=$TERMUX_HOST_PLATFORM-clang++ - export AR=$TERMUX_HOST_PLATFORM-ar + export AR=llvm-ar export CPP=$TERMUX_HOST_PLATFORM-cpp - export LD=$TERMUX_HOST_PLATFORM-ld - export OBJCOPY=$TERMUX_HOST_PLATFORM-objcopy - export OBJDUMP=$TERMUX_HOST_PLATFORM-objdump - export RANLIB=$TERMUX_HOST_PLATFORM-ranlib - export READELF=$TERMUX_HOST_PLATFORM-readelf - export STRIP=$TERMUX_HOST_PLATFORM-strip + export LD=ld.lld + export OBJCOPY=llvm-objcopy + export OBJDUMP=llvm-objdump + export RANLIB=llvm-ranlib + export READELF=llvm-readelf + export STRIP=llvm-strip if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then export PATH=$TERMUX_STANDALONE_TOOLCHAIN/bin:$PATH @@ -146,26 +146,6 @@ termux_setup_standalone_toolchain() { # Remove android-support header wrapping not needed on android-21: rm -Rf $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/local - # Use gold by default to work around https://github.com/android-ndk/ndk/issues/148 - cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld.gold \ - $_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld - cp $_TERMUX_TOOLCHAIN_TMPDIR/aarch64-linux-android/bin/ld.gold \ - $_TERMUX_TOOLCHAIN_TMPDIR/aarch64-linux-android/bin/ld - - # Linker wrapper script to add '--exclude-libs libgcc.a', see - # https://github.com/android-ndk/ndk/issues/379 - # https://android-review.googlesource.com/#/c/389852/ - local linker - for linker in ld ld.bfd ld.gold; do - local wrap_linker=$_TERMUX_TOOLCHAIN_TMPDIR/arm-linux-androideabi/bin/$linker - local real_linker=$_TERMUX_TOOLCHAIN_TMPDIR/arm-linux-androideabi/bin/$linker.real - cp $wrap_linker $real_linker - echo '#!/bin/bash' > $wrap_linker - echo -n '$(dirname $0)/' >> $wrap_linker - echo -n $linker.real >> $wrap_linker - echo ' --exclude-libs libunwind.a --exclude-libs libgcc_real.a "$@"' >> $wrap_linker - done - for HOST_PLAT in aarch64-linux-android armv7a-linux-androideabi i686-linux-android x86_64-linux-android; do cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT$TERMUX_PKG_API_LEVEL-clang \ $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang @@ -206,13 +186,20 @@ termux_setup_standalone_toolchain() { # Remove as we currently provide it from libandroid-glob. # Remove as it's provided by libiconv. # Remove as it's only for future (later than android-27). - # Remove and as we build our own zlib - rm usr/include/sys/{capability.h,shm.h,sem.h} usr/include/{glob.h,iconv.h,spawn.h,zlib.h,zconf.h} + # Remove and as we build our own zlib. + # Remove unicode headers provided by libicu. + rm usr/include/{sys/{capability,shm,sem},{glob,iconv,spawn,zlib,zconf}}.h + rm usr/include/unicode/{char16ptr,platform,ptypes,putil,stringoptions,ubidi,ubrk,uchar,uconfig,ucpmap,udisplaycontext,uenum,uldnames,ulocdata,uloc,umachine,unorm2,urename,uscript,ustring,utext,utf16,utf8,utf,utf_old,utypes,uvernum,uversion}.h sed -i "s/define __ANDROID_API__ __ANDROID_API_FUTURE__/define __ANDROID_API__ $TERMUX_PKG_API_LEVEL/" \ usr/include/android/api-level.h $TERMUX_ELF_CLEANER usr/lib/*/*/*.so + for dir in usr/lib/*; do + # This seem to be needed when building rust + # packages + echo 'INPUT(-lunwind)' > $dir/libgcc.a + done grep -lrw $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include/c++/v1 -e '' | xargs -n 1 sed -i 's//\"version\"/g' mv $_TERMUX_TOOLCHAIN_TMPDIR $TERMUX_STANDALONE_TOOLCHAIN diff --git a/scripts/build/termux_step_start_build.sh b/scripts/build/termux_step_start_build.sh index 7580cd6bd98852..a34cbbd5cdd103 100644 --- a/scripts/build/termux_step_start_build.sh +++ b/scripts/build/termux_step_start_build.sh @@ -2,7 +2,7 @@ termux_step_start_build() { TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_COMMON_CACHEDIR/android-r${TERMUX_NDK_VERSION}-api-${TERMUX_PKG_API_LEVEL}" # Bump the below version if a change is made in toolchain setup to ensure # that everyone gets an updated toolchain: - TERMUX_STANDALONE_TOOLCHAIN+="-v5" + TERMUX_STANDALONE_TOOLCHAIN+="-v0" # shellcheck source=/dev/null source "$TERMUX_PKG_BUILDER_SCRIPT" diff --git a/scripts/properties.sh b/scripts/properties.sh index 01e321170394d6..54ed345a78b222 100644 --- a/scripts/properties.sh +++ b/scripts/properties.sh @@ -1,6 +1,6 @@ TERMUX_ANDROID_BUILD_TOOLS_VERSION=30.0.3 -TERMUX_NDK_VERSION_NUM=21 -TERMUX_NDK_REVISION="d" +TERMUX_NDK_VERSION_NUM=23 +TERMUX_NDK_REVISION="" TERMUX_NDK_VERSION=$TERMUX_NDK_VERSION_NUM$TERMUX_NDK_REVISION export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 diff --git a/scripts/setup-android-sdk.sh b/scripts/setup-android-sdk.sh index dce0085efb2fb1..584f891a6632bc 100755 --- a/scripts/setup-android-sdk.sh +++ b/scripts/setup-android-sdk.sh @@ -4,10 +4,10 @@ set -e -u # Install desired parts of the Android SDK: . $(cd "$(dirname "$0")"; pwd)/properties.sh -ANDROID_SDK_FILE=sdk-tools-linux-4333796.zip -ANDROID_SDK_SHA256=92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9 -ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-Linux-x86_64.zip -ANDROID_NDK_SHA256=dd6dc090b6e2580206c64bcee499bc16509a5d017c6952dcd2bed9072af67cbd +ANDROID_SDK_FILE=commandlinetools-linux-7583922_latest.zip +ANDROID_SDK_SHA256=124f2d5115eee365df6cf3228ffbca6fc3911d16f8025bebd5b1c6e2fcfa7faf +ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-linux.zip +ANDROID_NDK_SHA256=e3eacf80016b91d4cd2c8ca9f34eebd32df912bb799c859cc5450b6b19277b4f if [ ! -d $ANDROID_HOME ]; then mkdir -p $ANDROID_HOME cd $ANDROID_HOME/.. @@ -39,7 +39,12 @@ if [ ! -d $NDK ]; then rm ndk.zip fi -yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses +yes | $ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=$ANDROID_HOME --licenses # The android platforms are used in the ecj and apksigner packages: -yes | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools" "build-tools;${TERMUX_ANDROID_BUILD_TOOLS_VERSION}" "platforms;android-28" "platforms;android-24" "platforms;android-21" +yes | $ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=$ANDROID_HOME \ + "platform-tools" \ + "build-tools;${TERMUX_ANDROID_BUILD_TOOLS_VERSION}" \ + "platforms;android-28" \ + "platforms;android-24" \ + "platforms;android-21" From cae6eaff44edb1d49ac208d0610eb0627cfa66fd Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Mon, 16 Aug 2021 17:08:43 +0200 Subject: [PATCH 02/29] ndk-patches: remove TCAFLUSH case from bits/termios_inlines.h To fix error: In file included from /termux-build/_cache/android-r23-api-24-v0/bin/../sysroot/usr/include/termios.h:154: In file included from /termux-build/_cache/android-r23-api-24-v0/bin/../sysroot/usr/include/android/legacy_termios_inlines.h:43: /termux-build/_cache/android-r23-api-24-v0/bin/../sysroot/usr/include/bits/termios_inlines.h:120:10: error: duplicate case value '0' case TCSAFLUSH: cmd = TCSETSF; break; ^ /termux-build/_cache/android-r23-api-24-v0/bin/../sysroot/usr/include/asm-generic/termbits.h:194:19: note: expanded from macro 'TCSAFLUSH' ^ /termux-build/_cache/android-r23-api-24-v0/bin/../sysroot/usr/include/bits/termios_inlines.h:118:10: note: previous case defined here case TCSANOW: cmd = TCSETS; break; ^ /termux-build/_cache/android-r23-api-24-v0/bin/../sysroot/usr/include/asm-generic/termbits.h:191:17: note: expanded from macro 'TCSANOW' ^ --- ...neric-termbits.h.patch => redefine-TCSAFLUSH.patch} | 10 ++++++++++ 1 file changed, 10 insertions(+) rename ndk-patches/{asm-generic-termbits.h.patch => redefine-TCSAFLUSH.patch} (56%) diff --git a/ndk-patches/asm-generic-termbits.h.patch b/ndk-patches/redefine-TCSAFLUSH.patch similarity index 56% rename from ndk-patches/asm-generic-termbits.h.patch rename to ndk-patches/redefine-TCSAFLUSH.patch index 6b4ecb4dd0c9ba..c063a89586181e 100644 --- a/ndk-patches/asm-generic-termbits.h.patch +++ b/ndk-patches/redefine-TCSAFLUSH.patch @@ -9,3 +9,13 @@ diff -u -r /home/builder/lib/android-ndk/sysroot/usr/include/asm-generic/termbit +/* TCSAFLUSH is patched to be TCSANOW in Termux to work around Android SELinux rule */ +#define TCSAFLUSH 0 #endif +--- ./usr/include/bits/termios_inlines.h.orig 2021-08-16 17:05:16.001067630 +0200 ++++ ./usr/include/bits/termios_inlines.h 2021-08-16 17:05:05.851074187 +0200 +@@ -117,7 +117,6 @@ + switch (optional_actions) { + case TCSANOW: cmd = TCSETS; break; + case TCSADRAIN: cmd = TCSETSW; break; +- case TCSAFLUSH: cmd = TCSETSF; break; + default: errno = EINVAL; return -1; + } + return ioctl(fd, cmd, s); From 9e1e7d940642927046b003143351700aa6292724 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Mon, 16 Aug 2021 12:13:07 +0200 Subject: [PATCH 03/29] termux_step_setup_toolchain: print info about applied ndk-patch --- scripts/build/termux_step_setup_toolchain.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index dec2e0627e884e..98c93e91710849 100644 --- a/scripts/build/termux_step_setup_toolchain.sh +++ b/scripts/build/termux_step_setup_toolchain.sh @@ -172,6 +172,7 @@ termux_setup_standalone_toolchain() { cd $_TERMUX_TOOLCHAIN_TMPDIR/sysroot for f in $TERMUX_SCRIPTDIR/ndk-patches/*.patch; do + echo "Applying ndk-patch: $(basename $f)" sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" "$f" | \ sed "s%\@TERMUX_HOME\@%${TERMUX_ANDROID_HOME}%g" | \ patch --silent -p1; From d9fe2c0c9b1c3228f235e7617ff73dcab197890d Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Mon, 16 Aug 2021 18:28:01 +0200 Subject: [PATCH 04/29] ndk-{multilib,sysroot}: update for ndk r23 --- packages/ndk-multilib/build.sh | 25 ++++++++++++++----------- packages/ndk-sysroot/build.sh | 26 +++++++++++++------------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/packages/ndk-multilib/build.sh b/packages/ndk-multilib/build.sh index 121b50a3dfa70d..be5c61a40c157b 100644 --- a/packages/ndk-multilib/build.sh +++ b/packages/ndk-multilib/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Multilib binaries for cross-compilation" TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION +TERMUX_PKG_REVISION=1 TERMUX_PKG_SKIP_SRC_EXTRACT=true TERMUX_PKG_PLATFORM_INDEPENDENT=true TERMUX_PKG_NO_STATICSPLIT=true @@ -17,23 +18,25 @@ prepare_libs() { fi mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib - local BASEDIR=$NDK/platforms/android-${TERMUX_PKG_API_LEVEL}/arch-$ARCH/usr/lib - if [ $ARCH = x86_64 ]; then BASEDIR+="64"; fi + local BASEDIR=$NDK/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/$SUFFIX/${TERMUX_PKG_API_LEVEL} cp $BASEDIR/*.o $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib cp $BASEDIR/lib{c,dl,log,m}.so $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib cp $BASEDIR/lib{c,dl,m}.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib - cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/${SUFFIX}/libc++_shared.so $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib - cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/${SUFFIX}/lib{c++_static,c++abi}.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib + cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/${SUFFIX}/libc++_shared.so \ + $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib + cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/${SUFFIX}/lib{c++_static,c++abi}.a \ + $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib echo 'INPUT(-lc++_static -lc++abi)' > $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib/libc++_shared.a - LIBATOMIC=$NDK/toolchains/${NDK_SUFFIX}-*/prebuilt/linux-*/${SUFFIX}/lib - if [ $ARCH = "arm64" ] || [ $ARCH = "x86_64" ]; then LIBATOMIC+="64"; fi - if [ $ARCH = "arm" ]; then LIBATOMIC+="/armv7-a"; fi - cp $LIBATOMIC/libatomic.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib/ + if [ $ARCH == "x86" ]; then + LIBATOMIC=$NDK/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/*/lib/linux/i386 + elif [ $ARCH == "arm64" ]; then + LIBATOMIC=$NDK/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/*/lib/linux/aarch64 + else + LIBATOMIC=$NDK/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/*/lib/linux/$ARCH + fi - LIBGCC=$NDK/toolchains/${NDK_SUFFIX}-*/prebuilt/linux-*/lib/gcc/${SUFFIX}/4.9.x - if [ $ARCH = "arm" ]; then LIBGCC+="/armv7-a"; fi - cp $LIBGCC/libgcc.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib/ + cp $LIBATOMIC/libatomic.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/$SUFFIX/lib/ } termux_step_extract_into_massagedir() { diff --git a/packages/ndk-sysroot/build.sh b/packages/ndk-sysroot/build.sh index 619bb3accd15c6..6d539c797973cf 100644 --- a/packages/ndk-sysroot/build.sh +++ b/packages/ndk-sysroot/build.sh @@ -3,7 +3,6 @@ TERMUX_PKG_DESCRIPTION="System header and library files from the Android NDK nee TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=$TERMUX_NDK_VERSION -TERMUX_PKG_REVISION=2 TERMUX_PKG_SKIP_SRC_EXTRACT=true # This package has taken over from the previous libutil-dev # and iconv.h from libandroid-support-dev: @@ -28,15 +27,16 @@ termux_step_extract_into_massagedir() { cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/*.o \ $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib - local LIBATOMIC_PATH=$TERMUX_STANDALONE_TOOLCHAIN/$TERMUX_HOST_PLATFORM/lib - if [ $TERMUX_ARCH_BITS = 64 ]; then LIBATOMIC_PATH+="64"; fi - if [ $TERMUX_ARCH = "arm" ]; then LIBATOMIC_PATH+="/armv7-a"; fi - LIBATOMIC_PATH+="/libatomic.a" - cp $LIBATOMIC_PATH $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/ + if [ $TERMUX_ARCH == "i686" ]; then + LIBATOMIC=$NDK/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/*/lib/linux/i386 + elif [ $TERMUX_ARCH == "arm64" ]; then + LIBATOMIC=$NDK/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/*/lib/linux/aarch64 + else + LIBATOMIC=$NDK/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/*/lib/linux/$TERMUX_ARCH + fi + + cp $LIBATOMIC/libatomic.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/ - local LIBGCC_PATH=$TERMUX_STANDALONE_TOOLCHAIN/lib/gcc/$TERMUX_HOST_PLATFORM/4.9.x - if [ $TERMUX_ARCH = "arm" ]; then LIBGCC_PATH+="/armv7-a"; fi - cp $LIBGCC_PATH/* -r $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/ cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/$TERMUX_PKG_API_LEVEL/libcompiler_rt-extras.a $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/ # librt and libpthread are built into libc on android, so setup them as symlinks # to libc for compatibility with programs that users try to build: @@ -44,10 +44,10 @@ termux_step_extract_into_massagedir() { if [ $TERMUX_ARCH_BITS = 32 ]; then _SYSTEM_LIBDIR=/system/lib; fi mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib cd $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib - if [ $TERMUX_ARCH = "arm" ]; then - rm thumb -rf - cp $TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/$TERMUX_HOST_PLATFORM/libunwind.a . - fi + NDK_ARCH=$TERMUX_ARCH + test $NDK_ARCH == 'i686' && NDK_ARCH='i386' + # clang 13 requires libunwind on Android. + cp $TERMUX_STANDALONE_TOOLCHAIN/lib64/clang/12.0.5/lib/linux/$NDK_ARCH/libunwind.a . for lib in librt.so libpthread.so libutil.so; do echo 'INPUT(-lc)' > $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/$lib From c2a309ed845cb181f67e1af1ab8b45a61c3b47ff Mon Sep 17 00:00:00 2001 From: Butta Date: Thu, 5 Aug 2021 16:52:24 +0530 Subject: [PATCH 05/29] rust: update from 1.53.0 to 1.54.0 --- packages/rust/build.sh | 9 ++++----- packages/rust/config.toml | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/rust/build.sh b/packages/rust/build.sh index 5381920d07ec37..74bdf32cd33734 100644 --- a/packages/rust/build.sh +++ b/packages/rust/build.sh @@ -1,11 +1,10 @@ TERMUX_PKG_HOMEPAGE=https://www.rust-lang.org/ TERMUX_PKG_DESCRIPTION="Systems programming language focused on safety, speed and concurrency" TERMUX_PKG_LICENSE="MIT" -TERMUX_PKG_MAINTAINER="Kevin Cotugno @kcotugno" -TERMUX_PKG_VERSION=1.53.0 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_MAINTAINER="@termux" +TERMUX_PKG_VERSION=1.54.0 TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/rustc-$TERMUX_PKG_VERSION-src.tar.xz -TERMUX_PKG_SHA256=e53a2df2c2c26f8929d551852eeae242b9a6167fba34481f92010b30def32dec +TERMUX_PKG_SHA256=a2934f85f76a35a3796c0fefd31e91f5b6dd8377cd8c3769c1c10e7ce7a495f4 TERMUX_PKG_DEPENDS="libc++, clang, openssl, lld, zlib, libllvm" TERMUX_PKG_RM_AFTER_INSTALL="bin/llvm-dwp" @@ -20,7 +19,7 @@ termux_step_configure() { # like 30 to 40 + minutes ... so lets get it right # upstream only tests build ver one version behind $TERMUX_PKG_VERSION - local BOOTSTRAP_VERSION=1.52.0 + local BOOTSTRAP_VERSION=1.53.0 rustup install $BOOTSTRAP_VERSION rustup default $BOOTSTRAP_VERSION-x86_64-unknown-linux-gnu export PATH=$HOME/.rustup/toolchains/$BOOTSTRAP_VERSION-x86_64-unknown-linux-gnu/bin:$PATH diff --git a/packages/rust/config.toml b/packages/rust/config.toml index 1ab362b03289d9..23bb4f92406f85 100644 --- a/packages/rust/config.toml +++ b/packages/rust/config.toml @@ -35,6 +35,7 @@ llvm-config = "/usr/bin/llvm-config-10" [target.@triple@] android-ndk = "@TERMUX_STANDALONE_TOOLCHAIN@" llvm-config = "@TERMUX_PREFIX@/bin/llvm-config" +ar = "llvm-ar" [dist] src-tarball = false From 38eebcb824adfef2b76b3ee21a7be6432d4c5a3d Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Thu, 19 Aug 2021 16:38:54 +0200 Subject: [PATCH 06/29] busybox: regenerate config --- packages/busybox/busybox.config | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/busybox/busybox.config b/packages/busybox/busybox.config index 6ca238c71fa2a7..fbe1b8133b2e84 100644 --- a/packages/busybox/busybox.config +++ b/packages/busybox/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.33.1 -# Tue May 4 14:51:31 2021 +# Thu Aug 19 16:37:48 2021 # CONFIG_HAVE_DOT_CONFIG=y @@ -336,10 +336,10 @@ CONFIG_BASE64=y CONFIG_UUENCODE=y CONFIG_WC=y CONFIG_FEATURE_WC_LARGE=y +CONFIG_WHOAMI=y # CONFIG_WHO is not set # CONFIG_W is not set # CONFIG_USERS is not set -CONFIG_WHOAMI=y CONFIG_YES=y # @@ -510,10 +510,10 @@ CONFIG_INIT_TERMINAL_TYPE="" # CONFIG_USE_BB_SHADOW is not set CONFIG_USE_BB_CRYPT=y # CONFIG_USE_BB_CRYPT_SHA is not set -# CONFIG_ADD_SHELL is not set -# CONFIG_REMOVE_SHELL is not set # CONFIG_ADDGROUP is not set # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set # CONFIG_ADDUSER is not set # CONFIG_FEATURE_CHECK_NAMES is not set CONFIG_LAST_ID=0 @@ -772,10 +772,10 @@ CONFIG_CRONTAB=y # CONFIG_FEATURE_DEVFS is not set # CONFIG_DEVMEM is not set # CONFIG_FBSPLASH is not set +# CONFIG_FLASHCP is not set # CONFIG_FLASH_ERASEALL is not set # CONFIG_FLASH_LOCK is not set # CONFIG_FLASH_UNLOCK is not set -# CONFIG_FLASHCP is not set # CONFIG_HDPARM is not set # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set @@ -825,13 +825,13 @@ CONFIG_STRINGS=y CONFIG_TIME=y # CONFIG_TS is not set CONFIG_TTYSIZE=y +# CONFIG_UBIRENAME is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set # CONFIG_UBIMKVOL is not set # CONFIG_UBIRMVOL is not set # CONFIG_UBIRSVOL is not set # CONFIG_UBIUPDATEVOL is not set -# CONFIG_UBIRENAME is not set # CONFIG_VOLNAME is not set # CONFIG_WATCHDOG is not set From 340bc1d2e56bda0e018e6f31dd0eff5d658bdd5a Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Thu, 19 Aug 2021 16:57:02 +0200 Subject: [PATCH 07/29] busybox: fix build with ndk r23 Compiler and tool names need to be updated in Makefile. Also fix some patch offsets while we are at it --- packages/busybox/0000-use-clang.patch | 21 ++++++++++++++----- packages/busybox/0004-Makefile.flags.patch | 6 +++--- ...crond.patch => 0006-miscutils-crond.patch} | 0 ...tab.patch => 0007-miscutils-crontab.patch} | 0 ...h => 0008-networking-ftpd-no-chroot.patch} | 7 +++---- ... 0009-networking-httpd-default-port.patch} | 15 +++++++------ ...010-networking-telnetd-default-port.patch} | 0 .../0011-networking-tftp-no-chroot.patch | 15 +++++++++++++ .../0012-networking-tftp-no-chroot.patch | 16 -------------- packages/busybox/build.sh | 2 +- 10 files changed, 45 insertions(+), 37 deletions(-) rename packages/busybox/{0007-miscutils-crond.patch => 0006-miscutils-crond.patch} (100%) rename packages/busybox/{0008-miscutils-crontab.patch => 0007-miscutils-crontab.patch} (100%) rename packages/busybox/{0009-networking-ftpd-no-chroot.patch => 0008-networking-ftpd-no-chroot.patch} (52%) rename packages/busybox/{0010-networking-httpd-default-port.patch => 0009-networking-httpd-default-port.patch} (77%) rename packages/busybox/{0011-networking-telnetd-default-port.patch => 0010-networking-telnetd-default-port.patch} (100%) create mode 100644 packages/busybox/0011-networking-tftp-no-chroot.patch delete mode 100644 packages/busybox/0012-networking-tftp-no-chroot.patch diff --git a/packages/busybox/0000-use-clang.patch b/packages/busybox/0000-use-clang.patch index 8cf9971a5d97f1..49f8700b7a8f39 100644 --- a/packages/busybox/0000-use-clang.patch +++ b/packages/busybox/0000-use-clang.patch @@ -1,7 +1,6 @@ -diff -uNr busybox-1.31.1/Makefile busybox-1.31.1.mod/Makefile ---- busybox-1.31.1/Makefile 2019-10-25 11:44:52.000000000 +0300 -+++ busybox-1.31.1.mod/Makefile 2019-11-11 22:19:06.004778909 +0200 -@@ -289,7 +289,7 @@ +--- ./Makefile.orig 2021-08-19 16:48:15.223628163 +0200 ++++ ./Makefile 2021-08-19 16:47:29.456942514 +0200 +@@ -289,14 +289,14 @@ # Make variables (CC, etc...) AS = $(CROSS_COMPILE)as @@ -9,4 +8,16 @@ diff -uNr busybox-1.31.1/Makefile busybox-1.31.1.mod/Makefile +CC = $(CROSS_COMPILE)clang LD = $(CC) -nostdlib CPP = $(CC) -E - AR = $(CROSS_COMPILE)ar +-AR = $(CROSS_COMPILE)ar +-NM = $(CROSS_COMPILE)nm +-STRIP = $(CROSS_COMPILE)strip +-OBJCOPY = $(CROSS_COMPILE)objcopy +-OBJDUMP = $(CROSS_COMPILE)objdump ++AR = llvm-ar ++NM = llvm-nm ++STRIP = llvm-strip ++OBJCOPY = llvm-objcopy ++OBJDUMP = llvm-objdump + PKG_CONFIG ?= $(CROSS_COMPILE)pkg-config + AWK = awk + GENKSYMS = scripts/genksyms/genksyms diff --git a/packages/busybox/0004-Makefile.flags.patch b/packages/busybox/0004-Makefile.flags.patch index 3a9306a6882603..ed634ddacc3b87 100644 --- a/packages/busybox/0004-Makefile.flags.patch +++ b/packages/busybox/0004-Makefile.flags.patch @@ -1,6 +1,6 @@ ---- ../Makefile.flags.orig 2020-07-20 19:17:12.263392471 +0000 -+++ ./Makefile.flags 2020-07-20 19:17:22.988106865 +0000 -@@ -150,9 +150,9 @@ +--- ./Makefile.flags.orig 2021-01-01 11:52:27.000000000 +0100 ++++ ./Makefile.flags 2021-08-19 16:49:06.743647568 +0200 +@@ -151,9 +151,9 @@ # fall back to using a temp file: CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) ifeq ($(CRYPT_AVAILABLE),y) diff --git a/packages/busybox/0007-miscutils-crond.patch b/packages/busybox/0006-miscutils-crond.patch similarity index 100% rename from packages/busybox/0007-miscutils-crond.patch rename to packages/busybox/0006-miscutils-crond.patch diff --git a/packages/busybox/0008-miscutils-crontab.patch b/packages/busybox/0007-miscutils-crontab.patch similarity index 100% rename from packages/busybox/0008-miscutils-crontab.patch rename to packages/busybox/0007-miscutils-crontab.patch diff --git a/packages/busybox/0009-networking-ftpd-no-chroot.patch b/packages/busybox/0008-networking-ftpd-no-chroot.patch similarity index 52% rename from packages/busybox/0009-networking-ftpd-no-chroot.patch rename to packages/busybox/0008-networking-ftpd-no-chroot.patch index ae6f6924487ddd..41c38715d5107f 100644 --- a/packages/busybox/0009-networking-ftpd-no-chroot.patch +++ b/packages/busybox/0008-networking-ftpd-no-chroot.patch @@ -1,7 +1,6 @@ -diff -uNr busybox-1.31.1/networking/ftpd.c busybox-1.31.1.mod/networking/ftpd.c ---- busybox-1.31.1/networking/ftpd.c 2019-06-10 13:50:53.000000000 +0300 -+++ busybox-1.31.1.mod/networking/ftpd.c 2019-11-11 22:26:50.216912741 +0200 -@@ -1301,8 +1301,11 @@ +--- ./networking/ftpd.c.orig 2021-08-19 16:49:06.730314230 +0200 ++++ ./networking/ftpd.c 2021-08-19 16:49:06.753647572 +0200 +@@ -1302,8 +1302,11 @@ G.root_fd = xopen("/", O_RDONLY | O_DIRECTORY); close_on_exec_on(G.root_fd); #endif diff --git a/packages/busybox/0010-networking-httpd-default-port.patch b/packages/busybox/0009-networking-httpd-default-port.patch similarity index 77% rename from packages/busybox/0010-networking-httpd-default-port.patch rename to packages/busybox/0009-networking-httpd-default-port.patch index d8154ea2576eba..027d9faedaec73 100644 --- a/packages/busybox/0010-networking-httpd-default-port.patch +++ b/packages/busybox/0009-networking-httpd-default-port.patch @@ -1,7 +1,6 @@ -diff -uNr busybox-1.31.1/networking/httpd.c busybox-1.31.1.mod/networking/httpd.c ---- busybox-1.31.1/networking/httpd.c 2019-11-11 21:31:58.406733857 +0200 -+++ busybox-1.31.1.mod/networking/httpd.c 2019-11-11 22:29:16.534250966 +0200 -@@ -232,7 +232,7 @@ +--- ./networking/httpd.c.orig 2021-08-19 16:49:06.730314230 +0200 ++++ ./networking/httpd.c 2021-08-19 16:49:06.756980906 +0200 +@@ -270,7 +270,7 @@ //usage: "\n -i Inetd mode" //usage: "\n -f Don't daemonize" //usage: "\n -v[v] Verbose" @@ -10,8 +9,8 @@ diff -uNr busybox-1.31.1/networking/httpd.c busybox-1.31.1.mod/networking/httpd. //usage: IF_FEATURE_HTTPD_SETUID( //usage: "\n -u USER[:GRP] Set uid/gid after binding to port") //usage: IF_FEATURE_HTTPD_BASIC_AUTH( -@@ -488,7 +488,7 @@ - asm volatile("":::"memory"); \ +@@ -538,7 +538,7 @@ + SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ IF_FEATURE_HTTPD_BASIC_AUTH(g_realm = "Web Server Authentication";) \ IF_FEATURE_HTTPD_RANGES(range_start = -1;) \ - bind_addr_or_port = "80"; \ @@ -19,7 +18,7 @@ diff -uNr busybox-1.31.1/networking/httpd.c busybox-1.31.1.mod/networking/httpd. index_page = index_html; \ file_size = -1; \ } while (0) -@@ -1004,7 +1004,7 @@ +@@ -1030,7 +1030,7 @@ if (!errno && n && n <= 0xffff) n = create_and_bind_stream_or_die(NULL, n); else @@ -28,7 +27,7 @@ diff -uNr busybox-1.31.1/networking/httpd.c busybox-1.31.1.mod/networking/httpd. xlisten(n, 9); return n; } -@@ -2209,7 +2209,7 @@ +@@ -2279,7 +2279,7 @@ if (proxy_entry) { if (verbose > 1) bb_error_msg("proxy:%s", urlcopy); diff --git a/packages/busybox/0011-networking-telnetd-default-port.patch b/packages/busybox/0010-networking-telnetd-default-port.patch similarity index 100% rename from packages/busybox/0011-networking-telnetd-default-port.patch rename to packages/busybox/0010-networking-telnetd-default-port.patch diff --git a/packages/busybox/0011-networking-tftp-no-chroot.patch b/packages/busybox/0011-networking-tftp-no-chroot.patch new file mode 100644 index 00000000000000..8f5c598a715f6f --- /dev/null +++ b/packages/busybox/0011-networking-tftp-no-chroot.patch @@ -0,0 +1,15 @@ +--- ./networking/tftp.c.orig 2021-01-01 11:52:27.000000000 +0100 ++++ ./networking/tftp.c 2021-08-19 16:49:06.763647575 +0200 +@@ -917,7 +917,12 @@ + G.pw = xgetpwnam(user_opt); + } + if (argv[0]) { ++#ifdef __ANDROID__ ++ // chroot may trigger seccomp and is allowed only for root anyway. ++ xchdir(argv[0]); ++#else + xchroot(argv[0]); ++#endif + } + + result = recv_from_to(STDIN_FILENO, diff --git a/packages/busybox/0012-networking-tftp-no-chroot.patch b/packages/busybox/0012-networking-tftp-no-chroot.patch deleted file mode 100644 index 9a0eb8cc6bc8fc..00000000000000 --- a/packages/busybox/0012-networking-tftp-no-chroot.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -uNr busybox-1.31.1/networking/tftp.c busybox-1.31.1.mod/networking/tftp.c ---- busybox-1.31.1/networking/tftp.c 2019-06-10 13:50:53.000000000 +0300 -+++ busybox-1.31.1.mod/networking/tftp.c 2019-11-11 22:36:27.592894669 +0200 -@@ -907,7 +907,12 @@ - G.pw = xgetpwnam(user_opt); - } - if (argv[0]) { -+#ifdef __ANDROID__ -+ // chroot may trigger seccomp and is allowed only for root anyway. -+ xchdir(argv[0]); -+#else - xchroot(argv[0]); -+#endif - } - - result = recv_from_to(STDIN_FILENO, diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh index 8d263fc120eace..74a44b0fa486ee 100644 --- a/packages/busybox/build.sh +++ b/packages/busybox/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a singl TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.33.1 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=12cec6bd2b16d8a9446dd16130f2b92982f1819f6e1c5f5887b6db03f5660d28 TERMUX_PKG_BUILD_IN_SRC=true From e811e1db461fee8e0ae04ce7436ae774f370cf64 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Thu, 19 Aug 2021 17:34:57 +0200 Subject: [PATCH 08/29] dns2tcp: fix duplicate symbol debug Error: ld: error: duplicate symbol: debug >>> defined at rr.c >>> rr.o:(debug) >>> defined at main.c >>> main.o:(.bss+0x0) happen when trying to build with android-ndk r22 or r23. More info: https://go-review.googlesource.com/c/go/+/280312 --- packages/dns2tcp/build.sh | 1 + packages/dns2tcp/duplicate_symbol.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 packages/dns2tcp/duplicate_symbol.patch diff --git a/packages/dns2tcp/build.sh b/packages/dns2tcp/build.sh index 1b705e7178ce22..ce70b29c5735bb 100644 --- a/packages/dns2tcp/build.sh +++ b/packages/dns2tcp/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="dns2tcp is a tool for relaying TCP connections over DNS" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Marlin Sööse " TERMUX_PKG_VERSION=0.5.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/alex-sector/dns2tcp/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=4f6e0ed0f5a1aa079a4d377c6d2b16da8ddcffae7d1ddad1280c3e209ada410c TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/dns2tcp/duplicate_symbol.patch b/packages/dns2tcp/duplicate_symbol.patch new file mode 100644 index 00000000000000..de8a9e38443a51 --- /dev/null +++ b/packages/dns2tcp/duplicate_symbol.patch @@ -0,0 +1,11 @@ +--- ./common/includes/debug.h.orig 2021-08-19 17:33:25.204243470 +0200 ++++ ./common/includes/debug.h 2021-08-19 17:33:31.160911682 +0200 +@@ -24,7 +24,7 @@ + #include + #include + +-int debug; ++int debug __attribute__((common)); + + #ifndef _WIN32 + #define DPRINTF(level, fmt, args...) \ From 0466545c045ae3995cc4c0829f9353f9f2772598 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Thu, 16 Sep 2021 22:12:51 +0200 Subject: [PATCH 09/29] rust: update to 1.55.0 --- packages/rust/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/rust/build.sh b/packages/rust/build.sh index 74bdf32cd33734..84b60f5a75cf82 100644 --- a/packages/rust/build.sh +++ b/packages/rust/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.rust-lang.org/ TERMUX_PKG_DESCRIPTION="Systems programming language focused on safety, speed and concurrency" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.54.0 +TERMUX_PKG_VERSION=1.55.0 TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/rustc-$TERMUX_PKG_VERSION-src.tar.xz -TERMUX_PKG_SHA256=a2934f85f76a35a3796c0fefd31e91f5b6dd8377cd8c3769c1c10e7ce7a495f4 +TERMUX_PKG_SHA256=aec85a7c1f40b7a40818a58ae13632f8a12cfaa4d3e2a10957d0e9d16dfdd556 TERMUX_PKG_DEPENDS="libc++, clang, openssl, lld, zlib, libllvm" TERMUX_PKG_RM_AFTER_INSTALL="bin/llvm-dwp" @@ -19,7 +19,7 @@ termux_step_configure() { # like 30 to 40 + minutes ... so lets get it right # upstream only tests build ver one version behind $TERMUX_PKG_VERSION - local BOOTSTRAP_VERSION=1.53.0 + local BOOTSTRAP_VERSION=1.54.0 rustup install $BOOTSTRAP_VERSION rustup default $BOOTSTRAP_VERSION-x86_64-unknown-linux-gnu export PATH=$HOME/.rustup/toolchains/$BOOTSTRAP_VERSION-x86_64-unknown-linux-gnu/bin:$PATH From 06716280af0cb5c02ab048034d7c228b9dcf367b Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 17 Sep 2021 11:19:17 +0200 Subject: [PATCH 10/29] freeimage: remove swab patch Not needed with ndk-r23 --- packages/freeimage/Makefile.gnu.patch | 4 +-- packages/freeimage/build.sh | 2 +- packages/freeimage/dcraw_common.patch | 11 ------- packages/freeimage/libraw_cxx.patch | 10 ------ packages/freeimage/swab.patch | 47 --------------------------- 5 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 packages/freeimage/dcraw_common.patch delete mode 100644 packages/freeimage/libraw_cxx.patch delete mode 100644 packages/freeimage/swab.patch diff --git a/packages/freeimage/Makefile.gnu.patch b/packages/freeimage/Makefile.gnu.patch index 7b1662fdfb321d..d36b5bcdadef29 100644 --- a/packages/freeimage/Makefile.gnu.patch +++ b/packages/freeimage/Makefile.gnu.patch @@ -1,6 +1,6 @@ --- FreeImage/Makefile.gnu 2015-03-10 09:04:00.000000000 +0530 +++ FreeImage-patch/Makefile.gnu 2021-08-27 10:38:11.313999758 +0530 -@@ -5,17 +5,20 @@ +@@ -5,17 +5,18 @@ # General configuration variables: DESTDIR ?= / @@ -8,8 +8,6 @@ -INSTALLDIR ?= $(DESTDIR)/usr/lib +INCDIR ?= @TERMUX_PREFIX@/include +INSTALLDIR ?= @TERMUX_PREFIX@/lib -+ -+SRCS += Source/LibRawLite/internal/swab.cpp # Converts cr/lf to just lf DOS2UNIX = dos2unix diff --git a/packages/freeimage/build.sh b/packages/freeimage/build.sh index 236a08e7cb952f..2b01aec7b6862a 100644 --- a/packages/freeimage/build.sh +++ b/packages/freeimage/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="license-fi.txt, license-gplv2.txt, license-gplv3.txt, license-bsd-2-clause.txt" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.18.0 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL="https://downloads.sourceforge.net/project/freeimage/Source%20Distribution/${TERMUX_PKG_VERSION}/FreeImage${TERMUX_PKG_VERSION//./}.zip" TERMUX_PKG_SHA256=f41379682f9ada94ea7b34fe86bf9ee00935a3147be41b6569c9605a53e438fd TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/freeimage/dcraw_common.patch b/packages/freeimage/dcraw_common.patch deleted file mode 100644 index 621616f206b321..00000000000000 --- a/packages/freeimage/dcraw_common.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Source/LibRawLite/internal/dcraw_common.cpp.old 2020-07-31 15:05:19.932910536 +0000 -+++ b/Source/LibRawLite/internal/dcraw_common.cpp 2020-07-31 15:07:53.161921895 +0000 -@@ -27,6 +27,7 @@ - #include "libraw/libraw.h" - #include "internal/defines.h" - #include "internal/var_defines.h" -+#include - int CLASS fcol(int row, int col) - { - static const char filter[16][16] = { - diff --git a/packages/freeimage/libraw_cxx.patch b/packages/freeimage/libraw_cxx.patch deleted file mode 100644 index 4982bdd2ef2d3b..00000000000000 --- a/packages/freeimage/libraw_cxx.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Source/LibRawLite/src/libraw_cxx.cpp -+++ b/Source/LibRawLite/src/libraw_cxx.cpp -@@ -51,6 +51,8 @@ - #include "dng_simple_image.h" - #include "dng_info.h" - #endif -+ -+#include "swab.h" - - #include "libraw_fuji_compressed.cpp" diff --git a/packages/freeimage/swab.patch b/packages/freeimage/swab.patch deleted file mode 100644 index 9aebd8cd26c2a5..00000000000000 --- a/packages/freeimage/swab.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- -+++ b/Source/LibRawLite/internal/swab.cpp -@@ -0,0 +1,39 @@ -+/* -+ * Copyright (C) 2017 The Android Open Source Project -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * * Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * * Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+#include -+void swab(const void* void_src, void* void_dst, ssize_t byte_count) { -+ const uint8_t* src = static_cast(void_src); -+ uint8_t* dst = static_cast(void_dst); -+ while (byte_count > 1) { -+ uint8_t x = *src++; -+ uint8_t y = *src++; -+ *dst++ = y; -+ *dst++ = x; -+ byte_count -= 2; -+ } -+} - ---- -+++ b/Source/LibRawLite/internal/swab.h -@@ -0,0 +1 @@ -+void swab(const void* __src, void* __dst, ssize_t __byte_count); From dba55c67d51fe5446fa66e8e346ea6c8ba16212a Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 22 Sep 2021 12:46:01 +0200 Subject: [PATCH 11/29] termux_setup_standalone_toolchain: remove one indentation level --- scripts/build/termux_step_setup_toolchain.sh | 152 ++++++++++--------- 1 file changed, 77 insertions(+), 75 deletions(-) diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index 98c93e91710849..b023ab3e346bdd 100644 --- a/scripts/build/termux_step_setup_toolchain.sh +++ b/scripts/build/termux_step_setup_toolchain.sh @@ -129,80 +129,82 @@ termux_step_setup_toolchain() { } termux_setup_standalone_toolchain() { - if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ] && [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then - # Do not put toolchain in place until we are done with setup, to avoid having a half setup - # toolchain left in place if something goes wrong (or process is just aborted): - local _TERMUX_TOOLCHAIN_TMPDIR=${TERMUX_STANDALONE_TOOLCHAIN}-tmp - rm -Rf $_TERMUX_TOOLCHAIN_TMPDIR - - local _NDK_ARCHNAME=$TERMUX_ARCH - if [ "$TERMUX_ARCH" = "aarch64" ]; then - _NDK_ARCHNAME=arm64 - elif [ "$TERMUX_ARCH" = "i686" ]; then - _NDK_ARCHNAME=x86 - fi - cp $NDK/toolchains/llvm/prebuilt/linux-x86_64 $_TERMUX_TOOLCHAIN_TMPDIR -r - - # Remove android-support header wrapping not needed on android-21: - rm -Rf $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/local - - for HOST_PLAT in aarch64-linux-android armv7a-linux-androideabi i686-linux-android x86_64-linux-android; do - cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT$TERMUX_PKG_API_LEVEL-clang \ - $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang - cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT$TERMUX_PKG_API_LEVEL-clang++ \ - $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang++ - - cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT$TERMUX_PKG_API_LEVEL-clang \ - $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-cpp - sed -i 's/clang/clang -E/' \ - $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-cpp - - cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang \ - $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-gcc - cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang++ \ - $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-g++ - done - - cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/armv7a-linux-androideabi$TERMUX_PKG_API_LEVEL-clang \ - $_TERMUX_TOOLCHAIN_TMPDIR/bin/arm-linux-androideabi-clang - cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/armv7a-linux-androideabi$TERMUX_PKG_API_LEVEL-clang++ \ - $_TERMUX_TOOLCHAIN_TMPDIR/bin/arm-linux-androideabi-clang++ - cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/armv7a-linux-androideabi-cpp \ - $_TERMUX_TOOLCHAIN_TMPDIR/bin/arm-linux-androideabi-cpp - - cd $_TERMUX_TOOLCHAIN_TMPDIR/sysroot - for f in $TERMUX_SCRIPTDIR/ndk-patches/*.patch; do - echo "Applying ndk-patch: $(basename $f)" - sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" "$f" | \ - sed "s%\@TERMUX_HOME\@%${TERMUX_ANDROID_HOME}%g" | \ - patch --silent -p1; - done - # libintl.h: Inline implementation gettext functions. - # langinfo.h: Inline implementation of nl_langinfo(). - cp "$TERMUX_SCRIPTDIR"/ndk-patches/{libintl.h,langinfo.h} usr/include - - # Remove because it is provided by libcap. - # Remove from the NDK in favour of that from the libandroid-shmem. - # Remove as it doesn't work for non-root. - # Remove as we currently provide it from libandroid-glob. - # Remove as it's provided by libiconv. - # Remove as it's only for future (later than android-27). - # Remove and as we build our own zlib. - # Remove unicode headers provided by libicu. - rm usr/include/{sys/{capability,shm,sem},{glob,iconv,spawn,zlib,zconf}}.h - rm usr/include/unicode/{char16ptr,platform,ptypes,putil,stringoptions,ubidi,ubrk,uchar,uconfig,ucpmap,udisplaycontext,uenum,uldnames,ulocdata,uloc,umachine,unorm2,urename,uscript,ustring,utext,utf16,utf8,utf,utf_old,utypes,uvernum,uversion}.h - - sed -i "s/define __ANDROID_API__ __ANDROID_API_FUTURE__/define __ANDROID_API__ $TERMUX_PKG_API_LEVEL/" \ - usr/include/android/api-level.h - - $TERMUX_ELF_CLEANER usr/lib/*/*/*.so - for dir in usr/lib/*; do - # This seem to be needed when building rust - # packages - echo 'INPUT(-lunwind)' > $dir/libgcc.a - done - - grep -lrw $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include/c++/v1 -e '' | xargs -n 1 sed -i 's//\"version\"/g' - mv $_TERMUX_TOOLCHAIN_TMPDIR $TERMUX_STANDALONE_TOOLCHAIN + if [ "$TERMUX_ON_DEVICE_BUILD" = "true" ] || [ -d $TERMUX_STANDALONE_TOOLCHAIN ]; then + return + fi + + # Do not put toolchain in place until we are done with setup, to avoid having a half setup + # toolchain left in place if something goes wrong (or process is just aborted): + local _TERMUX_TOOLCHAIN_TMPDIR=${TERMUX_STANDALONE_TOOLCHAIN}-tmp + rm -Rf $_TERMUX_TOOLCHAIN_TMPDIR + + local _NDK_ARCHNAME=$TERMUX_ARCH + if [ "$TERMUX_ARCH" = "aarch64" ]; then + _NDK_ARCHNAME=arm64 + elif [ "$TERMUX_ARCH" = "i686" ]; then + _NDK_ARCHNAME=x86 fi + cp $NDK/toolchains/llvm/prebuilt/linux-x86_64 $_TERMUX_TOOLCHAIN_TMPDIR -r + + # Remove android-support header wrapping not needed on android-21: + rm -Rf $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/local + + for HOST_PLAT in aarch64-linux-android armv7a-linux-androideabi i686-linux-android x86_64-linux-android; do + cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT$TERMUX_PKG_API_LEVEL-clang \ + $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang + cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT$TERMUX_PKG_API_LEVEL-clang++ \ + $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang++ + + cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT$TERMUX_PKG_API_LEVEL-clang \ + $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-cpp + sed -i 's/clang/clang -E/' \ + $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-cpp + + cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang \ + $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-gcc + cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-clang++ \ + $_TERMUX_TOOLCHAIN_TMPDIR/bin/$HOST_PLAT-g++ + done + + cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/armv7a-linux-androideabi$TERMUX_PKG_API_LEVEL-clang \ + $_TERMUX_TOOLCHAIN_TMPDIR/bin/arm-linux-androideabi-clang + cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/armv7a-linux-androideabi$TERMUX_PKG_API_LEVEL-clang++ \ + $_TERMUX_TOOLCHAIN_TMPDIR/bin/arm-linux-androideabi-clang++ + cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/armv7a-linux-androideabi-cpp \ + $_TERMUX_TOOLCHAIN_TMPDIR/bin/arm-linux-androideabi-cpp + + cd $_TERMUX_TOOLCHAIN_TMPDIR/sysroot + for f in $TERMUX_SCRIPTDIR/ndk-patches/*.patch; do + echo "Applying ndk-patch: $(basename $f)" + sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" "$f" | \ + sed "s%\@TERMUX_HOME\@%${TERMUX_ANDROID_HOME}%g" | \ + patch --silent -p1; + done + # libintl.h: Inline implementation gettext functions. + # langinfo.h: Inline implementation of nl_langinfo(). + cp "$TERMUX_SCRIPTDIR"/ndk-patches/{libintl.h,langinfo.h} usr/include + + # Remove because it is provided by libcap. + # Remove from the NDK in favour of that from the libandroid-shmem. + # Remove as it doesn't work for non-root. + # Remove as we currently provide it from libandroid-glob. + # Remove as it's provided by libiconv. + # Remove as it's only for future (later than android-27). + # Remove and as we build our own zlib. + # Remove unicode headers provided by libicu. + rm usr/include/{sys/{capability,shm,sem},{glob,iconv,spawn,zlib,zconf}}.h + rm usr/include/unicode/{char16ptr,platform,ptypes,putil,stringoptions,ubidi,ubrk,uchar,uconfig,ucpmap,udisplaycontext,uenum,uldnames,ulocdata,uloc,umachine,unorm2,urename,uscript,ustring,utext,utf16,utf8,utf,utf_old,utypes,uvernum,uversion}.h + + sed -i "s/define __ANDROID_API__ __ANDROID_API_FUTURE__/define __ANDROID_API__ $TERMUX_PKG_API_LEVEL/" \ + usr/include/android/api-level.h + + $TERMUX_ELF_CLEANER usr/lib/*/*/*.so + for dir in usr/lib/*; do + # This seem to be needed when building rust + # packages + echo 'INPUT(-lunwind)' > $dir/libgcc.a + done + + grep -lrw $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include/c++/v1 -e '' | xargs -n 1 sed -i 's//\"version\"/g' + mv $_TERMUX_TOOLCHAIN_TMPDIR $TERMUX_STANDALONE_TOOLCHAIN } From f11a4ef40dd3c896af72c5f7668e365a0e98a107 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 17 Sep 2021 13:40:15 +0200 Subject: [PATCH 12/29] termux_step_setup_toolchain: do not add prefix to pkg-config And create the pkg-config wrapper inside termux_setup_toolchain. --- scripts/build/termux_step_setup_toolchain.sh | 33 +++++++++----------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index b023ab3e346bdd..08a3e256db8c93 100644 --- a/scripts/build/termux_step_setup_toolchain.sh +++ b/scripts/build/termux_step_setup_toolchain.sh @@ -20,7 +20,7 @@ termux_step_setup_toolchain() { if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then export PATH=$TERMUX_STANDALONE_TOOLCHAIN/bin:$PATH export CC_FOR_BUILD=gcc - export PKG_CONFIG=$TERMUX_STANDALONE_TOOLCHAIN/bin/${TERMUX_HOST_PLATFORM}-pkg-config + export PKG_CONFIG=$TERMUX_STANDALONE_TOOLCHAIN/bin/pkg-config export CCTERMUX_HOST_PLATFORM=$TERMUX_HOST_PLATFORM$TERMUX_PKG_API_LEVEL if [ $TERMUX_ARCH = arm ]; then CCTERMUX_HOST_PLATFORM=armv7a-linux-androideabi$TERMUX_PKG_API_LEVEL @@ -32,6 +32,7 @@ termux_step_setup_toolchain() { # using this for on-device builds too. export PKG_CONFIG=pkg-config fi + export PKG_CONFIG_LIBDIR="$TERMUX_PKG_CONFIG_LIBDIR" if [ "$TERMUX_ARCH" = "arm" ]; then # https://developer.android.com/ndk/guides/standalone_toolchain.html#abi_compatibility: @@ -109,23 +110,6 @@ termux_step_setup_toolchain() { mkdir -p "$TERMUX_PREFIX/lib" echo 'INPUT(-lc)' > $TERMUX_PREFIX/lib/libutil.so fi - - export PKG_CONFIG_LIBDIR="$TERMUX_PKG_CONFIG_LIBDIR" - - if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then - # Create a pkg-config wrapper. We use path to host pkg-config to - # avoid picking up a cross-compiled pkg-config later on. - local _HOST_PKGCONFIG - _HOST_PKGCONFIG=$(which pkg-config) - mkdir -p $TERMUX_STANDALONE_TOOLCHAIN/bin "$PKG_CONFIG_LIBDIR" - cat > "$PKG_CONFIG" <<-HERE - #!/bin/sh - export PKG_CONFIG_DIR= - export PKG_CONFIG_LIBDIR=$PKG_CONFIG_LIBDIR - exec $_HOST_PKGCONFIG "\$@" - HERE - chmod +x "$PKG_CONFIG" - fi } termux_setup_standalone_toolchain() { @@ -173,6 +157,19 @@ termux_setup_standalone_toolchain() { cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/armv7a-linux-androideabi-cpp \ $_TERMUX_TOOLCHAIN_TMPDIR/bin/arm-linux-androideabi-cpp + # Create a pkg-config wrapper. We use path to host pkg-config to + # avoid picking up a cross-compiled pkg-config later on. + local _HOST_PKGCONFIG + _HOST_PKGCONFIG=$(which pkg-config) + mkdir -p "$PKG_CONFIG_LIBDIR" + cat > $_TERMUX_TOOLCHAIN_TMPDIR/bin/pkg-config <<-HERE + #!/bin/sh + export PKG_CONFIG_DIR= + export PKG_CONFIG_LIBDIR=$PKG_CONFIG_LIBDIR + exec $_HOST_PKGCONFIG "\$@" + HERE + chmod +x $_TERMUX_TOOLCHAIN_TMPDIR/bin/pkg-config + cd $_TERMUX_TOOLCHAIN_TMPDIR/sysroot for f in $TERMUX_SCRIPTDIR/ndk-patches/*.patch; do echo "Applying ndk-patch: $(basename $f)" From f8a22b90603be89091b0babbba5b05e22f7176fb Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 22 Sep 2021 14:01:45 +0200 Subject: [PATCH 13/29] libcap-ng: disable python2 as well --- packages/libcap-ng/build.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/libcap-ng/build.sh b/packages/libcap-ng/build.sh index 3be8df5a7bdd53..8bd516f45fbb06 100644 --- a/packages/libcap-ng/build.sh +++ b/packages/libcap-ng/build.sh @@ -3,11 +3,14 @@ TERMUX_PKG_DESCRIPTION="Library making programming with POSIX capabilities easie TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.8.2 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/stevegrubb/libcap-ng/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=65b86885b8d873e55c05bd49427fd370d559b26f0c2089ac9194828e6a2fe233 TERMUX_PKG_AUTO_UPDATE=true -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-python3" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +--without-python +--without-python3 +" termux_step_pre_configure() { ./autogen.sh From a54238e816f596941c5211be8761a498acf06702 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 22 Sep 2021 14:02:12 +0200 Subject: [PATCH 14/29] libowfat: fix build with ndk-r23 --- packages/libowfat/GNUmakefile.patch | 33 ++++++++++++++++++++++++----- packages/libowfat/build.sh | 1 + 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/packages/libowfat/GNUmakefile.patch b/packages/libowfat/GNUmakefile.patch index 45b2c39993bf14..57076f8056ab98 100644 --- a/packages/libowfat/GNUmakefile.patch +++ b/packages/libowfat/GNUmakefile.patch @@ -1,16 +1,39 @@ -diff -uNr libowfat-0.32/GNUmakefile libowfat-0.32.mod/GNUmakefile ---- libowfat-0.32/GNUmakefile 2018-08-24 15:00:46.000000000 +0300 -+++ libowfat-0.32.mod/GNUmakefile 2020-01-01 23:34:46.416487188 +0200 -@@ -21,7 +21,7 @@ +--- ../GNUmakefile.orig 2021-09-22 13:58:37.598012446 +0200 ++++ ./GNUmakefile 2021-09-22 13:59:03.258474130 +0200 +@@ -21,7 +21,9 @@ CROSS= #CROSS=i686-mingw- CC?=gcc -CCC=$(CROSS)$(CC) ++AR?=$(CROSS)ar ++RANLIB?=$(CROSS)ranlib +CCC=$(CROSS)clang WERROR= WARN=-W -Wall -Wextra $(WERROR) -@@ -192,7 +192,7 @@ +@@ -169,8 +171,8 @@ + $(IO_OBJS) $(CDB_OBJS) $(CRITBIT_OBJS) + + libowfat.a: $(ALL_OBJS) +- $(CROSS)ar cru $@ $(ALL_OBJS) +- -$(CROSS)ranlib $@ ++ $(AR) cru $@ $(ALL_OBJS) ++ -$(RANLIB) $@ + + CFLAGS+=-I. + CFLAGS_OPT+=-I. +@@ -182,8 +184,8 @@ + $(DIET) $(CCC) -c $< $(CFLAGS) + + %.a: +- $(CROSS)ar cru $@ $^ +- -$(CROSS)ranlib $@ ++ $(AR) cru $@ $^ ++ -$(RANLIB) $@ + + t.o: t.c fmt.h scan.h str.h uint16.h uint32.h stralloc.h socket.h \ + buffer.h ip4.h ip6.h byte.h mmap.h open.h textcode.h dns.h iopause.h \ +@@ -192,7 +194,7 @@ havesigio.h CAS.h t: t.o libowfat.a libsocket diff --git a/packages/libowfat/build.sh b/packages/libowfat/build.sh index 238a2274f8c2e0..0246733e3ff042 100644 --- a/packages/libowfat/build.sh +++ b/packages/libowfat/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="GPL reimplementation of libdjb" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.32 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://www.fefe.de/libowfat/libowfat-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=f4b9b3d9922dc25bc93adedf9e9ff8ddbebaf623f14c8e7a5f2301bfef7998c1 TERMUX_PKG_BUILD_IN_SRC=true From d6dd9c6364fb44b1f1cb01db03b47b45a8229ff7 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 22 Sep 2021 16:01:35 +0200 Subject: [PATCH 15/29] heyu: fix errors about duplicate symbols with ndk >=r22 Errors looks like: aarch64-linux-android-clang -fstack-protector-strong -Oz -Drindex=strrchr -L/data/data/com.termux/files/usr/lib -Wl,-rpath=/data/data/com.termux/files/usr/lib -fopenmp -static-openmp -Wl,--enable-new-dtags -Wl,--as-needed -Wl,-z,relro,-z,now -o heyu date.o erase.o info.o message.o relay.o monitor.o reset.o setclock.o stop.o tty.o x10.o xread.o xwrite.o status.o cm11a.o eeprom.o process.o sun.o cmd.o config.o x10state.o poll.o modules.o cm17a.o xsync.o timing.o cm10a.o tty_aux.o relay_aux.o x10aux.o rfxcom.o digimax.o oregon.o -lm ld: error: duplicate symbol: newsb >>> defined at tty.c >>> tty.o:(newsb) >>> defined at tty_aux.c >>> tty_aux.o:(.bss+0x30) ld: error: duplicate symbol: oldsb >>> defined at tty.c >>> tty.o:(oldsb) >>> defined at tty_aux.c >>> tty_aux.o:(.bss+0x0) ld: error: duplicate symbol: spoolfile >>> defined at relay.c >>> relay.o:(spoolfile) >>> defined at relay_aux.c >>> relay_aux.o:(.bss+0x1C4) clang-12: error: linker command failed with exit code 1 (use -v to see invocation) make[1]: *** [Makefile:467: heyu] Error 1 --- packages/heyu/build.sh | 2 +- packages/heyu/relay_aux.c.patch | 11 +++++++++++ packages/heyu/tty_aux.c.patch | 29 +++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 packages/heyu/relay_aux.c.patch create mode 100644 packages/heyu/tty_aux.c.patch diff --git a/packages/heyu/build.sh b/packages/heyu/build.sh index c5498db483e898..e2509cfa2d0fb7 100644 --- a/packages/heyu/build.sh +++ b/packages/heyu/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Program for remotely controlling lights and appliances" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.11-rc3 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/HeyuX10Automation/heyu/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=6285f134e03688b5ec03986ef53cce463abc007281996156cac52b61cbeb58b2 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/heyu/relay_aux.c.patch b/packages/heyu/relay_aux.c.patch new file mode 100644 index 00000000000000..9bda8d203a364d --- /dev/null +++ b/packages/heyu/relay_aux.c.patch @@ -0,0 +1,11 @@ +--- ../relay_aux.c.orig 2021-09-22 11:17:39.444565934 +0200 ++++ ./relay_aux.c 2021-09-22 11:17:59.128252191 +0200 +@@ -95,7 +95,7 @@ + extern CONFIG config; + extern CONFIG *configp; + +-char spoolfile[PATH_LEN + 1]; ++extern char spoolfile[PATH_LEN + 1]; + + extern int is_ring( void ); + int relay_ri_control( void ); diff --git a/packages/heyu/tty_aux.c.patch b/packages/heyu/tty_aux.c.patch new file mode 100644 index 00000000000000..bddf57c6f1c421 --- /dev/null +++ b/packages/heyu/tty_aux.c.patch @@ -0,0 +1,29 @@ +--- ../tty_aux.c.orig 2021-09-22 11:12:35.845952747 +0200 ++++ ./tty_aux.c 2021-09-22 11:13:47.397197243 +0200 +@@ -121,7 +121,7 @@ + + #if !defined(HAVE_STRUCT_TERMIOS) && !defined(HAVE_STRUCT_TERMIO) + # include +-struct sgttyb oldsb, newsb; ++extern struct sgttyb oldsb, newsb; + void hangup(); + #else + # ifndef HAVE_STRUCT_TERMIOS +@@ -131,7 +131,7 @@ + # ifdef HAVE_SYS_TERMIO_H + # include + # endif +-struct termio oldsb, newsb; ++extern struct termio oldsb, newsb; + # else + # ifdef HAVE_TERMIOS_H + # include +@@ -139,7 +139,7 @@ + # ifdef HAVE_SYS_TERMIOS_H + # include + # endif +-struct termios oldsb, newsb; ++extern struct termios oldsb, newsb; + # endif + # ifndef NCC + # define NCC NCCS From af09dec04c04f28c14fb3c4e0cb2070224c638a2 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 22 Sep 2021 16:30:10 +0200 Subject: [PATCH 16/29] libtirpc: fix build with ndk-r23 --- packages/libtirpc/build.sh | 1 + packages/libtirpc/ffsl-func.patch | 33 ------------------------ packages/libtirpc/poll-definitions.patch | 13 ++++++++++ 3 files changed, 14 insertions(+), 33 deletions(-) delete mode 100644 packages/libtirpc/ffsl-func.patch create mode 100644 packages/libtirpc/poll-definitions.patch diff --git a/packages/libtirpc/build.sh b/packages/libtirpc/build.sh index 9ec2a2e7244321..79c5e5a1908f43 100644 --- a/packages/libtirpc/build.sh +++ b/packages/libtirpc/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Transport Independent RPC library" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.3.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/sourceforge/libtirpc/libtirpc-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=245895caf066bec5e3d4375942c8cb4366adad184c29c618d97f724ea309ee17 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-gssapi" diff --git a/packages/libtirpc/ffsl-func.patch b/packages/libtirpc/ffsl-func.patch deleted file mode 100644 index a0c4b4c6b4d597..00000000000000 --- a/packages/libtirpc/ffsl-func.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -uNr libtirpc-1.2.6/src/svc.c libtirpc-1.2.6.mod/src/svc.c ---- libtirpc-1.2.6/src/svc.c 2020-04-07 16:24:34.000000000 +0300 -+++ libtirpc-1.2.6.mod/src/svc.c 2020-06-07 03:10:30.231611990 +0300 -@@ -630,6 +630,29 @@ - svc_getreqset (&readfds); - } - -+#ifdef __ANDROID__ -+static int ffsl(int i) -+{ -+ static const unsigned char table[] = -+ { -+ 0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, -+ 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, -+ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, -+ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, -+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, -+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, -+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, -+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8 -+ }; -+ unsigned int a; -+ unsigned int x = i & -i; -+ -+ a = x <= 0xffff ? (x <= 0xff ? 0 : 8) : (x <= 0xffffff ? 16 : 24); -+ -+ return table[x >> a] + a; -+} -+#endif -+ - void - svc_getreqset (readfds) - fd_set *readfds; diff --git a/packages/libtirpc/poll-definitions.patch b/packages/libtirpc/poll-definitions.patch new file mode 100644 index 00000000000000..aee105c0eb4316 --- /dev/null +++ b/packages/libtirpc/poll-definitions.patch @@ -0,0 +1,13 @@ +--- ../clnt_bcast.c.orig 2021-09-22 16:24:18.434244238 +0200 ++++ ./src/clnt_bcast.c 2021-09-22 16:24:38.977948416 +0200 +@@ -69,10 +69,6 @@ + #define INITTIME 4000 /* Time to wait initially */ + #define WAITTIME 8000 /* Maximum time to wait */ + +-# define POLLRDNORM 0x040 /* Normal data may be read. */ +-# define POLLRDBAND 0x080 /* Priority data may be read. */ +- +- + + /* + * If nettype is NULL, it broadcasts on all the available From e7401072dcf65e77efcc55bc16bba7b5af6a5d49 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 22 Sep 2021 16:38:06 +0200 Subject: [PATCH 17/29] libwren: fix build with ndk-r23 --- packages/libwren/build.sh | 1 + .../projects-make-wren_test.make.patch | 22 ------- packages/libwren/projects-make.patch | 62 +++++++++++++++++++ 3 files changed, 63 insertions(+), 22 deletions(-) delete mode 100644 packages/libwren/projects-make-wren_test.make.patch create mode 100644 packages/libwren/projects-make.patch diff --git a/packages/libwren/build.sh b/packages/libwren/build.sh index 590ac0ce805a1d..16ae2279a0532f 100644 --- a/packages/libwren/build.sh +++ b/packages/libwren/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Small, fast, class-based concurrent scripting language l TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.4.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/wren-lang/wren/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=23c0ddeb6c67a4ed9285bded49f7c91714922c2e7bb88f42428386bf1cf7b339 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/libwren/projects-make-wren_test.make.patch b/packages/libwren/projects-make-wren_test.make.patch deleted file mode 100644 index 4351f5da64531c..00000000000000 --- a/packages/libwren/projects-make-wren_test.make.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/projects/make/wren_test.make b/projects/make/wren_test.make -index 6d8c6383..8309bf5b 100644 ---- a/projects/make/wren_test.make -+++ b/projects/make/wren_test.make -@@ -40,7 +40,7 @@ ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -std=c99 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 - LIBS += ../../lib/libwren.a -lm - LDDEPS += ../../lib/libwren.a --ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -s -+ALL_LDFLAGS += $(LDFLAGS) -m64 -s - - else ifeq ($(config),release_32bit) - TARGETDIR = ../../bin -@@ -51,7 +51,7 @@ ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -std=c99 - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 - LIBS += ../../lib/libwren.a -lm - LDDEPS += ../../lib/libwren.a --ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 -s -+ALL_LDFLAGS += $(LDFLAGS) -m32 -s - - else ifeq ($(config),release_64bit-no-nan-tagging) - TARGETDIR = ../../bin diff --git a/packages/libwren/projects-make.patch b/packages/libwren/projects-make.patch new file mode 100644 index 00000000000000..3de98780903317 --- /dev/null +++ b/packages/libwren/projects-make.patch @@ -0,0 +1,62 @@ +diff --git a/projects/make/wren_test.make b/projects/make/wren_test.make +index 6d8c6383..8309bf5b 100644 +--- a/projects/make/wren_test.make ++++ b/projects/make/wren_test.make +@@ -40,7 +40,7 @@ ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -std=c99 + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 + LIBS += ../../lib/libwren.a -lm + LDDEPS += ../../lib/libwren.a +-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -s ++ALL_LDFLAGS += $(LDFLAGS) -m64 -s + + else ifeq ($(config),release_32bit) + TARGETDIR = ../../bin +@@ -51,7 +51,7 @@ ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -std=c99 + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 + LIBS += ../../lib/libwren.a -lm + LDDEPS += ../../lib/libwren.a +-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 -s ++ALL_LDFLAGS += $(LDFLAGS) -m32 -s + + else ifeq ($(config),release_64bit-no-nan-tagging) + TARGETDIR = ../../bin +--- ../wren.make.orig 2021-09-22 16:33:01.100347594 +0200 ++++ ./projects/make/wren.make 2021-09-22 16:33:36.664323142 +0200 +@@ -40,7 +40,7 @@ + DEFINES += -DNDEBUG + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -std=c99 + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 +-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -s ++ALL_LDFLAGS += $(LDFLAGS) -m64 -s + + else ifeq ($(config),release_32bit) + TARGETDIR = ../../lib +@@ -49,7 +49,7 @@ + DEFINES += -DNDEBUG + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -std=c99 + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 +-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 -s ++ALL_LDFLAGS += $(LDFLAGS) -m32 -s + + else ifeq ($(config),release_64bit-no-nan-tagging) + TARGETDIR = ../../lib +--- ../wren_shared.make.orig 2021-09-22 16:34:05.898184395 +0200 ++++ ./projects/make/wren_shared.make 2021-09-22 16:34:22.975159452 +0200 +@@ -40,7 +40,7 @@ + DEFINES += -DNDEBUG + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC -std=c99 + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC +-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -shared -Wl,-soname=libwren.so -s ++ALL_LDFLAGS += $(LDFLAGS) -m64 -shared -Wl,-soname=libwren.so -s + + else ifeq ($(config),release_32bit) + TARGETDIR = ../../lib +@@ -49,7 +49,7 @@ + DEFINES += -DNDEBUG + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fPIC -std=c99 + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fPIC +-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 -shared -Wl,-soname=libwren.so -s ++ALL_LDFLAGS += $(LDFLAGS) -m32 -shared -Wl,-soname=libwren.so -s + + else ifeq ($(config),release_64bit-no-nan-tagging) + TARGETDIR = ../../lib From fb198e060d71bf19cc46ccd1f56960cf7a4cceb3 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 22 Sep 2021 17:14:39 +0200 Subject: [PATCH 18/29] openal-soft: fix build error when qt5 is found on host If ALSOFT_NO_CONFIG_UTIL it looks for qt5widgets. --- packages/openal-soft/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/openal-soft/build.sh b/packages/openal-soft/build.sh index 22beeb7541235c..4a2f353df2ceb2 100644 --- a/packages/openal-soft/build.sh +++ b/packages/openal-soft/build.sh @@ -3,12 +3,14 @@ TERMUX_PKG_DESCRIPTION="Software implementation of the OpenAL API" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.21.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/kcat/openal-soft/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=8ac17e4e3b32c1af3d5508acfffb838640669b4274606b7892aa796ca9d7467f TERMUX_PKG_BREAKS="openal-soft-dev" TERMUX_PKG_REPLACES="openal-soft-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DALSOFT_UTILS=ON +-DALSOFT_NO_CONFIG_UTIL=ON -DALSOFT_EXAMPLES=ON -DALSOFT_TESTS=OFF -DALSOFT_REQUIRE_OPENSL=ON From 203f95e0fb7ff389b7c25353fb9a896ddb459f19 Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Sat, 2 Oct 2021 18:18:57 +0530 Subject: [PATCH 19/29] Fix lubicu package --- packages/libicu/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/libicu/build.sh b/packages/libicu/build.sh index e0af9d25415160..3f7b8377cb1f73 100644 --- a/packages/libicu/build.sh +++ b/packages/libicu/build.sh @@ -18,4 +18,5 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-samples --disable-tests --with-cross- termux_step_post_get_source() { TERMUX_PKG_SRCDIR+="/source" + find . -type f | xargs touch } From d3f5e3c1b7315568ba2a55e1d0c41abf8f9fab61 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 5 Oct 2021 20:40:27 +0200 Subject: [PATCH 20/29] libnl: fix build with ndk-r23 --- packages/libnl/build.sh | 1 + packages/libnl/socket.h.patch | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 packages/libnl/socket.h.patch diff --git a/packages/libnl/build.sh b/packages/libnl/build.sh index bf4b0a08304224..577e5e14e5e547 100644 --- a/packages/libnl/build.sh +++ b/packages/libnl/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Collection of libraries providing APIs to netlink protoc TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.5.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/thom311/libnl/releases/download/libnl${TERMUX_PKG_VERSION//./_}/libnl-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/libnl/socket.h.patch b/packages/libnl/socket.h.patch new file mode 100644 index 00000000000000..4787b4baf96322 --- /dev/null +++ b/packages/libnl/socket.h.patch @@ -0,0 +1,24 @@ +--- ../socket.h.orig 2021-10-05 20:33:54.147771599 +0200 ++++ ./include/linux-private/linux/socket.h 2021-10-05 20:37:22.881231039 +0200 +@@ -2,21 +2,7 @@ + #ifndef _LINUX_SOCKET_H + #define _LINUX_SOCKET_H + +-/* +- * Desired design of maximum size and alignment (see RFC2553) +- */ +-#define _K_SS_MAXSIZE 128 /* Implementation specific max size */ +-#define _K_SS_ALIGNSIZE (__alignof__ (struct sockaddr *)) +- /* Implementation specific desired alignment */ + + typedef unsigned short __kernel_sa_family_t; + +-struct __kernel_sockaddr_storage { +- __kernel_sa_family_t ss_family; /* address family */ +- /* Following field(s) are implementation specific */ +- char __data[_K_SS_MAXSIZE - sizeof(unsigned short)]; +- /* space to achieve desired size, */ +- /* _SS_MAXSIZE value minus size of ss_family */ +-} __attribute__ ((aligned(_K_SS_ALIGNSIZE))); /* force desired alignment */ +- + #endif /* _LINUX_SOCKET_H */ From 226a21938e8b50e9c4d639b33898f98a964e0942 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 10 Oct 2021 16:41:00 +0200 Subject: [PATCH 21/29] perl: specify AR to fix build with ndk-r23 --- packages/perl/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/perl/build.sh b/packages/perl/build.sh index 0cd92c3fd62c8f..bbc7451d74e1e5 100644 --- a/packages/perl/build.sh +++ b/packages/perl/build.sh @@ -11,6 +11,7 @@ TERMUX_PKG_MAINTAINER="@termux" # - subversion TERMUX_PKG_VERSION=(5.34.0 1.3.6) +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=(551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5) TERMUX_PKG_SRCURL=(http://www.cpan.org/src/5.0/perl-${TERMUX_PKG_VERSION}.tar.gz @@ -65,6 +66,7 @@ termux_step_configure() { -Dsh=$TERMUX_PREFIX/bin/sh \ -Dcc="$ORIG_CC" \ -Dld="$ORIG_CC -Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags" \ + -Dar="$ORIG_AR" \ -Duseshrplib } From af894cf2d4bc373d576dc2da4b4ef961255e55c3 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 10 Oct 2021 17:17:14 +0200 Subject: [PATCH 22/29] quickjs: fix build with ndk-r23 --- packages/quickjs/Makefile.patch | 27 ++++++++++++++++++++++----- packages/quickjs/build.sh | 10 +++++++++- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/packages/quickjs/Makefile.patch b/packages/quickjs/Makefile.patch index 876a524bdb76e5..68f49f32ec63ee 100644 --- a/packages/quickjs/Makefile.patch +++ b/packages/quickjs/Makefile.patch @@ -1,7 +1,24 @@ -diff -uNr quickjs-2020-07-05/Makefile quickjs-2020-07-05.mod/Makefile ---- quickjs-2020-07-05/Makefile 2020-07-05 12:03:51.000000000 +0200 -+++ quickjs-2020-07-05.mod/Makefile 2020-08-07 10:17:00.109022444 +0200 -@@ -173,7 +173,7 @@ +--- ./Makefile.orig 2021-10-10 17:13:11.147988944 +0200 ++++ ./Makefile 2021-10-10 17:12:41.424662424 +0200 +@@ -76,7 +76,7 @@ + CFLAGS += -Wchar-subscripts -funsigned-char + CFLAGS += -MMD -MF $(OBJDIR)/$(@F).d + ifdef CONFIG_DEFAULT_AR +- AR=$(CROSS_PREFIX)ar ++ AR ?= $(CROSS_PREFIX)ar + else + ifdef CONFIG_LTO + AR=$(CROSS_PREFIX)llvm-ar +@@ -95,7 +95,7 @@ + AR=$(CROSS_PREFIX)ar + endif + endif +-STRIP=$(CROSS_PREFIX)strip ++STRIP ?= $(CROSS_PREFIX)strip + ifdef CONFIG_WERROR + CFLAGS+=-Werror + endif +@@ -177,7 +177,7 @@ HOST_LIBS=-lm -ldl -lpthread LIBS=-lm ifndef CONFIG_WIN32 @@ -9,4 +26,4 @@ diff -uNr quickjs-2020-07-05/Makefile quickjs-2020-07-05.mod/Makefile +LIBS+=-ldl endif - $(OBJDIR): + $(OBJDIR): diff --git a/packages/quickjs/build.sh b/packages/quickjs/build.sh index e9253fd7e397eb..863339fc67ff97 100644 --- a/packages/quickjs/build.sh +++ b/packages/quickjs/build.sh @@ -6,8 +6,16 @@ _YEAR=2021 _MONTH=03 _DAY=27 TERMUX_PKG_VERSION=1:${_YEAR}${_MONTH}${_DAY} +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://bellard.org/quickjs/quickjs-${_YEAR}-${_MONTH}-${_DAY}.tar.xz TERMUX_PKG_SHA256=a45bface4c3379538dea8533878d694e289330488ea7028b105f72572fe7fe1a TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_NO_STATICSPLIT=true -TERMUX_PKG_EXTRA_MAKE_ARGS="CROSS_PREFIX=${TERMUX_HOST_PLATFORM}- CONFIG_CLANG=y CONFIG_DEFAULT_AR=y -W run-test262 -W run-test262-bn prefix=$TERMUX_PREFIX" +TERMUX_PKG_EXTRA_MAKE_ARGS=" +CROSS_PREFIX=${TERMUX_HOST_PLATFORM}- +CONFIG_CLANG=y +CONFIG_DEFAULT_AR=y +-W run-test262 +-W run-test262-bn +prefix=$TERMUX_PREFIX +" From 058c3b424af25a3c009c624b8b9e9603e5313bdd Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 10 Oct 2021 18:57:46 +0200 Subject: [PATCH 23/29] lua-language-server: fix hostbuild step Package still fails to build though: FAILED: build/obj/source_bee/subprocess_posix.obj aarch64-linux-android-clang -MMD -MT build/obj/source_bee/subprocess_posix.obj -MF build/obj/source_bee/subprocess_posix.obj.d -std=c++17 -O2 -Wall -Werror -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -I3rd/bee.lua -DBEE_INLINE -DNDEBUG -fstack-protector-strong -Oz -I/data/data/com.termux/files/usr/include -o build/obj/source_bee/subprocess_posix.obj -c 3rd/bee.lua/bee/subprocess/subprocess_posix.cpp 3rd/bee.lua/bee/subprocess/subprocess_posix.cpp:152:17: error: 'posix_spawnattr_init' is unavailable: introduced in Android 28 int r = posix_spawnattr_init(&spawnattr_); ^ /data/data/com.termux/files/usr/include/spawn.h:56:5: note: 'posix_spawnattr_init' has been explicitly marked unavailable here int posix_spawnattr_init(posix_spawnattr_t* __attr) __INTRODUCED_IN(28); ^ --- packages/lua-language-server/build.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/lua-language-server/build.sh b/packages/lua-language-server/build.sh index ef1ef2eb05441b..ca2f64be4b2baa 100644 --- a/packages/lua-language-server/build.sh +++ b/packages/lua-language-server/build.sh @@ -8,22 +8,22 @@ TERMUX_PKG_SRCURL=https://github.com/sumneko/lua-language-server.git TERMUX_PKG_GIT_BRANCH="${TERMUX_PKG_VERSION}" TERMUX_PKG_BUILD_DEPENDS="libandroid-spawn" TERMUX_PKG_HOSTBUILD=true +TERMUX_PKG_BUILD_IN_SRC=true termux_step_host_build() { termux_setup_ninja - - cd $TERMUX_PKG_SRCDIR/3rd/luamake + mkdir 3rd + cp -a $TERMUX_PKG_SRCDIR/3rd/luamake 3rd/ + cd 3rd/luamake ./compile/install.sh } termux_step_make() { - cd $TERMUX_PKG_SRCDIR - ./3rd/luamake/luamake -cc "${CC}" -flags "${CFLAGS} ${CPPFLAGS}" -hostos "android" + termux_setup_ninja + $TERMUX_PKG_HOSTBUILD_DIR/3rd/luamake/luamake -cc "${CC}" -flags "${CFLAGS} ${CPPFLAGS}" -hostos "android" } termux_step_make_install() { - cd $TERMUX_PKG_SRCDIR - local INSTALL_DIR="${TERMUX_PREFIX}/lib/lua-language-server" cat >"lua-language-server" <<-EOF From 40af3c49241e2ef472e75f1725e36de4441bd9cc Mon Sep 17 00:00:00 2001 From: Butta Date: Fri, 22 Oct 2021 11:11:30 +0530 Subject: [PATCH 24/29] libandroid-spawn: NDK 23 actually checks the INTRODUCED_IN() macros, so indicate that this library has been backported to API 24 --- packages/libandroid-spawn/build.sh | 3 +- packages/libandroid-spawn/posix_spawn.h | 50 ++++++++++++------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/packages/libandroid-spawn/build.sh b/packages/libandroid-spawn/build.sh index d8564ba7f90204..9d6ff435d18cd8 100644 --- a/packages/libandroid-spawn/build.sh +++ b/packages/libandroid-spawn/build.sh @@ -2,8 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://man7.org/linux/man-pages/man3/posix_spawn.3.html TERMUX_PKG_DESCRIPTION="Shared library for the posix_spawn system function" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=0.2 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_VERSION=0.3 TERMUX_PKG_SKIP_SRC_EXTRACT=true TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/libandroid-spawn/posix_spawn.h b/packages/libandroid-spawn/posix_spawn.h index 2e239bfc255584..4220389e9bc4da 100644 --- a/packages/libandroid-spawn/posix_spawn.h +++ b/packages/libandroid-spawn/posix_spawn.h @@ -50,40 +50,40 @@ __BEGIN_DECLS typedef struct __posix_spawnattr* posix_spawnattr_t; typedef struct __posix_spawn_file_actions* posix_spawn_file_actions_t; -int posix_spawn(pid_t* __pid, const char* __path, const posix_spawn_file_actions_t* __actions, const posix_spawnattr_t* __attr, char* const __argv[], char* const __env[]) __INTRODUCED_IN(28); -int posix_spawnp(pid_t* __pid, const char* __file, const posix_spawn_file_actions_t* __actions, const posix_spawnattr_t* __attr, char* const __argv[], char* const __env[]) __INTRODUCED_IN(28); +int posix_spawn(pid_t* __pid, const char* __path, const posix_spawn_file_actions_t* __actions, const posix_spawnattr_t* __attr, char* const __argv[], char* const __env[]) __INTRODUCED_IN(24); +int posix_spawnp(pid_t* __pid, const char* __file, const posix_spawn_file_actions_t* __actions, const posix_spawnattr_t* __attr, char* const __argv[], char* const __env[]) __INTRODUCED_IN(24); -int posix_spawnattr_init(posix_spawnattr_t* __attr) __INTRODUCED_IN(28); -int posix_spawnattr_destroy(posix_spawnattr_t* __attr) __INTRODUCED_IN(28); +int posix_spawnattr_init(posix_spawnattr_t* __attr) __INTRODUCED_IN(24); +int posix_spawnattr_destroy(posix_spawnattr_t* __attr) __INTRODUCED_IN(24); -int posix_spawnattr_setflags(posix_spawnattr_t* __attr, short __flags) __INTRODUCED_IN(28); -int posix_spawnattr_getflags(const posix_spawnattr_t* __attr, short* __flags) __INTRODUCED_IN(28); +int posix_spawnattr_setflags(posix_spawnattr_t* __attr, short __flags) __INTRODUCED_IN(24); +int posix_spawnattr_getflags(const posix_spawnattr_t* __attr, short* __flags) __INTRODUCED_IN(24); -int posix_spawnattr_setpgroup(posix_spawnattr_t* __attr, pid_t __pgroup) __INTRODUCED_IN(28); -int posix_spawnattr_getpgroup(const posix_spawnattr_t* __attr, pid_t* __pgroup) __INTRODUCED_IN(28); +int posix_spawnattr_setpgroup(posix_spawnattr_t* __attr, pid_t __pgroup) __INTRODUCED_IN(24); +int posix_spawnattr_getpgroup(const posix_spawnattr_t* __attr, pid_t* __pgroup) __INTRODUCED_IN(24); -int posix_spawnattr_setsigmask(posix_spawnattr_t* __attr, const sigset_t* __mask) __INTRODUCED_IN(28); -int posix_spawnattr_setsigmask64(posix_spawnattr_t* __attr, const sigset64_t* __mask) __INTRODUCED_IN(28); -int posix_spawnattr_getsigmask(const posix_spawnattr_t* __attr, sigset_t* __mask) __INTRODUCED_IN(28); -int posix_spawnattr_getsigmask64(const posix_spawnattr_t* __attr, sigset64_t* __mask) __INTRODUCED_IN(28); +int posix_spawnattr_setsigmask(posix_spawnattr_t* __attr, const sigset_t* __mask) __INTRODUCED_IN(24); +int posix_spawnattr_setsigmask64(posix_spawnattr_t* __attr, const sigset64_t* __mask) __INTRODUCED_IN(24); +int posix_spawnattr_getsigmask(const posix_spawnattr_t* __attr, sigset_t* __mask) __INTRODUCED_IN(24); +int posix_spawnattr_getsigmask64(const posix_spawnattr_t* __attr, sigset64_t* __mask) __INTRODUCED_IN(24); -int posix_spawnattr_setsigdefault(posix_spawnattr_t* __attr, const sigset_t* __mask) __INTRODUCED_IN(28); -int posix_spawnattr_setsigdefault64(posix_spawnattr_t* __attr, const sigset64_t* __mask) __INTRODUCED_IN(28); -int posix_spawnattr_getsigdefault(const posix_spawnattr_t* __attr, sigset_t* __mask) __INTRODUCED_IN(28); -int posix_spawnattr_getsigdefault64(const posix_spawnattr_t* __attr, sigset64_t* __mask) __INTRODUCED_IN(28); +int posix_spawnattr_setsigdefault(posix_spawnattr_t* __attr, const sigset_t* __mask) __INTRODUCED_IN(24); +int posix_spawnattr_setsigdefault64(posix_spawnattr_t* __attr, const sigset64_t* __mask) __INTRODUCED_IN(24); +int posix_spawnattr_getsigdefault(const posix_spawnattr_t* __attr, sigset_t* __mask) __INTRODUCED_IN(24); +int posix_spawnattr_getsigdefault64(const posix_spawnattr_t* __attr, sigset64_t* __mask) __INTRODUCED_IN(24); -int posix_spawnattr_setschedparam(posix_spawnattr_t* __attr, const struct sched_param* __param) __INTRODUCED_IN(28); -int posix_spawnattr_getschedparam(const posix_spawnattr_t* __attr, struct sched_param* __param) __INTRODUCED_IN(28); +int posix_spawnattr_setschedparam(posix_spawnattr_t* __attr, const struct sched_param* __param) __INTRODUCED_IN(24); +int posix_spawnattr_getschedparam(const posix_spawnattr_t* __attr, struct sched_param* __param) __INTRODUCED_IN(24); -int posix_spawnattr_setschedpolicy(posix_spawnattr_t* __attr, int __policy) __INTRODUCED_IN(28); -int posix_spawnattr_getschedpolicy(const posix_spawnattr_t* __attr, int* __policy) __INTRODUCED_IN(28); +int posix_spawnattr_setschedpolicy(posix_spawnattr_t* __attr, int __policy) __INTRODUCED_IN(24); +int posix_spawnattr_getschedpolicy(const posix_spawnattr_t* __attr, int* __policy) __INTRODUCED_IN(24); -int posix_spawn_file_actions_init(posix_spawn_file_actions_t* __actions) __INTRODUCED_IN(28); -int posix_spawn_file_actions_destroy(posix_spawn_file_actions_t* __actions) __INTRODUCED_IN(28); +int posix_spawn_file_actions_init(posix_spawn_file_actions_t* __actions) __INTRODUCED_IN(24); +int posix_spawn_file_actions_destroy(posix_spawn_file_actions_t* __actions) __INTRODUCED_IN(24); -int posix_spawn_file_actions_addopen(posix_spawn_file_actions_t* __actions, int __fd, const char* __path, int __flags, mode_t __mode) __INTRODUCED_IN(28); -int posix_spawn_file_actions_addclose(posix_spawn_file_actions_t* __actions, int __fd) __INTRODUCED_IN(28); -int posix_spawn_file_actions_adddup2(posix_spawn_file_actions_t* __actions, int __fd, int __new_fd) __INTRODUCED_IN(28); +int posix_spawn_file_actions_addopen(posix_spawn_file_actions_t* __actions, int __fd, const char* __path, int __flags, mode_t __mode) __INTRODUCED_IN(24); +int posix_spawn_file_actions_addclose(posix_spawn_file_actions_t* __actions, int __fd) __INTRODUCED_IN(24); +int posix_spawn_file_actions_adddup2(posix_spawn_file_actions_t* __actions, int __fd, int __new_fd) __INTRODUCED_IN(24); __END_DECLS From 279897ee5b60d87a780be28d3123afa7b06cc21e Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 22 Oct 2021 10:01:44 +0200 Subject: [PATCH 25/29] aapt: fix build with ndk-r23 As we have seen [1], i686 seem to explicitly need -fPIC. Pass CPPFLAGS in more places when building aapt, to avoid an error like: ld: error: relocation R_386_PC32 cannot be used against symbol config_free; recompile with -fPIC >>> defined in /tmp/config_utils-70060d.o >>> referenced by config_utils.c >>> /tmp/config_utils-70060d.o:(config_free) [1] https://github.com/termux/termux-packages/issues/7215#issuecomment-906154438 --- packages/aapt/build.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/aapt/build.sh b/packages/aapt/build.sh index 351a246f920f10..58e7e566a31cae 100644 --- a/packages/aapt/build.sh +++ b/packages/aapt/build.sh @@ -102,7 +102,7 @@ termux_step_make_install() { socket_network_client_unix.c \ sockets_unix.o \ str_parms.c" - $CC $LDFLAGS \ + $CC $CPPFLAGS $LDFLAGS \ -Dchar16_t=uint16_t \ -std=c11 \ -isystem $AOSP_INCLUDE_DIR \ @@ -114,8 +114,6 @@ termux_step_make_install() { -shared \ -o $TERMUX_PREFIX/lib/libandroid-cutils.so - - # Build libutil: local LIBUTILS_TARFILE=$TERMUX_PKG_CACHEDIR/libutils_${_TAGNAME}.tar.gz test ! -f $LIBUTILS_TARFILE && termux_download \ From 525161cd01d2c74cdd310481c6c140e28da7edd3 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 25 Dec 2020 20:22:06 +0100 Subject: [PATCH 26/29] binutils: fix build with ndk-r23 --- packages/binutils/build.sh | 2 +- packages/binutils/gold-ffsll.c.patch | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 packages/binutils/gold-ffsll.c.patch diff --git a/packages/binutils/build.sh b/packages/binutils/build.sh index edd57a8e1cf221..8bdbf6d6ea1d26 100644 --- a/packages/binutils/build.sh +++ b/packages/binutils/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Collection of binary tools, the main ones being ld, the TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.37 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/binutils/binutils-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c TERMUX_PKG_DEPENDS="libc++, zlib" diff --git a/packages/binutils/gold-ffsll.c.patch b/packages/binutils/gold-ffsll.c.patch new file mode 100644 index 00000000000000..9392da8ab45f8e --- /dev/null +++ b/packages/binutils/gold-ffsll.c.patch @@ -0,0 +1,23 @@ +--- ./gold/ffsll.c.orig 2020-12-25 18:14:59.949086305 +0000 ++++ ./gold/ffsll.c 2020-12-25 19:16:32.733522188 +0000 +@@ -29,20 +29,3 @@ + /* This file implements ffsll for systems which don't have it. We use + ffsll if possible because gcc supports it as a builtin which will + use a machine instruction if there is one. */ +- +-int +-ffsll (long long arg) +-{ +- unsigned long long i; +- int ret; +- +- if (arg == 0) +- ret = 0; +- else +- { +- ret = 1; +- for (i = (unsigned long long) arg; (i & 1) == 0; i >>= 1) +- ++ret; +- } +- return ret; +-} From f16993ebec67a5a841bbe532038f0f03faabb4ab Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 22 Oct 2021 10:01:24 +0200 Subject: [PATCH 27/29] Bump all packages depending on libc++ As part of ndk-r23 upgrade. --- packages/aapt/build.sh | 2 +- packages/android-tools/build.sh | 1 + packages/apt/build.sh | 1 + packages/aria2/build.sh | 2 +- packages/atomicparsley/build.sh | 1 + packages/binutils/build.sh | 2 +- packages/boinc/build.sh | 1 + packages/boost/build.sh | 1 + packages/cgdb/build.sh | 1 + packages/clamav/build.sh | 1 + packages/clpeak/build.sh | 1 + packages/clvk/build.sh | 1 + packages/cmake/build.sh | 1 + packages/ddrescue/build.sh | 1 + packages/doxygen/build.sh | 1 + packages/et/build.sh | 2 +- packages/exiv2/build.sh | 1 + packages/fish/build.sh | 2 +- packages/frobtads/build.sh | 1 + packages/gdb/build.sh | 2 +- packages/gegl/build.sh | 1 + packages/gettext/build.sh | 2 +- packages/gflags/build.sh | 2 +- packages/git-crypt/build.sh | 2 +- packages/gmic/build.sh | 1 + packages/gnuplot/build.sh | 2 +- packages/google-glog/build.sh | 1 + packages/googletest/build.sh | 1 + packages/gperf/build.sh | 2 +- packages/graphicsmagick/build.sh | 1 + packages/graphviz/build.sh | 2 +- packages/harfbuzz/build.sh | 1 + packages/hashdeep/build.sh | 2 +- packages/hugo/build.sh | 1 + packages/hunspell/build.sh | 2 +- packages/iverilog/build.sh | 1 + packages/jfrog-cli/build.sh | 1 + packages/jsoncpp/build.sh | 1 + packages/kakoune/build.sh | 1 + packages/keystone/build.sh | 1 + packages/ldc/build.sh | 1 + packages/ledger/build.sh | 2 +- packages/leveldb/build.sh | 1 + packages/lftp/build.sh | 2 +- packages/libcaca/build.sh | 2 +- packages/libcln/build.sh | 1 + packages/libconfig/build.sh | 1 + packages/libdispatch/build.sh | 1 + packages/libflac/build.sh | 2 +- packages/libgraphite/build.sh | 1 + packages/libgrpc/build.sh | 1 + packages/libical/build.sh | 1 + packages/libicu/build.sh | 2 +- packages/libllvm/build.sh | 1 + packages/libmosquitto/build.sh | 2 +- packages/libprotobuf-c/build.sh | 2 +- packages/libprotobuf/build.sh | 1 + packages/libtiff/build.sh | 1 + packages/libvpx/build.sh | 1 + packages/libx265/build.sh | 2 +- packages/libxapian/build.sh | 1 + packages/libzmq/build.sh | 1 + packages/libzopfli/build.sh | 2 +- packages/llbuild/build.sh | 1 + packages/ltrace/build.sh | 1 + packages/lzip/build.sh | 1 + packages/mariadb/build.sh | 2 +- packages/mosh/build.sh | 2 +- packages/mpd/build.sh | 2 +- packages/mu/build.sh | 1 + packages/muchsync/build.sh | 1 + packages/ncmpcpp/build.sh | 2 +- packages/newsboat/build.sh | 2 +- packages/ninja/build.sh | 1 + packages/nmap/build.sh | 2 +- packages/nodejs-lts/build.sh | 1 + packages/nodejs/build.sh | 1 + packages/notmuch/build.sh | 1 + packages/nzbget/build.sh | 1 + packages/ocrad/build.sh | 2 +- packages/p7zip/build.sh | 1 + packages/patchelf/build.sh | 1 + packages/pdfgrep/build.sh | 2 +- packages/play-audio/build.sh | 2 +- packages/poppler/build.sh | 1 + packages/proxmark3-git/build.sh | 1 + packages/proxmark3/build.sh | 1 + packages/qalc/build.sh | 1 + packages/qemu-system-x86-64-headless/build.sh | 2 +- packages/qpdf/build.sh | 1 + packages/ragel/build.sh | 2 +- packages/rust/build.sh | 1 + packages/sdcv/build.sh | 2 +- packages/squid/build.sh | 1 + packages/swift/build.sh | 2 +- packages/swig/build.sh | 1 + packages/tasksh/build.sh | 2 +- packages/taskwarrior/build.sh | 1 + packages/teckit/build.sh | 2 +- packages/termux-elf-cleaner/build.sh | 1 + packages/tesseract/build.sh | 1 + packages/texlive-bin/build.sh | 2 +- packages/timewarrior/build.sh | 1 + packages/timg/build.sh | 2 +- packages/unrar/build.sh | 1 + packages/utfdecode/build.sh | 2 +- packages/vde2/build.sh | 1 + packages/vtutils/build.sh | 2 +- packages/vulkan-tools/build.sh | 1 + 109 files changed, 109 insertions(+), 42 deletions(-) diff --git a/packages/aapt/build.sh b/packages/aapt/build.sh index 58e7e566a31cae..5c5596c1bb384c 100644 --- a/packages/aapt/build.sh +++ b/packages/aapt/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux" _TAG_VERSION=7.1.2 _TAG_REVISION=33 TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION} -TERMUX_PKG_REVISION=13 +TERMUX_PKG_REVISION=14 TERMUX_PKG_SKIP_SRC_EXTRACT=true TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="libc++, libexpat, libpng, libzopfli, zlib" diff --git a/packages/android-tools/build.sh b/packages/android-tools/build.sh index 7b9b5c27117696..e4a83726aabdde 100644 --- a/packages/android-tools/build.sh +++ b/packages/android-tools/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Android platform tools" TERMUX_PKG_LICENSE="Apache-2.0, MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=31.0.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/nmeum/android-tools/releases/download/$TERMUX_PKG_VERSION/android-tools-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=61b3bf6c240cb0b4d0ccfef696c55986e06657843627df950fdcf6881af0f8d4 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/apt/build.sh b/packages/apt/build.sh index fe95bb950949b9..eba3b219e3ad07 100644 --- a/packages/apt/build.sh +++ b/packages/apt/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Front-end for the dpkg package manager" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.3.11 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://deb.debian.org/debian/pool/main/a/apt/apt_${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=cc0c5b24240176e333b11bce1a7ac528ae263317d137ceeebad3ec2d8682cb91 # apt-key requires utilities from coreutils, findutils, gpgv, grep, sed. diff --git a/packages/aria2/build.sh b/packages/aria2/build.sh index 9749eff367ffd5..20e713bb43b4c7 100644 --- a/packages/aria2/build.sh +++ b/packages/aria2/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Download utility supporting HTTP/HTTPS, FTP, BitTorrent TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.36.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/aria2/aria2/releases/download/release-${TERMUX_PKG_VERSION}/aria2-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=58d1e7608c12404f0229a3d9a4953d0d00c18040504498b483305bcb3de907a5 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/atomicparsley/build.sh b/packages/atomicparsley/build.sh index 3cf1a254beae7c..4c44c56070bbbe 100644 --- a/packages/atomicparsley/build.sh +++ b/packages/atomicparsley/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Read, parse and set metadata of MPEG-4 and 3gp files" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1:20210715.151551.e7ad03a +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/wez/atomicparsley/archive/${TERMUX_PKG_VERSION:2}.tar.gz TERMUX_PKG_SHA256=546dcb5f3b625aff4f6bf22d27a0a636d15854fd729402a6933d31f3d0417e0d TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/binutils/build.sh b/packages/binutils/build.sh index 8bdbf6d6ea1d26..c8de12871479d0 100644 --- a/packages/binutils/build.sh +++ b/packages/binutils/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Collection of binary tools, the main ones being ld, the TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.37 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/binutils/binutils-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c TERMUX_PKG_DEPENDS="libc++, zlib" diff --git a/packages/boinc/build.sh b/packages/boinc/build.sh index 80851c4df59adf..eb985b6acf7550 100644 --- a/packages/boinc/build.sh +++ b/packages/boinc/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Open-source software for volunteer computing" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=7.16.16 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/BOINC/boinc/archive/client_release/${TERMUX_PKG_VERSION:0:4}/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=0d5656a9f8ed1048936a5764270848b892d63f27bdb863d0ace447f1eaae6002 TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libcurl, openssl, zlib" diff --git a/packages/boost/build.sh b/packages/boost/build.sh index ef7f2f60772621..34b8de1e9fbcdf 100644 --- a/packages/boost/build.sh +++ b/packages/boost/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Free peer-reviewed portable C++ source libraries" TERMUX_PKG_LICENSE="BSL-1.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.77.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://boostorg.jfrog.io/artifactory/main/release/$TERMUX_PKG_VERSION/source/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2 TERMUX_PKG_SHA256=fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854 TERMUX_PKG_DEPENDS="libc++, libbz2, libiconv, liblzma, zlib" diff --git a/packages/cgdb/build.sh b/packages/cgdb/build.sh index d33d3013af1e0f..4bb578f21bdd04 100644 --- a/packages/cgdb/build.sh +++ b/packages/cgdb/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A lightweight curses (terminal-based) interface to the G TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.7.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://cgdb.me/files/cgdb-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=bb723be58ec68cb59a598b8e24a31d10ef31e0e9c277a4de07b2f457fe7de198 TERMUX_PKG_DEPENDS="libc++, ncurses, readline, gdb" diff --git a/packages/clamav/build.sh b/packages/clamav/build.sh index 9731fa7fc9c857..cd153fe4fa9b3b 100644 --- a/packages/clamav/build.sh +++ b/packages/clamav/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Anti-virus toolkit for Unix" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Leonid Pliushch " TERMUX_PKG_VERSION=0.103.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.clamav.net/downloads/production/clamav-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=9f6e3d18449f3d1a3992771d696685249dfa12736fe2b2929858f2c7d8276ae9 TERMUX_PKG_DEPENDS="json-c, libandroid-support, libbz2, libc++, libcurl, libltdl, liblzma, libxml2, openssl, pcre2, zlib" diff --git a/packages/clpeak/build.sh b/packages/clpeak/build.sh index a1e8948bf3d556..9daf04b0671414 100644 --- a/packages/clpeak/build.sh +++ b/packages/clpeak/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A tool which profiles OpenCL devices to find their peak TERMUX_PKG_LICENSE="Unlicense" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.1.0 +TERMUX_PKG_REVISION=1 _COMMIT=0777205be1d5681d5a76d46ec94588544e8462a5 TERMUX_PKG_SRCURL=https://github.com/krrishnarraj/clpeak.git TERMUX_PKG_GIT_BRANCH=master diff --git a/packages/clvk/build.sh b/packages/clvk/build.sh index e338f5d987ced7..a17cf0372fa925 100644 --- a/packages/clvk/build.sh +++ b/packages/clvk/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Experimental implementation of OpenCL on Vulkan" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.0.20210829 +TERMUX_PKG_REVISION=1 _COMMIT=2797e13ee3b03cbc97bc2afa3e99fc35d6a0c831 TERMUX_PKG_SRCURL=https://github.com/kpet/clvk.git TERMUX_PKG_GIT_BRANCH=master diff --git a/packages/cmake/build.sh b/packages/cmake/build.sh index 69f1f56e41426e..f9a552d2df195c 100644 --- a/packages/cmake/build.sh +++ b/packages/cmake/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" # When updating version here, please update termux_setup_cmake.sh as well. TERMUX_PKG_VERSION=3.21.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=d14d06df4265134ee42c4d50f5a60cb8b471b7b6a47da8e5d914d49dd783794f TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang, zlib" diff --git a/packages/ddrescue/build.sh b/packages/ddrescue/build.sh index f18233727b1160..8fe5401531f3a2 100644 --- a/packages/ddrescue/build.sh +++ b/packages/ddrescue/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="GNU data recovery tool" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.25 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/ddrescue/ddrescue-${TERMUX_PKG_VERSION}.tar.lz TERMUX_PKG_SHA256=ce538ebd26a09f45da67d3ad3f7431932428231ceec7a2d255f716fa231a1063 TERMUX_PKG_DEPENDS="libc++" diff --git a/packages/doxygen/build.sh b/packages/doxygen/build.sh index 9843feb2fc2708..0a3b67e82a47fb 100644 --- a/packages/doxygen/build.sh +++ b/packages/doxygen/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A documentation system for C++, C, Java, IDL and PHP" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.9.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/doxygen/doxygen/archive/Release_${TERMUX_PKG_VERSION//./_}.tar.gz TERMUX_PKG_SHA256=40f429241027ea60f978f730229d22e971786172fdb4dc74db6406e7f6c034b3 TERMUX_PKG_DEPENDS="libc++, libiconv" diff --git a/packages/et/build.sh b/packages/et/build.sh index 1e75dfd254dc50..7d50194a5a3be0 100644 --- a/packages/et/build.sh +++ b/packages/et/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A remote shell that automatically reconnects without int TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=6.0.13 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/MisterTea/EternalTerminal/archive/et-v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=728c3a444d666897c710e33fe473d8d289263a59574451b13aa53ec3c6ac88b3 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/exiv2/build.sh b/packages/exiv2/build.sh index b7162ca20a2424..e4e9050c446bcf 100644 --- a/packages/exiv2/build.sh +++ b/packages/exiv2/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Exif, Iptc and XMP metadata manipulation library and too TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.27.5-RC3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/Exiv2/exiv2/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=5101739e9428edc6b660563e76fac8389f44f928d9724770890ac513ca1cc4a7 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/fish/build.sh b/packages/fish/build.sh index aecf2832c1674c..2b334be6c93d27 100644 --- a/packages/fish/build.sh +++ b/packages/fish/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="The user-friendly command line shell" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.3.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/fish-shell/fish-shell/releases/download/$TERMUX_PKG_VERSION/fish-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=b5b4ee1a5269762cbbe993a4bd6507e675e4100ce9bbe84214a5eeb2b19fae89 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/frobtads/build.sh b/packages/frobtads/build.sh index c8d1a23b547083..27e833abc7aaa6 100644 --- a/packages/frobtads/build.sh +++ b/packages/frobtads/build.sh @@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://www.tads.org/frobtads.htm TERMUX_PKG_DESCRIPTION="TADS is a free authoring system for writing your own Interactive Fiction" TERMUX_PKG_LICENSE="non-free" TERMUX_PKG_VERSION=2.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/realnc/frobtads/releases/download/v$TERMUX_PKG_VERSION/frobtads-$TERMUX_PKG_VERSION.tar.bz2 TERMUX_PKG_SHA256=893bd3fd77dfdc8bfe8a96e8d7bfac693da0e4278871f10fe7faa59cc239a090 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/gdb/build.sh b/packages/gdb/build.sh index 06963d55e831bf..b30cf26c7d131f 100644 --- a/packages/gdb/build.sh +++ b/packages/gdb/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="The standard GNU Debugger that runs on many Unix-like sy TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=10.1 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gdb/gdb-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0 TERMUX_PKG_DEPENDS="libc++, liblzma, libexpat, readline, ncurses, libmpfr, python, zlib" diff --git a/packages/gegl/build.sh b/packages/gegl/build.sh index 57f1baece6a2a9..2ef4340e05204e 100644 --- a/packages/gegl/build.sh +++ b/packages/gegl/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Data flow based image processing framework" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.4.32 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://download.gimp.org/pub/gegl/${TERMUX_PKG_VERSION:0:3}/gegl-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=668e3c6b9faf75fb00512701c36274ab6f22a8ba05ec62dbf187d34b8d298fa1 TERMUX_PKG_DEPENDS="libandroid-support, libc++, ffmpeg, babl, json-glib, libjpeg-turbo, libpng, libjasper, littlecms, libtiff, librsvg, zlib" diff --git a/packages/gettext/build.sh b/packages/gettext/build.sh index 81c272400c1c15..c53ceb0d6fbdd8 100644 --- a/packages/gettext/build.sh +++ b/packages/gettext/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="GNU Internationalization utilities" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.21 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gettext/gettext-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192 TERMUX_PKG_DEPENDS="libc++, libiconv, pcre, liblzma, libxml2, libcroco, ncurses, libunistring, zlib" diff --git a/packages/gflags/build.sh b/packages/gflags/build.sh index be889161a5c1fd..57bdc3595fd193 100644 --- a/packages/gflags/build.sh +++ b/packages/gflags/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_LICENSE_FILE="COPYING.txt" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.2.2 -TERMUX_PKG_REVISION=7 +TERMUX_PKG_REVISION=8 TERMUX_PKG_SRCURL=https://github.com/gflags/gflags/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=34af2f15cf7367513b352bdcd2493ab14ce43692d2dcd9dfc499492966c64dcf TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/git-crypt/build.sh b/packages/git-crypt/build.sh index 83a8f7499ac787..c855745b51e662 100644 --- a/packages/git-crypt/build.sh +++ b/packages/git-crypt/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Enables transparent encryption and decryption of files f TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@jottr" TERMUX_PKG_VERSION=0.6.0 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/AGWA/git-crypt/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=777c0c7aadbbc758b69aff1339ca61697011ef7b92f1d1ee9518a8ee7702bb78 TERMUX_PKG_DEPENDS="git, libc++, openssl" diff --git a/packages/gmic/build.sh b/packages/gmic/build.sh index d58fecb88c8dc8..f6362e63bfd8f2 100644 --- a/packages/gmic/build.sh +++ b/packages/gmic/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Full-featured framework for image processing" TERMUX_PKG_LICENSE="CeCILL-2.1" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.9.8 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://gmic.eu/files/source/gmic_$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=18d6bbc731ae3b4da8a656ac189476793b111a9dd19f72db2312f074df7cdc82 TERMUX_PKG_DEPENDS="libc++, libcurl, fftw, libpng, libjpeg-turbo, libtiff, zlib" diff --git a/packages/gnuplot/build.sh b/packages/gnuplot/build.sh index 5235f83e1d8698..e670a21216c5cf 100644 --- a/packages/gnuplot/build.sh +++ b/packages/gnuplot/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Command-line driven graphing utility" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=5.4.2 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/gnuplot/gnuplot/${TERMUX_PKG_VERSION}/gnuplot-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e57c75e1318133951d32a83bcdc4aff17fed28722c4e71f2305cfc2ae1cae7ba TERMUX_PKG_DEPENDS="libandroid-support, libc++, libgd, libiconv, libx11, pango, readline, zlib" diff --git a/packages/google-glog/build.sh b/packages/google-glog/build.sh index 7f00e6e56eb4e3..0cc8ca2b9066f6 100644 --- a/packages/google-glog/build.sh +++ b/packages/google-glog/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Logging library for C++" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.5.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/google/glog/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=eede71f28371bf39aa69b45de23b329d37214016e2055269b3b5e7cfd40b59f5 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/googletest/build.sh b/packages/googletest/build.sh index 963d31c4525ff3..973400431306af 100644 --- a/packages/googletest/build.sh +++ b/packages/googletest/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Google C++ testing framework" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.11.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/google/googletest/archive/release-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/gperf/build.sh b/packages/gperf/build.sh index 71af3a1c01aac0..42cec8da56982f 100644 --- a/packages/gperf/build.sh +++ b/packages/gperf/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A perfect hash function generator" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.1 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gperf/gperf-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2 TERMUX_PKG_DEPENDS="libc++" diff --git a/packages/graphicsmagick/build.sh b/packages/graphicsmagick/build.sh index 19dec878b83604..d9c55d6b54344d 100644 --- a/packages/graphicsmagick/build.sh +++ b/packages/graphicsmagick/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Collection of image processing tools" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.3.36 +TERMUX_PKG_REVISION=1 # Bandwith limited on main ftp site, so it's asked to use sourceforge instead: TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/${TERMUX_PKG_VERSION}/GraphicsMagick-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=5d5b3fde759cdfc307aaf21df9ebd8c752e3f088bb051dd5df8aac7ba7338f46 diff --git a/packages/graphviz/build.sh b/packages/graphviz/build.sh index 1baf0ab6afa970..3151868fe438e8 100644 --- a/packages/graphviz/build.sh +++ b/packages/graphviz/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Rich set of graph drawing tools" TERMUX_PKG_LICENSE="EPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.44.1 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://www2.graphviz.org/Packages/stable/portable_source/graphviz-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=8e1b34763254935243ccdb83c6ce108f531876d7a5dfd443f255e6418b8ea313 TERMUX_PKG_DEPENDS="libandroid-glob, libc++, libcairo, pango, libexpat, libltdl, librsvg, libgd, zlib" diff --git a/packages/harfbuzz/build.sh b/packages/harfbuzz/build.sh index b9db2b85f423b5..fb3dc4a8e939a9 100644 --- a/packages/harfbuzz/build.sh +++ b/packages/harfbuzz/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="OpenType text shaping engine" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.0.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/harfbuzz/harfbuzz/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=55f7e36671b8c5569b6438f80efed2fd663298f785ad2819e115b35b5587ef69 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/hashdeep/build.sh b/packages/hashdeep/build.sh index e7c89b96dce14e..ab30edb6503b8e 100644 --- a/packages/hashdeep/build.sh +++ b/packages/hashdeep/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Programs to compute hashsums of arbitrary number of file TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=4.4 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_REVISION=7 TERMUX_PKG_SRCURL=https://github.com/jessek/hashdeep/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=ad78d42142f9a74fe8ec0c61bc78d6588a528cbb9aede9440f50b6ff477f3a7f TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/hugo/build.sh b/packages/hugo/build.sh index 4452d90a23f08b..d4e14080fa3413 100644 --- a/packages/hugo/build.sh +++ b/packages/hugo/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A fast and flexible static site generator" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.88.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/gohugoio/hugo/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=da5f52437bfc7521b194b39d36a8cf7b2775e70e1ba8c443f81a14f468608507 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/hunspell/build.sh b/packages/hunspell/build.sh index febc48713c525a..2f70bb68321986 100644 --- a/packages/hunspell/build.sh +++ b/packages/hunspell/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Spell checker" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.7.0 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_REVISION=6 TERMUX_PKG_SRCURL=https://github.com/hunspell/hunspell/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=bb27b86eb910a8285407cf3ca33b62643a02798cf2eef468c0a74f6c3ee6bc8a TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/iverilog/build.sh b/packages/iverilog/build.sh index 702a7228a48025..c5419fd2626cb8 100644 --- a/packages/iverilog/build.sh +++ b/packages/iverilog/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Icarus Verilog compiler and simulation tool" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=10.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/steveicarus/iverilog/archive/v${TERMUX_PKG_VERSION/./_}.tar.gz TERMUX_PKG_SHA256=4b884261645a73b37467242d6ae69264fdde2e7c4c15b245d902531efaaeb234 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/jfrog-cli/build.sh b/packages/jfrog-cli/build.sh index ff5d2d526e97d1..eff7081c77c3a3 100644 --- a/packages/jfrog-cli/build.sh +++ b/packages/jfrog-cli/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A CLI for JFrog products." TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.4.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/jfrog/jfrog-cli/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=0873f5848823f6ed30cfc244ec975e63bd64eb5f6c8b7e69e5391331db780515 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/jsoncpp/build.sh b/packages/jsoncpp/build.sh index 71d39aa480de52..ee3dbfe636823a 100644 --- a/packages/jsoncpp/build.sh +++ b/packages/jsoncpp/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="C++ library for interacting with JSON" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.9.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/open-source-parsers/jsoncpp/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e34a628a8142643b976c7233ef381457efad79468c67cb1ae0b83a33d7493999 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/kakoune/build.sh b/packages/kakoune/build.sh index e15ac30cfe555b..17a65523ded9fd 100644 --- a/packages/kakoune/build.sh +++ b/packages/kakoune/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Code editor heavily inspired by Vim" TERMUX_PKG_LICENSE="Unlicense" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2021.08.28 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/mawww/kakoune/releases/download/v$TERMUX_PKG_VERSION/kakoune-$TERMUX_PKG_VERSION.tar.bz2 TERMUX_PKG_SHA256=6f6ed7dfd8c5723210dbd848708acf03af4b847016fd3ede96b2a89ad32276cb TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/keystone/build.sh b/packages/keystone/build.sh index 38dd9d4abc72e0..f9c4e6f9b78721 100644 --- a/packages/keystone/build.sh +++ b/packages/keystone/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Keystone is a lightweight multi-platform, multi-architec TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.9.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/keystone-engine/keystone/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=c9b3a343ed3e05ee168d29daf89820aff9effb2c74c6803c2d9e21d55b5b7c24 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/ldc/build.sh b/packages/ldc/build.sh index 7c38c7efc14b32..a812e5cad1681d 100644 --- a/packages/ldc/build.sh +++ b/packages/ldc/build.sh @@ -5,6 +5,7 @@ TERMUX_PKG_DESCRIPTION="D programming language compiler, built with LLVM" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=() +TERMUX_PKG_REVISION=1 TERMUX_PKG_VERSION+=(1.27.1) TERMUX_PKG_VERSION+=(12.0.1) # LLVM version TERMUX_PKG_VERSION+=(2.097.1) # TOOLS version diff --git a/packages/ledger/build.sh b/packages/ledger/build.sh index 26f3a21c7957e7..61a21477d10860 100644 --- a/packages/ledger/build.sh +++ b/packages/ledger/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Powerful, double-entry accounting system" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.2.1 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_REVISION=7 TERMUX_PKG_SRCURL=https://github.com/ledger/ledger/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=92bf09bc385b171987f456fe3ee9fa998ed5e40b97b3acdd562b663aa364384a TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/leveldb/build.sh b/packages/leveldb/build.sh index 1d9d7a01d06b8e..c031da598b4daa 100644 --- a/packages/leveldb/build.sh +++ b/packages/leveldb/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Fast key-value storage library" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.23 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/google/leveldb/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=9a37f8a6174f09bd622bc723b55881dc541cd50747cbd08831c2a82d620f6d76 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/lftp/build.sh b/packages/lftp/build.sh index 8e45b95aba74b7..ff920abf9c8810 100644 --- a/packages/lftp/build.sh +++ b/packages/lftp/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=4.9.2 TERMUX_PKG_SRCURL=https://lftp.tech/ftp/lftp-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=c517c4f4f9c39bd415d7313088a2b1e313b2d386867fe40b7692b83a20f0670d -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_DEPENDS="libandroid-support, libc++, libexpat, libiconv, openssl, readline, libidn2, zlib" # (1) Android has dn_expand, but lftp assumes that dn_skipname then exists, which it does not on android. diff --git a/packages/libcaca/build.sh b/packages/libcaca/build.sh index b88a62b17ac986..ea3c5a92fce4b9 100644 --- a/packages/libcaca/build.sh +++ b/packages/libcaca/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Graphics library that outputs text instead of pixels" TERMUX_PKG_LICENSE="WTFPL" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.99.beta19 -TERMUX_PKG_REVISION=8 +TERMUX_PKG_REVISION=9 TERMUX_PKG_SRCURL=http://fossies.org/linux/privat/libcaca-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=128b467c4ed03264c187405172a4e83049342cc8cc2f655f53a2d0ee9d3772f4 TERMUX_PKG_DEPENDS="imlib2, libc++, ncurses, zlib" diff --git a/packages/libcln/build.sh b/packages/libcln/build.sh index 9b185c9878e16b..5aedaa13cc0b9e 100644 --- a/packages/libcln/build.sh +++ b/packages/libcln/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="CLN is a library for efficient computations with all kin TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.3.6 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.ginac.de/CLN/cln-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=f492530e8879bda529009b6033e1923c8f4aae843149fc28c667c20b094d984a TERMUX_PKG_DEPENDS="libc++, libgmp" diff --git a/packages/libconfig/build.sh b/packages/libconfig/build.sh index 1e86cedb34b35a..783b013281fe10 100644 --- a/packages/libconfig/build.sh +++ b/packages/libconfig/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="C/C++ Configuration File Library" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.7.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/hyperrealm/libconfig/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=68757e37c567fd026330c8a8449aa5f9cac08a642f213f2687186b903bd7e94e TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/libdispatch/build.sh b/packages/libdispatch/build.sh index 1daa2229bfc6e3..d673acd1393dc7 100644 --- a/packages/libdispatch/build.sh +++ b/packages/libdispatch/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@buttaface" _VERSION=5.5 TERMUX_PKG_VERSION=1:${_VERSION} +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/apple/swift-corelibs-libdispatch/archive/swift-${_VERSION}-RELEASE.tar.gz TERMUX_PKG_SHA256=5efdfa1d2897c598acea42fc00776477bb3713645686774f5ff0818b26649e62 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/libflac/build.sh b/packages/libflac/build.sh index 220a4ac0433b96..fddcd6503aa708 100644 --- a/packages/libflac/build.sh +++ b/packages/libflac/build.sh @@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=668cdeab898a7dd43cf84739f7e1f3ed6b35ece2ef9968a5c7079fe9adfe16 TERMUX_PKG_DEPENDS="libc++, libogg" TERMUX_PKG_BREAKS="libflac-dev" TERMUX_PKG_REPLACES="libflac-dev" -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 termux_step_pre_configure() { ./autogen.sh } diff --git a/packages/libgraphite/build.sh b/packages/libgraphite/build.sh index 381b96eff40c1f..90c047e49095f8 100644 --- a/packages/libgraphite/build.sh +++ b/packages/libgraphite/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Font system for multiple languages" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.3.14 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/silnrsi/graphite/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=7a3b342c5681921ce2e0c2496509d30b5b078399d5a7bd2358f95166d57d91df TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/libgrpc/build.sh b/packages/libgrpc/build.sh index 8f5a2fef8a87ba..dcf3606d3186e5 100644 --- a/packages/libgrpc/build.sh +++ b/packages/libgrpc/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_SRCURL=https://github.com/grpc/grpc.git TERMUX_PKG_VERSION=1.38.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_DEPENDS="libc++, openssl, protobuf, c-ares, zlib" TERMUX_PKG_BREAKS="libgrpc-dev" TERMUX_PKG_REPLACES="libgrpc-dev" diff --git a/packages/libical/build.sh b/packages/libical/build.sh index 9203eaa21b686c..302cd072291777 100644 --- a/packages/libical/build.sh +++ b/packages/libical/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Libical is an Open Source implementation of the iCalenda TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.0.11 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/libical/libical/releases/download/v$TERMUX_PKG_VERSION/libical-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=1e6c5e10c5a48f7a40c68958055f0e2759d9ab3563aca17273fe35a5df7dbbf1 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/libicu/build.sh b/packages/libicu/build.sh index 3f7b8377cb1f73..8ea265b9fd6226 100644 --- a/packages/libicu/build.sh +++ b/packages/libicu/build.sh @@ -6,7 +6,7 @@ TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_LICENSE_FILE="../LICENSE" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=69.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/unicode-org/icu/releases/download/release-${TERMUX_PKG_VERSION//./-}/icu4c-${TERMUX_PKG_VERSION//./_}-src.tgz TERMUX_PKG_SHA256=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745 TERMUX_PKG_DEPENDS="libc++" diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh index c690dcfd22b43a..ad2a7e1f5bc89d 100644 --- a/packages/libllvm/build.sh +++ b/packages/libllvm/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Modular compiler and toolchain technologies library" TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_MAINTAINER="@buttaface" TERMUX_PKG_VERSION=12.0.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=129cb25cd13677aad951ce5c2deb0fe4afc1e9d98950f53b51bdcfb5a73afa0e TERMUX_PKG_SRCURL=https://github.com/llvm/llvm-project/releases/download/llvmorg-$TERMUX_PKG_VERSION/llvm-project-$TERMUX_PKG_VERSION.src.tar.xz TERMUX_PKG_HOSTBUILD=true diff --git a/packages/libmosquitto/build.sh b/packages/libmosquitto/build.sh index b161afdf621627..56f2f496bb9ed0 100644 --- a/packages/libmosquitto/build.sh +++ b/packages/libmosquitto/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="MQTT library" TERMUX_PKG_LICENSE="EPL-1.0" TERMUX_PKG_MAINTAINER="Nathaniel Wesley Filardo @nwf" TERMUX_PKG_VERSION=2.0.11 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://mosquitto.org/files/source/mosquitto-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=7b36a7198bce85cf31b132f5c6ee36dcf5dadf86fb768501eb1e11ce95d4f78a TERMUX_PKG_DEPENDS="c-ares, libc++, libcap, libwebsockets, openssl" diff --git a/packages/libprotobuf-c/build.sh b/packages/libprotobuf-c/build.sh index c01cd3d1fa5028..af5bf72d86b15a 100644 --- a/packages/libprotobuf-c/build.sh +++ b/packages/libprotobuf-c/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Protocol buffers C library" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" TERMUX_PKG_VERSION=1.3.3 -TERMUX_PKG_REVISION=10 +TERMUX_PKG_REVISION=11 TERMUX_PKG_SRCURL=https://github.com/protobuf-c/protobuf-c/releases/download/v${TERMUX_PKG_VERSION}/protobuf-c-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=22956606ef50c60de1fabc13a78fbc50830a0447d780467d3c519f84ad527e78 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/libprotobuf/build.sh b/packages/libprotobuf/build.sh index 1d1d5c2c1c4eee..817e315f032858 100644 --- a/packages/libprotobuf/build.sh +++ b/packages/libprotobuf/build.sh @@ -5,6 +5,7 @@ TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_LICENSE_FILE="../LICENSE" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2:3.19.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/protocolbuffers/protobuf/archive/v${TERMUX_PKG_VERSION:2}.tar.gz TERMUX_PKG_SHA256=4a045294ec76cb6eae990a21adb5d8b3c78be486f1507faa601541d1ccefbd6b TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/libtiff/build.sh b/packages/libtiff/build.sh index fc684e104f05a4..17d1bb2f4d00e6 100644 --- a/packages/libtiff/build.sh +++ b/packages/libtiff/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Support for the Tag Image File Format (TIFF) for storing TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=4.3.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://download.osgeo.org/libtiff/tiff-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8 TERMUX_PKG_DEPENDS="libc++, libjpeg-turbo, liblzma, zlib" diff --git a/packages/libvpx/build.sh b/packages/libvpx/build.sh index 9994cdd4d674bc..98097f152196b9 100644 --- a/packages/libvpx/build.sh +++ b/packages/libvpx/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="VP8 & VP9 Codec SDK" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.10.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/webmproject/libvpx/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=85803ccbdbdd7a3b03d930187cb055f1353596969c1f92ebec2db839fa4f834a TERMUX_PKG_DEPENDS="libc++" diff --git a/packages/libx265/build.sh b/packages/libx265/build.sh index f7120d9bd62b59..e0c2c4458ac376 100644 --- a/packages/libx265/build.sh +++ b/packages/libx265/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="H.265/HEVC video stream encoder library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.5 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://bitbucket.org/multicoreware/x265_git/downloads/x265_$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=e70a3335cacacbba0b3a20ec6fecd6783932288ebc8163ad74bcc9606477cae8 TERMUX_PKG_DEPENDS="libc++" diff --git a/packages/libxapian/build.sh b/packages/libxapian/build.sh index 15ead4040e4277..746daf34c27255 100644 --- a/packages/libxapian/build.sh +++ b/packages/libxapian/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Xapian search engine library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.4.18 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://oligarchy.co.uk/xapian/${TERMUX_PKG_VERSION}/xapian-core-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=196ddbb4ad10450100f0991a599e4ed944cbad92e4a6fe813be6dce160244b77 # Note that we cannot /proc/sys/kernel/random/uuid (permission denied on diff --git a/packages/libzmq/build.sh b/packages/libzmq/build.sh index 86a4f7abe5c9ff..45187efa158d3c 100644 --- a/packages/libzmq/build.sh +++ b/packages/libzmq/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Fast messaging system built on sockets. C and C++ bindin TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=4.3.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/zeromq/libzmq/releases/download/v${TERMUX_PKG_VERSION}/zeromq-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/libzopfli/build.sh b/packages/libzopfli/build.sh index 22f513dc3c84c4..7bc06794fe9eff 100644 --- a/packages/libzopfli/build.sh +++ b/packages/libzopfli/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="New zlib compatible compressor library" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.0.3 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/google/zopfli/archive/zopfli-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e955a7739f71af37ef3349c4fa141c648e8775bceb2195be07e86f8e638814bd TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/llbuild/build.sh b/packages/llbuild/build.sh index d2b0276f2e594a..79d703b2722411 100644 --- a/packages/llbuild/build.sh +++ b/packages/llbuild/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A low-level build system, used by the Swift Package Mana TERMUX_PKG_LICENSE="Apache-2.0, NCSA" TERMUX_PKG_MAINTAINER="@buttaface" TERMUX_PKG_VERSION=5.5 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/apple/swift-llbuild/archive/swift-${TERMUX_PKG_VERSION}-RELEASE.tar.gz TERMUX_PKG_SHA256=09e774c4a97bbb7473ab2b69ef2a547036660ce7d5d2c67802974de3e23381f8 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/ltrace/build.sh b/packages/ltrace/build.sh index b17a440f46f075..6b2bfb631f8fa5 100644 --- a/packages/ltrace/build.sh +++ b/packages/ltrace/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Tracks runtime library calls in dynamically linked progr TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1:0.7.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/dkogan/ltrace/archive/82c66409c7a93ca6ad2e4563ef030dfb7e6df4d4.tar.gz TERMUX_PKG_SHA256=4aecf69e4a33331aed1e50ce4907e73a98cbccc4835febc3473863474304d547 TERMUX_PKG_DEPENDS="libc++, libelf" diff --git a/packages/lzip/build.sh b/packages/lzip/build.sh index f68ed6e57fa5e6..6e3d8b44e4838a 100644 --- a/packages/lzip/build.sh +++ b/packages/lzip/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Lossless data compressor similar to gzip and bzip2" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.22 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://download.savannah.gnu.org/releases/lzip/lzip-${TERMUX_PKG_VERSION}.tar.lz TERMUX_PKG_SHA256=8fddf17bdca6bd4694c6015424d3162f14e7c1599373601aa3316a92ca1b5042 TERMUX_PKG_DEPENDS="libc++" diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh index 850e49e55f255b..8b64579209b50f 100644 --- a/packages/mariadb/build.sh +++ b/packages/mariadb/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2:10.6.4 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=http://ftp.hosteurope.de/mirror/archive.mariadb.org/mariadb-${TERMUX_PKG_VERSION:2}/source/mariadb-${TERMUX_PKG_VERSION:2}.tar.gz TERMUX_PKG_SHA256=75bf9b147a95d38160d01a73b098d50a1960563b46d16a235971fff64d99643c TERMUX_PKG_DEPENDS="libc++, libiconv, liblzma, ncurses, libedit, openssl, pcre2, libcrypt, libandroid-support, libandroid-glob, zlib, liblz4" diff --git a/packages/mosh/build.sh b/packages/mosh/build.sh index 795604c1389daa..f5a41113878973 100644 --- a/packages/mosh/build.sh +++ b/packages/mosh/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Mobile shell that supports roaming and intelligent local TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.3.2 -TERMUX_PKG_REVISION=33 +TERMUX_PKG_REVISION=34 TERMUX_PKG_SRCURL=https://github.com/mobile-shell/mosh/releases/download/mosh-${TERMUX_PKG_VERSION}/mosh-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/mpd/build.sh b/packages/mpd/build.sh index 81bdd67231964f..b04e0802d211a6 100644 --- a/packages/mpd/build.sh +++ b/packages/mpd/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Music player daemon" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.22.8 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=08065b26f2d19fea1a4bdf81903511b6d8e1357c5047be43ff2a7c5a495cdb85 TERMUX_PKG_DEPENDS="libc++, libcurl, libexpat, libid3tag, libopus, pulseaudio, libmpdclient, openal-soft, libvorbis, libsqlite, ffmpeg, libmp3lame, libbz2, libogg, libnfs, zlib" diff --git a/packages/mu/build.sh b/packages/mu/build.sh index aad5cef5f833dc..5d1b856a7cea0f 100644 --- a/packages/mu/build.sh +++ b/packages/mu/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Maildir indexer/searcher and Emacs client (mu4e)" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.6.7 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/djcb/mu/releases/download/$TERMUX_PKG_VERSION/mu-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=105df16df5fd6f54d5334cf68d8108f8b0593e37020b2fa8487c2e251ce9d9a2 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/muchsync/build.sh b/packages/muchsync/build.sh index cbd15e230a0d03..6a74ae8a72c52e 100644 --- a/packages/muchsync/build.sh +++ b/packages/muchsync/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Synchronize notmuch mail across machines" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=6 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://www.muchsync.org/src/muchsync-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=0b3de3b4d885edb9f887a07dcbc8b596e7fef2038c61e682cfa55a13fa4ce9e8 TERMUX_PKG_DEPENDS="libc++, libsqlite, libxapian, notmuch, openssl" diff --git a/packages/ncmpcpp/build.sh b/packages/ncmpcpp/build.sh index f2acd429d6de81..5617ce50bfdf90 100644 --- a/packages/ncmpcpp/build.sh +++ b/packages/ncmpcpp/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="NCurses Music Player Client (Plus Plus)" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.8.2 -TERMUX_PKG_REVISION=18 +TERMUX_PKG_REVISION=19 TERMUX_PKG_SRCURL=https://rybczak.net/ncmpcpp/stable/ncmpcpp-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=650ba3e8089624b7ad9e4cc19bc1ac6028edb7523cc111fa1686ea44c0921554 TERMUX_PKG_DEPENDS="fftw, boost, readline, libandroid-support, libc++, libcurl, libmpdclient, ncurses, zlib" diff --git a/packages/newsboat/build.sh b/packages/newsboat/build.sh index 784c9dcf5e9bf2..db7238157b2e51 100644 --- a/packages/newsboat/build.sh +++ b/packages/newsboat/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="RSS/Atom feed reader for the text console" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.24 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://newsboat.org/releases/${TERMUX_PKG_VERSION}/newsboat-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=62420688cca25618859548d10ff6df9ac75b9cf766699f37edd3e324d67c6ffb TERMUX_PKG_DEPENDS="libc++, libiconv, libandroid-support, libandroid-glob, json-c, libsqlite, libcurl, libxml2, stfl, ncurses, openssl" diff --git a/packages/ninja/build.sh b/packages/ninja/build.sh index e5208b6eee496b..c8471f70992ba6 100644 --- a/packages/ninja/build.sh +++ b/packages/ninja/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A small build system with a focus on speed" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.10.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/ninja-build/ninja/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/nmap/build.sh b/packages/nmap/build.sh index 5da3a5abcbf09e..a4a83e52e2e6c3 100644 --- a/packages/nmap/build.sh +++ b/packages/nmap/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Utility for network discovery and security auditing" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=7.91 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://nmap.org/dist/nmap-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=18cc4b5070511c51eb243cdd2b0b30ff9b2c4dc4544c6312f75ce3a67a593300 TERMUX_PKG_DEPENDS="libc++, libpcap, pcre, openssl, resolv-conf, liblua53, libssh2, zlib" diff --git a/packages/nodejs-lts/build.sh b/packages/nodejs-lts/build.sh index f8c0bafb3ceef6..524b105e2de420 100644 --- a/packages/nodejs-lts/build.sh +++ b/packages/nodejs-lts/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Open Source, cross-platform JavaScript runtime environme TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Yaksh Bariya " TERMUX_PKG_VERSION=14.18.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=3fa1d71adddfab2f5e3e41874b4eddbdf92b65cade4a43922fb1e437afcf89ed # Note that we do not use a shared libuv to avoid an issue with the Android diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh index 068a9dda553f92..a4c813f7188c24 100644 --- a/packages/nodejs/build.sh +++ b/packages/nodejs/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Open Source, cross-platform JavaScript runtime environme TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Yaksh Bariya " TERMUX_PKG_VERSION=16.11.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=67587f4de25e30a9cc0b51a6033eca3bc82d7b4e0d79bb84a265e88f76ab6278 # Note that we do not use a shared libuv to avoid an issue with the Android diff --git a/packages/notmuch/build.sh b/packages/notmuch/build.sh index a90204525f971a..c3b494af8bc55c 100644 --- a/packages/notmuch/build.sh +++ b/packages/notmuch/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Thread-based email index, search and tagging system" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.32.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://notmuchmail.org/releases/notmuch-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=8e0a7eb8ff2e6011ef48b2bf11d79b9c4bb74511cfe2987758b64898c2a2ded7 TERMUX_PKG_DEPENDS="glib, libc++, libgmime, libtalloc, libxapian, zlib" diff --git a/packages/nzbget/build.sh b/packages/nzbget/build.sh index d00f6deefc9f19..ec55e57a266ed6 100644 --- a/packages/nzbget/build.sh +++ b/packages/nzbget/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="The most efficient usenet downloader" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=21.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/nzbget/nzbget/releases/download/v${TERMUX_PKG_VERSION}/nzbget-${TERMUX_PKG_VERSION}-src.tar.gz TERMUX_PKG_SHA256=4e8fc1beb80dc2af2d6a36a33a33f44dedddd4486002c644f4c4793043072025 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/ocrad/build.sh b/packages/ocrad/build.sh index 72737ba00c0278..bd435a1d456c98 100644 --- a/packages/ocrad/build.sh +++ b/packages/ocrad/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Optical Character Recognition program based on a feature TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.27 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/ocrad/ocrad-${TERMUX_PKG_VERSION}.tar.lz TERMUX_PKG_SHA256=a9bfe67e9a040907aff5640dca56392476b6a89e48e37dc94ba846c5b6733b36 TERMUX_PKG_DEPENDS="libc++" diff --git a/packages/p7zip/build.sh b/packages/p7zip/build.sh index 5c7347efbcec63..8b815fbd1339b5 100644 --- a/packages/p7zip/build.sh +++ b/packages/p7zip/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Command-line version of the 7zip compressed file archive TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=17.04 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/jinfeihan57/p7zip/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=ea029a2e21d2d6ad0a156f6679bd66836204aa78148a4c5e498fe682e77127ef TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/patchelf/build.sh b/packages/patchelf/build.sh index 280aa45a812a52..28cb68420c08ca 100644 --- a/packages/patchelf/build.sh +++ b/packages/patchelf/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Utility to modify the dynamic linker and RPATH of ELF ex TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.13 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/NixOS/patchelf/archive/$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=60c6aeadb673de9cc1838b630c81f61e31c501de324ef7f1e8094a2431197d09 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/pdfgrep/build.sh b/packages/pdfgrep/build.sh index cbbbcb5944f0c8..fbefcee81d16a2 100644 --- a/packages/pdfgrep/build.sh +++ b/packages/pdfgrep/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Command line utility to search text in PDF files" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.1.2 -TERMUX_PKG_REVISION=7 +TERMUX_PKG_REVISION=8 TERMUX_PKG_SRCURL=https://pdfgrep.org/download/pdfgrep-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=0ef3dca1d749323f08112ffe68e6f4eb7bc25f56f90a2e933db477261b082aba TERMUX_PKG_DEPENDS="libc++, libgcrypt, libgpg-error, pcre, poppler" diff --git a/packages/play-audio/build.sh b/packages/play-audio/build.sh index 503248c91592eb..b389084fd52b78 100644 --- a/packages/play-audio/build.sh +++ b/packages/play-audio/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Simple command line audio player for Android" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.5 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://github.com/termux/play-audio/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=e114123c4b337cddb1d4aa6c3287574d8c81b2dc4b3abc07ce21616fa14f9e82 TERMUX_PKG_DEPENDS="libc++" diff --git a/packages/poppler/build.sh b/packages/poppler/build.sh index 6563efe9c36079..1bed7d5a4f8a3f 100644 --- a/packages/poppler/build.sh +++ b/packages/poppler/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="PDF rendering library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=21.08.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://poppler.freedesktop.org/poppler-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=e9cf5dc5964bce4bb0264d1c4f8122706c910588b421cfc30abc97d6b23e602d TERMUX_PKG_DEPENDS="fontconfig, freetype, glib, libc++, libcairo, libcurl, libiconv, libjpeg-turbo, libpng, libtiff, littlecms, openjpeg, openjpeg-tools, zlib" diff --git a/packages/proxmark3-git/build.sh b/packages/proxmark3-git/build.sh index 5249c37b7228cc..d3d635d3ee5e4d 100644 --- a/packages/proxmark3-git/build.sh +++ b/packages/proxmark3-git/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Marlin Sööse " _COMMIT=bac58d2a66a9ed3fc72e4ca342db34e30556fae7 TERMUX_PKG_VERSION="2021.09.07-${_COMMIT:0:8}" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://github.com/RfidResearchGroup/proxmark3/archive/bac58d2a66a9ed3fc72e4ca342db34e30556fae7.tar.gz" TERMUX_PKG_SHA256="6ad42c3065745ae1f6a3a479ecf1093c9200fdc9279d4598f72545b75d4a534a" TERMUX_PKG_DEPENDS="libbz2, libc++, readline" diff --git a/packages/proxmark3/build.sh b/packages/proxmark3/build.sh index beeab85dc5b3e1..9a7f176438c34f 100644 --- a/packages/proxmark3/build.sh +++ b/packages/proxmark3/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="The Swiss Army Knife of RFID Research - RRG/Iceman repo" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Marlin Sööse " TERMUX_PKG_VERSION=1:4.14434 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/RfidResearchGroup/proxmark3/archive/v${TERMUX_PKG_VERSION:2}.tar.gz TERMUX_PKG_SHA256=c92fb48f14d7428b9b06b9a2b966278ae9ada469b80f0eba1cc5bc001df86db6 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/qalc/build.sh b/packages/qalc/build.sh index 59b88681e7ac20..2432b8a4c38903 100644 --- a/packages/qalc/build.sh +++ b/packages/qalc/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Powerful and easy to use command line calculator" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.21.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/Qalculate/libqalculate/releases/download/v$TERMUX_PKG_VERSION/libqalculate-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=2a2b6f8de4b43acdff98efdda338436db1a3f7ecd994e1bc2a422a65fba03479 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/qemu-system-x86-64-headless/build.sh b/packages/qemu-system-x86-64-headless/build.sh index bedc482f679c8e..795a16757a11c7 100644 --- a/packages/qemu-system-x86-64-headless/build.sh +++ b/packages/qemu-system-x86-64-headless/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A generic and open source machine emulator and virtualiz TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="Leonid Pliushch " TERMUX_PKG_VERSION=1:6.1.0 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://download.qemu.org/qemu-${TERMUX_PKG_VERSION:2}.tar.xz TERMUX_PKG_SHA256=eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 TERMUX_PKG_DEPENDS="glib, libbz2, libc++, libcurl, libgnutls, libiconv, libjpeg-turbo, liblzo, libnettle, libnfs, libpixman, libpng, libspice-server, libssh, libusb, libusbredir, ncurses, pulseaudio, qemu-common, resolv-conf, zlib, zstd" diff --git a/packages/qpdf/build.sh b/packages/qpdf/build.sh index 9b03d82a1222c9..617170fe2e6663 100644 --- a/packages/qpdf/build.sh +++ b/packages/qpdf/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Content-Preserving PDF Transformation System" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=10.3.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/qpdf/qpdf/releases/download/release-qpdf-$TERMUX_PKG_VERSION/qpdf-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=062808c40ef8741ec8160ae00168638a712cfa1d4bf673e8e595ab5eba1da947 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/ragel/build.sh b/packages/ragel/build.sh index d40949e4f2edec..cb3370243aec92 100644 --- a/packages/ragel/build.sh +++ b/packages/ragel/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Compiles finite state machines from regular languages in TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=6.10 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://www.colm.net/files/ragel/ragel-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f TERMUX_PKG_DEPENDS="libc++" diff --git a/packages/rust/build.sh b/packages/rust/build.sh index 84b60f5a75cf82..621614ec1abf4d 100644 --- a/packages/rust/build.sh +++ b/packages/rust/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Systems programming language focused on safety, speed an TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.55.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/rustc-$TERMUX_PKG_VERSION-src.tar.xz TERMUX_PKG_SHA256=aec85a7c1f40b7a40818a58ae13632f8a12cfaa4d3e2a10957d0e9d16dfdd556 TERMUX_PKG_DEPENDS="libc++, clang, openssl, lld, zlib, libllvm" diff --git a/packages/sdcv/build.sh b/packages/sdcv/build.sh index 89dded8ff739c1..aeb33899665857 100644 --- a/packages/sdcv/build.sh +++ b/packages/sdcv/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="StarDict Console Version" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.5.3 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/Dushistov/sdcv/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=75fb95b1607fdd2fb9f7795d3432d295904614150575ae539202f680499803c9 TERMUX_PKG_DEPENDS="glib, libc++, readline, zlib" diff --git a/packages/squid/build.sh b/packages/squid/build.sh index 4b5c5091fec427..d43758164a480a 100644 --- a/packages/squid/build.sh +++ b/packages/squid/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Full-featured Web proxy cache server" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=4.16 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://squid.mirror.globo.tech/archive/4/squid-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=7e00e891757c1c02dae546c9898f440c6031b684d8c243d6edab529076e3ba63 TERMUX_PKG_DEPENDS="libc++, libcrypt, libxml2, libltdl, libgnutls, resolv-conf" diff --git a/packages/swift/build.sh b/packages/swift/build.sh index feaaa019ad9630..e1d7c672a3d76a 100644 --- a/packages/swift/build.sh +++ b/packages/swift/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Swift is a high-performance system programming language" TERMUX_PKG_LICENSE="Apache-2.0, NCSA" TERMUX_PKG_MAINTAINER="@buttaface" TERMUX_PKG_VERSION=5.5 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 SWIFT_RELEASE="RELEASE" TERMUX_PKG_SRCURL=https://github.com/apple/swift/archive/swift-$TERMUX_PKG_VERSION-$SWIFT_RELEASE.tar.gz TERMUX_PKG_SHA256=0f76c429e65f24d48a2a18b18e7b380a5c97be0d4370271ac3623e436332fd35 diff --git a/packages/swig/build.sh b/packages/swig/build.sh index 9555ddb5123206..1a74bba8dd14cf 100644 --- a/packages/swig/build.sh +++ b/packages/swig/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Generate scripting interfaces to C/C++ code" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=4.0.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/swig/swig-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=d53be9730d8d58a16bf0cbd1f8ac0c0c3e1090573168bfa151b01eb47fa906fc TERMUX_PKG_DEPENDS="libc++, pcre, zlib" diff --git a/packages/tasksh/build.sh b/packages/tasksh/build.sh index bbabb3fd6fd18c..16965445eb5513 100644 --- a/packages/tasksh/build.sh +++ b/packages/tasksh/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Shell command wrapping Taskwarrior commands" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.2.0 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_REVISION=7 TERMUX_PKG_SRCURL=https://taskwarrior.org/download/tasksh-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=6e42f949bfd7fbdde4870af0e7b923114cc96c4344f82d9d924e984629e21ffd TERMUX_PKG_DEPENDS="libc++, readline, taskwarrior, libandroid-glob" diff --git a/packages/taskwarrior/build.sh b/packages/taskwarrior/build.sh index 81f6c786773882..2fd155febf5079 100644 --- a/packages/taskwarrior/build.sh +++ b/packages/taskwarrior/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Utility for managing your TODO list" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.6.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${TERMUX_PKG_VERSION}/task-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=00aa6032b3d8379a5cfa29afb66d2b0703a69e3d1fea733d225d654dbcb0084f TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/teckit/build.sh b/packages/teckit/build.sh index 74bd407a89f7e4..31b5f8a4d8d410 100644 --- a/packages/teckit/build.sh +++ b/packages/teckit/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="TECkit is a library for encoding conversion" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" TERMUX_PKG_VERSION=2.5.10 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/silnrsi/teckit/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=c80900424f97a9c840332aef4bdf0a4a228d442cf835b4a8ce365351bc99e93b TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/termux-elf-cleaner/build.sh b/packages/termux-elf-cleaner/build.sh index f82fd3b65c3719..989f968a947726 100644 --- a/packages/termux-elf-cleaner/build.sh +++ b/packages/termux-elf-cleaner/build.sh @@ -6,6 +6,7 @@ TERMUX_PKG_MAINTAINER="@termux" # to create a native binary. Bumping this version will need # updating the checksum used there. TERMUX_PKG_VERSION=1.7 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/termux/termux-elf-cleaner/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=cf74cabfcf5c22e0308074e6683ca7efa14f1a3c801d1656b96e38ff7301ae0b TERMUX_PKG_DEPENDS="libc++" diff --git a/packages/tesseract/build.sh b/packages/tesseract/build.sh index 42c9e1dd8a5b43..648975a93ffb92 100644 --- a/packages/tesseract/build.sh +++ b/packages/tesseract/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Tesseract is probably the most accurate open source OCR TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=4.1.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/tesseract-ocr/tesseract/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=2a66ff0d8595bff8f04032165e6c936389b1e5727c3ce5a27b3e059d218db1cb TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/texlive-bin/build.sh b/packages/texlive-bin/build.sh index 0bd8da896264b5..70cb13b26bbda9 100644 --- a/packages/texlive-bin/build.sh +++ b/packages/texlive-bin/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" TERMUX_PKG_VERSION=20210325 _SVN_VERSION=58837 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/TeX-Live/texlive-source/archive/svn${_SVN_VERSION}.tar.gz TERMUX_PKG_SHA256=0afa6919e44675b7afe0fa45344747afef07b6ee98eeb14ff6a2ef78f458fc12 TERMUX_PKG_DEPENDS="libc++, libiconv, freetype, libpng, libgd, libgmp, libmpfr, libicu, liblua52, libgraphite, harfbuzz, harfbuzz-icu, teckit, libpixman, libcairo, zlib, zziplib" diff --git a/packages/timewarrior/build.sh b/packages/timewarrior/build.sh index 5197694892d2df..8c14623087b327 100644 --- a/packages/timewarrior/build.sh +++ b/packages/timewarrior/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Command-line time tracker" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.4.2 +TERMUX_PKG_REVISION=1 _LIBSHARED_COMMIT=0d4e31de757ea2609a82549c5b09703d3d3fbe16 TERMUX_PKG_SRCURL=(https://github.com/GothenburgBitFactory/timewarrior/archive/v${TERMUX_PKG_VERSION}.tar.gz https://github.com/GothenburgBitFactory/libshared/archive/${_LIBSHARED_COMMIT}.tar.gz) diff --git a/packages/timg/build.sh b/packages/timg/build.sh index 5732a24be958ab..18043af95eedae 100644 --- a/packages/timg/build.sh +++ b/packages/timg/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A terminal image and video viewer" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.4.2 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/hzeller/timg/archive/24d7727a4ba44b32fcdfb8e21fc258a4638fbbfe.tar.gz TERMUX_PKG_SHA256=5fe2a0f68dacfe367cc82ed5c3a21a9c1455ae78df1acedb7c02ed27ef502833 TERMUX_PKG_DEPENDS="ffmpeg, graphicsmagick, libc++, libjpeg-turbo, libexif, zlib" diff --git a/packages/unrar/build.sh b/packages/unrar/build.sh index c1ae5d9b5b00f0..7d69616e491ae9 100644 --- a/packages/unrar/build.sh +++ b/packages/unrar/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="non-free" TERMUX_PKG_LICENSE_FILE="license.txt" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=6.0.7 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.rarlab.com/rar/unrarsrc-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=a7029942006cbcced3f3b7322ec197683f8e7be408972ca08099b196c038f518 TERMUX_PKG_DEPENDS="libandroid-support, libc++" diff --git a/packages/utfdecode/build.sh b/packages/utfdecode/build.sh index 1184923dcdac78..53b8973e2ec0f6 100644 --- a/packages/utfdecode/build.sh +++ b/packages/utfdecode/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Tool for decoding, encoding and debugging unicode" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.3.4 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=https://github.com/fornwall/utfdecode/releases/download/v$TERMUX_PKG_VERSION/utfdecode-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=5fd1473f6cf6bdedeb33569c3b0f6823aceda366c714f6a475e2d28767f99b5a TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/vde2/build.sh b/packages/vde2/build.sh index fd3b285e4a486b..d58954c4352bcc 100644 --- a/packages/vde2/build.sh +++ b/packages/vde2/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="COPYING, COPYING.libvdeplug, COPYING.slirpvde" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.3.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/vde/vde2-$TERMUX_PKG_VERSION.tar.bz2 TERMUX_PKG_SHA256=cbea9b7e03097f87a6b5e98b07890d2275848f1fe4b9fcda77b8994148bc9542 TERMUX_PKG_DEPENDS="libpcap,libtool , openssl, libc++" diff --git a/packages/vtutils/build.sh b/packages/vtutils/build.sh index 9de7c38b7a886b..d56df6f037fabb 100644 --- a/packages/vtutils/build.sh +++ b/packages/vtutils/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Utilities for testing and working with virtual terminals TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.5 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=3 TERMUX_PKG_SRCURL=https://github.com/fornwall/vtutils/releases/download/v$TERMUX_PKG_VERSION/vtutils-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=ef0b11f9570697f53bcda7a61093f8d472afee2c8551b5b35e9b5b7c1539c2c6 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/vulkan-tools/build.sh b/packages/vulkan-tools/build.sh index ee180847f40b33..5798d8bb37a79a 100644 --- a/packages/vulkan-tools/build.sh +++ b/packages/vulkan-tools/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Vulkan Tools and Utilities" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.2.188 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/Vulkan-Tools/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=170edb74c4515f749efe6a64241eaccbceca068cfd43cee45304dca200442b3a TERMUX_PKG_BUILD_DEPENDS="vulkan-headers, vulkan-loader-android" From ad86a34f6c898ebb31048bb79b9e8a49132c665b Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 22 Oct 2021 15:31:28 +0200 Subject: [PATCH 28/29] libvpx: fix build with ndk-r23 Seems we need to explicitly pass -fPIC for all arches. --- packages/libvpx/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/libvpx/build.sh b/packages/libvpx/build.sh index 98097f152196b9..cc97df00e94576 100644 --- a/packages/libvpx/build.sh +++ b/packages/libvpx/build.sh @@ -52,5 +52,6 @@ termux_step_configure() { --enable-pic \ --enable-vp8 \ --enable-shared \ - --enable-small + --enable-small \ + --extra-cflags="-fPIC" } From 20d8e40de830935854bcded1c16cc0826ce43a8b Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 22 Oct 2021 16:08:49 +0200 Subject: [PATCH 29/29] ndk: update to r23b Includes fix for -fno-integrated-as flag, which is needed by libx265 build. --- packages/ndk-sysroot/build.sh | 2 +- scripts/properties.sh | 2 +- scripts/setup-android-sdk.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/ndk-sysroot/build.sh b/packages/ndk-sysroot/build.sh index 6d539c797973cf..38fd2f22c7def4 100644 --- a/packages/ndk-sysroot/build.sh +++ b/packages/ndk-sysroot/build.sh @@ -47,7 +47,7 @@ termux_step_extract_into_massagedir() { NDK_ARCH=$TERMUX_ARCH test $NDK_ARCH == 'i686' && NDK_ARCH='i386' # clang 13 requires libunwind on Android. - cp $TERMUX_STANDALONE_TOOLCHAIN/lib64/clang/12.0.5/lib/linux/$NDK_ARCH/libunwind.a . + cp $TERMUX_STANDALONE_TOOLCHAIN/lib64/clang/12.0.8/lib/linux/$NDK_ARCH/libunwind.a . for lib in librt.so libpthread.so libutil.so; do echo 'INPUT(-lc)' > $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/$lib diff --git a/scripts/properties.sh b/scripts/properties.sh index 54ed345a78b222..8f4420ce82a0f0 100644 --- a/scripts/properties.sh +++ b/scripts/properties.sh @@ -1,6 +1,6 @@ TERMUX_ANDROID_BUILD_TOOLS_VERSION=30.0.3 TERMUX_NDK_VERSION_NUM=23 -TERMUX_NDK_REVISION="" +TERMUX_NDK_REVISION="b" TERMUX_NDK_VERSION=$TERMUX_NDK_VERSION_NUM$TERMUX_NDK_REVISION export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 diff --git a/scripts/setup-android-sdk.sh b/scripts/setup-android-sdk.sh index 584f891a6632bc..41ea5b22d279ce 100755 --- a/scripts/setup-android-sdk.sh +++ b/scripts/setup-android-sdk.sh @@ -7,7 +7,7 @@ set -e -u ANDROID_SDK_FILE=commandlinetools-linux-7583922_latest.zip ANDROID_SDK_SHA256=124f2d5115eee365df6cf3228ffbca6fc3911d16f8025bebd5b1c6e2fcfa7faf ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-linux.zip -ANDROID_NDK_SHA256=e3eacf80016b91d4cd2c8ca9f34eebd32df912bb799c859cc5450b6b19277b4f +ANDROID_NDK_SHA256=c6e97f9c8cfe5b7be0a9e6c15af8e7a179475b7ded23e2d1c1fa0945d6fb4382 if [ ! -d $ANDROID_HOME ]; then mkdir -p $ANDROID_HOME cd $ANDROID_HOME/..