From 91e6bb5be1ed13d66589bf385cdefd99e7923fe3 Mon Sep 17 00:00:00 2001 From: asonix Date: Wed, 24 Jun 2020 14:20:40 -0500 Subject: [PATCH] Version v0.2.0-alpha.2-r1 --- Cargo.lock | 6 ++---- Cargo.toml | 8 +++++++- docker/prod/docker-compose.yml | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8344f7d..3726c34 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -786,8 +786,7 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" [[package]] name = "ffmpeg-next" version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37dadc7853e912107a8a671b7b22bff1309c09d0ba8851493028f06a36fc9f" +source = "git+https://git.asonix.dog/asonix/rust-ffmpeg?branch=main#47f5ee8b0538f74ed7a4af9df0bda57c14b441d8" dependencies = [ "bitflags", "ffmpeg-sys-next", @@ -797,8 +796,7 @@ dependencies = [ [[package]] name = "ffmpeg-sys-next" version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01bba495d04757f7a3e471b3e411759a8968571c4618235bc1c9e1099b4a84d1" +source = "git+https://git.asonix.dog/asonix/rust-ffmpeg-sys?branch=main#993c84e710605ffc55787600deafda3f575abe6f" dependencies = [ "bindgen 0.54.0", "cc", diff --git a/Cargo.toml b/Cargo.toml index 4ec1d00..31d281b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,6 @@ anyhow = "1.0" base64 = "0.12.1" bytes = "0.5" futures = "0.3.4" -ffmpeg-sys-next = "4.3.0" magick_rust = { version = "0.14.0", git = "https://git.asonix.dog/asonix/magick-rust" } mime = "0.3.1" once_cell = "1.4.0" @@ -38,5 +37,12 @@ uuid = { version = "0.8", features = ["v4"] } [dependencies.ffmpeg-next] version = "4.3.0" +git = "https://git.asonix.dog/asonix/rust-ffmpeg" +branch = "main" default-features = false features = ["ffmpeg42", "codec", "filter", "device", "format", "resampling", "postprocessing", "software-resampling", "software-scaling"] + +[dependencies.ffmpeg-sys-next] +version = "4.3.0" +git = "https://git.asonix.dog/asonix/rust-ffmpeg-sys" +branch = "main" diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 5f628a2..4882ab8 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: pictrs: - image: asonix/pictrs:v0.2.0-alpha.2-r0 + image: asonix/pictrs:v0.2.0-alpha.2-r1 ports: - "127.0.0.1:8080:8080" restart: always