Skip to content

Commit 3a23846

Browse files
committed
* Upgrade presets for FFmpeg 8.1
1 parent 0746d96 commit 3a23846

191 files changed

Lines changed: 703 additions & 291 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Add new `SampleOnnxMNIST` in samples for TensorRT ([pull #1742](https://github.com/bytedeco/javacpp-presets/pull/1742))
33
* Fix loading issues with `libomp.dylib` and `libiomp5.dylib` for DNNL and PyTorch on Mac
44
* Include `model_package_loader.h` header file in presets for PyTorch ([issue #1729](https://github.com/bytedeco/javacpp-presets/issues/1729))
5-
* Upgrade presets for LLVM 22.1.1, PyTorch 2.11.0, TensorFlow Lite 2.21.0, and their dependencies
5+
* Upgrade presets for FFmpeg 8.1, LLVM 22.1.1, PyTorch 2.11.0, TensorFlow Lite 2.21.0, and their dependencies
66
* Compile classes with `parameters` bumping minimum requirements to Java SE 8 and Android 7.0 ([issue #1739](https://github.com/bytedeco/javacpp-presets/issues/1739))
77

88
### February 22, 2026 version 1.5.13

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ The JavaCPP Presets depend on Maven, a powerful build system for Java, so before
181181
Each child module in turn relies by default on the included [`cppbuild.sh` scripts](#the-cppbuildsh-scripts), explained below, to install its corresponding native libraries in the `cppbuild` subdirectory. To use native libraries already installed somewhere else on the system, other installation directories than `cppbuild` can also be specified either in the `pom.xml` files or in the `.java` configuration files. The following versions are supported:
182182

183183
* OpenCV 4.13.x https://opencv.org/releases/
184-
* FFmpeg 8.0.x http://ffmpeg.org/download.html
184+
* FFmpeg 8.1.x http://ffmpeg.org/download.html
185185
* FlyCapture 2.13.x https://www.flir.com/products/flycapture-sdk
186186
* Spinnaker 4.0.x https://www.flir.com/products/spinnaker-sdk
187187
* libdc1394 2.2.6 http://sourceforge.net/projects/libdc1394/files/

ffmpeg/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Introduction
99
------------
1010
This directory contains the JavaCPP Presets module for:
1111

12-
* FFmpeg 8.0.1 http://ffmpeg.org/
12+
* FFmpeg 8.1 http://ffmpeg.org/
1313

1414
Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
1515

@@ -38,22 +38,22 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
3838
<modelVersion>4.0.0</modelVersion>
3939
<groupId>org.bytedeco.ffmpeg</groupId>
4040
<artifactId>readfewframe</artifactId>
41-
<version>1.5.13</version>
41+
<version>1.5.14-SNAPSHOT</version>
4242
<properties>
4343
<exec.mainClass>ReadFewFrame</exec.mainClass>
4444
</properties>
4545
<dependencies>
4646
<dependency>
4747
<groupId>org.bytedeco</groupId>
4848
<artifactId>ffmpeg-platform</artifactId>
49-
<version>8.0.1-1.5.13</version>
49+
<version>8.1-1.5.14-SNAPSHOT</version>
5050
</dependency>
5151

5252
<!-- Optional GPL builds with (almost) everything enabled -->
5353
<dependency>
5454
<groupId>org.bytedeco</groupId>
5555
<artifactId>ffmpeg-platform-gpl</artifactId>
56-
<version>8.0.1-1.5.13</version>
56+
<version>8.1-1.5.14-SNAPSHOT</version>
5757
</dependency>
5858
</dependencies>
5959
<build>

ffmpeg/cppbuild.sh

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ fi
2020
# DISABLE="--disable-iconv --disable-libxcb --disable-opencl --disable-sdl2 --disable-bzlib --disable-lzma --disable-linux-perf --disable-everything"
2121
# ENABLE="--enable-shared --enable-runtime-cpudetect --enable-libopenh264 --enable-encoder=libopenh264 --enable-encoder=aac --enable-encoder=mjpeg --enable-decoder=h264 --enable-decoder=aac --enable-decoder=mjpeg --enable-parser=h264 --enable-parser=aac --enable-parser=mjpeg --enable-muxer=mp4 --enable-muxer=rtsp --enable-muxer=mjpeg --enable-demuxer=mov --enable-demuxer=rtsp --enable-demuxer=mjpeg --enable-protocol=file --enable-protocol=http --enable-protocol=rtp --enable-protocol=rtmp"
2222

23-
HARFBUZZ_CONFIG="--default-library=static -Dcairo=disabled -Dchafa=disabled -Dcoretext=disabled -Ddirectwrite=disabled -Ddocs=disabled -Dfreetype=enabled -Dglib=disabled -Dgobject=disabled -Dgraphite=disabled -Dicu=disabled -Dtests=disabled -Dintrospection=disabled --libdir=lib --buildtype=release"
23+
HARFBUZZ_CONFIG="--default-library=static -Dcairo=disabled -Dchafa=disabled -Dcoretext=disabled -Ddirectwrite=disabled -Ddocs=disabled -Dfreetype=enabled -Dglib=disabled -Dgobject=disabled -Dgraphite=disabled -Dicu=disabled -Dtests=disabled -Dutilities=disabled -Dintrospection=disabled --libdir=lib --buildtype=release"
2424
LIBXML_CONFIG="--enable-static --disable-shared --without-iconv --without-python --without-lzma --with-pic"
2525
SRT_CONFIG="-DENABLE_APPS:BOOL=OFF -DENABLE_ENCRYPTION:BOOL=ON -DENABLE_SHARED:BOOL=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_INCLUDEDIR=include -DCMAKE_INSTALL_BINDIR=bin"
2626
WEBP_CONFIG="-DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_EXTRAS=OFF -DWEBP_BUILD_GIF2WEBP=OFF -DWEBP_BUILD_IMG2WEBP=OFF -DWEBP_BUILD_VWEBP=OFF -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_WEBPMUX=OFF -DWEBP_BUILD_WEBP_JS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_LIBDIR=lib"
2727
LIBAOM_CONFIG="-DENABLE_TESTS:BOOL=OFF -DENABLE_TESTDATA:BOOL=OFF -DENABLE_TOOLS:BOOL=OFF -DENABLE_EXAMPLES:BOOL=OFF -DENABLE_DOCS:BOOL=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_INCLUDEDIR=include -DCMAKE_INSTALL_BINDIR=bin"
2828
LIBSVTAV1_CONFIG="-DBUILD_APPS:BOOL=OFF -DBUILD_TESTING:BOOL=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_INCLUDEDIR=include -DCMAKE_INSTALL_BINDIR=bin"
2929

30-
NASM_VERSION=2.14
30+
NASM_VERSION=3.01
3131
ZLIB=zlib-1.3.2
3232
LAME=lame-3.100
3333
SPEEX=speex-1.2.1
@@ -38,20 +38,20 @@ OPENSSL=openssl-3.5.5
3838
OPENH264_VERSION=2.6.0
3939
X264=x264-stable
4040
X265=3.4
41-
VPX_VERSION=1.15.2
42-
ALSA_VERSION=1.2.14
43-
FREETYPE_VERSION=2.14.1
44-
HARFBUZZ_VERSION=12.3.0
41+
VPX_VERSION=1.16.0
42+
ALSA_VERSION=1.2.15.3
43+
FREETYPE_VERSION=2.14.3
44+
HARFBUZZ_VERSION=14.1.0
4545
MFX_VERSION=1.35.1
4646
NVCODEC_VERSION=13.0.19.0
4747
XML2=libxml2-2.9.12
4848
LIBSRT_VERSION=1.5.4
4949
WEBP_VERSION=1.6.0
50-
AOMAV1_VERSION=3.9.1
51-
SVTAV1_VERSION=3.1.2
50+
AOMAV1_VERSION=3.13.3
51+
SVTAV1_VERSION=4.1.0
5252
ZIMG_VERSION=3.0.6
53-
FFMPEG_VERSION=8.0.1
54-
download https://download.videolan.org/contrib/nasm/nasm-$NASM_VERSION.tar.gz nasm-$NASM_VERSION.tar.gz
53+
FFMPEG_VERSION=8.1
54+
download https://www.nasm.us/pub/nasm/releasebuilds/$NASM_VERSION/nasm-$NASM_VERSION.tar.gz nasm-$NASM_VERSION.tar.gz
5555
download https://zlib.net/$ZLIB.tar.gz $ZLIB.tar.gz
5656
download https://downloads.sourceforge.net/project/lame/lame/3.100/$LAME.tar.gz $LAME.tar.gz
5757
download https://ftp.osuosl.org/pub/xiph/releases/speex/$SPEEX.tar.gz $SPEEX.tar.gz
@@ -140,6 +140,7 @@ case $PLATFORM in
140140
export CC="$ANDROID_CC $ANDROID_FLAGS"
141141
export CXX="$ANDROID_CC++ $ANDROID_FLAGS"
142142
export STRIP="$ANDROID_PREFIX-strip"
143+
export PKG_CONFIG_LIBDIR=$PKG_CONFIG_PATH
143144
echo ""
144145
echo "--------------------"
145146
echo "Building zimg"
@@ -315,6 +316,7 @@ EOF
315316
export CC="$ANDROID_CC $ANDROID_FLAGS"
316317
export CXX="$ANDROID_CC++ $ANDROID_FLAGS"
317318
export STRIP="$ANDROID_PREFIX-strip"
319+
export PKG_CONFIG_LIBDIR=$PKG_CONFIG_PATH
318320
echo ""
319321
echo "--------------------"
320322
echo "Building zimg"
@@ -464,7 +466,7 @@ EOF
464466
cd ../libaom-$AOMAV1_VERSION
465467
mkdir -p build_release
466468
cd build_release
467-
$CMAKE -DCMAKE_TOOLCHAIN_FILE=${PLATFORM_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DANDROID_NATIVE_API_LEVEL=24 -DCMAKE_C_FLAGS="-I$INSTALL_PATH/include/" -DCMAKE_CXX_FLAGS="-I$INSTALL_PATH/include/" -DCMAKE_EXE_LINKER_FLAGS="-L$INSTALL_PATH/lib/" -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH $LIBAOM_CONFIG -DCONFIG_RUNTIME_CPU_DETECT:BOOL=OFF -DENABLE_NEON_I8MM=OFF ..
469+
$CMAKE -DCMAKE_TOOLCHAIN_FILE=${PLATFORM_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DANDROID_NATIVE_API_LEVEL=24 -DCMAKE_C_FLAGS="-I$INSTALL_PATH/include/" -DCMAKE_CXX_FLAGS="-I$INSTALL_PATH/include/" -DCMAKE_EXE_LINKER_FLAGS="-L$INSTALL_PATH/lib/" -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH $LIBAOM_CONFIG -DCONFIG_RUNTIME_CPU_DETECT:BOOL=OFF ..
468470
make -j $MAKEJ
469471
make install
470472
cd ..
@@ -488,6 +490,7 @@ EOF
488490
export CC="$ANDROID_CC $ANDROID_FLAGS"
489491
export CXX="$ANDROID_CC++ $ANDROID_FLAGS"
490492
export STRIP="$ANDROID_PREFIX-strip"
493+
export PKG_CONFIG_LIBDIR=$PKG_CONFIG_PATH
491494
echo ""
492495
echo "--------------------"
493496
echo "Building zimg"
@@ -658,6 +661,7 @@ EOF
658661
export CC="$ANDROID_CC $ANDROID_FLAGS"
659662
export CXX="$ANDROID_CC++ $ANDROID_FLAGS"
660663
export STRIP="$ANDROID_PREFIX-strip"
664+
export PKG_CONFIG_LIBDIR=$PKG_CONFIG_PATH
661665
echo ""
662666
echo "--------------------"
663667
echo "Building zimg"
@@ -1922,6 +1926,8 @@ EOF
19221926
echo "[binaries]" >> macos-arm.ini
19231927
echo "c = 'clang'" >> macos-arm.ini
19241928
echo "cpp = 'clang++'" >> macos-arm.ini
1929+
echo "objc = 'clang'" >> macos-arm.ini
1930+
echo "objcpp = 'clang++'" >> macos-arm.ini
19251931
echo "ar = 'ar'" >> macos-arm.ini
19261932
echo "windres = 'windres'" >> macos-arm.ini
19271933
echo "strip = 'strip'" >> macos-arm.ini
@@ -1930,6 +1936,8 @@ EOF
19301936
echo "[properties]" >> macos-arm.ini
19311937
echo "c_args = ['-arch', 'arm64']" >> macos-arm.ini
19321938
echo "cpp_args = ['-arch', 'arm64']" >> macos-arm.ini
1939+
echo "objc_args = ['-arch', 'arm64']" >> macos-arm.ini
1940+
echo "objcpp_args = ['-arch', 'arm64']" >> macos-arm.ini
19331941
echo "needs_exe_wrapper = true" >> macos-arm.ini
19341942
echo "[host_machine]" >> macos-arm.ini
19351943
echo "system = 'darwin'" >> macos-arm.ini
@@ -1944,7 +1952,7 @@ EOF
19441952
cd ../libaom-$AOMAV1_VERSION
19451953
mkdir -p build_release
19461954
cd build_release
1947-
CFLAGS="-I$INSTALL_PATH/include/" CXXFLAGS="-I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/" $CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_SYSTEM_VERSION=1 -DCMAKE_SYSTEM_PROCESSOR=armv8 -DCMAKE_CXX_FLAGS="$CXXFLAGS -fPIC" -DCMAKE_C_FLAGS="$CFLAGS -fPIC" -DCMAKE_C_COMPILER="clang" -DCMAKE_CXX_COMPILER="clang++" $LIBAOM_CONFIG -DAOM_ARCH_AARCH64=1 -DCONFIG_RUNTIME_CPU_DETECT:BOOL=OFF -DENABLE_NEON_I8MM=OFF ..
1955+
CFLAGS="-I$INSTALL_PATH/include/" CXXFLAGS="-I$INSTALL_PATH/include/" LDFLAGS="-L$INSTALL_PATH/lib/" $CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_SYSTEM_VERSION=1 -DCMAKE_SYSTEM_PROCESSOR=armv8 -DCMAKE_CXX_FLAGS="$CXXFLAGS -fPIC" -DCMAKE_C_FLAGS="$CFLAGS -fPIC" -DCMAKE_C_COMPILER="clang" -DCMAKE_CXX_COMPILER="clang++" $LIBAOM_CONFIG -DAOM_ARCH_AARCH64=1 -DCONFIG_RUNTIME_CPU_DETECT:BOOL=OFF ..
19481956
make -j $MAKEJ
19491957
make install
19501958
cd ..

0 commit comments

Comments
 (0)