update pkgs

bump(gpkg/mesa): to 24.0.4 bump(gpkg/bash): to 5.2.26 bump(gpkg/spirv-llvm-translator): to 18.1.0 bump(gpkg/spirv-headers): to 1.3.280.0 bump(gpkg/spirv-tools): to 2024.1 bump(gpkg/util-linux): to 2.40 bump(gpkg/libclc): to 18.1.3 fix(gpkg/glibc): adding `__shmctl64`
termux-pacman · Apr 7, 2024 · 8eb78a8 · 8eb78a8
1 parent f4acfed
commit 8eb78a8
Show file tree

Hide file tree

Showing 10 changed files with 98 additions and 91 deletions.
diff --git a/gpkg/bash/build.sh b/gpkg/bash/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A sh-compatible shell that incorporates useful features
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux-pacman"
 _MAIN_VERSION=5.2
-_PATCH_VERSION=15
+_PATCH_VERSION=26
 TERMUX_PKG_VERSION=${_MAIN_VERSION}.${_PATCH_VERSION}
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/bash/bash-${_MAIN_VERSION}.tar.gz
 TERMUX_PKG_SHA256=a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb
@@ -18,7 +18,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-installed-readline
 "
 TERMUX_PKG_CONFFILES="glibc/etc/bash.bashrc glibc/etc/bash.bash_logout glibc/etc/profile"
-TERMUX_PKG_RM_AFTER_INSTALL="share/man/man1/bashbug.1 bin/bashbug"
 
 termux_step_pre_configure() {
 	declare -A PATCH_CHECKSUMS
@@ -38,6 +37,17 @@ termux_step_pre_configure() {
 	PATCH_CHECKSUMS[013]=094b4fd81bc488a26febba5d799689b64d52a5505b63e8ee854f48d356bc7ce6
 	PATCH_CHECKSUMS[014]=3ef9246f2906ef1e487a0a3f4c647ae1c289cbd8459caa7db5ce118ef136e624
 	PATCH_CHECKSUMS[015]=ef73905169db67399a728e238a9413e0d689462cb9b72ab17a05dba51221358a
+	PATCH_CHECKSUMS[016]=155853bc5bd10e40a9bea369fb6f50a203a7d0358e9e32321be0d9fa21585915
+	PATCH_CHECKSUMS[017]=1c48cecbc9b7b4217990580203b7e1de19c4979d0bd2c0e310167df748df2c89
+	PATCH_CHECKSUMS[018]=4641dd49dd923b454dd0a346277907090410f5d60a29a2de3b82c98e49aaaa80
+	PATCH_CHECKSUMS[019]=325c26860ad4bba8558356c4ab914ac57e7b415dac6f5aae86b9b05ccb7ed282
+	PATCH_CHECKSUMS[020]=b6fc252aeb95ce67c9b017d29d81e8a5e285db4bf20d4ec8cdca35892be5c01d
+	PATCH_CHECKSUMS[021]=8334b88117ad047598f23581aeb0c66c0248cdd77abc3b4e259133aa307650cd
+	PATCH_CHECKSUMS[022]=78b5230a49594ec30811e72dcd0f56d1089710ec7828621022d08507aa57e470
+	PATCH_CHECKSUMS[023]=af905502e2106c8510ba2085aa2b56e64830fc0fdf6ee67ebb459ac11696dcd3
+	PATCH_CHECKSUMS[024]=971534490117eb05d97d7fd81f5f9d8daf927b4d581231844ffae485651b02c3
+	PATCH_CHECKSUMS[025]=5138f487e7cf71a6323dc81d22419906f1535b89835cc2ff68847e1a35613075
+	PATCH_CHECKSUMS[026]=96ee1f549aa0b530521e36bdc0ba7661602cfaee409f7023cac744dd42852eac
 
 	for PATCH_NUM in $(seq -f '%03g' ${_PATCH_VERSION}); do
 		PATCHFILE=$TERMUX_PKG_CACHEDIR/bash_patch_${PATCH_NUM}.patch

diff --git a/gpkg/glibc/build.sh b/gpkg/glibc/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="GNU C Library"
 TERMUX_PKG_LICENSE="GPL-3.0, LGPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux-pacman"
 TERMUX_PKG_VERSION=2.39
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/libc/glibc-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_SHA256=f77bd47cf8170c57365ae7bf86696c118adb3b120d3259c64c502d3dc1e2d926
 TERMUX_PKG_DEPENDS="linux-api-headers-glibc"

diff --git a/gpkg/glibc/shmctl.c.patch b/gpkg/glibc/shmctl.c.patch
@@ -1,6 +1,6 @@
---- glibc-2.39/sysdeps/unix/sysv/linux/shmctl.c	2023-02-01 06:27:45.000000000 +0300
-+++ glibc-2.39/sysdeps/unix/sysv/linux/shmctl.c.patch	2023-06-08 12:43:28.639174307 +0300
-@@ -15,277 +15,76 @@
+--- src/sysdeps/unix/sysv/linux/shmctl.c	2024-04-07 14:20:48.746263018 +0300
++++ src/sysdeps/unix/sysv/linux/shmctl.c.patch	2024-04-07 14:23:00.096262968 +0300
+@@ -15,277 +15,78 @@
     License along with the GNU C Library; if not, see
     <https://www.gnu.org/licenses/>.  */
 
@@ -164,7 +164,9 @@
 -	{
 -	  shmid64_to_kshmid64 (buf, &kshmid);
 -	  arg = &kshmid;
--	}
++		pthread_mutex_unlock (&mutex);
++		return 0;
+ 	}
 -#  ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T
 -      if (cmd == IPC_SET)
 -        arg->shm_perm.mode *= 0x10000U;
@@ -186,7 +188,7 @@
 -      return -1;
 -    }
 -
