* Upgrade presets for FFmpeg 7.1, CPython 3.13.0, LLVM 19.1.2

CHANGELOG.md

@@ -9,7 +9,7 @@
  * Build FFmpeg with zimg to enable zscale filter ([pull #1481](https://github.com/bytedeco/javacpp-presets/pull/1481))
  * Enable PulseAudio support for FFmpeg on Linux ([pull #1472](https://github.com/bytedeco/javacpp-presets/pull/1472))
  * Virtualize `btCollisionWorld`, `btOverlapFilterCallback`, `btOverlapCallback` from Bullet Physics SDK ([pull #1475](https://github.com/bytedeco/javacpp-presets/pull/1475))
- * 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
+ * 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
 
 ### January 29, 2024 version 1.5.10
  * Introduce `macosx-arm64` builds for PyTorch ([pull #1463](https://github.com/bytedeco/javacpp-presets/pull/1463))

README.md

@@ -180,7 +180,7 @@ The JavaCPP Presets depend on Maven, a powerful build system for Java, so before
 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:
 
  * OpenCV 4.10.x  https://opencv.org/releases/
- * FFmpeg 7.0.x  http://ffmpeg.org/download.html
+ * FFmpeg 7.1.x  http://ffmpeg.org/download.html
  * FlyCapture 2.13.x  https://www.flir.com/products/flycapture-sdk
  * Spinnaker 4.0.x https://www.flir.com/products/spinnaker-sdk
  * 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
  * CMINPACK 1.3.9  https://github.com/devernay/cminpack
  * FFTW 3.3.10  http://www.fftw.org/download.html
  * GSL 2.8  http://www.gnu.org/software/gsl/#downloading
- * CPython 3.12.x  https://www.python.org/downloads/
+ * CPython 3.13.x  https://www.python.org/downloads/
  * NumPy 2.1.x  https://github.com/numpy/numpy
  * SciPy 1.14.x  https://github.com/scipy/scipy
  * Gym 0.26.x  https://github.com/openai/gym
- * LLVM 18.1.x  http://llvm.org/releases/download.html
+ * LLVM 19.1.x  http://llvm.org/releases/download.html
  * libffi 3.4.x  https://github.com/libffi/libffi
  * libpostal 1.1  https://github.com/openvenues/libpostal
  * LibRaw 0.21.x  https://www.libraw.org/download

cpython/README.md

@@ -14,7 +14,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * CPython 3.12.7  https://www.python.org/
+ * CPython 3.13.0  https://www.python.org/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -54,7 +54,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cpython-platform</artifactId>
-            <version>3.12.7-1.5.11-SNAPSHOT</version>
+            <version>3.13.0-1.5.11-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

cpython/cppbuild.sh

@@ -8,7 +8,7 @@ if [[ -z "$PLATFORM" ]]; then
 fi
 
 OPENSSL=openssl-3.3.2
-CPYTHON_VERSION=3.12.7
+CPYTHON_VERSION=3.13.0
 download https://www.openssl.org/source/$OPENSSL.tar.gz $OPENSSL.tar.gz
 download https://www.python.org/ftp/python/$CPYTHON_VERSION/Python-$CPYTHON_VERSION.tgz Python-$CPYTHON_VERSION.tgz
 
@@ -179,7 +179,7 @@ case $PLATFORM in
         cp win32/*.dll win32/*.pyd ../../lib/
         cd ..
         cp -r Lib/* ../lib/
-        cp -r Include/* PC/pyconfig.h ../include/
+        cp -r Include/* PCbuild/win32/pyconfig.h ../include/
         unzip -o ../lib/ensurepip/_bundled/pip* -d ../lib/
         # unzip -o ../lib/ensurepip/_bundled/setuptools* -d ../lib/
         ;;
@@ -192,7 +192,7 @@ case $PLATFORM in
         cp amd64/*.dll amd64/*.pyd ../../lib/
         cd ..
         cp -r Lib/* ../lib/
-        cp -r Include/* PC/pyconfig.h ../include/
+        cp -r Include/* PCbuild/amd64/pyconfig.h ../include/
         unzip -o ../lib/ensurepip/_bundled/pip* -d ../lib/
         # unzip -o ../lib/ensurepip/_bundled/setuptools* -d ../lib/
         ;;

cpython/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>cpython-platform</artifactId>
-  <version>3.12.7-${project.parent.version}</version>
+  <version>3.13.0-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for CPython</name>
 
   <properties>

cpython/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>cpython</artifactId>
-  <version>3.12.7-${project.parent.version}</version>
+  <version>3.13.0-${project.parent.version}</version>
   <name>JavaCPP Presets for CPython</name>
 
   <dependencies>
@@ -35,7 +35,7 @@
         <configuration>
           <includePaths>
             <includePath>${basedir}/cppbuild/${javacpp.platform}/include/</includePath>
-            <includePath>${basedir}/cppbuild/${javacpp.platform}/include/python3.12/</includePath>
+            <includePath>${basedir}/cppbuild/${javacpp.platform}/include/python3.13/</includePath>
           </includePaths>
           <linkPaths>
             <linkPath>${basedir}/cppbuild/${javacpp.platform}/lib/</linkPath>

cpython/samples/pom.xml

@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cpython-platform</artifactId>
-            <version>3.12.7-1.5.11-SNAPSHOT</version>
+            <version>3.13.0-1.5.11-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

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

@@ -11,7 +11,6 @@
 import static org.bytedeco.cpython.global.python.*;
 
 
-// #if !defined(Py_LIMITED_API)
 @Properties(inherit = org.bytedeco.cpython.presets.python.class)
 public class PerfMapState extends Pointer {
     static { Loader.load(); }

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

@@ -11,6 +11,7 @@
 import static org.bytedeco.cpython.global.python.*;
 
 
+
 /* --- Unicode Type ------------------------------------------------------- */
 
 /* ASCII-only strings created through PyUnicode_New use the PyASCIIObject

cpython/src/gen/java/org/bytedeco/cpython/_PyCFunctionFast.java → cpython/src/gen/java/org/bytedeco/cpython/PyCFunctionFast.java

@@ -11,11 +11,11 @@
 import static org.bytedeco.cpython.global.python.*;
 
 @Properties(inherit = org.bytedeco.cpython.presets.python.class)
-public class _PyCFunctionFast extends FunctionPointer {
+public class PyCFunctionFast extends FunctionPointer {
     static { Loader.load(); }
     /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
-    public    _PyCFunctionFast(Pointer p) { super(p); }
-    protected _PyCFunctionFast() { allocate(); }
+    public    PyCFunctionFast(Pointer p) { super(p); }
+    protected PyCFunctionFast() { allocate(); }
     private native void allocate();
     public native PyObject call(PyObject arg0, @Cast("PyObject*const*") PointerPointer arg1, @Cast("Py_ssize_t") long arg2);
 }

cpython/src/gen/java/org/bytedeco/cpython/_PyCFunctionFastWithKeywords.java → cpython/src/gen/java/org/bytedeco/cpython/PyCFunctionFastWithKeywords.java

@@ -11,13 +11,13 @@
 import static org.bytedeco.cpython.global.python.*;
 
 @Properties(inherit = org.bytedeco.cpython.presets.python.class)
-public class _PyCFunctionFastWithKeywords extends FunctionPointer {
+public class PyCFunctionFastWithKeywords extends FunctionPointer {
     static { Loader.load(); }
     /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
-    public    _PyCFunctionFastWithKeywords(Pointer p) { super(p); }
-    protected _PyCFunctionFastWithKeywords() { allocate(); }
+    public    PyCFunctionFastWithKeywords(Pointer p) { super(p); }
+    protected PyCFunctionFastWithKeywords() { allocate(); }
     private native void allocate();
     public native PyObject call(PyObject arg0,
-                                                   @Cast("PyObject*const*") PointerPointer arg1, @Cast("Py_ssize_t") long arg2,
-                                                   PyObject arg3);
+                                                  @Cast("PyObject*const*") PointerPointer arg1, @Cast("Py_ssize_t") long arg2,
+                                                  PyObject arg3);
 }

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

@@ -83,8 +83,9 @@ public class PyCodeObject extends Pointer {
     public native PyObject co_qualname(); public native PyCodeObject co_qualname(PyObject setter);        /* unicode (qualname, for reference) */
     public native PyObject co_linetable(); public native PyCodeObject co_linetable(PyObject setter);       /* bytes object that holds location info */
     public native PyObject co_weakreflist(); public native PyCodeObject co_weakreflist(PyObject setter);     /* to support weakrefs to code objects */
+    public native _PyExecutorArray co_executors(); public native PyCodeObject co_executors(_PyExecutorArray setter);      /* executors from optimizer */
     public native _PyCoCached _co_cached(); public native PyCodeObject _co_cached(_PyCoCached setter);      /* cached co_* attributes */
-    public native @Cast("uint64_t") long _co_instrumentation_version(); public native PyCodeObject _co_instrumentation_version(long setter); /* current instrumentation version */
+    public native @Cast("uintptr_t") long _co_instrumentation_version(); public native PyCodeObject _co_instrumentation_version(long setter); /* current instrumentation version */
     public native _PyCoMonitoringData _co_monitoring(); public native PyCodeObject _co_monitoring(_PyCoMonitoringData setter); /* Monitoring data */
     public native int _co_firsttraceable(); public native PyCodeObject _co_firsttraceable(int setter);       /* index of first traceable instruction */
     /* Scratch space for extra data relating to the code object.               \

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

@@ -80,6 +80,10 @@ public class PyConfig extends Pointer {
     public native int safe_path(); public native PyConfig safe_path(int setter);
     public native int int_max_str_digits(); public native PyConfig int_max_str_digits(int setter);
 
+    public native int cpu_count(); public native PyConfig cpu_count(int setter);
+// #ifdef Py_GIL_DISABLED
+// #endif
+
     /* --- Path configuration inputs ------------ */
     public native int pathconfig_warnings(); public native PyConfig pathconfig_warnings(int setter);
     public native @Cast("wchar_t*") Pointer program_name(); public native PyConfig program_name(Pointer setter);
@@ -104,6 +108,9 @@ public class PyConfig extends Pointer {
     public native @Cast("wchar_t*") Pointer run_module(); public native PyConfig run_module(Pointer setter);
     public native @Cast("wchar_t*") Pointer run_filename(); public native PyConfig run_filename(Pointer setter);
 
+    /* --- Set by Py_Main() -------------------------- */
+    public native @Cast("wchar_t*") Pointer sys_path_0(); public native PyConfig sys_path_0(Pointer setter);
+
     /* --- Private fields ---------------------------- */
 
     // Install importlib? If equals to 0, importlib is not initialized at all.
@@ -115,4 +122,10 @@ public class PyConfig extends Pointer {
 
     // If non-zero, we believe we're running from a source tree.
     public native int _is_python_build(); public native PyConfig _is_python_build(int setter);
+
+// #ifdef Py_STATS
+// #endif
+
+// #ifdef Py_DEBUG
+// #endif
 }

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

@@ -0,0 +1,35 @@
+// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE
+
+package org.bytedeco.cpython;
+
+import java.nio.*;
+import org.bytedeco.javacpp.*;
+import org.bytedeco.javacpp.annotation.*;
+
+import static org.bytedeco.javacpp.presets.javacpp.*;
+
+import static org.bytedeco.cpython.global.python.*;
+
+
+
+@Properties(inherit = org.bytedeco.cpython.presets.python.class)
+public class PyFrameLocalsProxyObject extends Pointer {
+    static { Loader.load(); }
+    /** Default native constructor. */
+    public PyFrameLocalsProxyObject() { super((Pointer)null); allocate(); }
+    /** Native array allocator. Access with {@link Pointer#position(long)}. */
+    public PyFrameLocalsProxyObject(long size) { super((Pointer)null); allocateArray(size); }
+    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+    public PyFrameLocalsProxyObject(Pointer p) { super(p); }
+    private native void allocate();
+    private native void allocateArray(long size);
+    @Override public PyFrameLocalsProxyObject position(long position) {
+        return (PyFrameLocalsProxyObject)super.position(position);
+    }
+    @Override public PyFrameLocalsProxyObject getPointer(long i) {
+        return new PyFrameLocalsProxyObject((Pointer)this).offsetAddress(i);
+    }
+
+    public native @ByRef PyObject ob_base(); public native PyFrameLocalsProxyObject ob_base(PyObject setter);
+    public native PyFrameObject frame(); public native PyFrameLocalsProxyObject frame(PyFrameObject setter);
+}

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

@@ -11,9 +11,6 @@
 import static org.bytedeco.cpython.global.python.*;
 
 
-// #ifdef Py_DEBUG
-// #endif
-
 
 /* hash function definition */
 @Properties(inherit = org.bytedeco.cpython.presets.python.class)

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

@@ -12,6 +12,9 @@
 
 // #endif
 
+// #if !defined(Py_LIMITED_API) && defined(Py_GIL_DISABLED)
+// #endif
+
 @Properties(inherit = org.bytedeco.cpython.presets.python.class)
 public class PyModuleDef extends Pointer {
     static { Loader.load(); }

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

@@ -54,6 +54,6 @@ It is set by PyModuleDef_Init(). */
   /* A copy of the module's __dict__ after the first time it was loaded.
      This is only set/used for legacy modules that do not support
      multiple initializations.
-     It is set by _PyImport_FixupExtensionObject(). */
+     It is set by fix_up_extension() in import.c. */
   public native PyObject m_copy(); public native PyModuleDef_Base m_copy(PyObject setter);
 }

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

@@ -13,6 +13,7 @@
 
 // #endif /* !Py_BUILD_CORE */
 
+
 @Properties(inherit = org.bytedeco.cpython.presets.python.class)
 public class PyNumberMethods extends Pointer {
     static { Loader.load(); }

cpython/src/gen/java/org/bytedeco/cpython/xid_newobjectfunc.java → cpython/src/gen/java/org/bytedeco/cpython/PyRefTracer.java

@@ -12,11 +12,11 @@
 
 
 @Properties(inherit = org.bytedeco.cpython.presets.python.class)
-public class xid_newobjectfunc extends FunctionPointer {
+public class PyRefTracer extends FunctionPointer {
     static { Loader.load(); }
     /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
-    public    xid_newobjectfunc(Pointer p) { super(p); }
-    protected xid_newobjectfunc() { allocate(); }
+    public    PyRefTracer(Pointer p) { super(p); }
+    protected PyRefTracer() { allocate(); }
     private native void allocate();
-    public native PyObject call(_PyCrossInterpreterData arg0);
+    public native int call(PyObject arg0, @Cast("PyRefTracerEvent") int event, Pointer arg2);
 }