-
-
Notifications
You must be signed in to change notification settings - Fork 3.1k
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
bump(main/libx264): 0.164.3191 #21328
Conversation
Also revert 2b12322 that causes build error on NDK r27 for i686: i686-linux-android-clang conftest.c -m32 -march=i686 -msse3 -mstackrealign -mfpmath=sse -fPIC -fstack-protector-strong -Oz -Wall -I. -I$(SRCPATH) -m32 -L/data/data/com.termux/files/usr/lib -Wl,-rpath=/data/data/com.termux/files/usr/lib -Wl,--enable-new-dtags -Wl,--as-needed -Wl,-z,relro,-z,now -fuse-ld=bfd -lm -o conftest /usr/bin/ld.bfd: /home/builder/.termux-build/_cache/android-r27-api-24-v1/bin/../sysroot/usr/lib/i686-linux-android/24/libm.so: unable to initialize decompress status for section .debug_abbrev /usr/bin/ld.bfd: /home/builder/.termux-build/_cache/android-r27-api-24-v1/bin/../sysroot/usr/lib/i686-linux-android/24/libm.so: unable to initialize decompress status for section .debug_abbrev /home/builder/.termux-build/_cache/android-r27-api-24-v1/bin/../sysroot/usr/lib/i686-linux-android/24/libm.so: file not recognized: file format not recognized clang: error: linker command failed with exit code 1 (use -v to see invocation)
_COMMIT=b093bbe7d9bc642c8f24067cbdcc73bb43562eab | ||
TERMUX_PKG_VERSION=1:0.164.3101 # X264_BUILD from x264.h; commit count | ||
_COMMIT=4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1 | ||
# X264_BUILD from x264.h; commit count using "git rev-list --count HEAD" on x264 git repo |
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.
Would it be possible to get that version style automatically like in luajit
termux-packages/packages/libluajit/build.sh
Lines 16 to 24 in 2f56828
termux_step_post_get_source() { | |
# Do the same as e.g. arch linux is doing: | |
# The patch version is the timestamp of the above git commit, obtain via `git show -s --format=%ct` | |
local commit_ts=${TERMUX_PKG_VERSION:6} | |
# Find the commit made at the exact timestamp specified in the version: | |
local commit_hash=$(git log --date=unix --before=$commit_ts --after=$commit_ts --pretty=format:"%H") | |
git checkout $commit_hash | |
} |
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.
Code in luajit gets commit from version, it is not applicable in this case.
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.
Seems to work on my device.
I'll merge it in 48 hours if nobody minds or when it gets 2+ more approves. |
Also revert 2b12322 that causes build error on NDK r27 for i686: