~mdw
/
termux-packages
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
termux_step_configure: Use https
[termux-packages]
/
packages
/
ffmpeg
/
build.sh
diff --git
a/packages/ffmpeg/build.sh
b/packages/ffmpeg/build.sh
index
192959e
..
a3de01c
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.5
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=49cc3105f7891c5637f8fabb1b75ebb19c9b5123b311a3ccc6182aa35d58b89a
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, libmp3lame, liblzma
"
+TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, xvidcore, libvorbis, lib
mp3lame, libopus
"
TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples"
TERMUX_PKG_CONFLICTS="libav"
TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples"
TERMUX_PKG_CONFLICTS="libav"
@@
-31,25
+31,29
@@
termux_step_configure () {
exit 1
fi
exit 1
fi
+ # --disable-lzma to avoid problem with shared library clashes, see
+ # https://github.com/termux/termux-packages/issues/511
+ # Only used for LZMA compression support for tiff decoder.
$TERMUX_PKG_SRCDIR/configure \
--arch=${_ARCH} \
--cross-prefix=${TERMUX_HOST_PLATFORM}- \
--disable-avdevice \
--disable-ffserver \
--disable-static \
$TERMUX_PKG_SRCDIR/configure \
--arch=${_ARCH} \
--cross-prefix=${TERMUX_HOST_PLATFORM}- \
--disable-avdevice \
--disable-ffserver \
--disable-static \
- --disable-symver \
+ --disable-symver \
+ --disable-lzma \
--enable-cross-compile \
--enable-gpl \
--enable-libmp3lame \
--enable-cross-compile \
--enable-gpl \
--enable-libmp3lame \
- --enable-libfaac \
--enable-libvorbis \
--enable-libvorbis \
+ --enable-libopus \
--enable-libx264 \
--enable-libxvid \
--enable-nonfree \
--enable-openssl \
--enable-shared \
--prefix=$TERMUX_PREFIX \
--enable-libx264 \
--enable-libxvid \
--enable-nonfree \
--enable-openssl \
--enable-shared \
--prefix=$TERMUX_PREFIX \
- --target-os=
linux
\
+ --target-os=
android
\
$_EXTRA_CONFIGURE_FLAGS
}
$_EXTRA_CONFIGURE_FLAGS
}