Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump(main/libx264): 0.164.3191 #21328

Merged
merged 1 commit into from
Oct 27, 2024
Merged

bump(main/libx264): 0.164.3191 #21328

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions packages/libx264/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,30 @@ TERMUX_PKG_HOMEPAGE=https://www.videolan.org/developers/x264.html
TERMUX_PKG_DESCRIPTION="Library for encoding video streams into the H.264/MPEG-4 AVC format"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
_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
Copy link
Member

@Biswa96 Biswa96 Sep 2, 2024 •
edited by TomJo2000
Loading

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
}
?

Copy link
Member

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.

TERMUX_PKG_VERSION="1:0.164.3191"
TERMUX_PKG_SRCURL=https://code.videolan.org/videolan/x264/-/archive/$_COMMIT/x264-$_COMMIT.tar.bz2
TERMUX_PKG_SHA256=8a943822d761c302da647399582354fa8788802570ce3b865edd44b1aa77e9b0
TERMUX_PKG_SHA256=2a1b197fd1fbc85045794f18c9353648a9ae3cbe194b7b92d523d096f9445464
TERMUX_PKG_BREAKS="libx264-dev"
TERMUX_PKG_REPLACES="libx264-dev"
# Avoid linking against ffmpeg libraries to avoid circular dependency:
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--disable-lavf
--disable-swscale
--disable-lavf"
"

termux_step_pre_configure() {
#if [ $TERMUX_ARCH = "i686" -o $TERMUX_ARCH = "x86_64" ]; then
if [ $TERMUX_ARCH = "i686" ]; then
# Avoid text relocations on i686, see:
# https://mailman.videolan.org/pipermail/x264-devel/2016-March/011589.html
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-asm"
# Avoid errors such as "relocation R_386_GOTOFF against preemptible symbol
# x264_significant_coeff_flag_offset cannot be used when making a shared object":
LDFLAGS+=" -fuse-ld=bfd"
elif [ $TERMUX_ARCH = "x86_64" ]; then
# Avoid requiring nasm for now:
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-asm"
fi
}

termux_step_post_make_install() {
mkdir -p ${TERMUX_PREFIX}/share/bash-completion/completions
install -m 644 ${TERMUX_PKG_SRCDIR}/tools/bash-autocomplete.sh ${TERMUX_PREFIX}/share/bash-completion/completions/x264
install -Dm644 ${TERMUX_PKG_SRCDIR}/tools/bash-autocomplete.sh ${TERMUX_PREFIX}/share/bash-completion/completions/x264
}