Skip to content

Commit

Permalink
more attempts at having avif support again
Browse files Browse the repository at this point in the history
  • Loading branch information
ArturKovacs committed Nov 18, 2023
1 parent 708cce8 commit 526c962
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 6 deletions.
27 changes: 25 additions & 2 deletions .github/workflows/release-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,38 @@ jobs:
- name: Fetch Prerequisites
working-directory: ./distribution/windows/prerequisites
run: (New-Object System.Net.WebClient).DownloadFile('https://aka.ms/vs/16/release/vc_redist.x64.exe', 'vc_redist.x64.exe')


- name: Install avif build dependencies (Windows)
run: |
choco install pkgconfiglite
vcpkg integrate install
echo "set(VCPKG_BUILD_TYPE release)" >> $env:VCPKG_INSTALLATION_ROOT\triplets\x64-windows.cmake
vcpkg install --triplet=x64-windows
echo "vcpkg install folder: $(((Get-Command vcpkg.exe | select Source -First 1).source | Get-Item).Directory.FullName)"
$PKG_CONFIG_PATH = "$((Resolve-Path "./vcpkg_installed/x64-windows/lib/pkgconfig").Path)"
$PKG_CONFIG_PATH = $PKG_CONFIG_PATH.replace("\", "/")
echo "pkg config path is $PKG_CONFIG_PATH"
Get-ChildItem ./vcpkg_installed/x64-windows/lib
Get-Content .\vcpkg_installed\x64-windows\lib\pkgconfig\dav1d.pc
echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $env:GITHUB_ENV
curl -LO "https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.2/LLVM-15.0.2-win64.exe"
./LLVM-15.0.2-win64.exe /S
echo "LIBCLANG_PATH is: $LIBCLANG_PATH"
$LIBCLANG_PATH = (resolve-path "$env:ProgramFiles/LLVM/bin").Path
echo "------- CLANG BIN CONTENTS ----------"
dir $LIBCLANG_PATH
echo "LIBCLANG_PATH is: $LIBCLANG_PATH"
echo "LIBCLANG_PATH=$LIBCLANG_PATH" >> $env:GITHUB_ENV
- name: Build executable
run: |
echo "LIBCLANG_PATH is: $LIBCLANG_PATH"
echo "env:LIBCLANG_PATH is: $env:LIBCLANG_PATH"
$LIBCLANG_PATH = $env:LIBCLANG_PATH
echo "------- CLANG BIN CONTENTS ----------"
dir $LIBCLANG_PATH
cargo build --release --features=networking
cargo build --release --features=networking,avif
- name: Copy executable to distributable folder
working-directory: ./distribution/windows/
shell: cmd
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ avif = ["gelatin/avif"]
winres = "0.1.11"

[dependencies]
gelatin = { path = "./subcrates/gelatin", version = "0.9" }
gelatin = { path = "./subcrates/gelatin", version = "0.10" }
ureq = { version = "2.0.2", features = ["json"], optional = true }
lazy_static = "1.4.0"
directories-next = "2.0.0"
Expand Down
4 changes: 2 additions & 2 deletions subcrates/gelatin/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "gelatin"
version = "0.9.0"
version = "0.10.0"
description = "A basic UI framework"
repository = "https://github.com/ArturKovacs/emulsion"
authors = ["Artur Barnabas <kovacs.artur.barnabas@gmail.com>"]
Expand All @@ -15,6 +15,6 @@ avif = ["image/avif-decoder"]
[dependencies]
cgmath = "0.18.0"
derive_builder = "0.9.0"
image = "0.24.6"
image = "0.24.7"
glium = "0.29.0"
winit = "0.24.0"

0 comments on commit 526c962

Please sign in to comment.