diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver')
14 files changed, 110 insertions, 292 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf index f4cd139e8d..3eb380a0a4 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf @@ -35,4 +35,8 @@ Section "ServerLayout" Identifier "Default Layout" Screen "Default Screen" Option "AllowEmptyInput" "no" + Option "BlankTime" "0" + Option "StandbyTime" "0" + Option "SuspendTime" "0" + Option "OffTime" "0" EndSection diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf index f4cd139e8d..3eb380a0a4 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf @@ -35,4 +35,8 @@ Section "ServerLayout" Identifier "Default Layout" Screen "Default Screen" Option "AllowEmptyInput" "no" + Option "BlankTime" "0" + Option "StandbyTime" "0" + Option "SuspendTime" "0" + Option "OffTime" "0" EndSection diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf index f4cd139e8d..3eb380a0a4 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf @@ -35,4 +35,8 @@ Section "ServerLayout" Identifier "Default Layout" Screen "Default Screen" Option "AllowEmptyInput" "no" + Option "BlankTime" "0" + Option "StandbyTime" "0" + Option "SuspendTime" "0" + Option "OffTime" "0" EndSection diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf index c12d92c201..c01c3331c5 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf @@ -30,4 +30,8 @@ Section "ServerLayout" Identifier "Default Layout" Screen "Default Screen" Option "AllowEmptyInput" "no" + Option "BlankTime" "0" + Option "StandbyTime" "0" + Option "SuspendTime" "0" + Option "OffTime" "0" EndSection diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf index c12d92c201..c01c3331c5 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf @@ -30,4 +30,8 @@ Section "ServerLayout" Identifier "Default Layout" Screen "Default Screen" Option "AllowEmptyInput" "no" + Option "BlankTime" "0" + Option "StandbyTime" "0" + Option "SuspendTime" "0" + Option "OffTime" "0" EndSection diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb index 5420b7d23e..03f14cef2b 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb @@ -1,18 +1,17 @@ SUMMARY = "X.Org X server configuration file" HOMEPAGE = "http://www.x.org" SECTION = "x11/base" -LICENSE = "MIT-X" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r33" SRC_URI = "file://xorg.conf" S = "${WORKDIR}" -CONFFILES_${PN} = "${sysconfdir}/X11/xorg.conf" +CONFFILES:${PN} = "${sysconfdir}/X11/xorg.conf" PACKAGE_ARCH = "${MACHINE_ARCH}" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" do_install () { if test -s ${WORKDIR}/xorg.conf; then diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index b3e03744c0..22f7d9a8ad 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -1,7 +1,7 @@ SUMMARY = "The X.Org X server" HOMEPAGE = "http://www.x.org" SECTION = "x11/base" -LICENSE = "MIT-X" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" # xf86-*-* packages depend on an X server built with the xfree86 DDX @@ -15,18 +15,29 @@ PROVIDES += "virtual/xserver" PE = "2" XORG_PN = "xorg-server" -SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" +SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.xz" -CVE_PRODUCT = "xorg-server" +UPSTREAM_CHECK_REGEX = "xorg-server-(?P<pver>\d+(\.(?!99)\d+)+)\.tar" + +CVE_PRODUCT = "xorg-server x_server" + +CVE_STATUS[CVE-2011-4613] = "not-applicable-platform: This is specific to Debian's xserver-wrapper.c" +CVE_STATUS[CVE-2020-25697] = "upstream-wontfix: \ +As per upstream, exploiting this flaw is non-trivial and it requires exact \ +timing on the behalf of the attacker. Many graphical applications exit if their \ +connection to the X server is lost, so a typical desktop session is either \ +impossible or difficult to exploit. There is currently no upstream patch \ +available for this flaw." +CVE_STATUS[CVE-2022-3553] = "cpe-incorrect: This is specific to XQuartz, which is the macOS X server port" S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit autotools pkgconfig +inherit meson pkgconfig inherit features_check REQUIRED_DISTRO_FEATURES = "x11" -LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess" +LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess libxcvt libtirpc" DEPENDS = "xorgproto ${LIB_DEPS} font-util" # Split out some modules and extensions from the main package @@ -67,96 +78,80 @@ PACKAGES =+ "${PN}-sdl \ ${PN}-module-libxf4bpp \ xf86-video-modesetting" -SUMMARY_xf86-video-modesetting = "X.Org X server -- modesetting display driver" -INSANE_SKIP_${MLPREFIX}xf86-video-modesetting = "xorg-driver-abi" - -XSERVER_RRECOMMENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp xf86-input-libinput" -RRECOMMENDS_${PN} += "${XSERVER_RRECOMMENDS}" -RRECOMMENDS_${PN}-xwayland += "${XSERVER_RRECOMMENDS}" -RDEPENDS_${PN}-xvfb += "xkeyboard-config" -RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" - -FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d" -FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" -FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled" -FILES_${PN}-sdl = "${bindir}/Xsdl" -FILES_${PN}-fbdev = "${bindir}/Xfbdev" -FILES_${PN}-xvfb = "${bindir}/Xvfb" -FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" -FILES_${PN}-xephyr = "${bindir}/Xephyr" -FILES_${PN}-xwayland = "${bindir}/Xwayland" -FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" -FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so" -FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so" -FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so" -FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so" -FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so" -FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so" -FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so" -FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so" -FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so" -FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so" -FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so" -FILES_${PN}-module-exa = "${libdir}/xorg/modules/libexa.so" -FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so" -FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so" -FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so" -FILES_xf86-video-modesetting = "${libdir}/xorg/modules/drivers/modesetting_drv.so" - -EXTRA_OECONF += "--with-fop=no \ - --with-pic \ - --disable-static \ - --disable-record \ - --disable-dmx \ - --disable-xnest \ - --enable-xvfb \ - --enable-composite \ - --without-dtrace \ - --with-int10=x86emu \ - --sysconfdir=/etc/X11 \ - --localstatedir=/var \ - --with-xkb-output=/var/lib/xkb \ - --with-os-name=Linux \ +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" +RDEPENDS:${PN} += "${XSERVER_RDEPENDS}" +RDEPENDS:${PN}-xwayland += "${XSERVER_RDEPENDS}" +RDEPENDS:${PN}-xvfb += "xkeyboard-config" +RDEPENDS:${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" + +FILES:${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/input/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d" +FILES:${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" +FILES:${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled" +FILES:${PN}-sdl = "${bindir}/Xsdl" +FILES:${PN}-fbdev = "${bindir}/Xfbdev" +FILES:${PN}-xvfb = "${bindir}/Xvfb" +FILES:${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" +FILES:${PN}-xephyr = "${bindir}/Xephyr" +FILES:${PN}-xwayland = "${bindir}/Xwayland" +FILES:${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" +FILES:${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so" +FILES:${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so" +FILES:${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so" +FILES:${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so" +FILES:${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so" +FILES:${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so" +FILES:${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so" +FILES:${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so" +FILES:${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so" +FILES:${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so" +FILES:${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so" +FILES:${PN}-module-exa = "${libdir}/xorg/modules/libexa.so" +FILES:${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so" +FILES:${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so" +FILES:${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so" +FILES:xf86-video-modesetting = "${libdir}/xorg/modules/drivers/modesetting_drv.so" + +EXTRA_OEMESON += " \ + -Dxnest=false \ + -Ddtrace=false \ + -Dint10=x86emu \ + -Dxkb_output_dir=/var/lib/xkb \ " -OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" +OPENGL_PKGCONFIGS = "dri glx glamor dri3" PACKAGECONFIG ??= "dga dri2 udev ${XORG_CRYPTO} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'xwayland', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-logind', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-logind', '', d)} \ " -PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" -PACKAGECONFIG[dga] = "--enable-dga,--disable-dga" -PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,virtual/mesa" -PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2" -# DRI3 requires xshmfence to also be enabled -PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3" -PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/libgl virtual/libx11" -PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy virtual/libgbm,libegl" -PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" -PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" -PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" -PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus," -PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd" -PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama" -PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland wayland-native wayland-protocols libepoxy" +PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev" +PACKAGECONFIG[dga] = "-Ddga=true,-Ddga=false" +PACKAGECONFIG[dri] = "-Ddri1=true,-Ddri1=false,virtual/mesa" +PACKAGECONFIG[dri2] = "-Ddri2=true,-Ddri2=false" +PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false" +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[xvfb] = "-Dxvfb=true,-Dxvfb=false" # Xorg requires a SHA1 implementation, pick one XORG_CRYPTO ??= "openssl" -PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl" -PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle" -PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt" +PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl" +PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle" +PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt" -do_install_append () { - # Its assumed base-files creates this for us - rmdir ${D}${localstatedir}/log/ +do_install:append () { sed -i -e 's,${libdir}/xorg/modules,${prefix}/lib*/xorg/modules,' ${D}${mandir}/man5/xorg.conf.5 } # Add runtime provides for the ABI versions of the video and input subsystems, # so that drivers can depend on the relevant version. -python populate_packages_prepend() { +python populate_packages:prepend() { import subprocess # Set PKG_CONFIG_PATH so pkg-config looks at the .pc files that are going @@ -177,6 +172,8 @@ python populate_packages_prepend() { return "%sxorg-abi-%s-%s" % (mlprefix, name, output) pn = d.getVar("PN") - d.appendVar("RPROVIDES_" + pn, " " + get_abi("input")) - d.appendVar("RPROVIDES_" + pn, " " + get_abi("video")) + d.appendVar("RPROVIDES:" + pn, " " + get_abi("input")) + d.appendVar("RPROVIDES:" + pn, " " + get_abi("video")) } + +CVE_STATUS[CVE-2023-5574] = "${@bb.utils.contains('PACKAGECONFIG', 'xvfb', '', 'not-applicable-config: specific to Xvfb', d)}" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch index 4737040675..11d5546537 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch @@ -1,4 +1,4 @@ -From fc04acfd948ac99d04a5dc08c78f3b13bc0c5c41 Mon Sep 17 00:00:00 2001 +From ce3b8a230a3805c9b557c1f106795675bd034860 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 17 Aug 2020 10:50:51 -0700 Subject: [PATCH] Avoid duplicate definitions of IOPortBase @@ -10,26 +10,13 @@ compiler.h:528: multiple definition of `IOPortBase'; Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- - hw/xfree86/common/compiler.h | 2 +- hw/xfree86/os-support/linux/lnx_video.c | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) + 1 file changed, 1 insertion(+) -diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h -index 2b2008b..c7d617e 100644 ---- a/hw/xfree86/common/compiler.h -+++ b/hw/xfree86/common/compiler.h -@@ -525,7 +525,7 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset, - #define PORT_SIZE short - #endif - --_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ -+extern _X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ - - static __inline__ void - outb(unsigned PORT_SIZE port, unsigned char val) diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c -index 04e4509..9dc7316 100644 +index fd83022..1d0d96e 100644 --- a/hw/xfree86/os-support/linux/lnx_video.c +++ b/hw/xfree86/os-support/linux/lnx_video.c @@ -78,6 +78,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) @@ -40,6 +27,3 @@ index 04e4509..9dc7316 100644 #if defined(__powerpc__) volatile unsigned char *ioBase = NULL; --- -2.28.0 - diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch deleted file mode 100644 index 8b687d612d..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e50c85f4ebf559a3bac4817b41074c43d4691779 Mon Sep 17 00:00:00 2001 -From: Eric Anholt <eric@anholt.net> -Date: Fri, 26 Oct 2018 17:47:30 -0700 -Subject: [PATCH] Fix segfault on probing a non-PCI platform device on a system - with PCI. - -Some Broadcom set-top-box boards have PCI busses, but the GPU is still -probed through DT. We would dereference a null busid here in that -case. - -Signed-off-by: Eric Anholt <eric@anholt.net> - -Upstream-Status: Backport [https://github.com/freedesktop/xorg-xserver/commit/e50c85f4e] -Signed-off-by: Aníbal Limón <anibal.limon@linaro.org> ---- - hw/xfree86/common/xf86platformBus.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index cef47da03..dadbac6c8 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -289,7 +289,7 @@ xf86platformProbe(void) - for (i = 0; i < xf86_num_platform_devices; i++) { - char *busid = xf86_platform_odev_attributes(i)->busid; - -- if (pci && (strncmp(busid, "pci:", 4) == 0)) { -+ if (pci && busid && (strncmp(busid, "pci:", 4) == 0)) { - platform_find_pci_info(&xf86_platform_devices[i], busid); - } - --- -2.28.0 - diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch deleted file mode 100644 index 4b8e43f1e4..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 84338444179cab7ede1252a11b66e3b8f657e6a4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 7 Feb 2020 20:36:45 +0100 -Subject: [PATCH] drmmode_display.c: add missing mi.h include - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - hw/xfree86/drivers/modesetting/drmmode_display.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c -index e18cc37..3445cce 100644 ---- a/hw/xfree86/drivers/modesetting/drmmode_display.c -+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c -@@ -46,6 +46,7 @@ - #include "xf86Crtc.h" - #include "drmmode_display.h" - #include "present.h" -+#include "mi.h" - - #include <cursorstr.h> - diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch deleted file mode 100644 index c0c242814b..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8a382c015cd3c69fcfc146ef03dcbf30c77ff207 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 1 Mar 2019 09:47:57 -0800 -Subject: [PATCH] test/xtest: Initialize array with braces - -Fixes an error when extra warnings are enabled, this is caught with clang - -test/xtest.c:64:23: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces] - WindowRec root = {0}; - ^ - {} -1 error generated. - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - test/xtest.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/xtest.c b/test/xtest.c -index fc5e433..d7e6620 100644 ---- a/test/xtest.c -+++ b/test/xtest.c -@@ -61,7 +61,7 @@ xtest_init_devices(void) - { - ScreenRec screen = {0}; - ClientRec server_client = {0}; -- WindowRec root = {0}; -+ WindowRec root = {{0}}; - WindowOptRec optional = {0}; - - /* random stuff that needs initialization */ --- -2.21.0 - diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch deleted file mode 100644 index 2ef9fa9fe4..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/22] -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 5f65a6246fe752764045dd1e38912f1dccec71e4 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Thu, 20 Sep 2018 20:12:24 +0100 -Subject: [PATCH] xorg-server.m4: just all cflags instead of just sdkdir - -Instead of fetching just the sdkdir variable of xorg-server using pkg-config, -simply get all of the CFLAGS. Aside from completeness, this helps builds in -sysroots as pkg-config knows what to do with --cflags but doesn't remap -arbitrary variables. - -Signed-off-by: Ross Burton <ross.burton@intel.com> ---- - xorg-server.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xorg-server.m4 b/xorg-server.m4 -index 18255b91a..195bda5d8 100644 ---- a/xorg-server.m4 -+++ b/xorg-server.m4 -@@ -31,7 +31,7 @@ dnl - AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ - AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" -+ CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include "xorg-server.h" - #if !defined $1 --- -2.11.0 - diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch deleted file mode 100644 index be198ece49..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch +++ /dev/null @@ -1,50 +0,0 @@ -Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253] -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From ca832598d38ba55a001088b57d73c6d7261dc9a7 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Thu, 1 Aug 2019 15:24:51 +0100 -Subject: [PATCH] sdksyms.sh: don't embed the build path - -This script generates a header that has a comment containing the build path for -no real reason. As this source can end up deployed on targets in debug packages -this means there is both potentially sensitive information leakage about the -build environment, and a source of change for reproducible builds. ---- - hw/xfree86/sdksyms.sh | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh -index 39e33711d..bdf47a71a 100755 ---- a/hw/xfree86/sdksyms.sh -+++ b/hw/xfree86/sdksyms.sh -@@ -302,13 +302,16 @@ LC_ALL=C - export LC_ALL - ${CPP:-cpp} "$@" sdksyms.c > /dev/null || exit $? - ${CPP:-cpp} "$@" sdksyms.c | ${AWK:-awk} -v topdir=$topdir ' -+function basename(file) { -+ sub(".*/", "", file) -+ return file -+} - BEGIN { - sdk = 0; - print("/*"); - print(" * These symbols are referenced to ensure they"); - print(" * will be available in the X Server binary."); - print(" */"); -- printf("/* topdir=%s */\n", topdir); - print("_X_HIDDEN void *xorg_symbols[] = {"); - - printf("sdksyms.c:") > "sdksyms.dep"; -@@ -337,7 +340,7 @@ BEGIN { - # remove quotes - gsub(/"/, "", $3); - line = $2; -- header = $3; -+ header = basename($3); - if (! headers[$3]) { - printf(" \\\n %s", $3) >> "sdksyms.dep"; - headers[$3] = 1; --- -2.20.1 - diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.9.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.11.bb index c83e43ed99..6506d775ca 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.9.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.11.bb @@ -1,31 +1,26 @@ require xserver-xorg.inc SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ - file://pkgconfig.patch \ - file://0001-test-xtest-Initialize-array-with-braces.patch \ - file://sdksyms-no-build-path.patch \ - file://0001-drmmode_display.c-add-missing-mi.h-include.patch \ file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ - file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \ " -SRC_URI[sha256sum] = "e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571" +SRC_URI[sha256sum] = "1d3dadbd57fb86b16a018e9f5f957aeeadf744f56c0553f55737628d06d326ef" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. -RREPLACES_${PN} = "${PN}-extension-dri \ +RREPLACES:${PN} = "${PN}-extension-dri \ ${PN}-extension-dri2 \ ${PN}-extension-record \ ${PN}-extension-extmod \ ${PN}-extension-dbe \ " -RPROVIDES_${PN} = "${PN}-extension-dri \ +RPROVIDES:${PN} = "${PN}-extension-dri \ ${PN}-extension-dri2 \ ${PN}-extension-record \ ${PN}-extension-extmod \ ${PN}-extension-dbe \ " -RCONFLICTS_${PN} = "${PN}-extension-dri \ +RCONFLICTS:${PN} = "${PN}-extension-dri \ ${PN}-extension-dri2 \ ${PN}-extension-record \ ${PN}-extension-extmod \ |