Skip to content

Commit a7d8976

Browse files
committed
Update CHANGELOG.md and fix nits
1 parent 56fce74 commit a7d8976

File tree

8 files changed

+33
-34
lines changed

8 files changed

+33
-34
lines changed

.github/actions/deploy-centos/action.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,14 @@ runs:
122122
123123
if [[ "$CI_DEPLOY_MODULE" == "nvcodec" ]]; then
124124
echo Installing NVIDIA Video Codec SDK
125-
python3 -m gdown.cli https://drive.google.com/uc?id=13KyYoq8ZOLIA7jugDkdFma34mnyxnz4x
125+
python3 -m gdown 13KyYoq8ZOLIA7jugDkdFma34mnyxnz4x
126126
unzip Video_Codec_SDK_12.1.14.zip -d /usr/local
127127
ln -sf /usr/local/Video_Codec_SDK_* /usr/local/videocodecsdk
128128
fi
129129
130130
if [[ "$CI_DEPLOY_MODULE" == "tensorrt" ]]; then
131131
echo Installing TensorRT
132-
python3 -m gdown.cli https://drive.google.com/uc?id=1dVhD-DEYY42QbZe1GXl-vxe3k6KqWGsL
132+
python3 -m gdown 1dVhD-DEYY42QbZe1GXl-vxe3k6KqWGsL
133133
tar -hxvf TensorRT-8.6.1.6.Linux.x86_64-gnu.cuda-12.0.tar.gz -C /usr/local/
134134
ln -sf /usr/local/TensorRT* /usr/local/tensorrt
135135
fi
@@ -142,21 +142,21 @@ runs:
142142
143143
if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86" ]] && [[ "$CI_DEPLOY_MODULE" == "flycapture" ]]; then
144144
echo Installing FlyCapture i386
145-
python3 -m gdown.cli https://drive.google.com/uc?id=1BOpSik1Fndagzjf4ykwzermt2qlTzsWI
145+
python3 -m gdown 1BOpSik1Fndagzjf4ykwzermt2qlTzsWI
146146
tar -xzvf flycapture2-2.13.3.31-i386-pkg_xenial.tgz
147147
find -name *.deb | while read f; do ar -xv $f; tar --totals -xf data.tar.xz -C /; done;
148148
fi
149149
150150
if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86_64" ]] && [[ "$CI_DEPLOY_MODULE" == "flycapture" ]]; then
151151
echo Installing FlyCapture amd64
152-
python3 -m gdown.cli https://drive.google.com/uc?id=1YtVjdnbQLZHX_ocQ6xAmiq6pjftuPOPd
152+
python3 -m gdown 1YtVjdnbQLZHX_ocQ6xAmiq6pjftuPOPd
153153
tar -xzvf flycapture2-2.13.3.31-amd64-pkg_xenial.tgz
154154
find -name *.deb | while read f; do ar -xv $f; tar --totals -xf data.tar.xz -C /; done;
155155
fi
156156
157157
if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86_64" ]] && [[ "$CI_DEPLOY_MODULE" == "spinnaker" ]]; then
158158
echo Installing Spinnaker amd64
159-
python3 -m gdown.cli https://drive.google.com/file/d/1Xapzvxrgx1w3RCbAOFILaNCZwpusB_VA
159+
python3 -m gdown 1Xapzvxrgx1w3RCbAOFILaNCZwpusB_VA
160160
tar -xzvf spinnaker-4.0.0.116-amd64-pkg-22.04.tar.gz
161161
find -name *.deb | while read f; do ar -xv $f; tar --totals -xvf data.tar.xz -C /; done;
162162
fi
@@ -174,7 +174,7 @@ runs:
174174
GRADLE_TASK=publish
175175
MAVEN_PHASE=deploy
176176
if [[ "$GITHUB_EVENT_HEAD_COMMIT_MESSAGE" == Release* ]] || [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then
177-
python3 -m gdown.cli -q -O settings.tar.gz https://drive.google.com/uc?id=$CI_DEPLOY_SETTINGS
177+
python3 -m gdown -q -O settings.tar.gz $CI_DEPLOY_SETTINGS
178178
tar -xzf settings.tar.gz
179179
MAVEN_OPTIONS="$MAVEN_OPTIONS -Dgpg.homedir=$(pwd)/.gnupg/ -DperformRelease -DstagingRepositoryId=$STAGING_REPOSITORY"
180180
fi

.github/actions/deploy-macosx/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ runs:
8585
GRADLE_TASK=publish
8686
MAVEN_PHASE=deploy
8787
if [[ "$GITHUB_EVENT_HEAD_COMMIT_MESSAGE" == Release* ]] || [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then
88-
python3 -m gdown.cli -q -O settings.tar.gz https://drive.google.com/uc?id=$CI_DEPLOY_SETTINGS
88+
python3 -m gdown -q -O settings.tar.gz $CI_DEPLOY_SETTINGS
8989
tar -xzf settings.tar.gz
9090
MAVEN_OPTIONS="$MAVEN_OPTIONS -Dgpg.homedir=$(pwd)/.gnupg/ -DperformRelease -DstagingRepositoryId=$STAGING_REPOSITORY"
9191
fi

.github/actions/deploy-ubuntu/action.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ runs:
108108
# $SUDO apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA6932366A755776
109109
$SUDO apt-get update
110110
$SUDO apt-get -y install gcc-multilib g++-multilib gfortran-multilib python3 python2.7 python3-minimal python2.7-minimal rpm libasound2-dev:$ARCH freeglut3-dev:$ARCH libfontconfig-dev:$ARCH libgtk2.0-dev:$ARCH libusb-dev:$ARCH libusb-1.0-0-dev:$ARCH libffi-dev:$ARCH libbz2-dev:$ARCH zlib1g-dev:$ARCH libxcb1-dev:$ARCH libpulse-dev:$ARCH
111-
$SUDO apt-get -y install pkg-config ccache clang $TOOLCHAIN openjdk-8-jdk ant python2 python3-pip swig git file wget unzip tar bzip2 gzip patch autoconf-archive autogen automake cmake make libtool bison flex perl nasm ragel curl libcurl4-openssl-dev libssl-dev libffi-dev libbz2-dev zlib1g-dev rapidjson-dev libdrm-dev
112-
$SUDO apt-get -y install zstd
111+
$SUDO apt-get -y install pkg-config ccache clang $TOOLCHAIN openjdk-8-jdk ant python2 python3-pip swig git file wget unzip tar bzip2 gzip patch autoconf-archive autogen automake cmake make libtool bison flex perl nasm ragel curl libcurl4-openssl-dev libssl-dev libffi-dev libbz2-dev zlib1g-dev rapidjson-dev libdrm-dev zstd-dev
113112
114113
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
115114
echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
@@ -215,22 +214,22 @@ runs:
215214
216215
if [[ "$CI_DEPLOY_MODULE" == "nvcodec" ]]; then
217216
echo Installing NVIDIA Video Codec SDK
218-
python3 -m gdown.cli https://drive.google.com/uc?id=13KyYoq8ZOLIA7jugDkdFma34mnyxnz4x
217+
python3 -m gdown 13KyYoq8ZOLIA7jugDkdFma34mnyxnz4x
219218
$SUDO unzip Video_Codec_SDK_12.1.14.zip -d /usr/local
220219
$SUDO ln -sf /usr/local/Video_Codec_SDK_* /usr/local/videocodecsdk
221220
fi
222221
223222
if [[ "$CI_DEPLOY_PLATFORM" == "linux-arm64" ]] && [[ "$CI_DEPLOY_MODULE" == "tensorrt" ]]; then
224223
echo Installing TensorRT
225-
# python3 -m gdown.cli https://drive.google.com/uc?id=1LZRCv4ZAGiDQAu4pvADJIGntq4cGl5tU
224+
# python3 -m gdown 1LZRCv4ZAGiDQAu4pvADJIGntq4cGl5tU
226225
curl -LO https://developer.download.nvidia.com/compute/machine-learning/tensorrt/10.0.1/tars/TensorRT-10.0.1.6.Ubuntu-22.04.aarch64-gnu.cuda-12.4.tar.gz
227226
$SUDO tar -hxvf TensorRT-10.0.1.6.Ubuntu-22.04.aarch64-gnu.cuda-12.4.tar.gz -C /usr/local/
228227
$SUDO ln -sf /usr/local/TensorRT* /usr/local/tensorrt
229228
fi
230229
231230
if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86_64" ]] && [[ "$CI_DEPLOY_MODULE" == "tensorrt" ]]; then
232231
echo Installing TensorRT
233-
# python3 -m gdown.cli https://drive.google.com/uc?id=1dVhD-DEYY42QbZe1GXl-vxe3k6KqWGsL
232+
# python3 -m gdown 1dVhD-DEYY42QbZe1GXl-vxe3k6KqWGsL
234233
curl -LO https://developer.download.nvidia.com/compute/machine-learning/tensorrt/10.0.1/tars/TensorRT-10.0.1.6.Linux.x86_64-gnu.cuda-12.4.tar.gz
235234
$SUDO tar -hxvf TensorRT-10.0.1.6.Linux.x86_64-gnu.cuda-12.4.tar.gz -C /usr/local/
236235
$SUDO ln -sf /usr/local/TensorRT* /usr/local/tensorrt
@@ -245,28 +244,28 @@ runs:
245244
246245
if [[ "$CI_DEPLOY_PLATFORM" == "linux-armhf" ]] && [[ "$CI_DEPLOY_MODULE" == "flycapture" ]]; then
247246
echo Installing FlyCapture amdhf
248-
python3 -m gdown.cli https://drive.google.com/uc?id=16NuUBs2MXQpVYqzDCEr9KdMng-6rHuDI
247+
python3 -m gdown 16NuUBs2MXQpVYqzDCEr9KdMng-6rHuDI
249248
mkdir -p $GITHUB_WORKSPACE/downloads
250249
ln -s $(pwd)/flycapture.2.13.3.31_armhf_xenial.tar.gz $GITHUB_WORKSPACE/downloads/flycapture.2.13.3.31_armhf.tar.gz
251250
fi
252251
253252
if [[ "$CI_DEPLOY_PLATFORM" == "linux-arm64" ]] && [[ "$CI_DEPLOY_MODULE" == "flycapture" ]]; then
254253
echo Installing FlyCapture amd64
255-
python3 -m gdown.cli https://drive.google.com/uc?id=1LhnuRMT3urYsApCcuBEcaotGRK8h4kJv
254+
python3 -m gdown 1LhnuRMT3urYsApCcuBEcaotGRK8h4kJv
256255
mkdir -p $GITHUB_WORKSPACE/downloads
257256
ln -s $(pwd)/flycapture.2.13.3.31_arm64_xenial.tar.gz $GITHUB_WORKSPACE/downloads/flycapture.2.13.3.31_arm64.tar.gz
258257
fi
259258
260259
if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86" ]] && [[ "$CI_DEPLOY_MODULE" == "flycapture" ]]; then
261260
echo Installing FlyCapture i386
262-
python3 -m gdown.cli https://drive.google.com/uc?id=1BOpSik1Fndagzjf4ykwzermt2qlTzsWI
261+
python3 -m gdown 1BOpSik1Fndagzjf4ykwzermt2qlTzsWI
263262
tar -xzvf flycapture2-2.13.3.31-i386-pkg_xenial.tgz
264263
find -name *.deb | while read f; do ar -xv $f; $SUDO tar --totals -xf data.tar.xz -C /; done;
265264
fi
266265
267266
if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86_64" ]] && [[ "$CI_DEPLOY_MODULE" == "flycapture" ]]; then
268267
echo Installing FlyCapture amd64
269-
python3 -m gdown.cli https://drive.google.com/uc?id=1YtVjdnbQLZHX_ocQ6xAmiq6pjftuPOPd
268+
python3 -m gdown 1YtVjdnbQLZHX_ocQ6xAmiq6pjftuPOPd
270269
tar -xzvf flycapture2-2.13.3.31-amd64-pkg_xenial.tgz
271270
find -name *.deb | while read f; do ar -xv $f; $SUDO tar --totals -xf data.tar.xz -C /; done;
272271
fi
@@ -284,7 +283,7 @@ runs:
284283
GRADLE_TASK=publish
285284
MAVEN_PHASE=deploy
286285
if [[ "$GITHUB_EVENT_HEAD_COMMIT_MESSAGE" == Release* ]] || [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then
287-
python3 -m gdown.cli -q -O settings.tar.gz https://drive.google.com/uc?id=$CI_DEPLOY_SETTINGS
286+
python3 -m gdown -q -O settings.tar.gz $CI_DEPLOY_SETTINGS
288287
tar -xzf settings.tar.gz
289288
MAVEN_OPTIONS="$MAVEN_OPTIONS -Dgpg.homedir=$(pwd)/.gnupg/ -DperformRelease -DstagingRepositoryId=$STAGING_REPOSITORY"
290289
fi

.github/actions/deploy-windows/action.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ runs:
101101
curl -LO https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_522.06_windows.exe
102102
curl -LO https://developer.download.nvidia.com/compute/cuda/12.3.2/local_installers/cuda_12.3.2_546.12_windows.exe
103103
rem curl -LO https://developer.download.nvidia.com/compute/redist/cudnn/v8.8.0/local_installers/12.0/cudnn_8.8.0.121_windows.exe
104-
rem python -m gdown.cli https://drive.google.com/uc?id=135Z7zfwguQe6vn7p013HtVkHFu9-_rru
104+
rem python -m gdown 135Z7zfwguQe6vn7p013HtVkHFu9-_rru
105105
curl -LO https://github.com/bytedeco/binaries/releases/download/1.5.10/cudnn-windows-x86_64-8.9.7.29_cuda12-archive.zip
106106
curl -LO http://www.winimage.com/zLibDll/zlib123dllx64.zip
107107
curl -LO https://developer.download.nvidia.com/compute/nvcomp/3.0.5/local_installers/nvcomp_3.0.5_windows_12.x.zip
@@ -142,14 +142,14 @@ runs:
142142
143143
if "%CI_DEPLOY_MODULE%"=="nvcodec" (
144144
echo Installing NVIDIA Video Codec SDK
145-
python -m gdown.cli https://drive.google.com/uc?id=13KyYoq8ZOLIA7jugDkdFma34mnyxnz4x
145+
python -m gdown 13KyYoq8ZOLIA7jugDkdFma34mnyxnz4x
146146
unzip Video_Codec_SDK_12.1.14.zip
147147
move Video_Codec_SDK_12.1.14 "%ProgramFiles%\NVIDIA GPU Computing Toolkit\VideoCodecSDK"
148148
)
149149
150150
if "%CI_DEPLOY_MODULE%"=="tensorrt" (
151151
echo Installing TensorRT
152-
rem python -m gdown.cli https://drive.google.com/uc?id=1GfmJ1BKbacLpUU-0i_mGu0sjrAS0Xzzi
152+
rem python -m gdown 1GfmJ1BKbacLpUU-0i_mGu0sjrAS0Xzzi
153153
curl -LO https://developer.download.nvidia.com/compute/machine-learning/tensorrt/10.0.1/zip/TensorRT-10.0.1.6.Windows10.win10.cuda-12.4.zip
154154
unzip TensorRT-10.0.1.6.Windows10.win10.cuda-12.4.zip
155155
move TensorRT-10.0.1.6 "%ProgramFiles%\NVIDIA GPU Computing Toolkit\TensorRT"
@@ -163,14 +163,14 @@ runs:
163163
164164
if "%CI_DEPLOY_PLATFORM%"=="windows-x86" if "%CI_DEPLOY_MODULE%"=="flycapture" (
165165
echo Installing FlyCapture x86
166-
python -m gdown.cli https://drive.google.com/uc?id=1ctSSAMF5IkxTKWiiLtID-ltmm27pHFdr
166+
python -m gdown 1ctSSAMF5IkxTKWiiLtID-ltmm27pHFdr
167167
rem We can get this msi file by starting the installation from the exe file
168168
cmd.exe /c "msiexec /quiet /i FlyCapture_2.13.3.31_x86.msi ADDLOCAL=ALL"
169169
)
170170
171171
if "%CI_DEPLOY_PLATFORM%"=="windows-x86_64" if "%CI_DEPLOY_MODULE%"=="flycapture" (
172172
echo Installing FlyCapture x64
173-
python -m gdown.cli https://drive.google.com/uc?id=14QM7W5RHhvZanF1UBobgEIvwdy6VwTht
173+
python -m gdown 14QM7W5RHhvZanF1UBobgEIvwdy6VwTht
174174
rem We can get this msi file by starting the installation from the exe file
175175
cmd.exe /c "msiexec /quiet /i FlyCapture_2.13.3.31_x64.msi ADDLOCAL=ALL"
176176
)
@@ -193,7 +193,7 @@ runs:
193193
set GRADLE_TASK=publish
194194
set MAVEN_PHASE=deploy
195195
if "%DEPLOY%"=="RELEASE" (
196-
python -m gdown.cli -q -O settings.tar.gz https://drive.google.com/uc?id=%CI_DEPLOY_SETTINGS%
196+
python -m gdown -q -O settings.tar.gz %CI_DEPLOY_SETTINGS%
197197
bash -c "tar -xzf settings.tar.gz -C $HOME"
198198
set "MAVEN_OPTIONS=%MAVEN_OPTIONS% -DperformRelease -DstagingRepositoryId=%STAGING_REPOSITORY%"
199199
)

.github/workflows/spinnaker.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
linux-x86_64:
2121
runs-on: ubuntu-20.04
2222
steps:
23-
- uses: jpsacha/javacpp-presets/.github/actions/deploy-ubuntu@Spinnaker_4.0.0.116
23+
- uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
2424
windows-x86_64:
2525
runs-on: windows-2019
2626
steps:
27-
- uses: jpsacha/javacpp-presets/.github/actions/deploy-windows@Spinnaker_4.0.0.116
27+
- uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
2828
redeploy:
2929
needs: [linux-x86_64, windows-x86_64]
3030
runs-on: ubuntu-20.04
3131
steps:
32-
- uses: jpsacha/javacpp-presets/.github/actions/redeploy@Spinnaker_4.0.0.116
32+
- uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Build FFmpeg with zimg to enable zscale filter ([pull #1481](https://github.com/bytedeco/javacpp-presets/pull/1481))
88
* Enable PulseAudio support for FFmpeg on Linux ([pull #1472](https://github.com/bytedeco/javacpp-presets/pull/1472))
99
* Virtualize `btCollisionWorld`, `btOverlapFilterCallback`, `btOverlapCallback` from Bullet Physics SDK ([pull #1475](https://github.com/bytedeco/javacpp-presets/pull/1475))
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
10+
* Upgrade presets for OpenCV 4.10.0, FFmpeg 7.0, Spinnaker 4.0.0.116 ([pull #1524](https://github.com/bytedeco/javacpp-presets/pull/1524)), 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
1111

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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
182182
* OpenCV 4.10.x https://opencv.org/releases/
183183
* FFmpeg 7.0.x http://ffmpeg.org/download.html
184184
* FlyCapture 2.13.x https://www.flir.com/products/flycapture-sdk
185-
* Spinnaker 3.0.x https://www.flir.com/products/spinnaker-sdk
185+
* Spinnaker 4.0.x https://www.flir.com/products/spinnaker-sdk
186186
* libdc1394 2.2.6 http://sourceforge.net/projects/libdc1394/files/
187187
* libfreenect 0.5.7 https://github.com/OpenKinect/libfreenect
188188
* libfreenect2 0.2.0 https://github.com/OpenKinect/libfreenect2

platform/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<module>../opencv/platform</module>
1919
<module>../ffmpeg/platform</module>
2020
<!-- <module>../flycapture/platform</module>-->
21-
<!-- <module>../spinnaker/platform</module>-->
21+
<module>../spinnaker/platform</module>
2222
<!-- <module>../libdc1394/platform</module>-->
2323
<!-- <module>../libfreenect/platform</module>-->
2424
<!-- <module>../libfreenect2/platform</module>-->
@@ -99,11 +99,11 @@
9999
<!-- <artifactId>flycapture-platform</artifactId>-->
100100
<!-- <version>2.13.3.31-${project.version}</version>-->
101101
<!-- </dependency>-->
102-
<!-- <dependency>-->
103-
<!-- <groupId>org.bytedeco</groupId>-->
104-
<!-- <artifactId>spinnaker-platform</artifactId>-->
105-
<!-- <version>4.0.0.116-${project.version}</version>-->
106-
<!-- </dependency>-->
102+
<dependency>
103+
<groupId>org.bytedeco</groupId>
104+
<artifactId>spinnaker-platform</artifactId>
105+
<version>4.0.0.116-${project.version}</version>
106+
</dependency>
107107
<!-- <dependency>-->
108108
<!-- <groupId>org.bytedeco</groupId>-->
109109
<!-- <artifactId>libdc1394-platform</artifactId>-->

0 commit comments

Comments
 (0)