From ad3edec70d07932caa390ff0e794695a83884364 Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Fri, 2 Aug 2019 21:37:18 +0100 Subject: xserver-xorg: update to 1.20.5 (From OE-Core rev: b40277355b4ecf041061b3db0d4d890c7033e96f) Signed-off-by: Oleksandr Kravchuk Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../xorg-xserver/xserver-xorg_1.20.4.bb | 32 ---------------------- .../xorg-xserver/xserver-xorg_1.20.5.bb | 32 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.5.bb diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb deleted file mode 100644 index abc4656b0f..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb +++ /dev/null @@ -1,32 +0,0 @@ -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://0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch \ - file://sdksyms-no-build-path.patch \ - " -SRC_URI[md5sum] = "c4841cc24b79420205d082fe82e0a650" -SRC_URI[sha256sum] = "fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee" - -# 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_1.20.5.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.5.bb new file mode 100644 index 0000000000..3de6d22e57 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.5.bb @@ -0,0 +1,32 @@ +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://0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch \ + file://sdksyms-no-build-path.patch \ + " +SRC_URI[md5sum] = "c9fc7e21e11286dbedd22c00df652130" +SRC_URI[sha256sum] = "a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d" + +# 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