From c32dfebbab45122dc005c1ae9c49dc15a4f350b2 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Mon, 10 Jan 2022 11:38:45 +0800 Subject: xserver-xorg: 21.1.2 -> 21.1.3 Upgrade xserver-xorg from 21.1.2 to 21.1.3. And adjust indent as well. Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- .../xorg-xserver/xserver-xorg_21.1.2.bb | 28 ---------------------- .../xorg-xserver/xserver-xorg_21.1.3.bb | 28 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.2.bb create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb (limited to 'meta/recipes-graphics/xorg-xserver') diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.2.bb deleted file mode 100644 index 60c18c0a47..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -require xserver-xorg.inc - -SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ - file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ - " -SRC_URI[sha256sum] = "c20bf46a9fe8e74bf4e75430637e58d49a02d806609dc161462bceb1ef7e8db0" - -# These extensions are now integrated into the server, so declare the migration -# path for in-place upgrades. - -RREPLACES:${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " -RPROVIDES:${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " -RCONFLICTS:${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb new file mode 100644 index 0000000000..3e076ecca7 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb @@ -0,0 +1,28 @@ +require xserver-xorg.inc + +SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ + file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ + " +SRC_URI[sha256sum] = "61d6aad5b6b47a116b960bd7f0cba4ee7e6da95d6bb0b127bde75d7d1acdebe5" + +# These extensions are now integrated into the server, so declare the migration +# path for in-place upgrades. + +RREPLACES:${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " +RPROVIDES:${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " +RCONFLICTS:${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " -- cgit 1.2.3-korg