Skip to content

Commit 56fce74

Browse files
saudetsaudet
committed
Merge remote-tracking branch 'upstream/master' into Spinnaker_4.0.0.116
2 parents 38d9b73 + c99e105 commit 56fce74

File tree

69 files changed

+388
-142
lines changed

Some content is hidden

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

69 files changed

+388
-142
lines changed

‎.github/workflows/libraw.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@ env:
1919
jobs:
2020
linux-x86_64:
2121
runs-on: ubuntu-20.04
22-
container: centos:7
2322
steps:
24-
- uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
23+
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
2524
macosx-arm64:
26-
runs-on: macos-11
25+
runs-on: macos-14
2726
steps:
2827
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
2928
macosx-x86_64:
30-
runs-on: macos-11
29+
runs-on: macos-12
3130
steps:
3231
- uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
3332
windows-x86_64:

‎CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11

2+
* Add new `ClangMemoryMgmtExample` in samples for LLVM ([pull #1522](https://github.com/bytedeco/javacpp-presets/pull/1522))
23
* Enable `opencv_python3` module for `macosx-arm64` as well ([pull #1517](https://github.com/bytedeco/javacpp-presets/pull/1517))
34
* Introduce `macosx-arm64` builds for CPython ([pull #1511](https://github.com/bytedeco/javacpp-presets/pull/1511)), NumPy ([pull #1515](https://github.com/bytedeco/javacpp-presets/pull/1515)), SciPy ([pull #1516](https://github.com/bytedeco/javacpp-presets/pull/1516))
45
* Update and fix the sample code of the presets for LLVM ([pull #1501](https://github.com/bytedeco/javacpp-presets/pull/1501))
56
* Fix Vulkan GPU acceleration for FFmpeg ([pull #1497](https://github.com/bytedeco/javacpp-presets/pull/1497))
67
* Build FFmpeg with zimg to enable zscale filter ([pull #1481](https://github.com/bytedeco/javacpp-presets/pull/1481))
78
* Enable PulseAudio support for FFmpeg on Linux ([pull #1472](https://github.com/bytedeco/javacpp-presets/pull/1472))
89
* Virtualize `btCollisionWorld`, `btOverlapFilterCallback`, `btOverlapCallback` from Bullet Physics SDK ([pull #1475](https://github.com/bytedeco/javacpp-presets/pull/1475))
9-
* Upgrade presets for OpenCV 4.10.0, FFmpeg 7.0, DNNL 3.4.1, OpenBLAS 0.3.27, CMINPACK 1.3.9, GSL 2.8, CPython 3.12.4, NumPy 2.0.0, SciPy 1.14.0, LLVM 18.1.4, Tesseract 5.4.1, libffi 3.4.6, PyTorch 2.3.0 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)), SentencePiece 0.2.0, TensorFlow Lite 2.16.1, TensorRT 10.0.1.6, Triton Inference Server 2.44.0, ONNX 1.16.1, ONNX Runtime 1.18.0, TVM 0.16.0, and their dependencies
10+
* Upgrade presets for OpenCV 4.10.0, FFmpeg 7.0, DNNL 3.4.1, OpenBLAS 0.3.27, CMINPACK 1.3.9, GSL 2.8, CPython 3.12.4, NumPy 2.0.0, SciPy 1.14.0, LLVM 18.1.4, LibRaw 0.21.2 ([pull #1520](https://github.com/bytedeco/javacpp-presets/pull/1520)), Tesseract 5.4.1, libffi 3.4.6, PyTorch 2.3.0 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)), SentencePiece 0.2.0, TensorFlow Lite 2.16.1, TensorRT 10.0.1.6, Triton Inference Server 2.44.0, ONNX 1.16.1, ONNX Runtime 1.18.0, TVM 0.16.0, and their dependencies
1011

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

‎libraw/README.md

Lines changed: 3 additions & 3 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-
* LibRaw 0.21.1 https://www.libraw.org/
12+
* LibRaw 0.21.2 https://www.libraw.org/
1313

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

@@ -38,15 +38,15 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
3838
<modelVersion>4.0.0</modelVersion>
3939
<groupId>org.bytedeco.libraw</groupId>
4040
<artifactId>librawdemo</artifactId>
41-
<version>1.5.9</version>
41+
<version>1.5.11-SNAPSHOT</version>
4242
<properties>
4343
<exec.mainClass>LibRawDemo</exec.mainClass>
4444
</properties>
4545
<dependencies>
4646
<dependency>
4747
<groupId>org.bytedeco</groupId>
4848
<artifactId>libraw-platform</artifactId>
49-
<version>0.21.1-1.5.9</version>
49+
<version>0.21.2-1.5.11-SNAPSHOT</version>
5050
</dependency>
5151
</dependencies>
5252
<build>

‎libraw/cppbuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fi
99

1010
# Compilation instructions at https://www.libraw.org/docs/Install-LibRaw.html
1111

12-
LIBRAW_VERSION=0.21.1
12+
LIBRAW_VERSION=0.21.2
1313
download https://github.com/LibRaw/LibRaw/archive/refs/tags/$LIBRAW_VERSION.zip LibRaw-$LIBRAW_VERSION.zip
1414
unzip -o LibRaw-$LIBRAW_VERSION.zip
1515

‎libraw/platform/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<parent>
77
<groupId>org.bytedeco</groupId>
88
<artifactId>javacpp-presets</artifactId>
9-
<version>1.5.9</version>
9+
<version>1.5.11-SNAPSHOT</version>
1010
<relativePath>../../</relativePath>
1111
</parent>
1212

1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>libraw-platform</artifactId>
15-
<version>0.21.1-${project.parent.version}</version>
15+
<version>0.21.2-${project.parent.version}</version>
1616
<name>JavaCPP Presets Platform for LibRaw</name>
1717

1818
<properties>

‎libraw/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<parent>
77
<groupId>org.bytedeco</groupId>
88
<artifactId>javacpp-presets</artifactId>
9-
<version>1.5.9</version>
9+
<version>1.5.11-SNAPSHOT</version>
1010
</parent>
1111

1212
<groupId>org.bytedeco</groupId>
1313
<artifactId>libraw</artifactId>
14-
<version>0.21.1-${project.parent.version}</version>
14+
<version>0.21.2-${project.parent.version}</version>
1515
<name>JavaCPP Presets for LibRaw</name>
1616

1717
<dependencies>

‎libraw/samples/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>org.bytedeco.libraw</groupId>
44
<artifactId>librawdemo</artifactId>
5-
<version>1.5.9</version>
5+
<version>1.5.11-SNAPSHOT</version>
66
<properties>
77
<exec.mainClass>LibRawDemo</exec.mainClass>
88
<maven.compiler.source>1.7</maven.compiler.source>
@@ -12,7 +12,7 @@
1212
<dependency>
1313
<groupId>org.bytedeco</groupId>
1414
<artifactId>libraw-platform</artifactId>
15-
<version>0.21.1-1.5.9</version>
15+
<version>0.21.2-1.5.11-SNAPSHOT</version>
1616
</dependency>
1717
</dependencies>
1818
<build>

‎libraw/src/gen/java/org/bytedeco/libraw/LibRaw.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.libraw;
44

‎libraw/src/gen/java/org/bytedeco/libraw/LibRaw_abstract_datastream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.libraw;
44

‎libraw/src/gen/java/org/bytedeco/libraw/LibRaw_bigfile_datastream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Targeted by JavaCPP version 1.5.9: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.libraw;
44

0 commit comments

Comments
 (0)