diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg.inc')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 161 |
1 files changed, 79 insertions, 82 deletions
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 @@ | |||
1 | SUMMARY = "The X.Org X server" | 1 | SUMMARY = "The X.Org X server" |
2 | HOMEPAGE = "http://www.x.org" | 2 | HOMEPAGE = "http://www.x.org" |
3 | SECTION = "x11/base" | 3 | SECTION = "x11/base" |
4 | LICENSE = "MIT-X" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" |
6 | 6 | ||
7 | # xf86-*-* packages depend on an X server built with the xfree86 DDX | 7 | # xf86-*-* packages depend on an X server built with the xfree86 DDX |
@@ -15,18 +15,29 @@ PROVIDES += "virtual/xserver" | |||
15 | PE = "2" | 15 | PE = "2" |
16 | 16 | ||
17 | XORG_PN = "xorg-server" | 17 | XORG_PN = "xorg-server" |
18 | SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" | 18 | SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.xz" |
19 | 19 | ||
20 | CVE_PRODUCT = "xorg-server" | 20 | UPSTREAM_CHECK_REGEX = "xorg-server-(?P<pver>\d+(\.(?!99)\d+)+)\.tar" |
21 | |||
22 | CVE_PRODUCT = "xorg-server x_server" | ||
23 | |||
24 | CVE_STATUS[CVE-2011-4613] = "not-applicable-platform: This is specific to Debian's xserver-wrapper.c" | ||
25 | CVE_STATUS[CVE-2020-25697] = "upstream-wontfix: \ | ||
26 | As per upstream, exploiting this flaw is non-trivial and it requires exact \ | ||
27 | timing on the behalf of the attacker. Many graphical applications exit if their \ | ||
28 | connection to the X server is lost, so a typical desktop session is either \ | ||
29 | impossible or difficult to exploit. There is currently no upstream patch \ | ||
30 | available for this flaw." | ||
31 | CVE_STATUS[CVE-2022-3553] = "cpe-incorrect: This is specific to XQuartz, which is the macOS X server port" | ||
21 | 32 | ||
22 | S = "${WORKDIR}/${XORG_PN}-${PV}" | 33 | S = "${WORKDIR}/${XORG_PN}-${PV}" |
23 | 34 | ||
24 | inherit autotools pkgconfig | 35 | inherit meson pkgconfig |
25 | 36 | ||
26 | inherit features_check | 37 | inherit features_check |
27 | REQUIRED_DISTRO_FEATURES = "x11" | 38 | REQUIRED_DISTRO_FEATURES = "x11" |
28 | 39 | ||
29 | LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess" | 40 | LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess libxcvt libtirpc" |
30 | DEPENDS = "xorgproto ${LIB_DEPS} font-util" | 41 | DEPENDS = "xorgproto ${LIB_DEPS} font-util" |
31 | 42 | ||
32 | # Split out some modules and extensions from the main package | 43 | # Split out some modules and extensions from the main package |
@@ -67,96 +78,80 @@ PACKAGES =+ "${PN}-sdl \ | |||
67 | ${PN}-module-libxf4bpp \ | 78 | ${PN}-module-libxf4bpp \ |
68 | xf86-video-modesetting" | 79 | xf86-video-modesetting" |
69 | 80 | ||
70 | SUMMARY_xf86-video-modesetting = "X.Org X server -- modesetting display driver" | 81 | SUMMARY:xf86-video-modesetting = "X.Org X server -- modesetting display driver" |
71 | INSANE_SKIP_${MLPREFIX}xf86-video-modesetting = "xorg-driver-abi" | 82 | INSANE_SKIP:${MLPREFIX}xf86-video-modesetting = "xorg-driver-abi" |
72 | 83 | ||
73 | XSERVER_RRECOMMENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp xf86-input-libinput" | 84 | XSERVER_RDEPENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp xf86-input-libinput" |
74 | RRECOMMENDS_${PN} += "${XSERVER_RRECOMMENDS}" | 85 | RDEPENDS:${PN} += "${XSERVER_RDEPENDS}" |
75 | RRECOMMENDS_${PN}-xwayland += "${XSERVER_RRECOMMENDS}" | 86 | RDEPENDS:${PN}-xwayland += "${XSERVER_RDEPENDS}" |
76 | RDEPENDS_${PN}-xvfb += "xkeyboard-config" | 87 | RDEPENDS:${PN}-xvfb += "xkeyboard-config" |
77 | RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" | 88 | RDEPENDS:${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" |
78 | 89 | ||
79 | 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" | 90 | 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" |
80 | FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" | 91 | FILES:${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" |
81 | FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled" | 92 | FILES:${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled" |
82 | FILES_${PN}-sdl = "${bindir}/Xsdl" | 93 | FILES:${PN}-sdl = "${bindir}/Xsdl" |
83 | FILES_${PN}-fbdev = "${bindir}/Xfbdev" | 94 | FILES:${PN}-fbdev = "${bindir}/Xfbdev" |
84 | FILES_${PN}-xvfb = "${bindir}/Xvfb" | 95 | FILES:${PN}-xvfb = "${bindir}/Xvfb" |
85 | 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" | 96 | 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" |
86 | FILES_${PN}-xephyr = "${bindir}/Xephyr" | 97 | FILES:${PN}-xephyr = "${bindir}/Xephyr" |
87 | FILES_${PN}-xwayland = "${bindir}/Xwayland" | 98 | FILES:${PN}-xwayland = "${bindir}/Xwayland" |
88 | FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" | 99 | FILES:${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" |
89 | FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so" | 100 | FILES:${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so" |
90 | FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so" | 101 | FILES:${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so" |
91 | FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so" | 102 | FILES:${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so" |
92 | FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so" | 103 | FILES:${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so" |
93 | FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so" | 104 | FILES:${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so" |
94 | FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so" | 105 | FILES:${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so" |
95 | FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so" | 106 | FILES:${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so" |
96 | FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so" | 107 | FILES:${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so" |
97 | FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so" | 108 | FILES:${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so" |
98 | FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so" | 109 | FILES:${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so" |
99 | FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so" | 110 | FILES:${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so" |
100 | FILES_${PN}-module-exa = "${libdir}/xorg/modules/libexa.so" | 111 | FILES:${PN}-module-exa = "${libdir}/xorg/modules/libexa.so" |
101 | FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so" | 112 | FILES:${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so" |
102 | FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so" | 113 | FILES:${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so" |
103 | FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so" | 114 | FILES:${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so" |
104 | FILES_xf86-video-modesetting = "${libdir}/xorg/modules/drivers/modesetting_drv.so" | 115 | FILES:xf86-video-modesetting = "${libdir}/xorg/modules/drivers/modesetting_drv.so" |
105 | 116 | ||
106 | EXTRA_OECONF += "--with-fop=no \ | 117 | EXTRA_OEMESON += " \ |
107 | --with-pic \ | 118 | -Dxnest=false \ |
108 | --disable-static \ | 119 | -Ddtrace=false \ |
109 | --disable-record \ | 120 | -Dint10=x86emu \ |
110 | --disable-dmx \ | 121 | -Dxkb_output_dir=/var/lib/xkb \ |
111 | --disable-xnest \ | ||
112 | --enable-xvfb \ | ||
113 | --enable-composite \ | ||
114 | --without-dtrace \ | ||
115 | --with-int10=x86emu \ | ||
116 | --sysconfdir=/etc/X11 \ | ||
117 | --localstatedir=/var \ | ||
118 | --with-xkb-output=/var/lib/xkb \ | ||
119 | --with-os-name=Linux \ | ||
120 | " | 122 | " |
121 | 123 | ||
122 | OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" | 124 | OPENGL_PKGCONFIGS = "dri glx glamor dri3" |
123 | PACKAGECONFIG ??= "dga dri2 udev ${XORG_CRYPTO} \ | 125 | PACKAGECONFIG ??= "dga dri2 udev ${XORG_CRYPTO} \ |
124 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ | 126 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ |
125 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'xwayland', '', d)} \ | 127 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-logind', '', d)} \ |
126 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-logind', '', d)} \ | ||
127 | " | 128 | " |
128 | 129 | ||
129 | PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" | 130 | PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev" |
130 | PACKAGECONFIG[dga] = "--enable-dga,--disable-dga" | 131 | PACKAGECONFIG[dga] = "-Ddga=true,-Ddga=false" |
131 | PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,virtual/mesa" | 132 | PACKAGECONFIG[dri] = "-Ddri1=true,-Ddri1=false,virtual/mesa" |
132 | PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2" | 133 | PACKAGECONFIG[dri2] = "-Ddri2=true,-Ddri2=false" |
133 | # DRI3 requires xshmfence to also be enabled | 134 | PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false" |
134 | PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3" | 135 | PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" |
135 | PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/libgl virtual/libx11" | 136 | PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" |
136 | PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy virtual/libgbm,libegl" | 137 | PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" |
137 | PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" | 138 | PACKAGECONFIG[systemd-logind] = "-Dsystemd_logind=true,-Dsystemd_logind=false,dbus," |
138 | PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" | 139 | PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false" |
139 | PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" | 140 | PACKAGECONFIG[xvfb] = "-Dxvfb=true,-Dxvfb=false" |
140 | PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus," | ||
141 | PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd" | ||
142 | PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama" | ||
143 | PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland wayland-native wayland-protocols libepoxy" | ||
144 | 141 | ||
145 | # Xorg requires a SHA1 implementation, pick one | 142 | # Xorg requires a SHA1 implementation, pick one |
146 | XORG_CRYPTO ??= "openssl" | 143 | XORG_CRYPTO ??= "openssl" |
147 | PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl" | 144 | PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl" |
148 | PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle" | 145 | PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle" |
149 | PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt" | 146 | PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt" |
150 | 147 | ||
151 | do_install_append () { | 148 | do_install:append () { |
152 | # Its assumed base-files creates this for us | ||
153 | rmdir ${D}${localstatedir}/log/ | ||
154 | sed -i -e 's,${libdir}/xorg/modules,${prefix}/lib*/xorg/modules,' ${D}${mandir}/man5/xorg.conf.5 | 149 | sed -i -e 's,${libdir}/xorg/modules,${prefix}/lib*/xorg/modules,' ${D}${mandir}/man5/xorg.conf.5 |
155 | } | 150 | } |
156 | 151 | ||
157 | # Add runtime provides for the ABI versions of the video and input subsystems, | 152 | # Add runtime provides for the ABI versions of the video and input subsystems, |
158 | # so that drivers can depend on the relevant version. | 153 | # so that drivers can depend on the relevant version. |
159 | python populate_packages_prepend() { | 154 | python populate_packages:prepend() { |
160 | import subprocess | 155 | import subprocess |
161 | 156 | ||
162 | # Set PKG_CONFIG_PATH so pkg-config looks at the .pc files that are going | 157 | # Set PKG_CONFIG_PATH so pkg-config looks at the .pc files that are going |
@@ -177,6 +172,8 @@ python populate_packages_prepend() { | |||
177 | return "%sxorg-abi-%s-%s" % (mlprefix, name, output) | 172 | return "%sxorg-abi-%s-%s" % (mlprefix, name, output) |
178 | 173 | ||
179 | pn = d.getVar("PN") | 174 | pn = d.getVar("PN") |
180 | d.appendVar("RPROVIDES_" + pn, " " + get_abi("input")) | 175 | d.appendVar("RPROVIDES:" + pn, " " + get_abi("input")) |
181 | d.appendVar("RPROVIDES_" + pn, " " + get_abi("video")) | 176 | d.appendVar("RPROVIDES:" + pn, " " + get_abi("video")) |
182 | } | 177 | } |
178 | |||
179 | CVE_STATUS[CVE-2023-5574] = "${@bb.utils.contains('PACKAGECONFIG', 'xvfb', '', 'not-applicable-config: specific to Xvfb', d)}" | ||