openkylin
/
xwayland
mirror of https://gitee.com/openkylin/xwayland.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change version 

Signed-off-by: Morose <chenlinxiang@kylinos.cn>
This commit is contained in:
Morose 2023-12-08 15:28:15 +08:00 committed by openkylin-cibot
parent d7ff7949e7
commit 02d6ff2a79
5 changed files with 72 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
xwayland (2:23.2.0-1ok1) nile; urgency=medium
xwayland (2:23.2.0-ok1) nile; urgency=medium
* Add debian files

2
debian/files vendored
View File

@ -1 +1 @@
xwayland_23.2.0-1k3_source.buildinfo x11 optional
xwayland_23.2.0-1ok1_source.buildinfo x11 optional

44
debian/patches/add-logfile vendored
View File

@ -1,30 +1,24 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
xwayland (2:23.2.0-1k1) yangtze; urgency=medium
.
* Rebuild
Author: Morose <chenlinxiang@kylinos.cn>
From: Morose <chenlinxiang@kylinos.cn>
Date: Fri, 8 Dec 2023 07:28:47 +0000
Subject: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
xwayland (2:23.2.0-1k1) yangtze; urgency=medium
* Rebuild
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
hw/xwayland/xwayland.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2023-10-18
--- xwayland-23.2.0.orig/hw/xwayland/xwayland.c
+++ xwayland-23.2.0/hw/xwayland/xwayland.c
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 672dc31..6c20f22 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -44,6 +44,7 @@
#include <xserver_poll.h>
#include <propertyst.h>
@ -33,7 +27,7 @@ Last-Update: 2023-10-18
#include "xwayland-screen.h"
#include "xwayland-vidmode.h"
@@ -56,11 +57,47 @@ extern _X_EXPORT Bool noXFree86VidModeEx
@@ -56,11 +57,47 @@ extern _X_EXPORT Bool noXFree86VidModeExtension;
void
ddxGiveUp(enum ExitCode error)
{

42
debian/patches/fix-add-logfile vendored
View File

@ -1,30 +1,24 @@
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
xwayland (2:23.2.0-1k3) nile; urgency=medium
.
* Add logfile
Author: Morose <chenlinxiang@kylinos.cn>
From: Morose <chenlinxiang@kylinos.cn>
Date: Fri, 8 Dec 2023 07:28:48 +0000
Subject: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
xwayland (2:23.2.0-1k3) nile; urgency=medium
* Add logfile
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
hw/xwayland/xwayland.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2023-11-16
--- xwayland-23.2.0.orig/hw/xwayland/xwayland.c
+++ xwayland-23.2.0/hw/xwayland/xwayland.c
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 6c20f22..126be33 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -31,6 +31,7 @@
#include <stdio.h>

55
debian/patches/xwayland-Detect-gbm_bo_get_fd_for_plane-at-runtime.patch vendored
View File

@ -1,23 +1,32 @@
Description: xwayland: Detect gbm_bo_get_fd_for_plane at runtime
`gbm_bo_get_fd_for_plane` was introduced in Mesa 21 but some
proprietary GBM implementations (Xilinx) still haven't been updated
to support it:
```
/usr/bin/Xwayland: symbol lookup error: /usr/bin/Xwayland: undefined symbol: gbm_bo_get_fd_for_plane
```
.
Since distros would like to build a single Xwayland binary for all
OEMs of the same architecture, we now make the function always
available.
.
If a real implementation of `gbm_bo_get_fd_for_plane` exists at runtime
then it will be used, otherwise fall back to `gbm_bo_get_fd` or fail.
Author: Daniel van Vugt <daniel.van.vugt@canonical.com>
From: Daniel van Vugt <daniel.van.vugt@canonical.com>
Date: Fri, 8 Dec 2023 07:28:47 +0000
Subject: xwayland: Detect gbm_bo_get_fd_for_plane at runtime
Origin: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/946
Bug-Ubuntu: https://launchpad.net/bugs/1987628
Forwarded: yes
Last-Update: 2022-08-25
`gbm_bo_get_fd_for_plane` was introduced in Mesa 21 but some
proprietary GBM implementations (Xilinx) still haven't been updated
to support it:
```
/usr/bin/Xwayland: symbol lookup error: /usr/bin/Xwayland: undefined symbol: gbm_bo_get_fd_for_plane
```
Since distros would like to build a single Xwayland binary for all
OEMs of the same architecture, we now make the function always
available.
If a real implementation of `gbm_bo_get_fd_for_plane` exists at runtime
then it will be used, otherwise fall back to `gbm_bo_get_fd` or fail.
---
hw/xwayland/xwayland-glamor-gbm.c | 36 +++++++++++++++++++++++++++++++-----
include/meson.build | 2 --
2 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
index b177b77..a030ad4 100644
--- a/hw/xwayland/xwayland-glamor-gbm.c
+++ b/hw/xwayland/xwayland-glamor-gbm.c
@@ -32,6 +32,7 @@
@ -28,7 +37,7 @@ Last-Update: 2022-08-25
#include <sys/stat.h>
#include <xf86drm.h>
#include <drm_fourcc.h>
@@ -115,6 +116,33 @@ is_device_path_render_node (const char *
@@ -115,6 +116,33 @@ is_device_path_render_node (const char *device_path)
return is_render_node;
}
@ -62,7 +71,7 @@ Last-Update: 2022-08-25
static PixmapPtr
xwl_glamor_gbm_create_pixmap_for_bo(ScreenPtr screen, struct gbm_bo *bo,
int depth,
@@ -123,7 +151,6 @@ xwl_glamor_gbm_create_pixmap_for_bo(Scre
@@ -123,7 +151,6 @@ xwl_glamor_gbm_create_pixmap_for_bo(ScreenPtr screen, struct gbm_bo *bo,
PixmapPtr pixmap;
struct xwl_pixmap *xwl_pixmap;
struct xwl_screen *xwl_screen = xwl_screen_get(screen);
@ -70,7 +79,7 @@ Last-Update: 2022-08-25
struct xwl_gbm_private *xwl_gbm = xwl_gbm_get(xwl_screen);
uint64_t modifier = gbm_bo_get_modifier(bo);
const int num_planes = gbm_bo_get_plane_count(bo);
@@ -171,7 +198,6 @@ xwl_glamor_gbm_create_pixmap_for_bo(Scre
@@ -171,7 +198,6 @@ xwl_glamor_gbm_create_pixmap_for_bo(ScreenPtr screen, struct gbm_bo *bo,
};
for (plane = 0; plane < num_planes; plane++) fds[plane] = -1;
@ -78,7 +87,7 @@ Last-Update: 2022-08-25
xwl_pixmap = calloc(1, sizeof(*xwl_pixmap));
if (xwl_pixmap == NULL)
@@ -192,7 +218,6 @@ xwl_glamor_gbm_create_pixmap_for_bo(Scre
@@ -192,7 +218,6 @@ xwl_glamor_gbm_create_pixmap_for_bo(ScreenPtr screen, struct gbm_bo *bo,
xwl_pixmap->buffer = NULL;
xwl_pixmap->implicit_modifier = implicit_modifier;
@ -86,7 +95,7 @@ Last-Update: 2022-08-25
if (xwl_gbm->dmabuf_capable) {
#define ADD_ATTR(attrs, num, attr) \
do { \
@@ -207,7 +232,7 @@ xwl_glamor_gbm_create_pixmap_for_bo(Scre
@@ -207,7 +232,7 @@ xwl_glamor_gbm_create_pixmap_for_bo(ScreenPtr screen, struct gbm_bo *bo,
ADD_ATTR(img_attrs, attr_num, gbm_bo_get_format(bo));
for (plane = 0; plane < num_planes; plane++) {
@ -95,7 +104,7 @@ Last-Update: 2022-08-25
ADD_ATTR(img_attrs, attr_num, planeAttrs[plane][PLANE_FD]);
ADD_ATTR(img_attrs, attr_num, fds[plane]);
ADD_ATTR(img_attrs, attr_num, planeAttrs[plane][PLANE_OFFSET]);
@@ -234,7 +259,6 @@ xwl_glamor_gbm_create_pixmap_for_bo(Scre
@@ -234,7 +259,6 @@ xwl_glamor_gbm_create_pixmap_for_bo(ScreenPtr screen, struct gbm_bo *bo,
}
}
else
@ -103,7 +112,7 @@ Last-Update: 2022-08-25
{
xwl_pixmap->image = eglCreateImageKHR(xwl_screen->egl_display,
EGL_NO_CONTEXT,
@@ -1238,6 +1262,8 @@ xwl_glamor_init_gbm(struct xwl_screen *x
@@ -1238,6 +1262,8 @@ xwl_glamor_init_gbm(struct xwl_screen *xwl_screen)
return;
}
@ -112,6 +121,8 @@ Last-Update: 2022-08-25
dixSetPrivate(&xwl_screen->screen->devPrivates, &xwl_gbm_private_key,
xwl_gbm);
diff --git a/include/meson.build b/include/meson.build
index e6e3d55..61b1471 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -105,8 +105,6 @@ conf_data.set('GLAMOR_HAS_GBM_LINEAR',