diff --git a/packages/graphics/vulkan/glslang/package.mk b/packages/graphics/vulkan/glslang/package.mk index 39428be9a1..9c0d47caca 100644 --- a/packages/graphics/vulkan/glslang/package.mk +++ b/packages/graphics/vulkan/glslang/package.mk @@ -6,8 +6,8 @@ PKG_NAME="glslang" # The SPIRV-Tools & SPIRV-Headers pkg_version/s need to match the compatible (known_good) glslang pkg_version. # https://raw.githubusercontent.com/KhronosGroup/glslang/${PKG_VERSION}/known_good.json # When updating glslang pkg_version please update to the known_good spirv-tools & spirv-headers pkg_version/s. -PKG_VERSION="13.1.1" -PKG_SHA256="1c4d0a5a38c8aaf89a2d7e6093be734320599f5a6775b2726beeb05b0c054e66" +PKG_VERSION="14.0.0" +PKG_SHA256="80bbb916a23e94ea9cbfb1acb5d1a44a7e0c9613bcf5b5947c03f2273bdc92b0" PKG_LICENSE="Apache-2.0" PKG_SITE="https://github.com/KhronosGroup/glslang" PKG_URL="https://github.com/KhronosGroup/glslang/archive/${PKG_VERSION}.tar.gz" @@ -23,8 +23,7 @@ PKG_CMAKE_OPTS_COMMON="-DBUILD_EXTERNAL=ON \ -DENABLE_EXCEPTIONS=OFF \ -DENABLE_OPT=ON \ -DENABLE_PCH=ON \ - -DENABLE_CTEST=OFF \ - -DUSE_CCACHE=ON \ + -DGLSLANG_TESTS=OFF \ -Wno-dev" post_unpack() { diff --git a/packages/graphics/vulkan/glslang/patches/glslang-100.01-build-static-spirv-tools.patch b/packages/graphics/vulkan/glslang/patches/glslang-100.01-build-static-spirv-tools.patch index adde65d169..ab3ac57c9a 100644 --- a/packages/graphics/vulkan/glslang/patches/glslang-100.01-build-static-spirv-tools.patch +++ b/packages/graphics/vulkan/glslang/patches/glslang-100.01-build-static-spirv-tools.patch @@ -4,31 +4,9 @@ if(ENABLE_OPT AND NOT TARGET SPIRV-Tools-opt) if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools) set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip building SPIRV-Tools tests") -- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools spirv-tools) +- add_subdirectory(spirv-tools) + set(BUILD_SHARED_LIBS OFF CACHE BOOL "Disable build shared libs" FORCE) -+ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools EXCLUDE_FROM_ALL) ++ add_subdirectory(spirv-tools EXCLUDE_FROM_ALL) endif() endif() ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -100,7 +100,7 @@ if(ENABLE_OPT) - target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt) - target_include_directories(SPIRV PUBLIC - $ -- $) -+ $) - else() - target_link_libraries(SPIRV PRIVATE MachineIndependent) - endif() ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt -@@ -83,7 +83,7 @@ endif() - target_link_libraries(glslangValidator ${LIBRARIES}) - target_include_directories(glslangValidator PUBLIC - $ -- $) -+ $) - - if(ENABLE_OPT) - target_include_directories(glslangValidator diff --git a/packages/graphics/vulkan/spirv-headers/package.mk b/packages/graphics/vulkan/spirv-headers/package.mk index 2e6b7801d4..088ac64c0f 100644 --- a/packages/graphics/vulkan/spirv-headers/package.mk +++ b/packages/graphics/vulkan/spirv-headers/package.mk @@ -6,8 +6,8 @@ PKG_NAME="spirv-headers" # The SPIRV-Headers pkg_version needs to match the compatible (known_good) glslang pkg_version. # https://raw.githubusercontent.com/KhronosGroup/glslang/${PKG_VERSION}/known_good.json # When updating glslang pkg_version please update to the known_good spirv-headers pkg_version. -PKG_VERSION="e867c06631767a2d96424cbec530f9ee5e78180f" -PKG_SHA256="98f8afbbadaea4a2c7d7d1a549785baf5ff8ccdb046ca176d00c0e58dcb09c79" +PKG_VERSION="1c6bb2743599e6eb6f37b2969acc0aef812e32e3" +PKG_SHA256="1a248f4199f4a30b2e7304ed4d62f731765bab12d9fa4c5abb189a5e2d57f1f5" PKG_LICENSE="Apache-2.0" PKG_SITE="https://github.com/KhronosGroup/SPIRV-headers" PKG_URL="https://github.com/KhronosGroup/SPIRV-headers/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/graphics/vulkan/spirv-tools/package.mk b/packages/graphics/vulkan/spirv-tools/package.mk index 3bcfc50b36..27a351e032 100644 --- a/packages/graphics/vulkan/spirv-tools/package.mk +++ b/packages/graphics/vulkan/spirv-tools/package.mk @@ -6,8 +6,8 @@ PKG_NAME="spirv-tools" # The SPIRV-Tools pkg_version needs to match the compatible (known_good) glslang pkg_version. # https://raw.githubusercontent.com/KhronosGroup/glslang/${PKG_VERSION}/known_good.json # When updating glslang pkg_version please update to the known_good spirv-tools pkg_version. -PKG_VERSION="360d469b9eac54d6c6e20f609f9ec35e3a5380ad" -PKG_SHA256="7370b821bc223965090c35d18dae74c0bb913f9000605a729901fab0954a6fac" +PKG_VERSION="f0cc85efdbbe3a46eae90e0f915dc1509836d0fc" +PKG_SHA256="cb2f7a474feb5a530384594ce17904c1c192800bbd0e563548c784f7b72f8695" PKG_LICENSE="Apache-2.0" PKG_SITE="https://github.com/KhronosGroup/SPIRV-Tools" PKG_URL="https://github.com/KhronosGroup/SPIRV-Tools/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/wayland/compositor/sway/package.mk b/packages/wayland/compositor/sway/package.mk index a3af67d4aa..6462fdff17 100644 --- a/packages/wayland/compositor/sway/package.mk +++ b/packages/wayland/compositor/sway/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="sway" -PKG_VERSION="1.8.1" -PKG_SHA256="e9f575761342fc8fe0cfeea80c90f32ddfa8c543572fec179f40922346f47dff" +PKG_VERSION="1.9" +PKG_SHA256="b6e4e8d74af744278201792bcc4447470fcb91e15bbda475c647d475bf8e7b0b" PKG_LICENSE="MIT" PKG_SITE="https://swaywm.org/" PKG_URL="https://github.com/swaywm/sway/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/wayland/compositor/sway/patches/sway-999.01-fix-build-with-updated-libinput.patch b/packages/wayland/compositor/sway/patches/sway-999.01-fix-build-with-updated-libinput.patch deleted file mode 100644 index 29d6b13800..0000000000 --- a/packages/wayland/compositor/sway/patches/sway-999.01-fix-build-with-updated-libinput.patch +++ /dev/null @@ -1,49 +0,0 @@ -From dee032d0a0ecd958c902b88302dc59703d703c7f Mon Sep 17 00:00:00 2001 -From: Simon Ser -Date: Sun, 26 Mar 2023 23:27:40 +0200 -Subject: [PATCH] ipc: add LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM entry - -This was introduced in the last libinput release. - -Fixes the following error: - - ../sway/ipc-json.c:928:17: error: enumeration value 'LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM' not handled in switch [-Werror=switch] - 928 | switch (libinput_device_config_accel_get_profile(device)) { - | ^~~~~~ ---- - meson.build | 5 +++++ - sway/ipc-json.c | 5 +++++ - 2 files changed, 10 insertions(+) - -diff --git a/meson.build b/meson.build -index 84e7c6c56f..d1fbfa38ab 100644 ---- a/meson.build -+++ b/meson.build -@@ -117,6 +117,11 @@ conf_data.set10('HAVE_LIBSYSTEMD', sdbus.found() and sdbus.name() == 'libsystemd - conf_data.set10('HAVE_LIBELOGIND', sdbus.found() and sdbus.name() == 'libelogind') - conf_data.set10('HAVE_BASU', sdbus.found() and sdbus.name() == 'basu') - conf_data.set10('HAVE_TRAY', have_tray) -+conf_data.set10('HAVE_LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM', cc.has_header_symbol( -+ 'libinput.h', -+ 'LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM', -+ dependencies: libinput, -+)) - - scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages')) - if scdoc.found() -diff --git a/sway/ipc-json.c b/sway/ipc-json.c -index 51e6a99518..c7cbea0136 100644 ---- a/sway/ipc-json.c -+++ b/sway/ipc-json.c -@@ -935,6 +935,11 @@ static json_object *describe_libinput_device(struct libinput_device *device) { - case LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE: - accel_profile = "adaptive"; - break; -+#if HAVE_LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM -+ case LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM: -+ accel_profile = "custom"; -+ break; -+#endif - } - json_object_object_add(object, "accel_profile", - json_object_new_string(accel_profile)); diff --git a/packages/wayland/lib/fcft/package.mk b/packages/wayland/lib/fcft/package.mk index 8addd8e511..42fdde3dcc 100644 --- a/packages/wayland/lib/fcft/package.mk +++ b/packages/wayland/lib/fcft/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="fcft" -PKG_VERSION="3.1.6" -PKG_SHA256="95797f945faf407cb658efe6e5dcf0cc3ab08ef01e159383f9cf7cf5ee257506" +PKG_VERSION="3.1.7" +PKG_SHA256="53ad699d388812ec210a50ed34114d6a2de40d6fcae5b8bf2b4098d8d4ba7507" PKG_LICENSE="MIT" PKG_SITE="https://codeberg.org/dnkl/fcft" PKG_URL="https://codeberg.org/dnkl/fcft/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/wayland/lib/wlroots/package.mk b/packages/wayland/lib/wlroots/package.mk index a637241287..77b658e6ba 100644 --- a/packages/wayland/lib/wlroots/package.mk +++ b/packages/wayland/lib/wlroots/package.mk @@ -2,12 +2,12 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="wlroots" -PKG_VERSION="0.16.2" -PKG_SHA256="afea2cc740344c4e86749cf4908e07692e183cb14a3db854d24dec454c664b88" +PKG_VERSION="0.17.1" +PKG_SHA256="80fa4163ed585bce6fa0e9a35401f51da64231a3a5511118f1e4c1ac97d458f7" PKG_LICENSE="MIT" PKG_SITE="https://gitlab.freedesktop.org/wlroots/wlroots/" PKG_URL="https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" -PKG_DEPENDS_TARGET="toolchain hwdata libinput libxkbcommon pixman libdrm wayland wayland-protocols seatd" +PKG_DEPENDS_TARGET="toolchain hwdata libdisplay-info libinput libxkbcommon pixman libdrm wayland wayland-protocols seatd" PKG_LONGDESC="A modular Wayland compositor library" configure_package() { @@ -19,6 +19,7 @@ configure_package() { PKG_MESON_OPTS_TARGET="-Dxcb-errors=disabled \ -Dxwayland=disabled \ + -Dbackends=drm,libinput \ -Dexamples=false \ -Drenderers=gles2" diff --git a/packages/wayland/util/bemenu/package.mk b/packages/wayland/util/bemenu/package.mk index af797ba0a7..d6703c1c63 100644 --- a/packages/wayland/util/bemenu/package.mk +++ b/packages/wayland/util/bemenu/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bemenu" -PKG_VERSION="0.6.16" -PKG_SHA256="ccf9de47171e0d18a20a28f8460ad1360724b9dd47be346084557bd38abd33aa" +PKG_VERSION="0.6.19" +PKG_SHA256="b22adb4446a4d95ad1ad5daf565d906f414fd454082d6f533b488d70cdbcce4e" PKG_LICENSE="MIT" PKG_SITE="https://github.com/Cloudef/bemenu" PKG_URL="https://github.com/Cloudef/bemenu/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/wayland/util/wlr-randr/package.mk b/packages/wayland/util/wlr-randr/package.mk index 50c9e0b6a8..7f0c426f25 100644 --- a/packages/wayland/util/wlr-randr/package.mk +++ b/packages/wayland/util/wlr-randr/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="wlr-randr" -PKG_VERSION="0.3.1" -PKG_SHA256="918420f134fc094da0cd9cc5112b65f623abd773964bff5fa57e221204506ab2" +PKG_VERSION="0.4.0" +PKG_SHA256="3bf5446487a165cb071e24197206bb11d5db35ac05445d76184f4ef6b999ac1c" PKG_LICENSE="MIT" PKG_SITE="https://git.sr.ht/~emersion/wlr-randr" PKG_URL="https://git.sr.ht/~emersion/wlr-randr/archive/v${PKG_VERSION}.tar.gz" diff --git a/packages/wayland/wayland-protocols/package.mk b/packages/wayland/wayland-protocols/package.mk index 0d2369a736..48c1362448 100644 --- a/packages/wayland/wayland-protocols/package.mk +++ b/packages/wayland/wayland-protocols/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="wayland-protocols" -PKG_VERSION="1.32" -PKG_SHA256="7459799d340c8296b695ef857c07ddef24c5a09b09ab6a74f7b92640d2b1ba11" +PKG_VERSION="1.33" +PKG_SHA256="94f0c50b090d6e61a03f62048467b19abbe851be4e11ae7b36f65f8b98c3963a" PKG_LICENSE="OSS" PKG_SITE="https://wayland.freedesktop.org/" PKG_URL="https://gitlab.freedesktop.org/wayland/${PKG_NAME}/-/releases/${PKG_VERSION}/downloads/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/wayland/weston/package.mk b/packages/wayland/weston/package.mk index dabdaf40ad..e89417beb2 100644 --- a/packages/wayland/weston/package.mk +++ b/packages/wayland/weston/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="weston" -PKG_VERSION="12.0.2" -PKG_SHA256="eb686a7cf00992a23b17f192fca9a887313e92c346ee35d8575196983d656b4a" +PKG_VERSION="13.0.0" +PKG_SHA256="52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a" PKG_LICENSE="MIT" PKG_SITE="https://wayland.freedesktop.org/" PKG_URL="https://gitlab.freedesktop.org/wayland/weston/-/releases/${PKG_VERSION}/downloads/${PKG_NAME}-${PKG_VERSION}.tar.xz" @@ -31,7 +31,6 @@ PKG_MESON_OPTS_TARGET="-Dbackend-drm=true \ -Dshell-kiosk=false \ -Ddesktop-shell-client-default="weston-desktop-shell" \ -Dcolor-management-lcms=false \ - -Dlauncher-libseat=true \ -Dimage-jpeg=true \ -Dimage-webp=false \ -Dtools=['terminal']