install_deps: Add handling of libaom, update ffmpeg build for it.
Ref T98555.
This commit is contained in:
parent
065dfe744c
commit
1665e40e16
|
@ -627,6 +627,9 @@ WEBP_DEV=""
|
||||||
VPX_USE=false
|
VPX_USE=false
|
||||||
VPX_VERSION_MIN=0.9.7
|
VPX_VERSION_MIN=0.9.7
|
||||||
VPX_DEV=""
|
VPX_DEV=""
|
||||||
|
AOM_USE=false
|
||||||
|
AOM_VERSION_MIN=3.3.0
|
||||||
|
AOM_DEV=""
|
||||||
OPUS_USE=false
|
OPUS_USE=false
|
||||||
OPUS_VERSION_MIN=1.1.1
|
OPUS_VERSION_MIN=1.1.1
|
||||||
OPUS_DEV=""
|
OPUS_DEV=""
|
||||||
|
@ -1209,7 +1212,7 @@ You may also want to build them yourself (optional ones are [between brackets]):
|
||||||
** [NumPy $PYTHON_NUMPY_VERSION] (use pip).
|
** [NumPy $PYTHON_NUMPY_VERSION] (use pip).
|
||||||
* Boost $BOOST_VERSION (from $BOOST_SOURCE, modules: $BOOST_BUILD_MODULES).
|
* Boost $BOOST_VERSION (from $BOOST_SOURCE, modules: $BOOST_BUILD_MODULES).
|
||||||
* TBB $TBB_VERSION (from $TBB_SOURCE).
|
* TBB $TBB_VERSION (from $TBB_SOURCE).
|
||||||
* [FFMpeg $FFMPEG_VERSION (needs libvorbis, libogg, libtheora, libx264, libmp3lame, libxvidcore, libvpx, libwebp, ...)] (from $FFMPEG_SOURCE).
|
* [FFMpeg $FFMPEG_VERSION (needs libvorbis, libogg, libtheora, libx264, libmp3lame, libxvidcore, libvpx, libaom, libwebp, ...)] (from $FFMPEG_SOURCE).
|
||||||
* [OpenColorIO $OCIO_VERSION] (from $OCIO_SOURCE).
|
* [OpenColorIO $OCIO_VERSION] (from $OCIO_SOURCE).
|
||||||
* Imath $IMATH_VERSION (from $IMATH_SOURCE).
|
* Imath $IMATH_VERSION (from $IMATH_SOURCE).
|
||||||
* OpenEXR $OPENEXR_VERSION (from $OPENEXR_SOURCE).
|
* OpenEXR $OPENEXR_VERSION (from $OPENEXR_SOURCE).
|
||||||
|
@ -3634,7 +3637,7 @@ compile_FFmpeg() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# To be changed each time we make edits that would modify the compiled result!
|
# To be changed each time we make edits that would modify the compiled result!
|
||||||
ffmpeg_magic=5
|
ffmpeg_magic=6
|
||||||
_init_ffmpeg
|
_init_ffmpeg
|
||||||
|
|
||||||
# Force having own builds for the dependencies.
|
# Force having own builds for the dependencies.
|
||||||
|
@ -3687,6 +3690,10 @@ compile_FFmpeg() {
|
||||||
extra="$extra --enable-libvpx"
|
extra="$extra --enable-libvpx"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$AOM_USE" = true ]; then
|
||||||
|
extra="$extra --enable-libaom"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ "$WEBP_USE" = true ]; then
|
if [ "$WEBP_USE" = true ]; then
|
||||||
extra="$extra --enable-libwebp"
|
extra="$extra --enable-libwebp"
|
||||||
fi
|
fi
|
||||||
|
@ -4140,30 +4147,34 @@ install_DEB() {
|
||||||
WEBP_USE=true
|
WEBP_USE=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$WITH_ALL" = true ]; then
|
XVID_DEV="libxvidcore-dev"
|
||||||
XVID_DEV="libxvidcore-dev"
|
check_package_DEB $XVID_DEV
|
||||||
check_package_DEB $XVID_DEV
|
if [ $? -eq 0 ]; then
|
||||||
if [ $? -eq 0 ]; then
|
XVID_USE=true
|
||||||
XVID_USE=true
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
MP3LAME_DEV="libmp3lame-dev"
|
MP3LAME_DEV="libmp3lame-dev"
|
||||||
check_package_DEB $MP3LAME_DEV
|
check_package_DEB $MP3LAME_DEV
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
MP3LAME_USE=true
|
MP3LAME_USE=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
VPX_DEV="libvpx-dev"
|
VPX_DEV="libvpx-dev"
|
||||||
check_package_version_ge_DEB $VPX_DEV $VPX_VERSION_MIN
|
check_package_version_ge_DEB $VPX_DEV $VPX_VERSION_MIN
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
VPX_USE=true
|
VPX_USE=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
OPUS_DEV="libopus-dev"
|
AOM_DEV="libaom-dev"
|
||||||
check_package_version_ge_DEB $OPUS_DEV $OPUS_VERSION_MIN
|
check_package_version_ge_DEB $AOM_DEV $AOM_VERSION_MIN
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
OPUS_USE=true
|
AOM_USE=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
OPUS_DEV="libopus-dev"
|
||||||
|
check_package_version_ge_DEB $OPUS_DEV $OPUS_VERSION_MIN
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
OPUS_USE=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check cmake version and disable features for older distros.
|
# Check cmake version and disable features for older distros.
|
||||||
|
@ -4546,6 +4557,9 @@ install_DEB() {
|
||||||
if [ "$VPX_USE" = true ]; then
|
if [ "$VPX_USE" = true ]; then
|
||||||
_packages="$_packages $VPX_DEV"
|
_packages="$_packages $VPX_DEV"
|
||||||
fi
|
fi
|
||||||
|
if [ "$AOM_USE" = true ]; then
|
||||||
|
_packages="$_packages $AOM_DEV"
|
||||||
|
fi
|
||||||
if [ "$OPUS_USE" = true ]; then
|
if [ "$OPUS_USE" = true ]; then
|
||||||
_packages="$_packages $OPUS_DEV"
|
_packages="$_packages $OPUS_DEV"
|
||||||
fi
|
fi
|
||||||
|
@ -4846,21 +4860,27 @@ install_RPM() {
|
||||||
WEBP_USE=true
|
WEBP_USE=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$WITH_ALL" = true ]; then
|
VPX_DEV="libvpx-devel"
|
||||||
VPX_DEV="libvpx-devel"
|
check_package_version_ge_RPM $VPX_DEV $VPX_VERSION_MIN
|
||||||
check_package_version_ge_RPM $VPX_DEV $VPX_VERSION_MIN
|
if [ $? -eq 0 ]; then
|
||||||
if [ $? -eq 0 ]; then
|
VPX_USE=true
|
||||||
VPX_USE=true
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
|
AOM_DEV="libaom-devel"
|
||||||
|
check_package_version_ge_RPM $AOM_DEV $AOM_VERSION_MIN
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
AOM_USE=true
|
||||||
|
fi
|
||||||
|
|
||||||
|
OPUS_DEV="libopus-devel"
|
||||||
|
check_package_version_ge_RPM $OPUS_DEV $OPUS_VERSION_MIN
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
OPUS_USE=true
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$WITH_ALL" = true ]; then
|
||||||
PRINT ""
|
PRINT ""
|
||||||
install_packages_RPM libspnav-devel
|
install_packages_RPM libspnav-devel
|
||||||
|
|
||||||
OPUS_DEV="libopus-devel"
|
|
||||||
check_package_version_ge_RPM $OPUS_DEV $OPUS_VERSION_MIN
|
|
||||||
if [ $? -eq 0 ]; then
|
|
||||||
OPUS_USE=true
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PRINT ""
|
PRINT ""
|
||||||
|
@ -5245,6 +5265,9 @@ install_RPM() {
|
||||||
if [ "$VPX_USE" = true ]; then
|
if [ "$VPX_USE" = true ]; then
|
||||||
_packages="$_packages $VPX_DEV"
|
_packages="$_packages $VPX_DEV"
|
||||||
fi
|
fi
|
||||||
|
if [ "$AOM_USE" = true ]; then
|
||||||
|
_packages="$_packages $AOM_DEV"
|
||||||
|
fi
|
||||||
if [ "$OPUS_USE" = true ]; then
|
if [ "$OPUS_USE" = true ]; then
|
||||||
_packages="$_packages $OPUS_DEV"
|
_packages="$_packages $OPUS_DEV"
|
||||||
fi
|
fi
|
||||||
|
@ -5434,30 +5457,34 @@ install_ARCH() {
|
||||||
WEBP_USE=true
|
WEBP_USE=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$WITH_ALL" = true ]; then
|
XVID_DEV="xvidcore"
|
||||||
XVID_DEV="xvidcore"
|
check_package_ARCH $XVID_DEV
|
||||||
check_package_ARCH $XVID_DEV
|
if [ $? -eq 0 ]; then
|
||||||
if [ $? -eq 0 ]; then
|
XVID_USE=true
|
||||||
XVID_USE=true
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
MP3LAME_DEV="lame"
|
MP3LAME_DEV="lame"
|
||||||
check_package_ARCH $MP3LAME_DEV
|
check_package_ARCH $MP3LAME_DEV
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
MP3LAME_USE=true
|
MP3LAME_USE=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
VPX_DEV="libvpx"
|
VPX_DEV="libvpx"
|
||||||
check_package_version_ge_ARCH $VPX_DEV $VPX_VERSION_MIN
|
check_package_version_ge_ARCH $VPX_DEV $VPX_VERSION_MIN
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
VPX_USE=true
|
VPX_USE=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
OPUS_DEV="opus"
|
AOM_DEV="libaom"
|
||||||
check_package_version_ge_ARCH $OPUS_DEV $OPUS_VERSION_MIN
|
check_package_version_ge_ARCH $AOM_DEV $AOM_VERSION_MIN
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
OPUS_USE=true
|
AOM_USE=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
OPUS_DEV="opus"
|
||||||
|
check_package_version_ge_ARCH $OPUS_DEV $OPUS_VERSION_MIN
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
OPUS_USE=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
@ -5835,6 +5862,9 @@ install_ARCH() {
|
||||||
if [ "$VPX_USE" = true ]; then
|
if [ "$VPX_USE" = true ]; then
|
||||||
_packages="$_packages $VPX_DEV"
|
_packages="$_packages $VPX_DEV"
|
||||||
fi
|
fi
|
||||||
|
if [ "$AOM_USE" = true ]; then
|
||||||
|
_packages="$_packages $AOM_DEV"
|
||||||
|
fi
|
||||||
if [ "$OPUS_USE" = true ]; then
|
if [ "$OPUS_USE" = true ]; then
|
||||||
_packages="$_packages $OPUS_DEV"
|
_packages="$_packages $OPUS_DEV"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue