Skip to content

Commit

Permalink
Meta: Tell vcpkg we don't need to build vulkan-loader
Browse files Browse the repository at this point in the history
Trying to build VulkanLoader from source is a giant headache of
unnecessary packages. Every modern distro has vulkan packages, let's
depend on those instead of trying to build something for both wayland
and X11.
  • Loading branch information
ADKaster committed Jul 7, 2024
1 parent e643204 commit 22d7aa5
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 54 deletions.
3 changes: 1 addition & 2 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ runs:
sudo apt-get update
sudo apt-get install autoconf autoconf-archive automake build-essential cmake libavcodec-dev fonts-liberation2 zip curl tar ccache clang-18 clang++-18 lld-18 gcc-13 g++-13 libstdc++-13-dev \
ninja-build unzip qt6-base-dev qt6-tools-dev-tools libqt6svg6-dev qt6-multimedia-dev libgl1-mesa-dev libpulse-dev libssl-dev libegl1-mesa-dev \
libx11-dev libxrandr-dev
ninja-build unzip qt6-base-dev qt6-tools-dev-tools libqt6svg6-dev qt6-multimedia-dev libgl1-mesa-dev libpulse-dev libssl-dev libegl1-mesa-dev
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 100
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/libjs-test262.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y ninja-build unzip gcc-13 g++-13 jq wget curl zip tar autoconf autoconf-archive automake pkg-config libgl1-mesa-dev libx11-dev libxrandr-dev
sudo apt-get install -y ninja-build unzip gcc-13 g++-13 jq wget curl zip tar autoconf autoconf-archive automake pkg-config libgl1-mesa-dev
test -e /opt/wabt-1.0.35 || (
cd /tmp
wget https://github.com/WebAssembly/wabt/releases/download/1.0.35/wabt-1.0.35-ubuntu-20.04.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion Documentation/BuildInstructionsLadybird.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ sudo apt update -y && sudo apt install clang-18 -y
##### Required packages include, but are not limited to:

```
sudo apt install autoconf autoconf-archive automake build-essential cmake libavcodec-dev libgl1-mesa-dev ninja-build qt6-base-dev qt6-tools-dev-tools qt6-multimedia-dev ccache fonts-liberation2 zip unzip curl tar libssl-dev libx11-dev libxrandr-dev
sudo apt install autoconf autoconf-archive automake build-essential cmake libavcodec-dev libgl1-mesa-dev ninja-build qt6-base-dev qt6-tools-dev-tools qt6-multimedia-dev ccache fonts-liberation2 zip unzip curl tar libssl-dev
```

For Ubuntu 20.04 and above, ensure that the Qt6 Wayland packages are available:
Expand Down
29 changes: 0 additions & 29 deletions Meta/CMake/vcpkg/overlay-ports/vulkan-loader/portfile.cmake

This file was deleted.

2 changes: 0 additions & 2 deletions Meta/CMake/vcpkg/overlay-ports/vulkan-loader/usage

This file was deleted.

19 changes: 0 additions & 19 deletions Meta/CMake/vcpkg/overlay-ports/vulkan-loader/vcpkg.json

This file was deleted.

1 change: 1 addition & 0 deletions Meta/CMake/vcpkg/overlay-ports/vulkan/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
4 changes: 4 additions & 0 deletions Meta/CMake/vcpkg/overlay-ports/vulkan/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "vulkan",
"version-date": "2023-12-17"
}

0 comments on commit 22d7aa5

Please sign in to comment.