Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Nightfall with ffmpeg >= v6.0 #583

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Nightfall with ffmpeg >= v6.0 #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions .github/workflows/Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,18 @@ RUN apt update && \
apt install -y --no-install-recommends wget unzip tar ca-certificates xz-utils

RUN if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \
wget https://github.com/Dusk-Labs/ffmpeg-static/releases/download/ffmpeg-all-0.0.1/ffmpeg && \
wget https://github.com/Dusk-Labs/ffmpeg-static/releases/download/ffmpeg-all-0.0.1/ffprobe && \
ls -la . && \
pwd \
wget https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz && \
tar --strip-components 1 -xf ffmpeg-release-amd64-static.tar.xz \
; fi

RUN if [ "${TARGETPLATFORM}" = "linux/arm64" ]; then \
wget https://johnvansickle.com/ffmpeg/old-releases/ffmpeg-5.1.1-arm64-static.tar.xz && \
tar --strip-components 1 -xf ffmpeg-5.1.1-arm64-static.tar.xz \
wget https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-arm64-static.tar.xz && \
tar --strip-components 1 -xf ffmpeg-release-arm64-static.tar.xz \
; fi

RUN if [ "${TARGETPLATFORM}" = "linux/arm/v7" ]; then \
wget https://johnvansickle.com/ffmpeg/old-releases/ffmpeg-5.1.1-armhf-static.tar.xz && \
tar --strip-components 1 -xf ffmpeg-5.1.1-armhf-static.tar.xz \
wget https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-armhf-static.tar.xz && \
tar --strip-components 1 -xf ffmpeg-release-armhf-static.tar.xz \
; fi

RUN chmod +x /static/ffmpeg && chmod +x /static/ffprobe
Expand Down
20 changes: 5 additions & 15 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,11 @@ jobs:
override: true
components: cargo

- name: Download ffmpeg artifact
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: "Dusk-Labs/ffmpeg-static"
version: "tags/ffmpeg-all-0.0.1"
file: "ffmpeg"
token: ${{ secrets.GITHUB_TOKEN }}

- name: Download ffprobe artifact
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: "Dusk-Labs/ffmpeg-static"
version: "tags/ffmpeg-all-0.0.1"
file: "ffprobe"
token: ${{ secrets.GITHUB_TOKEN }}
- name: Download static ffmpeg/ffprobe
run: |
curl -OL https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz
tar --strip-components 1 -xf ffmpeg-release-amd64-static.tar.xz --wildcards '*ffmpeg'
tar --strip-components 1 -xf ffmpeg-release-amd64-static.tar.xz --wildcards '*ffprobe'

- name: Create release dir
run: |
Expand Down
6 changes: 2 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@ RUN apt update && \
apt install -y --no-install-recommends wget unzip tar ca-certificates xz-utils

RUN if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \
wget https://github.com/Dusk-Labs/ffmpeg-static/releases/download/ffmpeg-all-0.0.1/ffmpeg && \
wget https://github.com/Dusk-Labs/ffmpeg-static/releases/download/ffmpeg-all-0.0.1/ffprobe && \
ls -la . && \
pwd \
wget https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz && \
tar --strip-components 1 -xf ffmpeg-release-amd64-static.tar.xz \
; fi

RUN if [ "${TARGETPLATFORM}" = "linux/arm64" ]; then \
Expand Down
2 changes: 1 addition & 1 deletion dim-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ embed_ui = []

[dependencies]
# git dependencies
nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [
nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "08a5d3a2beb6b9217f2551fa44f8410369e34815", default-features = false, features = [
"cuda",
"ssa_transmux",
] }
Expand Down
2 changes: 1 addition & 1 deletion dim-web/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dim-utils = { path = "../dim-utils" }
dim-events = { path = "../dim-events" }
dim-core = { path = "../dim-core" }

nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [
nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "08a5d3a2beb6b9217f2551fa44f8410369e34815", default-features = false, features = [
"cuda",
"ssa_transmux",
] }
Expand Down
2 changes: 1 addition & 1 deletion dim/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ xtra = { version = "0.5.1", features = ["tokio", "with-tokio-1"] }
fdlimit = "0.2.1"

# git dependencies
nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [
nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "08a5d3a2beb6b9217f2551fa44f8410369e34815", default-features = false, features = [
"cuda",
"ssa_transmux",
] }
Expand Down
Loading