Skip to content

Commit

Permalink
update pkgs (termux-pacman#268)
Browse files Browse the repository at this point in the history
gpkg/libclc
gpkg/mesa
gpkg/vulkan-icd-loader
gpkg/vulkan-tools
  • Loading branch information
termuxbot2 committed Jul 15, 2024
1 parent d61764b commit 9c195aa
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 60 deletions.
4 changes: 2 additions & 2 deletions gpkg/box64/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/ptitSeb/box64
TERMUX_PKG_DESCRIPTION="Linux Userspace x86_64 Emulator with a twist"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux-pacman"
TERMUX_PKG_VERSION=0.2.8
TERMUX_PKG_VERSION=0.3.0
TERMUX_PKG_SRCURL=https://github.com/ptitSeb/box64/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=c3cd67d253de617487fc921270045246ec46a8f5ec310326734bb2246cb64903
TERMUX_PKG_SHA256=e334e793638f375a28829c01b089c6ba27d8c3f6094fcbc9360b56ad9c09d0b5
TERMUX_PKG_DEPENDS="gcc-libs-glibc"
TERMUX_PKG_BLACKLISTED_ARCHES="arm, i686"
TERMUX_CMAKE_BUILD="Unix Makefiles"
Expand Down
4 changes: 2 additions & 2 deletions gpkg/libclc/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://libclc.llvm.org/
TERMUX_PKG_DESCRIPTION="Library requirements of the OpenCL C programming language"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux-pacman"
TERMUX_PKG_VERSION=18.1.7
TERMUX_PKG_VERSION=18.1.8
TERMUX_PKG_SRCURL=https://github.com/llvm/llvm-project/releases/download/llvmorg-$TERMUX_PKG_VERSION/libclc-$TERMUX_PKG_VERSION.src.tar.xz
TERMUX_PKG_SHA256=bf99fdabd64ebfc688775754edf4c6bd3ffc361906b710ee49107e03fd3db396
TERMUX_PKG_SHA256=905bd59e9f810d6bd0ae6874725a8f8a3c91cb416199c03f2b98b57437cfb32e
TERMUX_PKG_BUILD_DEPENDS="clang-glibc, python-glibc, spirv-llvm-translator-glibc"
TERMUX_PKG_PLATFORM_INDEPENDENT=true

Expand Down
6 changes: 3 additions & 3 deletions gpkg/mesa/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.8"
TERMUX_PKG_VERSION="24.1.3"
TERMUX_PKG_SRCURL=https://archive.mesa3d.org/mesa-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=d1ed86a266d5b7b8c136ae587ef5618ed1a9837a43440f3713622bf0123bf5c1
TERMUX_PKG_SHA256=63236426b25a745ba6aa2d6daf8cd769d5ea01887b0745ab7124d2ef33a9020d
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"
Expand All @@ -30,7 +30,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-D gles2=enabled
-D glvnd=true
-D glx=dri
-D intel-clc=disabled
-D intel-clc=system
-D libunwind=disabled
-D llvm=enabled
-D microsoft-clc=disabled
Expand Down
11 changes: 0 additions & 11 deletions gpkg/mesa/enable-smoothLines.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
--- src/src/broadcom/vulkan/v3dv_device.c 2024-01-24 23:01:24.000000000 +0300
+++ src/src/broadcom/vulkan/v3dv_device.c.patch 2024-01-31 11:04:04.927688286 +0300
@@ -383,7 +383,7 @@
/* VK_EXT_line_rasterization */
.rectangularLines = true,
.bresenhamLines = true,
- .smoothLines = false,
+ .smoothLines = true,
.stippledRectangularLines = false,
.stippledBresenhamLines = false,
.stippledSmoothLines = false,
--- src/src/freedreno/vulkan/tu_device.cc 2024-01-24 23:01:24.000000000 +0300
+++ src/src/freedreno/vulkan/tu_device.cc.patch 2024-01-31 11:04:37.987688273 +0300
@@ -505,7 +505,7 @@
Expand Down
19 changes: 3 additions & 16 deletions gpkg/mesa/gallium-targets-dri-meson-build.patch
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
We are using `install_symlink` which was introduced a version later.
--- src/meson.build 2024-02-14 23:55:00.000000000 +0300
+++ src/meson.build.patch 2024-02-17 08:32:53.127999633 +0300
@@ -23,7 +23,7 @@
['c', 'cpp'],
version : files('VERSION'),
license : 'MIT',
- meson_version : '>= 0.60',
+ meson_version : '>= 0.61',
default_options : [
'buildtype=debugoptimized',
'b_ndebug=if-release',
No, it isn't. Hardlinks won't work on Android.
--- a/src/gallium/targets/dri/meson.build 2024-01-10 23:39:55.000000000 +0300
+++ b/src/gallium/targets/dri/meson.build.patch 2024-01-11 14:21:53.100387236 +0300
@@ -132,7 +132,7 @@
--- src/src/gallium/targets/dri/meson.build 2024-07-03 17:51:12.000000000 +0300
+++ src/src/gallium/targets/dri/meson.build.patch 2024-07-14 00:07:59.742357536 +0300
@@ -143,7 +143,7 @@
'devenv_@0@'.format(d),
input : libgallium_dri,
output : d,
Expand Down
34 changes: 12 additions & 22 deletions gpkg/mesa/wsi-termux-x11-v3.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ index 9929993bbe0..85c744585a8 100644
+ int *fd,
+ uint32_t *offset)
+{
+ TU_FROM_HANDLE(tu_physical_device, pdevice, _pdevice);
+ TU_FROM_HANDLE(tu_device_memory, memory, _memory);
+ 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;
+}
Expand Down Expand Up @@ -256,24 +256,6 @@ 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
@@ -1422,7 +1422,7 @@ x11_acquire_next_image_poll_find_index(struct x11_swapchain *chain, uint32_t *im
for (uint32_t i = 0; i < chain->base.image_count; i++) {
if (!chain->images[i].busy) {
/* We found a non-busy image */
- xshmfence_await(chain->images[i].shm_fence);
+ xcb_sync_await_fence(chain->conn, 1, &chain->images[i].sync_fence);
*image_index = i;
chain->images[i].busy = true;
chain->present_poll_acquire_count++;
@@ -1578,7 +1578,7 @@ x11_acquire_next_image_from_queue(struct x11_swapchain *chain,
}

assert(image_index < chain->base.image_count);
- xshmfence_await(chain->images[image_index].shm_fence);
+ xcb_sync_await_fence(chain->conn, 1, &chain->images[image_index].sync_fence);

*image_index_out = image_index;

@@ -1617,7 +1617,7 @@ x11_present_to_x11_dri3(struct x11_swapchain *chain, uint32_t image_index,
options |= XCB_PRESENT_OPTION_SUBOPTIMAL;
#endif
Expand All @@ -283,6 +265,15 @@ index 2dff27afa64..1ba21660bab 100644

++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;

Expand Down Expand Up @@ -315,14 +306,13 @@ index 2dff27afa64..1ba21660bab 100644
}

error = xcb_request_check(chain->conn, cookie);
@@ -2201,6 +2210,12 @@ x11_image_init(VkDevice device_h, struct x11_swapchain *chain,
@@ -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);
+ image->busy = false;
+ return VK_SUCCESS;
+
out_fence:
Expand Down
4 changes: 2 additions & 2 deletions gpkg/vulkan-icd-loader/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.289
TERMUX_PKG_VERSION=1.3.290
TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/Vulkan-Loader/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=93897b1a7c5a5d69e3346ce176379f00e12223658b204651c79348ca8bec29d1
TERMUX_PKG_SHA256=a1f0d80c4ee448d4fa37d1d4a4c4cf1d6d0f5873d3ca6dffe2a9498e6e654142
TERMUX_PKG_DEPENDS="glibc"
TERMUX_PKG_BUILD_DEPENDS="vulkan-headers-glibc, libxrandr-glibc"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
Expand Down
4 changes: 2 additions & 2 deletions gpkg/vulkan-tools/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.289
TERMUX_PKG_VERSION=1.3.290
TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=1b012a16e990d6290822b45925881be650e299f34727c40fc0e8cb8aaed148bb
TERMUX_PKG_SHA256=e07c900f770a8bb596ee5c5ba427eab473ec3bc6b70df2554ebce8a51d1b282a
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="
Expand Down

0 comments on commit 9c195aa

Please sign in to comment.