Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
fornwall committed Dec 15, 2024
2 parents bfa9eaf + 3e971ba commit 8d26286
Show file tree
Hide file tree
Showing 22 changed files with 78 additions and 94 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/bootstrap_archives.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ jobs:
steps:
- name: Git clone
uses: actions/checkout@v4
with:
persist-credentials: false
- name: Create bootstrap archive
run: ./scripts/generate-bootstraps.sh --architectures ${{ matrix.arch }}
- name: Store artifacts
Expand All @@ -44,7 +42,6 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
persist-credentials: false
- name: Fetch bootstrap archives
uses: actions/download-artifact@v4
with:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/command_not_found.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ jobs:
with:
fetch-depth: 1
token: ${{ secrets.TERMUXBOT2_TOKEN }}
persist-credentials: false
- name: Revbump main/command-not-found
env:
GITHUB_TOKEN: ${{ secrets.TERMUXBOT2_TOKEN }}
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/docker_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ jobs:
steps:
- name: Clone repository
uses: actions/checkout@v4
with:
persist-credentials: false
- name: Build
run: |
cd ./scripts
Expand All @@ -37,7 +35,6 @@ jobs:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.DOCKER_TOKEN }}
persist-credentials: false
- name: Push
if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && github.repository == 'termux-play-store/termux-packages'
run: |
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 1000
persist-credentials: false
- name: Gather build summary
id: build-info
env:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/vagrant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ jobs:
steps:
- name: Clone repository
uses: actions/checkout@v4
with:
persist-credentials: false
- name: Set up Vagrant repo
run: |
# https://developer.hashicorp.com/vagrant/downloads#linux
Expand Down
6 changes: 3 additions & 3 deletions packages/c-ares/build.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
TERMUX_PKG_HOMEPAGE=https://c-ares.haxx.se
TERMUX_PKG_HOMEPAGE=https://c-ares.org/
TERMUX_PKG_DESCRIPTION="Library for asynchronous DNS requests (including name resolves)"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="1.34.3"
TERMUX_PKG_VERSION="1.34.4"
TERMUX_PKG_SRCURL=https://github.com/c-ares/c-ares/archive/v$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=f66e9d71bdbca96b0a1a19a56331a84e0138de2e0778d41cbfe6785e44150588
TERMUX_PKG_SHA256=a35f7c4cdbdfaf0a69a9a50029e95ffe403daf605fade05c649d18333592222d
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+.\d+.\d+"
TERMUX_PKG_DEPENDS="resolv-conf"
Expand Down
4 changes: 2 additions & 2 deletions packages/chezmoi/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://chezmoi.io
TERMUX_PKG_DESCRIPTION="Manage your dotfiles across multiple machines"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
TERMUX_PKG_VERSION="2.55.0"
TERMUX_PKG_VERSION="2.56.0"
TERMUX_PKG_SRCURL=https://github.com/twpayne/chezmoi/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=1fa36ce5ffff5a49e5a69c0910b866086749f359ae7afa06cbcc17b3bc9d8ca0
TERMUX_PKG_SHA256=bc56294a3c47c0dfa5e22f05b1e8f6f656b650fd212d83975039a521b74e3d3c
TERMUX_PKG_AUTO_UPDATE=true

