Date: Wed, 29 Apr 2026 20:48:24 +0000 From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: ed2116f38194 - 2026Q2 - x11-servers/xlibre-server: Update to 25.1.5 Message-ID: <69f26e98.432a8.656a6adb@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch 2026Q2 has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=ed2116f381946ab248f96cd8c24c9ccf24395474 commit ed2116f381946ab248f96cd8c24c9ccf24395474 Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2026-04-29 20:41:05 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> CommitDate: 2026-04-29 20:48:15 +0000 x11-servers/xlibre-server: Update to 25.1.5 ChangeLog at: https://github.com/X11Libre/xserver/releases/tag/xlibre-xserver-25.1.5 PR: 294876 Reported by: Tomasz "CeDeROM" CEDRO <tomek __at_ cedro.info> With hat: xlibre (cherry picked from commit 5627a69f8b8d83c1c1e9410060c886b8235a4b05) --- x11-servers/xlibre-server/Makefile.version | 2 +- x11-servers/xlibre-server/distinfo | 6 +- .../files/patch-glamor__glamor_priv.h | 60 ---------------- .../xlibre-server/files/patch-glamor_glamor.h | 82 ---------------------- 4 files changed, 4 insertions(+), 146 deletions(-) diff --git a/x11-servers/xlibre-server/Makefile.version b/x11-servers/xlibre-server/Makefile.version index e99e127d7035..e6eff2f0e263 100644 --- a/x11-servers/xlibre-server/Makefile.version +++ b/x11-servers/xlibre-server/Makefile.version @@ -1,4 +1,4 @@ XLIBRE_MJR_VER=25 -XLIBRE_MIN_VER=1.4 +XLIBRE_MIN_VER=1.5 XLIBRE_VER=${XLIBRE_MJR_VER}.${XLIBRE_MIN_VER} diff --git a/x11-servers/xlibre-server/distinfo b/x11-servers/xlibre-server/distinfo index 02a561c32c0a..1abfa792ab56 100644 --- a/x11-servers/xlibre-server/distinfo +++ b/x11-servers/xlibre-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1776806273 -SHA256 (xlibre/server/X11Libre-xserver-25.1.4-xlibre-xserver-25.1.4_GH0.tar.gz) = de5f19fe9ea5a020db6fc114195b6dd1c4106d5796d2259a78b9e74d363b265a -SIZE (xlibre/server/X11Libre-xserver-25.1.4-xlibre-xserver-25.1.4_GH0.tar.gz) = 5491109 +TIMESTAMP = 1777494799 +SHA256 (xlibre/server/X11Libre-xserver-25.1.5-xlibre-xserver-25.1.5_GH0.tar.gz) = 7ee3612e7674595d7cef337d6955fddf02e63719cbc2607b29d80a17891eca0e +SIZE (xlibre/server/X11Libre-xserver-25.1.5-xlibre-xserver-25.1.5_GH0.tar.gz) = 5491211 diff --git a/x11-servers/xlibre-server/files/patch-glamor__glamor_priv.h b/x11-servers/xlibre-server/files/patch-glamor__glamor_priv.h deleted file mode 100644 index ddb2f952a7c9..000000000000 --- a/x11-servers/xlibre-server/files/patch-glamor__glamor_priv.h +++ /dev/null @@ -1,60 +0,0 @@ ---- glamor/glamor_priv.h.orig 2026-04-21 11:32:22.000000000 -0700 -+++ glamor/glamor_priv.h 2026-04-25 18:41:22.504539000 -0700 -@@ -1007,57 +1007,6 @@ - - int glamor_egl_fd_from_pixmap(ScreenPtr, PixmapPtr, CARD16 *, CARD32 *); - --/* @glamor_fds_from_pixmap: Get a dma-buf fd from a pixmap. -- * -- * @screen: Current screen pointer. -- * @pixmap: The pixmap from which we want the fd. -- * @fds, @strides, @offsets: Pointers to fill info of each plane. -- * @modifier: Pointer to fill the modifier of the buffer. -- * -- * the pixmap and the buffer associated by the fds will share the same -- * content. The caller is responsible to close the returned file descriptors. -- * Returns the number of planes, -1 on error. -- * */ --int glamor_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds, -- uint32_t *strides, uint32_t *offsets, -- uint64_t *modifier); -- --/* @glamor_pixmap_from_fds: Creates a pixmap to wrap a dma-buf fds. -- * -- * @screen: Current screen pointer. -- * @num_fds: Number of fds to import -- * @fds: The dma-buf fds to import. -- * @width: The width of the buffers. -- * @height: The height of the buffers. -- * @stride: The stride of the buffers. -- * @depth: The depth of the buffers. -- * @bpp: The bpp of the buffers. -- * @modifier: The modifier of the buffers. -- * -- * Returns a valid pixmap if the import succeeded, else NULL. -- * */ --PixmapPtr glamor_pixmap_from_fds(ScreenPtr screen, -- CARD8 num_fds, -- const int *fds, -- CARD16 width, -- CARD16 height, -- const CARD32 *strides, -- const CARD32 *offsets, -- CARD8 depth, -- CARD8 bpp, -- uint64_t modifier); -- --Bool glamor_get_formats(ScreenPtr screen, CARD32 *num_formats, CARD32 **formats); -- --Bool glamor_get_modifiers(ScreenPtr screen, -- uint32_t format, -- uint32_t *num_modifiers, -- uint64_t **modifiers); -- --Bool glamor_get_drawable_modifiers(DrawablePtr draw, -- uint32_t format, -- uint32_t *num_modifiers, -- uint64_t **modifiers); - - void glamor_egl_screen_init(ScreenPtr screen, - struct glamor_context *glamor_ctx); diff --git a/x11-servers/xlibre-server/files/patch-glamor_glamor.h b/x11-servers/xlibre-server/files/patch-glamor_glamor.h deleted file mode 100644 index 8f4c886a5ff9..000000000000 --- a/x11-servers/xlibre-server/files/patch-glamor_glamor.h +++ /dev/null @@ -1,82 +0,0 @@ ---- glamor/glamor.h.orig 2026-04-25 18:41:16.101162000 -0700 -+++ glamor/glamor.h 2026-04-25 18:41:22.504221000 -0700 -@@ -152,6 +152,23 @@ - * */ - extern _X_EXPORT Bool glamor_supports_pixmap_import_export(ScreenPtr screen); - -+/* @glamor_fds_from_pixmap: Get a dma-buf fd from a pixmap. -+ * -+ * @screen: Current screen pointer. -+ * @pixmap: The pixmap from which we want the fd. -+ * @fds, @strides, @offsets: Pointers to fill info of each plane. -+ * @modifier: Pointer to fill the modifier of the buffer. -+ * -+ * the pixmap and the buffer associated by the fds will share the same -+ * content. The caller is responsible to close the returned file descriptors. -+ * Returns the number of planes, -1 on error. -+ * */ -+extern _X_EXPORT int glamor_fds_from_pixmap(ScreenPtr screen, -+ PixmapPtr pixmap, -+ int *fds, -+ uint32_t *strides, uint32_t *offsets, -+ uint64_t *modifier); -+ - /* @glamor_fd_from_pixmap: Get a dma-buf fd from a pixmap. - * - * @screen: Current screen pointer. -@@ -217,6 +234,31 @@ - extern _X_EXPORT struct gbm_bo *glamor_gbm_bo_from_pixmap(ScreenPtr screen, - PixmapPtr pixmap); - -+/* @glamor_pixmap_from_fds: Creates a pixmap to wrap a dma-buf fds. -+ * -+ * @screen: Current screen pointer. -+ * @num_fds: Number of fds to import -+ * @fds: The dma-buf fds to import. -+ * @width: The width of the buffers. -+ * @height: The height of the buffers. -+ * @stride: The stride of the buffers. -+ * @depth: The depth of the buffers. -+ * @bpp: The bpp of the buffers. -+ * @modifier: The modifier of the buffers. -+ * -+ * Returns a valid pixmap if the import succeeded, else NULL. -+ * */ -+extern _X_EXPORT PixmapPtr glamor_pixmap_from_fds(ScreenPtr screen, -+ CARD8 num_fds, -+ const int *fds, -+ CARD16 width, -+ CARD16 height, -+ const CARD32 *strides, -+ const CARD32 *offsets, -+ CARD8 depth, -+ CARD8 bpp, -+ uint64_t modifier); -+ - /* @glamor_pixmap_from_fd: Creates a pixmap to wrap a dma-buf fd. - * - * @screen: Current screen pointer. -@@ -257,9 +299,22 @@ - CARD8 depth, - CARD8 bpp); - -+extern _X_EXPORT Bool glamor_get_formats(ScreenPtr screen, -+ CARD32 *num_formats, -+ CARD32 **formats); -+ -+extern _X_EXPORT Bool glamor_get_modifiers(ScreenPtr screen, -+ uint32_t format, -+ uint32_t *num_modifiers, -+ uint64_t **modifiers); -+ -+extern _X_EXPORT Bool glamor_get_drawable_modifiers(DrawablePtr draw, -+ uint32_t format, -+ uint32_t *num_modifiers, -+ uint64_t **modifiers); -+ - extern _X_EXPORT void glamor_set_drawable_modifiers_func(ScreenPtr screen, - GetDrawableModifiersFuncPtr func); -- - #ifdef GLAMOR_FOR_XORG - - #define GLAMOR_EGL_MODULE_NAME "glamoregl"home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f26e98.432a8.656a6adb>