~mdw
/
termux-packages
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update libmpdclient url and fix libflac 1.3.2 update (#2268)
[termux-packages]
/
packages
/
ffmpeg
/
build.sh
diff --git
a/packages/ffmpeg/build.sh
b/packages/ffmpeg/build.sh
index
ae0545b
..
f92d4c2
100644
(file)
--- a/
packages/ffmpeg/build.sh
+++ b/
packages/ffmpeg/build.sh
@@
-1,20
+1,21
@@
TERMUX_PKG_HOMEPAGE=https://ffmpeg.org
TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multimedia formats and protocols"
# NOTE: mpv has to be rebuilt and version bumped after updating ffmpeg.
TERMUX_PKG_HOMEPAGE=https://ffmpeg.org
TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multimedia formats and protocols"
# NOTE: mpv has to be rebuilt and version bumped after updating ffmpeg.
-TERMUX_PKG_VERSION=3.2.1
+TERMUX_PKG_VERSION=3.4.2
+TERMUX_PKG_SHA256=2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740
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=1ecf93da5d601e6fb3096c65cbe33fdaf042d690a3c50c4efadb0a9b74f2badf
-TERMUX_PKG_FOLDERNAME=ffmpeg-$TERMUX_PKG_VERSION
# libbz2 is used by matroska decoder:
# libvpx is the VP8 & VP9 video encoder for WebM, see
# https://trac.ffmpeg.org/wiki/Encode/VP8 and https://trac.ffmpeg.org/wiki/Encode/VP9
# libbz2 is used by matroska decoder:
# libvpx is the VP8 & VP9 video encoder for WebM, see
# https://trac.ffmpeg.org/wiki/Encode/VP8 and https://trac.ffmpeg.org/wiki/Encode/VP9
-TERMUX_PKG_DEPENDS="
openssl, libbz2, libx264, xvidcore, libvorbis, libmp3lame, libopus, libvpx
"
+TERMUX_PKG_DEPENDS="
libbz2, libsoxr, libx264, libx265, xvidcore, libvorbis, libmp3lame, libopus, libvpx, libgnutls, libandroid-glob
"
TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples"
TERMUX_PKG_CONFLICTS="libav"
termux_step_configure () {
cd $TERMUX_PKG_BUILDDIR
TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples"
TERMUX_PKG_CONFLICTS="libav"
termux_step_configure () {
cd $TERMUX_PKG_BUILDDIR
+ export ASFLAGS="-no-integrated-as"
+
local _EXTRA_CONFIGURE_FLAGS=""
if [ $TERMUX_ARCH = "arm" ]; then
_ARCH="armeabi-v7a"
local _EXTRA_CONFIGURE_FLAGS=""
if [ $TERMUX_ARCH = "arm" ]; then
_ARCH="armeabi-v7a"
@@
-30,8
+31,7
@@
termux_step_configure () {
_ARCH=$TERMUX_ARCH
_EXTRA_CONFIGURE_FLAGS="--enable-neon"
else
_ARCH=$TERMUX_ARCH
_EXTRA_CONFIGURE_FLAGS="--enable-neon"
else
- echo "Unsupported arch $TERMUX_ARCH"
- exit 1
+ termux_error_exit "Unsupported arch: $TERMUX_ARCH"
fi
# --disable-lzma to avoid problem with shared library clashes, see
fi
# --disable-lzma to avoid problem with shared library clashes, see
@@
-39,6
+39,9
@@
termux_step_configure () {
# Only used for LZMA compression support for tiff decoder.
$TERMUX_PKG_SRCDIR/configure \
--arch=${_ARCH} \
# Only used for LZMA compression support for tiff decoder.
$TERMUX_PKG_SRCDIR/configure \
--arch=${_ARCH} \
+ --as=$AS \
+ --cc=$CC \
+ --cxx=$CXX \
--cross-prefix=${TERMUX_HOST_PLATFORM}- \
--disable-avdevice \
--disable-ffserver \
--cross-prefix=${TERMUX_HOST_PLATFORM}- \
--disable-avdevice \
--disable-ffserver \
@@
-46,18
+49,20
@@
termux_step_configure () {
--disable-symver \
--disable-lzma \
--enable-cross-compile \
--disable-symver \
--disable-lzma \
--enable-cross-compile \
+ --enable-gnutls \
--enable-gpl \
--enable-libmp3lame \
--enable-libvorbis \
--enable-libopus \
--enable-libx264 \
--enable-gpl \
--enable-libmp3lame \
--enable-libvorbis \
--enable-libopus \
--enable-libx264 \
+ --enable-libx265 \
--enable-libxvid \
--enable-libvpx \
--enable-libxvid \
--enable-libvpx \
- --enable-nonfree \
- --enable-openssl \
--enable-shared \
--enable-shared \
+ --enable-libsoxr \
--prefix=$TERMUX_PREFIX \
--target-os=android \
--prefix=$TERMUX_PREFIX \
--target-os=android \
+ --extra-libs="-landroid-glob" \
$_EXTRA_CONFIGURE_FLAGS
}
$_EXTRA_CONFIGURE_FLAGS
}