termux_step_make() {
Expand Down
8 changes: 4 additions & 4 deletions packages/fzf/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://junegunn.github.io/fzf/
TERMUX_PKG_DESCRIPTION="Command-line fuzzy finder"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="0.56.3"
TERMUX_PKG_VERSION="0.57.0"
TERMUX_PKG_SRCURL=https://github.com/junegunn/fzf/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=fc7bf3fcfdc3c9562237d1e82196618201a39b3fd6bf3364149516b288f5a24a
TERMUX_PKG_SHA256=d4e8e25fad2d3f75943b403c40b61326db74b705bf629c279978fdd0ceb1f97c
TERMUX_PKG_AUTO_UPDATE=true

# Depend on findutils as fzf uses the -fstype option, which busybox
Expand Down Expand Up @@ -49,13 +49,13 @@ termux_step_make_install() {
# Install the rest of the shell scripts:
mkdir -p $TERMUX_PREFIX/share/fzf
cp $TERMUX_PKG_SRCDIR/shell/* $TERMUX_PREFIX/share/fzf/

# Symlink shell completions.
mkdir -p $TERMUX_PREFIX/share/bash-completion/completions/
ln -sfr $TERMUX_PREFIX/share/fzf/completion.bash $TERMUX_PREFIX/share/bash-completion/completions/fzf
mkdir -p $TERMUX_PREFIX/share/zsh/site-functions
ln -sfr $TERMUX_PREFIX/share/fzf/completion.zsh $TERMUX_PREFIX/share/zsh/site-functions/_fzf

# Fish keybindings.
mkdir -p $TERMUX_PREFIX/share/fish/vendor_functions.d
ln -sfr $TERMUX_PREFIX/share/fzf/key-bindings.fish $TERMUX_PREFIX/share/fish/vendor_functions.d/fzf_key_bindings.fish
Expand Down
4 changes: 2 additions & 2 deletions packages/hugo/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gohugo.io/
TERMUX_PKG_DESCRIPTION="A fast and flexible static site generator"
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="0.139.4"
TERMUX_PKG_VERSION="0.139.5"
TERMUX_PKG_SRCURL=https://github.com/gohugoio/hugo/archive/v$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=8c89c968ace21086528a164cd9a1019809c0064f0ea2ef8a82b035c2d079d19b
TERMUX_PKG_SHA256=ed3e3e8887285c71b5d8ae9f9be956c5313c16f31c8501602d52eae7a002f53d
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="libc++"

Expand Down
4 changes: 2 additions & 2 deletions packages/iperf3/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/esnet/iperf
TERMUX_PKG_DESCRIPTION="TCP, UDP, and SCTP network bandwidth measurement tool"
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3.17.1"
TERMUX_PKG_VERSION="3.18"
TERMUX_PKG_SRCURL=https://github.com/esnet/iperf/releases/download/$TERMUX_PKG_VERSION/iperf-$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=84404ca8431b595e86c473d8f23d8bb102810001f15feaf610effd3b318788aa
TERMUX_PKG_SHA256=c0618175514331e766522500e20c94bfb293b4424eb27d7207fb427b88d20bab
TERMUX_PKG_UPDATE_VERSION_REGEXP="^\d+\.\d+[^ABRabr]*$"
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="openssl"
Expand Down
60 changes: 0 additions & 60 deletions packages/iperf3/pthread_cancel.patch

This file was deleted.

7 changes: 5 additions & 2 deletions packages/matplotlib/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ LICENSE/LICENSE_SOLARIZED
LICENSE/LICENSE_STIX
LICENSE/LICENSE_YORICK"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3.9.4"
TERMUX_PKG_VERSION="3.10.0"
TERMUX_PKG_SRCURL=https://github.com/matplotlib/matplotlib/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=a29f8bab72f81df9077480e6b55394a17effd329d0ff1524bb5bc570734e7c54
TERMUX_PKG_SHA256=825919da8957bbc19cec35caf8663b734d34af72a0b040c43b7d8c1b76fdcab7
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="freetype, libc++, patchelf, ninja, python, python-contourpy, python-numpy, python-pillow, python-pip"
_NUMPY_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python-numpy/build.sh; echo $TERMUX_PKG_VERSION)
Expand All @@ -32,6 +32,9 @@ termux_step_pre_configure() {
if $TERMUX_ON_DEVICE_BUILD; then
termux_error_exit "Package '$TERMUX_PKG_NAME' is not available for on-device builds."
fi

# error: non-constant-expression cannot be narrowed from type 'unsigned int' to 'int' in initializer list [-Wc++11-narrowing]
CXXFLAGS+=" -Wno-c++11-narrowing"
}

termux_step_configure() {
Expand Down
4 changes: 2 additions & 2 deletions packages/minio/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://min.io/
TERMUX_PKG_DESCRIPTION="Multi-Cloud Object Storage"
TERMUX_PKG_LICENSE="AGPL-V3"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="2024.11.07.00.52.20"
TERMUX_PKG_VERSION="2024.12.13.22.19.12"
_VERSION=$(sed 's/\./T/3;s/\./-/g' <<< $TERMUX_PKG_VERSION)
TERMUX_PKG_SRCURL=https://github.com/minio/minio/archive/refs/tags/RELEASE.${_VERSION}Z.tar.gz
TERMUX_PKG_SHA256=9f6ba4a0a78dad3f19ab99880dbaef9d2bd4a0d5a24ad7200d064bdefa7e6435
TERMUX_PKG_SHA256=1ce743e5400479c5ed9db127319653d65fe3314ca8bacfb119625dfdc206d206
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_UPDATE_VERSION_SED_REGEXP='s/T/-/g;s/[^0-9-]//g;s/-/./g'
TERMUX_PKG_DEPENDS="resolv-conf"
Expand Down
4 changes: 2 additions & 2 deletions packages/mpg123/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://mpg123.org/
TERMUX_PKG_DESCRIPTION="Fast console MPEG Audio Player and decoder library"
TERMUX_PKG_LICENSE="LGPL-2.1"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="1.32.9"
TERMUX_PKG_VERSION="1.32.10"
# Flaky https://mpg123.org/download/mpg123-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/sourceforge/mpg123/mpg123-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=03b61e4004e960bacf2acdada03ed94d376e6aab27a601447bd4908d8407b291
TERMUX_PKG_SHA256=87b2c17fe0c979d3ef38eeceff6362b35b28ac8589fbf1854b5be75c9ab6557c
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="pulseaudio"
4 changes: 2 additions & 2 deletions packages/oh-my-posh/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://ohmyposh.dev
TERMUX_PKG_DESCRIPTION="A prompt theme engine for any shell."
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="24.12.0"
TERMUX_PKG_VERSION="24.13.0"
TERMUX_PKG_SRCURL=https://github.com/JanDeDobbeleer/oh-my-posh/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=188b5060de286f798e518ff1c45846c8ba6878540c5ec2aca7bbe586c3e105fc
TERMUX_PKG_SHA256=1a8da2257ee2775b9ab2fa2b50c8e10f4ed68dc837fa30c49f8c356a57bb24ba
TERMUX_PKG_AUTO_UPDATE=true

termux_step_pre_configure() {
Expand Down
4 changes: 2 additions & 2 deletions packages/seanime/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/5rahim/seanime
TERMUX_PKG_DESCRIPTION="Self-hosted anime and manga server for sea rovers."
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="2.4.2"
TERMUX_PKG_VERSION="2.5.0"
TERMUX_PKG_SRCURL=https://github.com/5rahim/seanime/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=f8357978870f746cf8d36b1c2928687abdc7ac1f661a347dfee64cd111b359ec
TERMUX_PKG_SHA256=1c5c8deae2cc07e16075b7be70c9a446794701eaa7bc7ae7893fbabc29c51c5e
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_HOSTBUILD=true
Expand Down
19 changes: 19 additions & 0 deletions x11-packages/mangohud/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
TERMUX_PKG_HOMEPAGE=https://github.com/flightlessmango/MangoHud/
TERMUX_PKG_DESCRIPTION="A Vulkan overlay layer for monitoring FPS, temperatures, CPU/GPU load and more"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="0.7.2"
TERMUX_PKG_SRCURL=https://github.com/flightlessmango/MangoHud/releases/download/v${TERMUX_PKG_VERSION}/MangoHud-v${TERMUX_PKG_VERSION}-Source.tar.xz
TERMUX_PKG_SHA256=114ad3ea87b1db7358816c7b8e7843aaee356ff048b9e15d6fff02d89414841b
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="libwayland, libx11, libxkbcommon"
TERMUX_PKG_BUILD_DEPENDS="dbus, libandroid-wordexp, nlohmann-json"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-Ddynamic_string_tokens=false
-Dwith_xnvctrl=disabled
"

termux_step_pre_configure() {
# Workaround linker error wit version script
LDFLAGS+=" -Wl,--undefined-version"
}
11 changes: 11 additions & 0 deletions x11-packages/mangohud/meson.build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/meson.build
+++ b/meson.build
@@ -36,7 +36,7 @@
endif
# TODO: this is very incomplete
is_unixy = false
-if ['linux', 'cygwin', 'gnu'].contains(host_machine.system())
+if ['android', 'linux', 'cygwin', 'gnu'].contains(host_machine.system())
pre_args += '-D_GNU_SOURCE'
pre_args += '-DHAVE_PTHREAD'
is_unixy = true
8 changes: 8 additions & 0 deletions x11-packages/mangohud/src-hud_elements.h.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
--- a/src/hud_elements.h
+++ b/src/hud_elements.h
@@ -1,4 +1,5 @@
#pragma once
+#include <map>
#include <vector>
#include <string>
#include <utility>
12 changes: 12 additions & 0 deletions x11-packages/mangohud/src-overlay.cpp.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Workaround [error] [file_utils.cpp:50] Error opening directory '/sys/class/hwmon/': Permission denied

--- a/src/overlay.cpp
+++ b/src/overlay.cpp
@@ -114,7 +114,6 @@

void update_hw_info(const struct overlay_params& params, uint32_t vendorID)
{
- update_fan();
if (params.enabled[OVERLAY_PARAM_ENABLED_cpu_stats] || logger->is_active()) {
cpuStats.UpdateCPUData();

2 changes: 1 addition & 1 deletion x11-packages/mpv-x/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000"
# Update both mpv and mpv-x to the same version in one PR.
TERMUX_PKG_VERSION="0.39.0"
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://github.com/mpv-player/mpv/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=2ca92437affb62c2b559b4419ea4785c70d023590500e8a52e95ea3ab4554683
TERMUX_PKG_AUTO_UPDATE=false
Expand Down
1 change: 1 addition & 0 deletions x11-packages/scrcpy/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Provides display and control of Android devices connecte
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3.1"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/Genymobile/scrcpy/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=beaa5050a3c45faa77cedc70ad13d88ef26b74d29d52f512b7708671e037d24d
TERMUX_PKG_AUTO_UPDATE=true
Expand Down

0 comments on commit 8d26286

Please sign in to comment.