* Remove mapping for platform-dependent enum values in presets for…

… libffi (pull #1318)
bytedeco · Feb 1, 2023 · c5c7d4b · c5c7d4b
1 parent 1ca5630
commit c5c7d4b
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Remove mapping for platform-dependent `enum` values in presets for libffi ([pull #1318](https://github.com/bytedeco/javacpp-presets/pull/1318))
  * Fix mapping of `cv::fisheye::calibrate()` function from `opencv_calib3d` ([issue #1185](https://github.com/bytedeco/javacpp-presets/issues/1185))
  * Add an RPATH to the `tesseract` program to avoid loading issues ([issue #1314](https://github.com/bytedeco/javacpp-presets/issues/1314))
  * Bundle the CUPTI module of CUDA in the presets for PyTorch ([pull #1307](https://github.com/bytedeco/javacpp-presets/pull/1307))
@@ -13,7 +14,7 @@
  * Map `c10::impl::GenericDict` as returned by `c10::IValue::toGenericDict()` in presets for PyTorch
  * Introduce `linux-armhf` and `linux-x86` builds to presets for TensorFlow Lite ([pull #1268](https://github.com/bytedeco/javacpp-presets/pull/1268))
  * Add presets for LibRaw 0.20.2 ([pull #1211](https://github.com/bytedeco/javacpp-presets/pull/1211))
- * Upgrade presets for OpenCV 4.7.0, librealsense2 2.53.1 ([pull #1305](https://github.com/bytedeco/javacpp-presets/pull/1305)), DNNL 2.7.2, CPython 3.11.1, NumPy 1.24.0, SciPy 1.10.0, LLVM 15.0.6, Leptonica 1.83.0, Tesseract 5.3.0, PyTorch 1.13.1, TensorFlow Lite 2.11.0, DepthAI 2.19.1, and their dependencies
+ * Upgrade presets for OpenCV 4.7.0, Spinnaker 3.0.0.118 ([pull #1313](https://github.com/bytedeco/javacpp-presets/pull/1313)), librealsense2 2.53.1 ([pull #1305](https://github.com/bytedeco/javacpp-presets/pull/1305)), DNNL 2.7.2, CPython 3.11.1, NumPy 1.24.0, SciPy 1.10.0, LLVM 15.0.6, Leptonica 1.83.0, Tesseract 5.3.0, PyTorch 1.13.1, TensorFlow Lite 2.11.0, DepthAI 2.19.1, and their dependencies
 
 ### November 2, 2022 version 1.5.8
  * Fix mapping of `torch::ExpandingArrayWithOptionalElem` in presets for PyTorch ([issue #1250](https://github.com/bytedeco/javacpp-presets/issues/1250))

diff --git a/README.md b/README.md
@@ -186,7 +186,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * libfreenect 0.5.7  https://github.com/OpenKinect/libfreenect
  * libfreenect2 0.2.0  https://github.com/OpenKinect/libfreenect2
  * librealsense 1.12.x  https://github.com/IntelRealSense/librealsense
- * librealsense2 2.53.1  https://github.com/IntelRealSense/librealsense
+ * librealsense2 2.53.x  https://github.com/IntelRealSense/librealsense
  * videoInput 0.200  https://github.com/ofTheo/videoInput/
  * ARToolKitPlus 2.3.1  https://launchpad.net/artoolkitplus
  * Chilitags  https://github.com/chili-epfl/chilitags

diff --git a/libffi/src/gen/java/org/bytedeco/libffi/Fun_ffi_cif_Pointer_PointerPointer_Pointer.java b/libffi/src/gen/java/org/bytedeco/libffi/Fun_ffi_cif_Pointer_PointerPointer_Pointer.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.libffi;
 

diff --git a/libffi/src/gen/java/org/bytedeco/libffi/Fun_ffi_cif_Pointer_Pointer_Pointer.java b/libffi/src/gen/java/org/bytedeco/libffi/Fun_ffi_cif_Pointer_Pointer_Pointer.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.libffi;
 

diff --git a/libffi/src/gen/java/org/bytedeco/libffi/Fun_ffi_cif_Pointer_ffi_raw_Pointer.java b/libffi/src/gen/java/org/bytedeco/libffi/Fun_ffi_cif_Pointer_ffi_raw_Pointer.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.libffi;
 

diff --git a/libffi/src/gen/java/org/bytedeco/libffi/ffi_cif.java b/libffi/src/gen/java/org/bytedeco/libffi/ffi_cif.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.libffi;
 

diff --git a/libffi/src/gen/java/org/bytedeco/libffi/ffi_closure.java b/libffi/src/gen/java/org/bytedeco/libffi/ffi_closure.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.libffi;
 

diff --git a/libffi/src/gen/java/org/bytedeco/libffi/ffi_java_raw.java b/libffi/src/gen/java/org/bytedeco/libffi/ffi_java_raw.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.libffi;
 

diff --git a/libffi/src/gen/java/org/bytedeco/libffi/ffi_java_raw_closure.java b/libffi/src/gen/java/org/bytedeco/libffi/ffi_java_raw_closure.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.libffi;
 

diff --git a/libffi/src/gen/java/org/bytedeco/libffi/ffi_raw.java b/libffi/src/gen/java/org/bytedeco/libffi/ffi_raw.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.libffi;
 

diff --git a/libffi/src/gen/java/org/bytedeco/libffi/ffi_raw_closure.java b/libffi/src/gen/java/org/bytedeco/libffi/ffi_raw_closure.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.libffi;
 

diff --git a/libffi/src/gen/java/org/bytedeco/libffi/ffi_type.java b/libffi/src/gen/java/org/bytedeco/libffi/ffi_type.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.libffi;
 

diff --git a/libffi/src/gen/java/org/bytedeco/libffi/global/ffi.java b/libffi/src/gen/java/org/bytedeco/libffi/global/ffi.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.libffi.global;
 
@@ -83,23 +83,9 @@ a copy of this software and associated documentation files (the
 // #endif
 
 /** enum ffi_abi */
-public static final int
-// #if defined(X86_WIN64)
-
-// #elif defined(X86_64) || (defined (__x86_64__) && defined (X86_DARWIN))
+;
+public static native @MemberGetter int FFI_DEFAULT_ABI();
 
-// #elif defined(X86_WIN32)
-// #else
-  FFI_FIRST_ABI = 0,
-  FFI_SYSV      = 1,
-  FFI_THISCALL  = 3,
-  FFI_FASTCALL  = 4,
-  FFI_STDCALL   = 5,
-  FFI_PASCAL    = 6,
-  FFI_REGISTER  = 7,
-  FFI_MS_CDECL  = 8,
-  FFI_LAST_ABI = 9,
-  FFI_DEFAULT_ABI = FFI_SYSV;
 // #endif
 // #endif
 

diff --git a/libffi/src/main/java/org/bytedeco/libffi/presets/ffi.java b/libffi/src/main/java/org/bytedeco/libffi/presets/ffi.java
@@ -79,6 +79,9 @@ public void map(InfoMap infoMap) {
                .put(new Info("_ffi_type").pointerTypes("ffi_type"))
                .put(new Info("void (*)(void)").cast().pointerTypes("Pointer"))
                .put(new Info("__attribute__((deprecated))").annotations("@Deprecated"))
+               .put(new Info("FFI_FIRST_ABI", "FFI_SYSV", "FFI_THISCALL", "FFI_FASTCALL",
+                             "FFI_STDCALL", "FFI_PASCAL", "FFI_REGISTER", "FFI_MS_CDECL",
+                             "FFI_LAST_ABI", "FFI_DEFAULT_ABI").skip())
         ;
     }