From 921a44b1c71f71ae84ac1a38480a3409871e6a12 Mon Sep 17 00:00:00 2001 From: Maxython Date: Thu, 14 Nov 2024 10:08:37 +0300 Subject: [PATCH] update pkgs gpkg/libpixman gpkg/mesa gpkg/wget gpkg/xorg-util-macros gpkg/libaom gpkg/libsqlite gpkg/libtpms gpkg/mariadb gpkg/cmake gpkg/libtool gpkg/vulkan-headers gpkg/vulkan-icd-loader gpkg/vulkan-tools --- gpkg/cmake/build.sh | 4 +- gpkg/libaom/build.sh | 4 +- gpkg/libpixman/build.sh | 9 +- gpkg/libsqlite/build.sh | 2 +- gpkg/libtool/build.sh | 4 +- gpkg/libtpms/build.sh | 4 +- gpkg/mariadb/build.sh | 18 +- gpkg/mesa/build.sh | 4 +- gpkg/mesa/wsi-termux-x11-v3.patch | 328 ------------------------------ gpkg/vulkan-headers/build.sh | 4 +- gpkg/vulkan-icd-loader/build.sh | 4 +- gpkg/vulkan-tools/build.sh | 4 +- gpkg/wget/build.sh | 4 +- gpkg/xorg-util-macros/build.sh | 4 +- 14 files changed, 40 insertions(+), 357 deletions(-) delete mode 100644 gpkg/mesa/wsi-termux-x11-v3.patch diff --git a/gpkg/cmake/build.sh b/gpkg/cmake/build.sh index 0623d971a..411277ce5 100644 --- a/gpkg/cmake/build.sh +++ b/gpkg/cmake/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://cmake.org/ TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package software" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=3.31.0 +TERMUX_PKG_VERSION=3.31.1 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=300b71db6d69dcc1ab7c5aae61cbc1aa2778a3e00cbd918bc720203e311468c3 +TERMUX_PKG_SHA256=c4fc2a9bd0cd5f899ccb2fb81ec422e175090bc0de5d90e906dd453b53065719 TERMUX_PKG_DEPENDS="libcurl-glibc, libarchive-glibc, jsoncpp-glibc, libuv-glibc, rhash-glibc, cppdap-glibc, libexpat-glibc" TERMUX_PKG_RECOMMENDS="gcc-glibc, make-glibc" TERMUX_PKG_FORCE_CMAKE=true diff --git a/gpkg/libaom/build.sh b/gpkg/libaom/build.sh index b91f9a219..a12d52f73 100644 --- a/gpkg/libaom/build.sh +++ b/gpkg/libaom/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="AV1 Video Codec Library" TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_LICENSE_FILE="LICENSE, PATENTS" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=3.10.0 +TERMUX_PKG_VERSION=3.11.0 TERMUX_PKG_SRCURL=https://storage.googleapis.com/aom-releases/libaom-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=55ccb6816fb4b7d508d96a95b6e9cc3d2c0ae047f9f947dbba03720b56d89631 +TERMUX_PKG_SHA256=cf7d103d2798e512aca9c6e7353d7ebf8967ee96fffe9946e015bb9947903e3e TERMUX_PKG_DEPENDS="glibc" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -DCMAKE_BUILD_TYPE=None diff --git a/gpkg/libpixman/build.sh b/gpkg/libpixman/build.sh index d84b59e13..a2e636ee9 100644 --- a/gpkg/libpixman/build.sh +++ b/gpkg/libpixman/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://www.pixman.org/ TERMUX_PKG_DESCRIPTION="Low-level library for pixel manipulation" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=0.43.4 +TERMUX_PKG_VERSION=0.44.0 TERMUX_PKG_SRCURL=https://cairographics.org/releases/pixman-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=a0624db90180c7ddb79fc7a9151093dc37c646d8c38d3f232f767cf64b85a226 +TERMUX_PKG_SHA256=89a4c1e1e45e0b23dffe708202cb2eaffde0fe3727d7692b2e1739fec78a7dac TERMUX_PKG_DEPENDS="glibc" TERMUX_PKG_BUILD_DEPENDS="libpng-glibc" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" @@ -13,7 +13,10 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Darm-simd=disabled -Dneon=disabled -Da64-neon=disabled --Diwmmxt=disabled +-Drvv=disabled +-Dmmx=disabled +-Dsse2=disabled +-Dssse3=disabled -Dmips-dspr2=disabled -Dgtk=disabled " diff --git a/gpkg/libsqlite/build.sh b/gpkg/libsqlite/build.sh index 81c0fba3e..7f9584ab1 100644 --- a/gpkg/libsqlite/build.sh +++ b/gpkg/libsqlite/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="Public Domain" TERMUX_PKG_MAINTAINER="@termux-pacman" _SQLITE_SRCVER=3460100 _SQLITE_YEAR=2024 -TERMUX_PKG_VERSION=3.46.1 +TERMUX_PKG_VERSION=3.47.0 TERMUX_PKG_SRCURL=https://www.sqlite.org/${_SQLITE_YEAR}/sqlite-src-${_SQLITE_SRCVER}.zip TERMUX_PKG_SHA256=def3fc292eb9ecc444f6c1950e5c79d8462ed5e7b3d605fd6152d145e1d5abb4 TERMUX_PKG_DEPENDS="zlib-glibc" diff --git a/gpkg/libtool/build.sh b/gpkg/libtool/build.sh index 9e119a890..69057df44 100644 --- a/gpkg/libtool/build.sh +++ b/gpkg/libtool/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/libtool/ TERMUX_PKG_DESCRIPTION="Generic library support script hiding the complexity of using shared libraries behind a consistent, portable interface" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=2.5.3 +TERMUX_PKG_VERSION=2.5.4 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/libtool/libtool-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=9322bd8f6bc848fda3e385899dd1934957169652acef716d19d19d24053abb95 +TERMUX_PKG_SHA256=da8ebb2ce4dcf46b90098daf962cffa68f4b4f62ea60f798d0ef12929ede6adf TERMUX_PKG_DEPENDS="bash-glibc, grep-glibc, sed-glibc, tar-glibc, libltdl-glibc" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" lt_cv_sys_lib_search_path_spec=$TERMUX_PREFIX/lib diff --git a/gpkg/libtpms/build.sh b/gpkg/libtpms/build.sh index dd63fb344..3e8308e58 100644 --- a/gpkg/libtpms/build.sh +++ b/gpkg/libtpms/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/stefanberger/libtpms TERMUX_PKG_DESCRIPTION="Provides software emulation of a Trusted Platform Module (TPM 1.2 and TPM 2.0)" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=0.9.6 +TERMUX_PKG_VERSION=0.10.0 TERMUX_PKG_SRCURL=https://github.com/stefanberger/libtpms/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=2807466f1563ebe45fdd12dd26e501e8a0c4fbb99c7c428fbb508789efd221c0 +TERMUX_PKG_SHA256=6da9a527b3afa7b1470acd4cd17157b8646c31a2c7ff3ba2dfc50c81ba413426 TERMUX_PKG_DEPENDS="openssl-glibc" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-openssl diff --git a/gpkg/mariadb/build.sh b/gpkg/mariadb/build.sh index fc249350b..bb6c5014b 100644 --- a/gpkg/mariadb/build.sh +++ b/gpkg/mariadb/build.sh @@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://mariadb.org TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION="11.5.2" -TERMUX_PKG_SRCURL=https://mirror.netcologne.de/mariadb/mariadb-${TERMUX_PKG_VERSION}/source/mariadb-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=e25fac00aeb34610faf62182836a14e3310c0ca5d882e9109f63bd8dfdc3542d +TERMUX_PKG_VERSION="11.7.1" +TERMUX_PKG_SRCURL=git+https://github.com/MariaDB/server +TERMUX_PKG_SHA256=3a2aaa2b6c82a374f19aad2bcbe5f51037831ec497029558d594ff822b2370da +TERMUX_PKG_GIT_BRANCH="mariadb-${TERMUX_PKG_VERSION}" TERMUX_PKG_DEPENDS="openssl-glibc, libxcrypt-glibc, pcre2-glibc, zlib-glibc, zstd-glibc, ncurses-glibc, libbz2-glibc, libxml2-glibc, liblz4-glibc, perl-glibc" TERMUX_PKG_BUILD_DEPENDS="boost-glibc" TERMUX_PKG_CMAKE_CROSSCOMPILING=false @@ -52,9 +53,16 @@ glibc/sql-bench glibc/mariadb-test " +termux_step_post_get_source() { + local s=$(find . -type f ! -path '*/.git/*' -print0 | xargs -0 sha256sum | LC_ALL=C sort | sha256sum) + if [[ "${s}" != "${TERMUX_PKG_SHA256} "* ]]; then + termux_error_exit "Checksum mismatch for source files." + fi +} + termux_step_pre_configure() { - CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" - CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" + CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2} -Wno-return-mismatch -Wno-incompatible-pointer-types" + CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2} -fpermissive" } termux_step_create_debscripts() { diff --git a/gpkg/mesa/build.sh b/gpkg/mesa/build.sh index af1897b9f..e8ae097fe 100644 --- a/gpkg/mesa/build.sh +++ b/gpkg/mesa/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="An open-source implementation of the OpenGL specificatio TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE_FILE="docs/license.rst" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION="24.2.6" +TERMUX_PKG_VERSION="24.2.8" TERMUX_PKG_SRCURL=https://mesa.freedesktop.org/archive/mesa-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=2b68c4a6f204c1999815a457299f81c41ba7bf48c4674b0b2d1d8864f41f3709 +TERMUX_PKG_SHA256=999d0a854f43864fc098266aaf25600ce7961318a1e2e358bff94a7f53580e30 TERMUX_PKG_DEPENDS="libglvnd-glibc, gcc-libs-glibc, libdrm-glibc, libllvm-glibc, libexpat-glibc, zlib-glibc, zstd-glibc, libx11-glibc, libxcb-glibc, libxext-glibc, libxfixes-glibc, libxshmfence-glibc, libxxf86vm-glibc, libwayland-glibc, libvdpau-glibc, libomxil-bellagio-glibc, libva-glibc, libxml2-glibc, libelf-glibc, libbz2-glibc, libclc-glibc" TERMUX_PKG_SUGGESTS="mesa-dev-glibc" TERMUX_PKG_BUILD_DEPENDS="llvm-glibc, libwayland-protocols-glibc, xorgproto-glibc, glslang-glibc" diff --git a/gpkg/mesa/wsi-termux-x11-v3.patch b/gpkg/mesa/wsi-termux-x11-v3.patch deleted file mode 100644 index ddaf0fc7a..000000000 --- a/gpkg/mesa/wsi-termux-x11-v3.patch +++ /dev/null @@ -1,328 +0,0 @@ -diff --git a/src/freedreno/vulkan/tu_wsi.cc b/src/freedreno/vulkan/tu_wsi.cc -index 9929993bbe0..85c744585a8 100644 ---- a/src/freedreno/vulkan/tu_wsi.cc -+++ b/src/freedreno/vulkan/tu_wsi.cc -@@ -14,6 +14,18 @@ - - #include "tu_device.h" - -+static void -+kgsl_get_info(VkPhysicalDevice _pdevice, -+ VkDeviceMemory _memory, -+ int *fd, -+ uint32_t *offset) -+{ -+ VK_FROM_HANDLE(tu_physical_device, pdevice, _pdevice); -+ VK_FROM_HANDLE(tu_device_memory, memory, _memory); -+ *fd = pdevice->local_fd; -+ *offset = memory->bo->gem_handle << 12; -+} -+ - static VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL - tu_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName) - { -@@ -45,6 +57,11 @@ tu_wsi_init(struct tu_physical_device *physical_device) - if (result != VK_SUCCESS) - return result; - -+ if (strcmp(physical_device->instance->knl->name, "kgsl") == 0) { -+ physical_device->wsi_device.kgsl_get_info = kgsl_get_info; -+ physical_device->wsi_device.is_tu_kgsl = true; -+ } -+ - physical_device->wsi_device.supports_modifiers = true; - physical_device->wsi_device.can_present_on_device = - tu_wsi_can_present_on_device; -diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c -index 726862560e8..3539a585d22 100644 ---- a/src/vulkan/wsi/wsi_common.c -+++ b/src/vulkan/wsi/wsi_common.c -@@ -1424,7 +1424,7 @@ wsi_common_queue_present(const struct wsi_device *wsi, - assert(!has_signal_dma_buf); - #endif - -- if (wsi->sw) -+ if (wsi->sw || (wsi->is_tu_kgsl && !has_signal_dma_buf)) - wsi->WaitForFences(device, 1, &swapchain->fences[image_index], - true, ~0ull); - -diff --git a/src/vulkan/wsi/wsi_common.h b/src/vulkan/wsi/wsi_common.h -index 346025602b9..fbf22a736c1 100644 ---- a/src/vulkan/wsi/wsi_common.h -+++ b/src/vulkan/wsi/wsi_common.h -@@ -168,6 +168,7 @@ struct wsi_device { - } win32; - - bool sw; -+ bool is_tu_kgsl; - - /* Set to true if the implementation is ok with linear WSI images. */ - bool wants_linear; -@@ -221,6 +222,11 @@ struct wsi_device { - */ - VkQueue (*get_blit_queue)(VkDevice device); - -+ void (*kgsl_get_info)(VkPhysicalDevice _pdevice, -+ VkDeviceMemory _memory, -+ int *fd, -+ uint32_t *offset); -+ - #define WSI_CB(cb) PFN_vk##cb cb - WSI_CB(AllocateMemory); - WSI_CB(AllocateCommandBuffers); -diff --git a/src/vulkan/wsi/wsi_common_drm.c b/src/vulkan/wsi/wsi_common_drm.c -index b53d485ef3a..da6afac2376 100644 ---- a/src/vulkan/wsi/wsi_common_drm.c -+++ b/src/vulkan/wsi/wsi_common_drm.c -@@ -39,6 +39,10 @@ - #include - #include - #include -+#include -+#include -+#include -+#include - - static VkResult - wsi_dma_buf_export_sync_file(int dma_buf_fd, int *sync_file_fd) -@@ -54,7 +58,7 @@ wsi_dma_buf_export_sync_file(int dma_buf_fd, int *sync_file_fd) - }; - int ret = drmIoctl(dma_buf_fd, DMA_BUF_IOCTL_EXPORT_SYNC_FILE, &export); - if (ret) { -- if (errno == ENOTTY || errno == EBADF || errno == ENOSYS) { -+ if (errno == ENOTTY || errno == EBADF || errno == ENOSYS || errno == ENODEV) { - no_dma_buf_sync_file = true; - return VK_ERROR_FEATURE_NOT_PRESENT; - } else { -@@ -82,7 +86,7 @@ wsi_dma_buf_import_sync_file(int dma_buf_fd, int sync_file_fd) - }; - int ret = drmIoctl(dma_buf_fd, DMA_BUF_IOCTL_IMPORT_SYNC_FILE, &import); - if (ret) { -- if (errno == ENOTTY || errno == EBADF || errno == ENOSYS) { -+ if (errno == ENOTTY || errno == EBADF || errno == ENOSYS || errno == ENODEV) { - no_dma_buf_sync_file = true; - return VK_ERROR_FEATURE_NOT_PRESENT; - } else { -@@ -306,6 +310,11 @@ wsi_create_native_image_mem(const struct wsi_swapchain *chain, - const struct wsi_image_info *info, - struct wsi_image *image); - -+static VkResult -+wsi_create_kgsl_image_mem(const struct wsi_swapchain *chain, -+ const struct wsi_image_info *info, -+ struct wsi_image *image); -+ - static VkResult - wsi_configure_native_image(const struct wsi_swapchain *chain, - const VkSwapchainCreateInfoKHR *pCreateInfo, -@@ -444,7 +453,10 @@ wsi_configure_native_image(const struct wsi_swapchain *chain, - } - } - -- info->create_mem = wsi_create_native_image_mem; -+ if (wsi->is_tu_kgsl) -+ info->create_mem = wsi_create_kgsl_image_mem; -+ else -+ info->create_mem = wsi_create_native_image_mem; - - return VK_SUCCESS; - -@@ -563,6 +575,124 @@ wsi_create_native_image_mem(const struct wsi_swapchain *chain, - return VK_SUCCESS; - } - -+static int -+dma_heap_alloc(uint64_t size) -+{ -+ int fd = -1, heap = open("/dev/dma_heap/system", O_RDONLY); -+ if (heap < 0) -+ goto fail_open; -+ struct dma_heap_allocation_data alloc_data = {.len = size, .fd_flags = O_RDWR | O_CLOEXEC}; -+ if (ioctl(heap, DMA_HEAP_IOCTL_ALLOC, &alloc_data) < 0) -+ goto fail_alloc; -+ fd = alloc_data.fd; -+fail_alloc: -+ close(heap); -+fail_open: -+ return fd; -+} -+ -+static int ion_alloc(uint64_t size) { -+ int fd = -1, ion_dev = open("/dev/ion", O_RDONLY); -+ if (ion_dev < 0) -+ goto fail_open; -+ struct ion_allocation_data { -+ __u64 len; -+ __u32 heap_id_mask; -+ __u32 flags; -+ __u32 fd; -+ __u32 unused; -+ } alloc_data = { -+ .len = size, -+ /* ION_HEAP_SYSTEM | ION_SYSTEM_HEAP_ID */ -+ .heap_id_mask = (1U << 0) | (1U << 25), -+ .flags = 0, /* uncached */ -+ }; -+ if (ioctl(ion_dev, _IOWR('I', 0, struct ion_allocation_data), &alloc_data) < -+ 0) -+ goto fail_alloc; -+ fd = alloc_data.fd; -+fail_alloc: -+ close(ion_dev); -+fail_open: -+ return fd; -+}; -+ -+static VkResult -+wsi_create_kgsl_image_mem(const struct wsi_swapchain *chain, -+ const struct wsi_image_info *info, -+ struct wsi_image *image) -+{ -+ const struct wsi_device *wsi = chain->wsi; -+ VkResult result; -+ -+ VkMemoryRequirements reqs; -+ wsi->GetImageMemoryRequirements(chain->device, image->image, &reqs); -+ -+ if (debug_get_bool_option("USE_HEAP", true)) { -+ image->dma_buf_fd = dma_heap_alloc(reqs.size); -+ if (image->dma_buf_fd < 0) -+ image->dma_buf_fd = ion_alloc(reqs.size); -+ } -+ -+ const struct wsi_memory_allocate_info memory_wsi_info = { -+ .sType = VK_STRUCTURE_TYPE_WSI_MEMORY_ALLOCATE_INFO_MESA, -+ .pNext = NULL, -+ .implicit_sync = true, -+ }; -+ const VkImportMemoryFdInfoKHR memory_import_info = { -+ .sType = VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR, -+ .pNext = &memory_wsi_info, -+ .fd = os_dupfd_cloexec(image->dma_buf_fd), -+ .handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT -+ }; -+ const VkMemoryDedicatedAllocateInfo memory_dedicated_info = { -+ .sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO, -+ .pNext = (image->dma_buf_fd < 0) ? (void*)&memory_wsi_info : (void*)&memory_import_info, -+ .image = image->image, -+ .buffer = VK_NULL_HANDLE, -+ }; -+ const VkMemoryAllocateInfo memory_info = { -+ .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, -+ .pNext = &memory_dedicated_info, -+ .allocationSize = reqs.size, -+ .memoryTypeIndex = -+ wsi_select_device_memory_type(wsi, reqs.memoryTypeBits), -+ }; -+ result = wsi->AllocateMemory(chain->device, &memory_info, -+ &chain->alloc, &image->memory); -+ if (result != VK_SUCCESS) -+ return result; -+ -+ uint32_t dma_buf_offset = 0; -+ if (image->dma_buf_fd == -1) -+ wsi->kgsl_get_info(wsi->pdevice, image->memory, &image->dma_buf_fd, -+ &dma_buf_offset); -+ -+ image->cpu_map = mmap(0, reqs.size, PROT_READ | PROT_WRITE, MAP_SHARED, -+ image->dma_buf_fd, dma_buf_offset); -+ -+ if (image->cpu_map == MAP_FAILED) -+ return VK_ERROR_OUT_OF_HOST_MEMORY; -+ munmap(image->cpu_map, reqs.size); -+ -+ const VkImageSubresource image_subresource = { -+ .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, -+ .mipLevel = 0, -+ .arrayLayer = 0, -+ }; -+ VkSubresourceLayout image_layout; -+ wsi->GetImageSubresourceLayout(chain->device, image->image, -+ &image_subresource, &image_layout); -+ -+ image->drm_modifier = 1274; /* termux-x11's RAW_MMAPPABLE_FD */ -+ image->num_planes = 1; -+ image->sizes[0] = reqs.size; -+ image->row_pitches[0] = image_layout.rowPitch; -+ image->offsets[0] = dma_buf_offset; -+ -+ return VK_SUCCESS; -+} -+ - #define WSI_PRIME_LINEAR_STRIDE_ALIGN 256 - - static VkResult -diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c -index 2dff27afa64..1ba21660bab 100644 ---- a/src/vulkan/wsi/wsi_common_x11.c -+++ b/src/vulkan/wsi/wsi_common_x11.c -@@ -1617,7 +1617,7 @@ x11_present_to_x11_dri3(struct x11_swapchain *chain, uint32_t image_index, - options |= XCB_PRESENT_OPTION_SUBOPTIMAL; - #endif - -- xshmfence_reset(image->shm_fence); -+ xcb_sync_reset_fence(chain->conn, image->sync_fence); - - ++chain->sent_image_count; - assert(chain->sent_image_count <= chain->base.image_count); -@@ -1749,7 +1749,7 @@ x11_acquire_next_image(struct wsi_swapchain *anv_chain, - assert(*image_index < chain->base.image_count); - if (chain->images[*image_index].shm_fence && - !chain->base.image_info.explicit_sync) -- xshmfence_await(chain->images[*image_index].shm_fence); -+ xcb_sync_await_fence(chain->conn, 1, &chain->images[*image_index].sync_fence); - - return result; - } -@@ -2185,14 +2185,23 @@ x11_image_init(VkDevice device_h, struct x11_swapchain *chain, - return VK_ERROR_OUT_OF_HOST_MEMORY; - - cookie = -- xcb_dri3_pixmap_from_buffer_checked(chain->conn, -- image->pixmap, -- chain->window, -- image->base.sizes[0], -- pCreateInfo->imageExtent.width, -- pCreateInfo->imageExtent.height, -- image->base.row_pitches[0], -- chain->depth, bpp, fd); -+ xcb_dri3_pixmap_from_buffers_checked(chain->conn, -+ image->pixmap, -+ chain->window, -+ 1, -+ pCreateInfo->imageExtent.width, -+ pCreateInfo->imageExtent.height, -+ image->base.row_pitches[0], -+ image->base.offsets[0], -+ 0, -+ 0, -+ 0, -+ 0, -+ 0, -+ 0, -+ chain->depth, bpp, -+ image->base.drm_modifier, -+ &fd); - } - - error = xcb_request_check(chain->conn, cookie); -@@ -2201,6 +2210,11 @@ x11_image_init(VkDevice device_h, struct x11_swapchain *chain, - goto fail_image; - } - -+ image->sync_fence = xcb_generate_id(chain->conn); -+ xcb_sync_create_fence(chain->conn, image->pixmap, image->sync_fence, false); -+ xcb_sync_trigger_fence(chain->conn, image->sync_fence); -+ return VK_SUCCESS; -+ - out_fence: - fence_fd = xshmfence_alloc_shm(); - if (fence_fd < 0) -@@ -2245,7 +2260,6 @@ x11_image_finish(struct x11_swapchain *chain, - if (!chain->base.wsi->sw || chain->has_mit_shm) { - cookie = xcb_sync_destroy_fence(chain->conn, image->sync_fence); - xcb_discard_reply(chain->conn, cookie.sequence); -- xshmfence_unmap_shm(image->shm_fence); - - cookie = xcb_free_pixmap(chain->conn, image->pixmap); - xcb_discard_reply(chain->conn, cookie.sequence); diff --git a/gpkg/vulkan-headers/build.sh b/gpkg/vulkan-headers/build.sh index 959d439f3..85a7de674 100644 --- a/gpkg/vulkan-headers/build.sh +++ b/gpkg/vulkan-headers/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers TERMUX_PKG_DESCRIPTION="Vulkan Header files and API registry" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION="1.3.301" +TERMUX_PKG_VERSION="1.4.303" TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/Vulkan-Headers/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=6c02949bed7f3984e1d12263bdce52a1c99e54a1abcdae90d00527c2890c1cc5 +TERMUX_PKG_SHA256=fdf0e2e05356b455137ff97f837c9689ba253ec7d20f87ad81575b9bdbe7fdd4 TERMUX_PKG_PLATFORM_INDEPENDENT=true diff --git a/gpkg/vulkan-icd-loader/build.sh b/gpkg/vulkan-icd-loader/build.sh index 51879bc80..d3b6ad832 100644 --- a/gpkg/vulkan-icd-loader/build.sh +++ b/gpkg/vulkan-icd-loader/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="LICENSE.txt" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=1.3.301 +TERMUX_PKG_VERSION=1.4.303 TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/Vulkan-Loader/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=7f6895bb25faaca72b9d75325f1d225ae7f30081d3e81c8c19f2c4556b23d676 +TERMUX_PKG_SHA256=248a5f7dbf990609f61dac34d19e43f441ccc31fd5ec49b64e807740099057a9 TERMUX_PKG_DEPENDS="glibc" TERMUX_PKG_BUILD_DEPENDS="vulkan-headers-glibc, libxrandr-glibc" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/gpkg/vulkan-tools/build.sh b/gpkg/vulkan-tools/build.sh index 2ce7b4d05..2c0dd75fc 100644 --- a/gpkg/vulkan-tools/build.sh +++ b/gpkg/vulkan-tools/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Vulkan Tools and Utilities" TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="LICENSE.txt" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=1.3.301 +TERMUX_PKG_VERSION=1.4.303 TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=452a1693fdde1f175fc82e3461ebd09cb8285246972bc6dc206ad0f72f6a5acd +TERMUX_PKG_SHA256=958b646bbc5ac0a54908342df30da8c183690f579dce7f7130ac93d433d9d3a8 TERMUX_PKG_DEPENDS="gcc-libs-glibc, libx11-glibc, libxcb-glibc, libwayland-glibc, vulkan-icd-loader-glibc" TERMUX_PKG_BUILD_DEPENDS="vulkan-headers-glibc, libwayland-protocols-glibc, vulkan-volk-glibc" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/gpkg/wget/build.sh b/gpkg/wget/build.sh index 2d1ed5433..1c671c343 100644 --- a/gpkg/wget/build.sh +++ b/gpkg/wget/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/wget/ TERMUX_PKG_DESCRIPTION="Commandline tool for retrieving files using HTTP, HTTPS and FTP" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=1.24.5 +TERMUX_PKG_VERSION=1.25.0 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/wget/wget-${TERMUX_PKG_VERSION}.tar.lz -TERMUX_PKG_SHA256=57a107151e4ef94fdf94affecfac598963f372f13293ed9c74032105390b36ee +TERMUX_PKG_SHA256=19225cc756b0a088fc81148dc6a40a0c8f329af7fd8483f1c7b2fe50f4e08a1f TERMUX_PKG_DEPENDS="libidn2-glibc, libuuid-glibc, openssl-glibc, pcre2-glibc, zlib-glibc, libnettle-glibc, libpsl-glibc, libgnutls-glibc" TERMUX_PKG_CONFFILES="glibc/etc/wgetrc" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/gpkg/xorg-util-macros/build.sh b/gpkg/xorg-util-macros/build.sh index be5b03768..a6d2ec705 100644 --- a/gpkg/xorg-util-macros/build.sh +++ b/gpkg/xorg-util-macros/build.sh @@ -4,7 +4,7 @@ TERMUX_PKG_DESCRIPTION="X.Org Autotools macros" TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="COPYING" TERMUX_PKG_MAINTAINER="@termux-pacman" -TERMUX_PKG_VERSION=1.20.1 +TERMUX_PKG_VERSION=1.20.2 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/util/util-macros-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=0b308f62dce78ac0f4d9de6888234bf170f276b64ac7c96e99779bb4319bcef5 +TERMUX_PKG_SHA256=9ac269eba24f672d7d7b3574e4be5f333d13f04a7712303b1821b2a51ac82e8e TERMUX_PKG_PLATFORM_INDEPENDENT=true