~mdw
/
termux-packages
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
finch: Update from 2.10.12 to 2.11.0
[termux-packages]
/
packages
/
ffmpeg
/
build.sh
diff --git
a/packages/ffmpeg/build.sh
b/packages/ffmpeg/build.sh
index
5b8e0dd
..
3fcde11
100644
(file)
--- a/
packages/ffmpeg/build.sh
+++ b/
packages/ffmpeg/build.sh
@@
-1,11
+1,11
@@
TERMUX_PKG_HOMEPAGE=https://www.ffmpeg.org/
TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multimedia formats and protocols"
TERMUX_PKG_HOMEPAGE=https://www.ffmpeg.org/
TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multimedia formats and protocols"
-TERMUX_PKG_VERSION=3.0.2
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_VERSION=3.1.3
TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=f8575c071e2a64437aeb70c8c030b385cddbe0b5cde20c9b18a6def840128822
TERMUX_PKG_FOLDERNAME=ffmpeg-$TERMUX_PKG_VERSION
# libbz2 is used by matroska decoder:
TERMUX_PKG_FOLDERNAME=ffmpeg-$TERMUX_PKG_VERSION
# libbz2 is used by matroska decoder:
-TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, xvidcore, libvorbis, lib
faac, lib
mp3lame, liblzma"
+TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, xvidcore, libvorbis, libmp3lame, liblzma"
TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples"
TERMUX_PKG_CONFLICTS="libav"
TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples"
TERMUX_PKG_CONFLICTS="libav"
@@
-21,6
+21,8
@@
termux_step_configure () {
# Specify --disable-asm to prevent text relocations on i686,
# see https://trac.ffmpeg.org/ticket/4928
_EXTRA_CONFIGURE_FLAGS="--disable-asm"
# Specify --disable-asm to prevent text relocations on i686,
# see https://trac.ffmpeg.org/ticket/4928
_EXTRA_CONFIGURE_FLAGS="--disable-asm"
+ elif [ $TERMUX_ARCH = "x86_64" ]; then
+ _ARCH="x86_64"
elif [ $TERMUX_ARCH = "aarch64" ]; then
_ARCH=$TERMUX_ARCH
_EXTRA_CONFIGURE_FLAGS="--enable-neon"
elif [ $TERMUX_ARCH = "aarch64" ]; then
_ARCH=$TERMUX_ARCH
_EXTRA_CONFIGURE_FLAGS="--enable-neon"
@@
-39,7
+41,6
@@
termux_step_configure () {
--enable-cross-compile \
--enable-gpl \
--enable-libmp3lame \
--enable-cross-compile \
--enable-gpl \
--enable-libmp3lame \
- --enable-libfaac \
--enable-libvorbis \
--enable-libx264 \
--enable-libxvid \
--enable-libvorbis \
--enable-libx264 \
--enable-libxvid \
@@
-47,7
+48,7
@@
termux_step_configure () {
--enable-openssl \
--enable-shared \
--prefix=$TERMUX_PREFIX \
--enable-openssl \
--enable-shared \
--prefix=$TERMUX_PREFIX \
- --target-os=
linux
\
+ --target-os=
android
\
$_EXTRA_CONFIGURE_FLAGS
}
$_EXTRA_CONFIGURE_FLAGS
}