--
+ 
 -  int ret = shmctl_syscall (shmid, cmd, arg);
 -  if (ret < 0)
 -    return ret;
@@ -215,10 +217,13 @@
 -#else /* !IPC_CTL_NEED_TRANSLATION */
 -  return shmctl_syscall (shmid, cmd, buf);
 -#endif
--}
++	DBG("%s: cmd %d not implemented yet!\n", __PRETTY_FUNCTION__, cmd);
++	errno = EINVAL;
++	return -1;
+ }
 -#if __TIMESIZE != 64
 -libc_hidden_def (__shmctl64)
--
+ 
 -static void
 -shmid_to_shmid64 (struct __shmid64_ds *shm64, const struct shmid_ds *shm)
 -{
@@ -265,15 +270,13 @@
 -	{
 -	  shmid_to_shmid64 (&shmid64, buf);
 -	  buf64 = &shmid64;
-+		pthread_mutex_unlock (&mutex);
-+		return 0;
- 	}
+-	}
 -    }
 -
 -  int ret = __shmctl64 (shmid, cmd, buf64);
 -  if (ret < 0)
 -    return ret;
- 
+-
 -  switch (cmd)
 -    {
 -      case IPC_STAT:
@@ -283,10 +286,7 @@
 -    }
 -
 -  return ret;
-+	DBG("%s: cmd %d not implemented yet!\n", __PRETTY_FUNCTION__, cmd);
-+	errno = EINVAL;
-+	return -1;
- }
+-}
 -#endif
 -
 -#ifndef DEFAULT_VERSION
@@ -342,3 +342,4 @@
 -}
 -compat_symbol (libc, __old_shmctl, shmctl, GLIBC_2_0);
 -#endif
++weak_alias (shmctl, __shmctl64)
diff --git a/gpkg/libclc/build.sh b/gpkg/libclc/build.sh
@@ -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=17.0.6
+TERMUX_PKG_VERSION=18.1.3
 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=122f641d94d5dfbb3c37534f2b76612fa59d15c36c2a4917369a85eaaca32148
+TERMUX_PKG_SHA256=b117efb9a27ab923e03e565435f30ca8c5c1624d0832a09e32d14c3eb4995a7c
 TERMUX_PKG_BUILD_DEPENDS="clang-glibc, lld-glibc, python-glibc, spirv-llvm-translator-glibc"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 

diff --git 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.0.3"
+TERMUX_PKG_VERSION="24.0.4"
 TERMUX_PKG_SRCURL="https://archive.mesa3d.org/mesa-${TERMUX_PKG_VERSION}.tar.xz"
