mirror of https://github.com/aseprite/aseprite.git
Update laf and add new libxrandr dependency
This commit is contained in:
parent
5cfa75ab3f
commit
d8ac1a7a9e
|
@ -24,7 +24,8 @@ jobs:
|
||||||
sudo apt-get update -qq
|
sudo apt-get update -qq
|
||||||
sudo apt-get install -y \
|
sudo apt-get install -y \
|
||||||
libpixman-1-dev libfreetype6-dev libharfbuzz-dev zlib1g-dev \
|
libpixman-1-dev libfreetype6-dev libharfbuzz-dev zlib1g-dev \
|
||||||
libx11-dev libxcursor-dev libxi-dev libgl1-mesa-dev libfontconfig1-dev
|
libx11-dev libxcursor-dev libxi-dev libxrandr-dev libgl1-mesa-dev \
|
||||||
|
libfontconfig1-dev
|
||||||
- uses: aseprite/get-ninja@main
|
- uses: aseprite/get-ninja@main
|
||||||
- uses: ilammy/msvc-dev-cmd@v1
|
- uses: ilammy/msvc-dev-cmd@v1
|
||||||
if: runner.os == 'Windows'
|
if: runner.os == 'Windows'
|
||||||
|
|
|
@ -28,7 +28,8 @@ jobs:
|
||||||
sudo apt-get update -qq
|
sudo apt-get update -qq
|
||||||
sudo apt-get install -y \
|
sudo apt-get install -y \
|
||||||
libpixman-1-dev libfreetype6-dev libharfbuzz-dev zlib1g-dev \
|
libpixman-1-dev libfreetype6-dev libharfbuzz-dev zlib1g-dev \
|
||||||
libx11-dev libxcursor-dev libxi-dev libgl1-mesa-dev libfontconfig1-dev
|
libx11-dev libxcursor-dev libxi-dev libxrandr-dev libgl1-mesa-dev \
|
||||||
|
libfontconfig1-dev
|
||||||
- name: Install Skia
|
- name: Install Skia
|
||||||
if: ${{ matrix.ui == 'gui' }}
|
if: ${{ matrix.ui == 'gui' }}
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
|
@ -25,7 +25,7 @@ jobs:
|
||||||
apt_packages: |
|
apt_packages: |
|
||||||
libc++-dev, libc++abi-dev, libpixman-1-dev,
|
libc++-dev, libc++abi-dev, libpixman-1-dev,
|
||||||
libfreetype6-dev, libharfbuzz-dev, zlib1g-dev, libx11-dev,
|
libfreetype6-dev, libharfbuzz-dev, zlib1g-dev, libx11-dev,
|
||||||
libxcursor-dev, libxi-dev, libgl1-mesa-dev
|
libxcursor-dev, libxi-dev, libxrandr-dev, libgl1-mesa-dev
|
||||||
cmake_command: |
|
cmake_command: |
|
||||||
cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DLAF_BACKEND=none -DCMAKE_EXPORT_COMPILE_COMMANDS=on
|
cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DLAF_BACKEND=none -DCMAKE_EXPORT_COMPILE_COMMANDS=on
|
||||||
- uses: ZedThree/clang-tidy-review/upload@v0.20.1
|
- uses: ZedThree/clang-tidy-review/upload@v0.20.1
|
||||||
|
|
|
@ -74,7 +74,7 @@ On macOS you will need macOS 15.4 SDK and Xcode 16.3 (older versions might work)
|
||||||
|
|
||||||
You will need the following dependencies on Ubuntu/Debian:
|
You will need the following dependencies on Ubuntu/Debian:
|
||||||
|
|
||||||
sudo apt-get install -y g++ clang cmake ninja-build libx11-dev libxcursor-dev libxi-dev libgl1-mesa-dev libfontconfig1-dev
|
sudo apt-get install -y g++ clang cmake ninja-build libx11-dev libxcursor-dev libxi-dev libxrandr-dev libgl1-mesa-dev libfontconfig1-dev
|
||||||
|
|
||||||
Or use clang-12 packages (or newer) in case that clang in your distribution is older than clang 12.0:
|
Or use clang-12 packages (or newer) in case that clang in your distribution is older than clang 12.0:
|
||||||
|
|
||||||
|
@ -82,15 +82,15 @@ Or use clang-12 packages (or newer) in case that clang in your distribution is o
|
||||||
|
|
||||||
On Fedora:
|
On Fedora:
|
||||||
|
|
||||||
sudo dnf install -y gcc-c++ clang libcxx-devel cmake ninja-build libX11-devel libXcursor-devel libXi-devel mesa-libGL-devel fontconfig-devel
|
sudo dnf install -y gcc-c++ clang libcxx-devel cmake ninja-build libX11-devel libXcursor-devel libXi-devel libXrandr-devel mesa-libGL-devel fontconfig-devel
|
||||||
|
|
||||||
On Arch:
|
On Arch:
|
||||||
|
|
||||||
sudo pacman -S gcc clang cmake ninja libx11 libxcursor mesa-libgl fontconfig libwebp
|
sudo pacman -S gcc clang cmake ninja libx11 libxcursor libxi libxrandr mesa-libgl fontconfig libwebp
|
||||||
|
|
||||||
On SUSE:
|
On SUSE:
|
||||||
|
|
||||||
sudo zypper install gcc-c++ clang cmake ninja libX11-devel libXcursor-devel libXi-devel Mesa-libGL-devel fontconfig-devel
|
sudo zypper install gcc-c++ clang cmake ninja libX11-devel libXcursor-devel libXi-devel libXrandr-devel Mesa-libGL-devel fontconfig-devel
|
||||||
|
|
||||||
# Automatic Building
|
# Automatic Building
|
||||||
|
|
||||||
|
|
2
laf
2
laf
|
@ -1 +1 @@
|
||||||
Subproject commit ff3146071e86db059af6eef64fd24096554fa15e
|
Subproject commit 19db1d20fce67dcb0793c1060f6739babec46ea3
|
Loading…
Reference in New Issue