zepto-forks/meta-mortsgna
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xserver-xorg: Run all scripts to make compatible with oe-core master

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2022-04-09 14:29:38 +02:00
parent 11c94efca2
commit 6ce853cf92
2 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
recipes-graphics/xorg-xserver/xserver-xorg.inc
View File

@@ -1,7 +1,7 @@
SUMMARY = "The X.Org X server" SUMMARY = "The X.Org X server"
HOMEPAGE = "http://www.x.org" HOMEPAGE = "http://www.x.org"
SECTION = "x11/base" SECTION = "x11/base"
LICENSE = "MIT-X" LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880"
# xf86-*-* packages depend on an X server built with the xfree86 DDX # xf86-*-* packages depend on an X server built with the xfree86 DDX
@@ -20,13 +20,13 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.gz"
CVE_PRODUCT = "xorg-server x_server" CVE_PRODUCT = "xorg-server x_server"
# This is specific to Debian's xserver-wrapper.c # This is specific to Debian's xserver-wrapper.c
CVE_CHECK_WHITELIST += "CVE-2011-4613" CVE_CHECK_IGNORE += "CVE-2011-4613"
# As per upstream, exploiting this flaw is non-trivial and it requires exact # 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 # 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 # 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 # impossible or difficult to exploit. There is currently no upstream patch
# available for this flaw. # available for this flaw.
CVE_CHECK_WHITELIST += "CVE-2020-25697" CVE_CHECK_IGNORE += "CVE-2020-25697"
S = "${WORKDIR}/${XORG_PN}-${PV}" S = "${WORKDIR}/${XORG_PN}-${PV}"
@@ -76,41 +76,41 @@ PACKAGES =+ "${PN}-sdl \
${PN}-module-libxf4bpp \ ${PN}-module-libxf4bpp \
xf86-video-modesetting" xf86-video-modesetting"
SUMMARY_xf86-video-modesetting = "X.Org X server -- modesetting display driver" SUMMARY:xf86-video-modesetting = "X.Org X server -- modesetting display driver"
INSANE_SKIP_${MLPREFIX}xf86-video-modesetting = "xorg-driver-abi" INSANE_SKIP:${MLPREFIX}xf86-video-modesetting = "xorg-driver-abi"
XSERVER_RRECOMMENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp xf86-input-libinput" XSERVER_RRECOMMENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp xf86-input-libinput"
RRECOMMENDS_${PN} += "${XSERVER_RRECOMMENDS}" RRECOMMENDS:${PN} += "${XSERVER_RRECOMMENDS}"
RRECOMMENDS_${PN}-xwayland += "${XSERVER_RRECOMMENDS}" RRECOMMENDS:${PN}-xwayland += "${XSERVER_RRECOMMENDS}"
RDEPENDS_${PN}-xvfb += "xkeyboard-config" RDEPENDS:${PN}-xvfb += "xkeyboard-config"
RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" 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} = "${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}-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}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled"
FILES_${PN}-sdl = "${bindir}/Xsdl" FILES:${PN}-sdl = "${bindir}/Xsdl"
FILES_${PN}-fbdev = "${bindir}/Xfbdev" FILES:${PN}-fbdev = "${bindir}/Xfbdev"
FILES_${PN}-xvfb = "${bindir}/Xvfb" 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}-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}-xephyr = "${bindir}/Xephyr"
FILES_${PN}-xwayland = "${bindir}/Xwayland" FILES:${PN}-xwayland = "${bindir}/Xwayland"
FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" FILES:${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so" FILES:${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so" FILES:${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"
FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so" FILES:${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so" FILES:${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so"
FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so" FILES:${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so"
FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so" FILES:${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so"
FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so" FILES:${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so"
FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so" FILES:${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so"
FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so" FILES:${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so"
FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so" FILES:${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so"
FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so" FILES:${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so"
FILES_${PN}-module-exa = "${libdir}/xorg/modules/libexa.so" FILES:${PN}-module-exa = "${libdir}/xorg/modules/libexa.so"
FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so" FILES:${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so" FILES:${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so" FILES:${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
FILES_xf86-video-modesetting = "${libdir}/xorg/modules/drivers/modesetting_drv.so" FILES:xf86-video-modesetting = "${libdir}/xorg/modules/drivers/modesetting_drv.so"
EXTRA_OECONF += "--with-fop=no \ EXTRA_OECONF += "--with-fop=no \
--with-pic \ --with-pic \
@@ -157,7 +157,7 @@ PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl"
PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle" PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle"
PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt" PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt"
do_install_append () { do_install:append () {
# Its assumed base-files creates this for us # Its assumed base-files creates this for us
rmdir ${D}${localstatedir}/log/ rmdir ${D}${localstatedir}/log/
sed -i -e 's,${libdir}/xorg/modules,${prefix}/lib*/xorg/modules,' ${D}${mandir}/man5/xorg.conf.5 sed -i -e 's,${libdir}/xorg/modules,${prefix}/lib*/xorg/modules,' ${D}${mandir}/man5/xorg.conf.5
@@ -165,7 +165,7 @@ do_install_append () {
# Add runtime provides for the ABI versions of the video and input subsystems, # Add runtime provides for the ABI versions of the video and input subsystems,
# so that drivers can depend on the relevant version. # so that drivers can depend on the relevant version.
python populate_packages_prepend() { python populate_packages:prepend() {
import subprocess import subprocess
# Set PKG_CONFIG_PATH so pkg-config looks at the .pc files that are going # Set PKG_CONFIG_PATH so pkg-config looks at the .pc files that are going
@@ -186,6 +186,6 @@ python populate_packages_prepend() {
return "%sxorg-abi-%s-%s" % (mlprefix, name, output) return "%sxorg-abi-%s-%s" % (mlprefix, name, output)
pn = d.getVar("PN") pn = d.getVar("PN")
d.appendVar("RPROVIDES_" + pn, " " + get_abi("input")) d.appendVar("RPROVIDES:" + pn, " " + get_abi("input"))
d.appendVar("RPROVIDES_" + pn, " " + get_abi("video")) d.appendVar("RPROVIDES:" + pn, " " + get_abi("video"))
} }

6
recipes-graphics/xorg-xserver/xserver-xorg_1.20.14.bb
View File

@@ -13,19 +13,19 @@ CFLAGS += "-fcommon"
# These extensions are now integrated into the server, so declare the migration # These extensions are now integrated into the server, so declare the migration
# path for in-place upgrades. # path for in-place upgrades.
RREPLACES_${PN} = "${PN}-extension-dri \ RREPLACES:${PN} = "${PN}-extension-dri \
${PN}-extension-dri2 \ ${PN}-extension-dri2 \
${PN}-extension-record \ ${PN}-extension-record \
${PN}-extension-extmod \ ${PN}-extension-extmod \
${PN}-extension-dbe \ ${PN}-extension-dbe \
" "
RPROVIDES_${PN} = "${PN}-extension-dri \ RPROVIDES:${PN} = "${PN}-extension-dri \
${PN}-extension-dri2 \ ${PN}-extension-dri2 \
${PN}-extension-record \ ${PN}-extension-record \
${PN}-extension-extmod \ ${PN}-extension-extmod \
${PN}-extension-dbe \ ${PN}-extension-dbe \
" "
RCONFLICTS_${PN} = "${PN}-extension-dri \ RCONFLICTS:${PN} = "${PN}-extension-dri \
${PN}-extension-dri2 \ ${PN}-extension-dri2 \
${PN}-extension-record \ ${PN}-extension-record \
${PN}-extension-extmod \ ${PN}-extension-extmod \