-
-
Notifications
You must be signed in to change notification settings - Fork 3.5k
tree-wide: support full bootstrapping of ffplay
, rust
, and mesa
#24669
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
robertkirkman
merged 19 commits into
termux:master
from
robertkirkman:fix-crossbuild-prefix-pollution-3
May 15, 2025
Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
cb17176
fix(scripts/build/termux_step_override_config_scripts): do not skip a…
robertkirkman bb10d8c
fix(main/python-brotli): separate `build.sh` from `brotli` again
robertkirkman 366f9c6
fix(x11/{sdl2,sdl2-compat}): create `libSDL2.so` symbolic link during…
robertkirkman b51fba7
fix(main/librsvg): prevent `meson.build` from using `pkg-config` to a…
robertkirkman fb67fba
fix(main/wasi-libc): enable termux_step_host_build() to complete succ…
robertkirkman fc2c6ea
bump(main/libtheora): 1.2.0
robertkirkman 438eaea
fix(main/glib): always remove `$TERMUX_HOSTBUILD_MARKER`
robertkirkman afd7f25
revbump({main/ffmpeg,x11/ffplay}): for `libtheora` 1.2.0
robertkirkman f85dd54
revbump({main/vlc,x11/vlc-qt}): for `libtheora` 1.2.0
robertkirkman d98e1da
fix(main/libmpeg2): do not check for X11 during configure
robertkirkman bd8aa8a
revbump(main/gpac): for `libtheora` 1.2.0
robertkirkman 66f99a9
revbump(main/gst-plugins-base): for `libtheora` 1.2.0
robertkirkman 7cfdb5e
revbump(main/mplayer): for `libtheora` 1.2.0
robertkirkman 5476407
revbump(x11/godot): for `libtheora` 1.2.0
robertkirkman 811b904
revbump(x11/handbrake): for `libtheora` 1.2.0
robertkirkman d7075f1
revbump(x11/love): for `libtheora` 1.2.0
robertkirkman 5732a38
revbump(x11/recordmydesktop): for `libtheora` 1.2.0
robertkirkman c73534b
chore(scripts/big-pkgs.list): add `wasi-libc`
robertkirkman 2e3d168
fix(main/tor): do not automatically enable `libseccomp`
robertkirkman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
packages/librsvg/do-not-use-pkg-config-to-find-vapigen.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
Sometimes, if other packages (exact reproduction steps unknown) | ||
were built in the same $TERMUX_PREFIX before librsvg, | ||
the build of librsvg will fail because the vapigen placed in $PATH by termux_setup_gir() | ||
will not be found. This prevents that by forcing librsvg to search $PATH for vapigen. | ||
|
||
Before: | ||
../src/meson.build:131:17: ERROR: Dependency "vapigen" not found, tried pkgconfig | ||
|
||
After: | ||
Program vapigen found: YES (/home/builder/.termux-build/_cache/gir-cross/bin/vapigen) | ||
|
||
--- a/meson.build | ||
+++ b/meson.build | ||
@@ -128,7 +128,7 @@ gidocgen = find_program('gi-docgen', version: gidocgen_required, | ||
gi_dep = dependency('gobject-introspection-1.0', | ||
version: introspection_required, | ||
required: get_option('introspection')) | ||
-vapigen_dep = dependency('vapigen', | ||
+vapigen_dep = find_program('vapigen', | ||
version: vapigen_required, | ||
required: get_option('vala')) | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
TERMUX_PKG_HOMEPAGE=https://github.com/google/brotli | ||
TERMUX_PKG_DESCRIPTION="lossless compression algorithm and format (Python bindings)" | ||
TERMUX_PKG_LICENSE="MIT" | ||
TERMUX_PKG_MAINTAINER="@termux" | ||
TERMUX_PKG_VERSION=1.1.0 | ||
TERMUX_PKG_REVISION=3 | ||
TERMUX_PKG_SRCURL=https://github.com/google/brotli/archive/v$TERMUX_PKG_VERSION.tar.gz | ||
TERMUX_PKG_SHA256=e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff | ||
TERMUX_PKG_DEPENDS="python, python-pip" | ||
TERMUX_PKG_PYTHON_COMMON_DEPS="wheel" | ||
TERMUX_PKG_BUILD_IN_SRC=true | ||
TERMUX_PKG_AUTO_UPDATE=true | ||
|
||
termux_step_configure() { | ||
# ERROR: ./lib/python3.12/site-packages/_brotli.cpython-312.so contains undefined symbols: | ||
# 31: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND log2 | ||
LDFLAGS+=" -lm" | ||
LDFLAGS+=" -Wl,--no-as-needed -lpython${TERMUX_PYTHON_VERSION}" | ||
} | ||
|
||
termux_step_make() { | ||
: | ||
} | ||
|
||
termux_step_make_install() { | ||
pip install . --prefix="$TERMUX_PREFIX" -vv --no-build-isolation --no-deps | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,6 +19,7 @@ rust | |
swift | ||
thunderbird | ||
tinygo | ||
wasi-libc | ||
wasmer | ||
zig | ||
ghc |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
First time seeing that variable.
Is this documented?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are several other places in the repository where this is done in order to force
termux_step_host_build()
to always run on every build and never cache. Here is one of them:termux-packages/x11-packages/virglrenderer-android/build.sh
Lines 72 to 75 in d26858e
reasons this can be necessary vary between each package.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, while on the subject, I just noticed that technically
glib
requires this too, because if it doesn't have it, then this command:scripts/run-docker.sh ./build-package.sh -a all gtk3
will fail with this error:
.../files/usr/bin/glib-compile-resources: Exec format error
(because
glib-cross
does not get properly installed into$TERMUX_PREFIX
if an operation that deletes$TERMUX_PREFIX
without deleting all hostbuild markers, like-a all
, is combined with the mode that runs when-I
is not used)Basically any package that installs something into
$TERMUX_PREFIX
duringtermux_step_host_build()
requires it. I'm doing them one by one while they're touched by the dependency tree of the packages mentioned in each PR related to this subject, I guess.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess it would be possible to add a check that counts files modified in
$TERMUX_PREFIX
sincetermux_step_create_timestamp_file()
right after the end oftermux_step_host_build()
but before anything else runs, and remove/don't create$TERMUX_HOSTBUILD_MARKER
if that number of files is greater than 0, and that would fix some of these automatically, but it wouldn't cover all of them and that might be kind of an overly invasive change.