diff options
Diffstat (limited to 'user/waypipe')
| -rw-r--r-- | user/waypipe/APKBUILD | 7 | ||||
| -rw-r--r-- | user/waypipe/tid-is-pointer.patch | 15 |
2 files changed, 20 insertions, 2 deletions
diff --git a/user/waypipe/APKBUILD b/user/waypipe/APKBUILD index 311c4e8c6..af0bdba19 100644 --- a/user/waypipe/APKBUILD +++ b/user/waypipe/APKBUILD @@ -11,7 +11,9 @@ depends="" makedepends="ffmpeg-dev libdrm-dev libva-dev lz4-dev mesa-dev meson scdoc wayland-dev wayland-protocols" subpackages="$pkgname-doc" source="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v$pkgver/$pkgname-v$pkgver.tar.bz2 - 0.9.2-fix-compile.patch" + 0.9.2-fix-compile.patch + tid-is-pointer.patch + " builddir="$srcdir/$pkgname-v$pkgver" build() { @@ -34,4 +36,5 @@ package() { } sha512sums="0ffdb49cb5dbee717798721505e4661710fcd234a55bbfe2452888024d4a8b99a0e0e99cdce23ba0b92ee456aeb9f14324baba1c7c5724cb8cca7bb6e9c276bb waypipe-v0.9.2.tar.bz2 -30c818075c95b198d351cad94e48e3d7eb3dc18f9b38964c2090483131365bf37f7eeb12ba89f17822c8cab9dbb658e7e2efcc81f0433e79c9a2cdb8bbf92dc6 0.9.2-fix-compile.patch" +30c818075c95b198d351cad94e48e3d7eb3dc18f9b38964c2090483131365bf37f7eeb12ba89f17822c8cab9dbb658e7e2efcc81f0433e79c9a2cdb8bbf92dc6 0.9.2-fix-compile.patch +93f8b9bc030f46896f7e0642a3503c14178ce1527f2a852fb7f6535055baf7e9dc9e088fbe0ac5ed3cb31dd41c4e8338f5200f85d0a93bc5dd7416ac5c773820 tid-is-pointer.patch" diff --git a/user/waypipe/tid-is-pointer.patch b/user/waypipe/tid-is-pointer.patch new file mode 100644 index 000000000..d2cfcd8d4 --- /dev/null +++ b/user/waypipe/tid-is-pointer.patch @@ -0,0 +1,15 @@ +On musl systems, pthread_t is an opaque pointer. + +This fails to compile on 32-bit systems because it is attempting to alias a +pointer of 32 bits to an integer of 64 bits, which is invalid. +--- waypipe-v0.9.2/test/common.c.old 2024-11-18 22:29:20.000000000 +0000 ++++ waypipe-v0.9.2/test/common.c 2025-08-11 07:20:46.797918115 +0000 +@@ -412,7 +412,7 @@ + pthread_t tid = pthread_self(); + char msg[1024]; + int nwri = 0; +- nwri += sprintf(msg + nwri, "%" PRIx64 " [%s:%3d] ", (uint64_t)tid, ++ nwri += sprintf(msg + nwri, "%" PRIxPTR " [%s:%3d] ", (uintptr_t)tid, + file, line); + + va_list args; |