Skip to content

Commit 59c6d01

Browse files
committed
* Upgrade presets for FFmpeg 7.1, CPython 3.13.0, LLVM 19.1.2
1 parent e78462c commit 59c6d01

File tree

112 files changed

+2865
-3654
lines changed

Some content is hidden

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

112 files changed

+2865
-3654
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Build FFmpeg with zimg to enable zscale filter ([pull #1481](https://github.com/bytedeco/javacpp-presets/pull/1481))
1010
* Enable PulseAudio support for FFmpeg on Linux ([pull #1472](https://github.com/bytedeco/javacpp-presets/pull/1472))
1111
* Virtualize `btCollisionWorld`, `btOverlapFilterCallback`, `btOverlapCallback` from Bullet Physics SDK ([pull #1475](https://github.com/bytedeco/javacpp-presets/pull/1475))
12-
* Upgrade presets for OpenCV 4.10.0, FFmpeg 7.0.2, Spinnaker 4.0.0.116 ([pull #1524](https://github.com/bytedeco/javacpp-presets/pull/1524)), DNNL 3.5.3, OpenBLAS 0.3.28, CMINPACK 1.3.9, GSL 2.8, CPython 3.12.7, NumPy 2.1.2, SciPy 1.14.1, LLVM 18.1.8, LibRaw 0.21.2 ([pull #1520](https://github.com/bytedeco/javacpp-presets/pull/1520)), Tesseract 5.4.1, libffi 3.4.6, CUDA 12.6.0, cuDNN 9.3.0, NCCL 2.22.3, nvCOMP 4.0.0, OpenCL 3.0.16, NVIDIA Video Codec SDK 12.2.72, PyTorch 2.4.0 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)), SentencePiece 0.2.0, TensorFlow Lite 2.17.0, TensorRT 10.3.0.26, Triton Inference Server 2.48.0, ONNX 1.17.0, ONNX Runtime 1.19.2, TVM 0.17.0, and their dependencies
12+
* Upgrade presets for OpenCV 4.10.0, FFmpeg 7.1, Spinnaker 4.0.0.116 ([pull #1524](https://github.com/bytedeco/javacpp-presets/pull/1524)), DNNL 3.5.3, OpenBLAS 0.3.28, CMINPACK 1.3.9, GSL 2.8, CPython 3.13.0, NumPy 2.1.2, SciPy 1.14.1, LLVM 19.1.2, LibRaw 0.21.2 ([pull #1520](https://github.com/bytedeco/javacpp-presets/pull/1520)), Tesseract 5.4.1, libffi 3.4.6, CUDA 12.6.0, cuDNN 9.3.0, NCCL 2.22.3, nvCOMP 4.0.0, OpenCL 3.0.16, NVIDIA Video Codec SDK 12.2.72, PyTorch 2.4.0 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)), SentencePiece 0.2.0, TensorFlow Lite 2.17.0, TensorRT 10.3.0.26, Triton Inference Server 2.48.0, ONNX 1.17.0, ONNX Runtime 1.19.2, TVM 0.17.0, and their dependencies
1313

1414
### January 29, 2024 version 1.5.10
1515
* Introduce `macosx-arm64` builds for PyTorch ([pull #1463](https://github.com/bytedeco/javacpp-presets/pull/1463))

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ The JavaCPP Presets depend on Maven, a powerful build system for Java, so before
180180
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:
181181

182182
* OpenCV 4.10.x https://opencv.org/releases/
183-
* FFmpeg 7.0.x http://ffmpeg.org/download.html
183+
* FFmpeg 7.1.x http://ffmpeg.org/download.html
184184
* FlyCapture 2.13.x https://www.flir.com/products/flycapture-sdk
185185
* Spinnaker 4.0.x https://www.flir.com/products/spinnaker-sdk
186186
* libdc1394 2.2.6 http://sourceforge.net/projects/libdc1394/files/
@@ -204,11 +204,11 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
204204
* CMINPACK 1.3.9 https://github.com/devernay/cminpack
205205
* FFTW 3.3.10 http://www.fftw.org/download.html
206206
* GSL 2.8 http://www.gnu.org/software/gsl/#downloading
207-
* CPython 3.12.x https://www.python.org/downloads/
207+
* CPython 3.13.x https://www.python.org/downloads/
208208
* NumPy 2.1.x https://github.com/numpy/numpy
209209
* SciPy 1.14.x https://github.com/scipy/scipy
210210
* Gym 0.26.x https://github.com/openai/gym
211-
* LLVM 18.1.x http://llvm.org/releases/download.html
211+
* LLVM 19.1.x http://llvm.org/releases/download.html
212212
* libffi 3.4.x https://github.com/libffi/libffi
213213
* libpostal 1.1 https://github.com/openvenues/libpostal
214214
* LibRaw 0.21.x https://www.libraw.org/download

cpython/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Introduction
1414
------------
1515
This directory contains the JavaCPP Presets module for:
1616

17-
* CPython 3.12.7 https://www.python.org/
17+
* CPython 3.13.0 https://www.python.org/
1818

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

@@ -54,7 +54,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
5454
<dependency>
5555
<groupId>org.bytedeco</groupId>
5656
<artifactId>cpython-platform</artifactId>
57-
<version>3.12.7-1.5.11-SNAPSHOT</version>
57+
<version>3.13.0-1.5.11-SNAPSHOT</version>
5858
</dependency>
5959
</dependencies>
6060
<build>

cpython/cppbuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if [[ -z "$PLATFORM" ]]; then
88
fi
99

1010
OPENSSL=openssl-3.3.2
11-
CPYTHON_VERSION=3.12.7
11+
CPYTHON_VERSION=3.13.0
1212
download https://www.openssl.org/source/$OPENSSL.tar.gz $OPENSSL.tar.gz
1313
download https://www.python.org/ftp/python/$CPYTHON_VERSION/Python-$CPYTHON_VERSION.tgz Python-$CPYTHON_VERSION.tgz
1414

cpython/platform/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>cpython-platform</artifactId>
15-
<version>3.12.7-${project.parent.version}</version>
15+
<version>3.13.0-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for CPython</name>
1717

1818
<properties>

cpython/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>org.bytedeco</groupId>
1313
<artifactId>cpython</artifactId>
14-
<version>3.12.7-${project.parent.version}</version>
14+
<version>3.13.0-${project.parent.version}</version>
1515
<name>JavaCPP Presets for CPython</name>
1616

1717
<dependencies>
@@ -35,7 +35,7 @@
3535
<configuration>
3636
<includePaths>
3737
<includePath>${basedir}/cppbuild/${javacpp.platform}/include/</includePath>
38-
<includePath>${basedir}/cppbuild/${javacpp.platform}/include/python3.12/</includePath>
38+
<includePath>${basedir}/cppbuild/${javacpp.platform}/include/python3.13/</includePath>
3939
</includePaths>
4040
<linkPaths>
4141
<linkPath>${basedir}/cppbuild/${javacpp.platform}/lib/</linkPath>

cpython/samples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<dependency>
1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>cpython-platform</artifactId>
15-
<version>3.12.7-1.5.11-SNAPSHOT</version>
15+
<version>3.13.0-1.5.11-SNAPSHOT</version>
1616
</dependency>
1717
</dependencies>
1818
<build>

cpython/src/gen/java/org/bytedeco/cpython/Innerfunc_BytePointer_long_Pointer.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

cpython/src/gen/java/org/bytedeco/cpython/Innerfunc_String_long_Pointer.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

cpython/src/gen/java/org/bytedeco/cpython/PerfMapState.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import static org.bytedeco.cpython.global.python.*;
1212

1313

14-
// #if !defined(Py_LIMITED_API)
1514
@Properties(inherit = org.bytedeco.cpython.presets.python.class)
1615
public class PerfMapState extends Pointer {
1716
static { Loader.load(); }

0 commit comments

Comments
 (0)