From b65acf01c82b64de1840b5bb36cbee4c6e852813 Mon Sep 17 00:00:00 2001 From: kieran Date: Thu, 21 Nov 2024 12:40:34 +0000 Subject: [PATCH] fix: ci --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- debian.sh | 40 ++++++++++++++++++++++++---------------- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f63b092..6df6ba7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1379,7 +1379,7 @@ dependencies = [ [[package]] name = "egui-video" version = "0.8.0" -source = "git+https://github.com/v0l/egui-video.git?rev=7d93a672fcadb7f98883a1a46f3c7f6e902c89a6#7d93a672fcadb7f98883a1a46f3c7f6e902c89a6" +source = "git+https://github.com/v0l/egui-video.git?rev=f3753a50bbd2ac1f5e324b3d3768a0b173dfbd2e#f3753a50bbd2ac1f5e324b3d3768a0b173dfbd2e" dependencies = [ "anyhow", "atomic", @@ -1608,7 +1608,7 @@ dependencies = [ [[package]] name = "ffmpeg-rs-raw" version = "0.1.0" -source = "git+https://git.v0l.io/Kieran/ffmpeg-rs-raw.git?rev=bb11e998e759b0332c22703844f448fb2ea3b4b5#bb11e998e759b0332c22703844f448fb2ea3b4b5" +source = "git+https://git.v0l.io/Kieran/ffmpeg-rs-raw.git?rev=a2c0e3374ba5130588adcbeda18439b69bb2cb12#a2c0e3374ba5130588adcbeda18439b69bb2cb12" dependencies = [ "anyhow", "ffmpeg-sys-the-third", @@ -1620,7 +1620,7 @@ dependencies = [ [[package]] name = "ffmpeg-sys-the-third" version = "2.1.0+ffmpeg-7.1" -source = "git+https://git.v0l.io/ffmpeg/ffmpeg-the-third.git?branch=master#0fdfa9ab506f5c92aad5a175db081c8a2c1579a1" +source = "git+https://git.v0l.io/Kieran/ffmpeg-the-third.git?rev=e5f8e077b04b10d5887bce4df1eb1a71738a6c66#e5f8e077b04b10d5887bce4df1eb1a71738a6c66" dependencies = [ "bindgen 0.69.5", "cc", diff --git a/Cargo.toml b/Cargo.toml index d6f9aa8..e81d465 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ resvg = { version = "0.44.0", default-features = false } serde = { version = "1.0.214", features = ["derive"] } serde_with = { version = "3.11.0", features = ["hex"] } -egui-video = { git = "https://github.com/v0l/egui-video.git", rev = "7d93a672fcadb7f98883a1a46f3c7f6e902c89a6" } +egui-video = { git = "https://github.com/v0l/egui-video.git", rev = "f3753a50bbd2ac1f5e324b3d3768a0b173dfbd2e" } #egui-video = { path = "../egui-video" } [target.'cfg(not(target_os = "android"))'.dependencies] diff --git a/debian.sh b/debian.sh index d5063a4..ccb8f97 100755 --- a/debian.sh +++ b/debian.sh @@ -1,28 +1,36 @@ #!/bin/bash -apt update && apt install -y \ - build-essential \ - pkg-config \ - libx264-dev \ - libwebp-dev \ - libssl-dev \ - libpipewire-0.3-dev \ - libpulse-dev \ - libpng-dev \ - libasound2-dev \ - libclang-dev \ - nasm +apt update && \ + apt install -y \ + build-essential \ + libx264-dev \ + libx265-dev \ + libwebp-dev \ + libvpx-dev \ + libopus-dev \ + libdav1d-dev \ + libpipewire-0.3-dev \ + libasound2-dev \ + nasm \ + libclang-dev \ + squashfs-tools git clone --single-branch --branch release/7.1 https://git.v0l.io/ffmpeg/FFmpeg.git && \ cd FFmpeg && \ ./configure \ + --prefix=${FFMPEG_DIR} \ --disable-programs \ --disable-doc \ + --disable-network \ --enable-gpl \ --enable-libx264 \ + --enable-libx265 \ --enable-libwebp \ + --enable-libvpx \ + --enable-libopus \ + --enable-libdav1d \ + --disable-static \ --disable-postproc \ - --enable-static \ - --disable-shared && \ + --enable-shared && \ make -j$(nproc) install -export CARGO_FEATURE_STATIC=1 + cargo install xbuild -x build --release \ No newline at end of file +x build --release --format appimage \ No newline at end of file