-TERMUX_PKG_SHA256="77aec9a2a37b7d3596ea1640b3cc53d0b5d9b3b52abed89de07e3717e91bfdbe"
+TERMUX_PKG_SHA256="90febd30a098cbcd97ff62ecc3dcf5c93d76f7fa314de944cfce81951ba745f0"
 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/spirv-headers/build.sh b/gpkg/spirv-headers/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Headers
 TERMUX_PKG_DESCRIPTION="SPIR-V Headers"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux-pacman"
-TERMUX_PKG_VERSION="1.3.275.0"
+TERMUX_PKG_VERSION="1.3.280.0"
 TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/vulkan-sdk-${TERMUX_PKG_VERSION}/spirv-headers-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=d46b261f1fbc5e85022cb2fada9a6facb5b0c9932b45007a77fe05639a605bd1
+TERMUX_PKG_SHA256=a00906b6bddaac1e37192eff2704582f82ce2d971f1aacee4d51d9db33b0f772
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
diff --git a/gpkg/spirv-llvm-translator/build.sh b/gpkg/spirv-llvm-translator/build.sh
@@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="Tool and a library for bi-directional translation betwee
 TERMUX_PKG_LICENSE="custom"
 TERMUX_PKG_LICENSE_FILE="LICENSE.TXT"
 TERMUX_PKG_MAINTAINER="@termux-pacman"
-TERMUX_PKG_VERSION=17.0.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=18.1.0
 TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=eba381e1dd99b4ff6c672a28f52755d1adf2d810a97b51e6074ad4fa67937fb2
+TERMUX_PKG_SHA256=78a770eff24d5ffe2798479845adec4b909cbf058ddc55830ea00fa7d2c1698a
 TERMUX_PKG_DEPENDS="libllvm-glibc, spirv-tools-glibc"
 TERMUX_PKG_BUILD_DEPENDS="llvm-glibc"
 TERMUX_PKG_NO_STATICSPLIT=true

diff --git a/gpkg/spirv-tools/build.sh b/gpkg/spirv-tools/build.sh
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
 TERMUX_PKG_DESCRIPTION="SPIR-V Tools"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux-pacman"
-TERMUX_PKG_VERSION="2023.6"
+TERMUX_PKG_VERSION="2024.1"
 TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v${TERMUX_PKG_VERSION}.rc1.tar.gz
-TERMUX_PKG_SHA256=750e4bfcaccd636fb04dd912b668a8a6d29940f8f83b7d9a266170b1023a1a89
+TERMUX_PKG_SHA256=793715a2b09b86bbd795101a201724a8fc86fe9619b1ecbaf78677e77a183b92
 TERMUX_PKG_DEPENDS="gcc-libs-glibc"
 TERMUX_PKG_BUILD_DEPENDS="spirv-headers-glibc"
 TERMUX_PKG_NO_STATICSPLIT=true

diff --git a/gpkg/util-linux/build.sh b/gpkg/util-linux/build.sh
@@ -9,10 +9,11 @@ Documentation/licenses/COPYING.BSD-3-Clause
 Documentation/licenses/COPYING.BSD-4-Clause-UC
 Documentation/licenses/COPYING.ISC"
 TERMUX_PKG_MAINTAINER="@termux-pacman"
-TERMUX_PKG_VERSION=2.39.3
-TERMUX_PKG_SRCURL=https://www.kernel.org/pub/linux/utils/util-linux/v${TERMUX_PKG_VERSION:0:4}/util-linux-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f
+TERMUX_PKG_VERSION=2.40
+TERMUX_PKG_SRCURL=https://github.com/util-linux/util-linux/archive/refs/tags/v2.40.zip
+TERMUX_PKG_SHA256=9ed02b0ba40948f1127fc2b9f6fb0444e23f6f49e760cfd25735d7b861387f5d
 TERMUX_PKG_DEPENDS="libcap-ng-glibc, ncurses-glibc, zlib-glibc, libpam-glibc, libsmartcols-glibc, bash-glibc"
+TERMUX_PKG_BUILD_DEPENDS="python-glibc"
 TERMUX_PKG_ESSENTIAL=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dlibuser=disabled
@@ -32,9 +33,10 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dbuild-su=disabled
 -Dbuild-lsmem=disabled
 -Dbuild-chmem=disabled
--Dbuild-python=disabled
+-Dpython=$TERMUX_PREFIX/bin/python
 "
 
 termux_step_configure() {
+	LDFLAGS+=" -lrt"
 	termux_step_configure_meson
 }