gentoo auto-resync : 13:05:2024 - 00:01:18

3 files changed, 76 insertions, 1 deletions

diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index f879d61427fc..d6f780588162 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,8 +1,9 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
+AUX weston-musl-basename.patch 2369 BLAKE2B 87b49e150f4f390bb9ce131f9cb85198d95a4916ea2ed3597ed521e0d09d747f961045cbbb1fb56356f39b71b76cda20c37a80f49f74137770f4b5a060c2ab09 SHA512 25c6abc04f9c2af541e8428d63c83c7e35eef5275839afb0fd347926b06e39064e835543d68e7bc4652eed946be2c4080b7e5ed593bae75214fd06f7e456a9e1
 AUX weston-neatvnc-0.8.patch 782 BLAKE2B bf0c5734dec8b3b859d5c080945ed8664deda3665e8311493dedbf8060760c9d71322895ed247498659e2530275a5332c9cca03b1abd68a18fa14da45a094eb2 SHA512 22860eb9322ffe64c5aa05fbe92faeb1da9cc569417c97dac339512a88f251e4573e5c9349cb5a01faea7cafe3da7a73f6fca49b36cb0bb8ac73862ecb00600c
 DIST weston-13.0.0.tar.xz 1986520 BLAKE2B df0e73e451e39b329ed327c370f42bcae01eb5b8fad67711f069fa8f24900ac0c9a9e69b9a6445b67c76ab0ce441dcd2a5a1a8aa3ac0d89a647b9661d575a917 SHA512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc
 DIST weston-13.0.1.tar.xz 1986684 BLAKE2B 7910f9b62c2fe92a6915037521024d3682f391727d615b044517e1cc2e157dc78b7571a923b9c6d62c55bf2a532101220d4ffd2ecbb81f984e9676919420576b SHA512 4a0fd0b1aec823219421d701030bc534576be64b71ede70c7d33f131e9e64c0e0dc209e62f75cecb9368df7604c1d5b2321932eccc818b529d246ec2e3114122
 EBUILD weston-13.0.0-r2.ebuild 3865 BLAKE2B 32c389046ca3b81baf43ed730c336371344f89f383a4d8b1dd25e1d397fd3d8d88af0b48dc701ffdcf0c78a8d666267a55bd0b2bd89ca78bf740052bb4b6e2cb SHA512 ea031dff688f169ce80b822d79fe21dc8dcadc7ba43e8e43e558cdff8bf3a799573142b2c7b5e22b11c0d7039f7f02ddc7f40e9094ee7e71295865738e1101c2
-EBUILD weston-13.0.1.ebuild 3869 BLAKE2B 0a96f157ca7e3c26f6aab15fcd5047df579c5d86cf1b6a56b61427da18a60b7f6ba436799da29bfe0b55cba637b22b51a816c67a64426a8e80724f9ac35e9b3e SHA512 0452797c28b6d124ac29ae7cda160f7d11111f34c5af30c9336fff3632d830c8e01c46ac63863e4a7037552e25fb6f3713519cbd27d2e16f2d69141f50d36262
+EBUILD weston-13.0.1.ebuild 3910 BLAKE2B 9c985cfa690b2bb7c694ade3d6801a9f6c2bc779363c28194c7d3dce215bb900a27294aedef27ecfe4550af2d77f3991d5c4d0dc86266b2b67b349a66aa83ef7 SHA512 8aef8df24aebe85f7d9ce8f6b04306962ec01fb5e2b1094c9d951867aa12ab9131e0e5c469a7ecea0c19e8b64a3bbfe1f5d2dd1a6902f3484adc41cd19dd4ef5
 EBUILD weston-9999.ebuild 3869 BLAKE2B 0a96f157ca7e3c26f6aab15fcd5047df579c5d86cf1b6a56b61427da18a60b7f6ba436799da29bfe0b55cba637b22b51a816c67a64426a8e80724f9ac35e9b3e SHA512 0452797c28b6d124ac29ae7cda160f7d11111f34c5af30c9336fff3632d830c8e01c46ac63863e4a7037552e25fb6f3713519cbd27d2e16f2d69141f50d36262
 MISC metadata.xml 1512 BLAKE2B 9601dd1e3a3f977f92597a498a03eb819ea19b7a8434b3a0b27c138a5f9a6aa6f0642d82c1817797a57ff576e4058f7d54cf62e3ac5b5069a844f017fb47f5a7 SHA512 fc88d3a27063106d9c554253dceb65b9e6aa6207a502b4c6cb865c9529685b738e88b7fb84258201193248d0e6060cc84bc8a29661fdb71194fe499dbb0cae57
