diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 56776a78040..fd0d2ee3723 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -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 diff --git a/.github/workflows/libjs-test262.yml b/.github/workflows/libjs-test262.yml index e388a373317..a8c90e01efe 100644 --- a/.github/workflows/libjs-test262.yml +++ b/.github/workflows/libjs-test262.yml @@ -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 diff --git a/Documentation/BuildInstructionsLadybird.md b/Documentation/BuildInstructionsLadybird.md index 44184ce26b2..5b52ae64780 100644 --- a/Documentation/BuildInstructionsLadybird.md +++ b/Documentation/BuildInstructionsLadybird.md @@ -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: diff --git a/Meta/CMake/vcpkg/overlay-ports/vulkan-loader/portfile.cmake b/Meta/CMake/vcpkg/overlay-ports/vulkan-loader/portfile.cmake deleted file mode 100644 index 128973eb606..00000000000 --- a/Meta/CMake/vcpkg/overlay-ports/vulkan-loader/portfile.cmake +++ /dev/null @@ -1,29 +0,0 @@ -set(VCPKG_LIBRARY_LINKAGE dynamic) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KhronosGroup/Vulkan-Loader - REF "vulkan-sdk-${VERSION}" - SHA512 8ec98e0da867f829e048e100a97d7b94a3c40f56f858e3eb81f11f6f58e20e59da6ca8785a9642958ff3b698c618b9968407028cc66dfa0ad296576bf9db45ca - HEAD_REF main -) - -vcpkg_find_acquire_program(PKGCONFIG) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTS:BOOL=OFF - -DPKG_CONFIG_EXECUTABLE="${PKGCONFIG}" - #-DBUILD_WSI_XCB_SUPPORT=OFF - #-DBUILD_WSI_XLIB_SUPPORT=OFF -) -vcpkg_cmake_install() -vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/VulkanLoader" PACKAGE_NAME VulkanLoader) - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") - -set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) - -configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/Meta/CMake/vcpkg/overlay-ports/vulkan-loader/usage b/Meta/CMake/vcpkg/overlay-ports/vulkan-loader/usage deleted file mode 100644 index e6f32865fd0..00000000000 --- a/Meta/CMake/vcpkg/overlay-ports/vulkan-loader/usage +++ /dev/null @@ -1,2 +0,0 @@ -The package @PORT@ provides the vulkan loader. -Please be aware of https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderApplicationInterface.md#bundling-the-loader-with-an-application diff --git a/Meta/CMake/vcpkg/overlay-ports/vulkan-loader/vcpkg.json b/Meta/CMake/vcpkg/overlay-ports/vulkan-loader/vcpkg.json deleted file mode 100644 index 711e349ad58..00000000000 --- a/Meta/CMake/vcpkg/overlay-ports/vulkan-loader/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "vulkan-loader", - "version": "1.3.280.0", - "description": "Vulkan Development Tools", - "homepage": "https://github.com/KhronosGroup/Vulkan-Loader", - "license": null, - "supports": "!android", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "vulkan-headers" - ] -} diff --git a/Meta/CMake/vcpkg/overlay-ports/vulkan/portfile.cmake b/Meta/CMake/vcpkg/overlay-ports/vulkan/portfile.cmake new file mode 100644 index 00000000000..065116c276a --- /dev/null +++ b/Meta/CMake/vcpkg/overlay-ports/vulkan/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/Meta/CMake/vcpkg/overlay-ports/vulkan/vcpkg.json b/Meta/CMake/vcpkg/overlay-ports/vulkan/vcpkg.json new file mode 100644 index 00000000000..889a3be1e42 --- /dev/null +++ b/Meta/CMake/vcpkg/overlay-ports/vulkan/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "vulkan", + "version-date": "2023-12-17" +}