Commit 0025198c authored by du dengke's avatar du dengke
Browse files

xorg-xserver: enable xinerama support

On poky master branch, it disable support for extension,
because it was opensource for demo. In release, we need
to support many cases, such as: nvidie 40** cards, so open
it should be placed in poky.
No related merge requests found
Showing with 52 additions and 0 deletions
+52 -0
From 0832337dfe77a4dab8705848f8dea55bde8bf58d Mon Sep 17 00:00:00 2001
From: dudengke <dengke.du@ucas.com.cn>
Date: Fri, 15 Nov 2024 14:32:13 +0800
Subject: [PATCH] xserver: enable xinerama extension
---
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 6b11c79be6..5c8f68d084 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -37,7 +37,7 @@ inherit features_check
REQUIRED_DISTRO_FEATURES = "x11"
LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess libxcvt libtirpc"
-DEPENDS = "xorgproto ${LIB_DEPS} font-util"
+DEPENDS = "xorgproto ${LIB_DEPS} font-util libxinerama"
# Split out some modules and extensions from the main package
# These aren't needed for basic operations and only take up space:
@@ -80,7 +80,7 @@ PACKAGES =+ "${PN}-sdl \
SUMMARY:xf86-video-modesetting = "X.Org X server -- modesetting display driver"
INSANE_SKIP:${MLPREFIX}xf86-video-modesetting = "xorg-driver-abi"
-XSERVER_RDEPENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp xf86-input-libinput"
+XSERVER_RDEPENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp xf86-input-libinput libxinerama"
RDEPENDS:${PN} += "${XSERVER_RDEPENDS}"
RDEPENDS:${PN}-xwayland += "${XSERVER_RDEPENDS}"
RDEPENDS:${PN}-xvfb += "xkeyboard-config"
@@ -119,6 +119,7 @@ EXTRA_OEMESON += " \
-Ddtrace=false \
-Dint10=x86emu \
-Dxkb_output_dir=/var/lib/xkb \
+ -Dxinerama=true \
"
OPENGL_PKGCONFIGS = "dri glx glamor dri3"
@@ -136,7 +137,7 @@ PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11"
PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl"
PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind"
PACKAGECONFIG[systemd-logind] = "-Dsystemd_logind=true,-Dsystemd_logind=false,dbus,"
-PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false"
+# PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false"
# Xorg requires a SHA1 implementation, pick one
XORG_CRYPTO ??= "openssl"
--
2.25.1
......@@ -4,6 +4,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat
file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \
file://0001-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch \
file://0001-xkb-proof-GetCountedString-against-request-length-at.patch \
file://0001-xserver-enable-xinerama-extension.patch \
"
SRC_URI[sha256sum] = "5cc4be8ee47edb58d4a90e603a59d56b40291ad38371b0bd2471fc3cbee1c587"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment