Skip to content

Commit

Permalink
* Upgrade presets for FFmpeg 6.0 (issue bytedeco/javacv#1693)
Browse files Browse the repository at this point in the history
  • Loading branch information
saudet committed Mar 2, 2023
1 parent ba3e979 commit ea9b59e
Show file tree
Hide file tree
Showing 49 changed files with 1,593 additions and 1,260 deletions.
4 changes: 3 additions & 1 deletion .github/actions/deploy-centos/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ runs:
steps:
- name: Install environment
shell: bash
env:
GITHUB_EVENT_HEAD_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
run: |
cd /root
mkdir -p .ccache
Expand Down Expand Up @@ -162,7 +164,7 @@ runs:
if [[ -n ${CI_DEPLOY_USERNAME:-} ]] && [[ ! "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
GRADLE_TASK=publish
MAVEN_PHASE=deploy
if [[ "${{ github.event.head_commit.message }}" == Release* ]] || [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then
if [[ "$GITHUB_EVENT_HEAD_COMMIT_MESSAGE" == Release* ]] || [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then
python3 -m gdown.cli -q -O settings.tar.gz https://drive.google.com/uc?id=$CI_DEPLOY_SETTINGS
tar -xzf settings.tar.gz
MAVEN_OPTIONS="$MAVEN_OPTIONS -Dgpg.homedir=$(pwd)/.gnupg/ -DperformRelease -DstagingRepositoryId=$STAGING_REPOSITORY"
Expand Down
4 changes: 3 additions & 1 deletion .github/actions/deploy-macosx/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ runs:
steps:
- name: Install environment
shell: bash
env:
GITHUB_EVENT_HEAD_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
run: |
cd $HOME
mkdir -p .ccache
Expand Down Expand Up @@ -81,7 +83,7 @@ runs:
if [[ -n ${CI_DEPLOY_USERNAME:-} ]] && [[ ! "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
GRADLE_TASK=publish
MAVEN_PHASE=deploy
if [[ "${{ github.event.head_commit.message }}" == Release* ]] || [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then
if [[ "$GITHUB_EVENT_HEAD_COMMIT_MESSAGE" == Release* ]] || [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then
python3 -m gdown.cli -q -O settings.tar.gz https://drive.google.com/uc?id=$CI_DEPLOY_SETTINGS
tar -xzf settings.tar.gz
MAVEN_OPTIONS="$MAVEN_OPTIONS -Dgpg.homedir=$(pwd)/.gnupg/ -DperformRelease -DstagingRepositoryId=$STAGING_REPOSITORY"
Expand Down
4 changes: 3 additions & 1 deletion .github/actions/deploy-ubuntu/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ runs:
steps:
- name: Install environment
shell: bash
env:
GITHUB_EVENT_HEAD_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
run: |
cd /root
mkdir -p .ccache
Expand Down Expand Up @@ -175,7 +177,7 @@ runs:
if [[ -n ${CI_DEPLOY_USERNAME:-} ]] && [[ ! "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
GRADLE_TASK=publish
MAVEN_PHASE=deploy
if [[ "${{ github.event.head_commit.message }}" == Release* ]] || [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then
if [[ "$GITHUB_EVENT_HEAD_COMMIT_MESSAGE" == Release* ]] || [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then
python3 -m gdown.cli -q -O settings.tar.gz https://drive.google.com/uc?id=$CI_DEPLOY_SETTINGS
tar -xzf settings.tar.gz
MAVEN_OPTIONS="$MAVEN_OPTIONS -Dgpg.homedir=$(pwd)/.gnupg/ -DperformRelease -DstagingRepositoryId=$STAGING_REPOSITORY"
Expand Down
4 changes: 3 additions & 1 deletion .github/actions/deploy-windows/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ runs:
steps:
- name: Install environment
shell: cmd
env:
GITHUB_EVENT_HEAD_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
run: |
cd /d %USERPROFILE%
Expand Down Expand Up @@ -166,7 +168,7 @@ runs:
set GRADLE_TASK=publishToMavenLocal
set MAVEN_PHASE=install
set "MESSAGE=${{ github.event.head_commit.message }}"
set "MESSAGE=%GITHUB_EVENT_HEAD_COMMIT_MESSAGE%"
if "%MESSAGE:~0,7%"=="Release" set DEPLOY=RELEASE
if "%GITHUB_REF:~11%"=="release" set DEPLOY=RELEASE
if not "%CI_DEPLOY_USERNAME%"=="" if not "%GITHUB_EVENT_NAME%"=="pull_request" (
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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, HDF5 1.14.0, Hyperscan 5.4.1 ([issue #1308](https://github.com/bytedeco/javacpp-presets/issues/1308)), 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.3, ARPACK-NG 3.9.0, CPython 3.11.2, NumPy 1.24.2, SciPy 1.10.1, LLVM 15.0.7, Leptonica 1.83.0, Tesseract 5.3.0, PyTorch 1.13.1, TensorFlow Lite 2.11.0, DepthAI 2.19.1, ONNX Runtime 1.14.0, Bullet Physics SDK 3.25, and their dependencies
* Upgrade presets for OpenCV 4.7.0, FFmpeg 6.0 ([issue bytedeco/javacv#1693](https://github.com/bytedeco/javacv/issues/1693)), HDF5 1.14.0, Hyperscan 5.4.1 ([issue #1308](https://github.com/bytedeco/javacpp-presets/issues/1308)), 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.3, ARPACK-NG 3.9.0, CPython 3.11.2, NumPy 1.24.2, SciPy 1.10.1, LLVM 15.0.7, Leptonica 1.83.0, Tesseract 5.3.0, PyTorch 1.13.1, TensorFlow Lite 2.11.0, DepthAI 2.19.1, ONNX Runtime 1.14.0, Bullet Physics SDK 3.25, 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))
Expand Down
8 changes: 4 additions & 4 deletions ffmpeg/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:

* FFmpeg 5.1.2 http://ffmpeg.org/
* FFmpeg 6.0 http://ffmpeg.org/

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

Expand Down Expand Up @@ -38,22 +38,22 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
<modelVersion>4.0.0</modelVersion>
<groupId>org.bytedeco.ffmpeg</groupId>
<artifactId>readfewframe</artifactId>
<version>1.5.8</version>
<version>1.5.9-SNAPSHOT</version>
<properties>
<exec.mainClass>ReadFewFrame</exec.mainClass>
</properties>
<dependencies>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>ffmpeg-platform</artifactId>
<version>5.1.2-1.5.8</version>
<version>6.0-1.5.9-SNAPSHOT</version>
</dependency>

<!-- Optional GPL builds with (almost) everything enabled -->
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>ffmpeg-platform-gpl</artifactId>
<version>5.1.2-1.5.8</version>
<version>6.0-1.5.9-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down

0 comments on commit ea9b59e

Please sign in to comment.