diff --git a/dev-libs/weston/files/weston-musl-basename.patch b/dev-libs/weston/files/weston-musl-basename.patch
new file mode 100644
index 000000000000..57b91331055f
--- /dev/null
+++ b/dev-libs/weston/files/weston-musl-basename.patch
@@ -0,0 +1,73 @@
+From dbd134ca5a3c639819c6fd503de7e2c72762ada0 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 14 Dec 2023 09:13:54 -0800
+Subject: [PATCH] libweston,tools: Include libgen.h for basename signature
+Upstream: https://gitlab.freedesktop.org/wayland/weston/-/commit/dbd134ca5a3c639819c6fd503de7e2c72762ada0
+Upstream-Status: Merged in main branch
+
+Latest musl has removed the declaration from string.h [1] as it only
+implements POSIX version alone and string.h in glibc implements GNU
+version of basename. This now results in compile errors on musl.
+
+This might be a warning with older compilers but it is error with
+Clang-17+ as it treats -Wimplicit-function-declaration as error
+
+Switch the use in backlight_init function to use POSIX version
+
+[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libweston/backend-drm/libbacklight.c | 8 +++++---
+ tools/zunitc/src/zunitc_impl.c       | 1 +
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/libweston/backend-drm/libbacklight.c b/libweston/backend-drm/libbacklight.c
+index ca7f2d6806..973d15ff8c 100644
+--- a/libweston/backend-drm/libbacklight.c
++++ b/libweston/backend-drm/libbacklight.c
+@@ -41,6 +41,7 @@
+ #include <drm.h>
+ #include <fcntl.h>
+ #include <malloc.h>
++#include <libgen.h>
+ #include <string.h>
+ #include <errno.h>
+ 
+@@ -167,7 +168,7 @@ struct backlight *backlight_init(struct udev_device *drm_device,
+ 	DIR *backlights = NULL;
+ 	struct dirent *entry;
+ 	enum backlight_type type = 0;
+-	char buffer[100];
++	char buffer[100], basename_buffer[100];
+ 	struct backlight *backlight = NULL;
+ 	int ret;
+ 
+@@ -186,9 +187,10 @@ struct backlight *backlight_init(struct udev_device *drm_device,
+ 	free(path);
+ 	if (ret < 0)
+ 		return NULL;
+-
++	strncpy(basename_buffer, buffer, ret);
+ 	buffer[ret] = '\0';
+-	pci_name = basename(buffer);
++	basename_buffer[ret] = '\0';
++	pci_name = basename(basename_buffer);
+ 
+ 	if (connector_type <= 0)
+ 		return NULL;
+diff --git a/tools/zunitc/src/zunitc_impl.c b/tools/zunitc/src/zunitc_impl.c
+index 18f030158e..9b460fa03b 100644
+--- a/tools/zunitc/src/zunitc_impl.c
++++ b/tools/zunitc/src/zunitc_impl.c
+@@ -27,6 +27,7 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
++#include <libgen.h>
+ #include <stdarg.h>
+ #include <stdbool.h>
+ #include <stdio.h>
+-- 
+GitLab
+
diff --git a/dev-libs/weston/weston-13.0.1.ebuild b/dev-libs/weston/weston-13.0.1.ebuild
index 40b3bd77eef2..801ef005cb3b 100644
--- a/dev-libs/weston/weston-13.0.1.ebuild
+++ b/dev-libs/weston/weston-13.0.1.ebuild
@@ -95,6 +95,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-neatvnc-0.8.patch
+	"${FILESDIR}"/${PN}-musl-basename.patch
 )
 
 python_check_deps() {