Kieran/zap-stream-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: ci

Browse Source
This commit is contained in:
kieran 2024-11-21 12:40:34 +00:00
parent cdafa1d786
commit b65acf01c8
No known key found for this signature in database
GPG Key ID: DE71CEB3925BE941
3 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -1379,7 +1379,7 @@ dependencies = [
[[package]] [[package]]
name = "egui-video" name = "egui-video"
version = "0.8.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"atomic", "atomic",
@ -1608,7 +1608,7 @@ dependencies = [
[[package]] [[package]]
name = "ffmpeg-rs-raw" name = "ffmpeg-rs-raw"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"ffmpeg-sys-the-third", "ffmpeg-sys-the-third",
@ -1620,7 +1620,7 @@ dependencies = [
[[package]] [[package]]
name = "ffmpeg-sys-the-third" name = "ffmpeg-sys-the-third"
version = "2.1.0+ffmpeg-7.1" 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 = [ dependencies = [
"bindgen 0.69.5", "bindgen 0.69.5",
"cc", "cc",

2
Cargo.toml
View File

@ -28,7 +28,7 @@ resvg = { version = "0.44.0", default-features = false }
serde = { version = "1.0.214", features = ["derive"] } serde = { version = "1.0.214", features = ["derive"] }
serde_with = { version = "3.11.0", features = ["hex"] } 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" } #egui-video = { path = "../egui-video" }
[target.'cfg(not(target_os = "android"))'.dependencies] [target.'cfg(not(target_os = "android"))'.dependencies]

28
debian.sh
View File

@ -1,28 +1,36 @@
#!/bin/bash #!/bin/bash
apt update && apt install -y \ apt update && \
apt install -y \
build-essential \ build-essential \
pkg-config \
libx264-dev \ libx264-dev \
libx265-dev \
libwebp-dev \ libwebp-dev \
libssl-dev \ libvpx-dev \
libopus-dev \
libdav1d-dev \
libpipewire-0.3-dev \ libpipewire-0.3-dev \
libpulse-dev \
libpng-dev \
libasound2-dev \ libasound2-dev \
nasm \
libclang-dev \ libclang-dev \
nasm squashfs-tools
git clone --single-branch --branch release/7.1 https://git.v0l.io/ffmpeg/FFmpeg.git && \ git clone --single-branch --branch release/7.1 https://git.v0l.io/ffmpeg/FFmpeg.git && \
cd FFmpeg && \ cd FFmpeg && \
./configure \ ./configure \
--prefix=${FFMPEG_DIR} \
--disable-programs \ --disable-programs \
--disable-doc \ --disable-doc \
--disable-network \
--enable-gpl \ --enable-gpl \
--enable-libx264 \ --enable-libx264 \
--enable-libx265 \
--enable-libwebp \ --enable-libwebp \
--enable-libvpx \
--enable-libopus \
--enable-libdav1d \
--disable-static \
--disable-postproc \ --disable-postproc \
--enable-static \ --enable-shared && \
--disable-shared && \
make -j$(nproc) install make -j$(nproc) install
export CARGO_FEATURE_STATIC=1
cargo install xbuild cargo install xbuild
x build --release x build --release --format appimage