From 05bbc3db86f7f875fe2746e5430a0807762a2dc8 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 7 Oct 2013 11:49:09 +0000 Subject: xf86-video-vesa: upgrade to 2.3.3 Drop Remove-mibstore.h.patch as that was a backport from git and is integrated into 2.3.3. (From OE-Core rev: cce5f8ea5ecf87c506be1c5e21d5058fbe953143) Signed-off-by: Ross Burton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../xf86-video-vesa/Remove-mibstore.h.patch | 37 ---------------------- .../xorg-driver/xf86-video-vesa_2.3.2.bb | 23 -------------- .../xorg-driver/xf86-video-vesa_2.3.3.bb | 21 ++++++++++++ 3 files changed, 21 insertions(+), 60 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vesa/Remove-mibstore.h.patch delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.2.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa/Remove-mibstore.h.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vesa/Remove-mibstore.h.patch deleted file mode 100644 index 0805d815c3..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa/Remove-mibstore.h.patch +++ /dev/null @@ -1,37 +0,0 @@ -Upstream-Status: Backported - -From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 25 Sep 2012 08:55:03 -0400 -Subject: [PATCH] Remove mibstore.h - -Signed-off-by: Adam Jackson ---- - src/vesa.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/vesa.c b/src/vesa.c -index 11cd26c..b73d104 100644 ---- a/src/vesa.c -+++ b/src/vesa.c -@@ -49,9 +49,6 @@ - /* All drivers initialising the SW cursor need this */ - #include "mipointer.h" - --/* All drivers implementing backing store need this */ --#include "mibstore.h" -- - /* Colormap handling */ - #include "micmap.h" - #include "xf86cmap.h" -@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL) - VESADGAInit(pScrn, pScreen); - - xf86SetBlackWhitePixels(pScreen); -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - /* software cursor */ --- -1.7.9.5 - diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.2.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.2.bb deleted file mode 100644 index 4ec07a03b1..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -require xorg-driver-video.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=a1f0610ebdc6f314a9fa5102a8c5c1b0" - -SUMMARY = "X.Org X server -- Generic Vesa video driver" - -DESCRIPTION = "vesa is an Xorg driver for generic VESA video cards. It \ -can drive most VESA-compatible video cards, but only makes use of the \ -basic standard VESA core that is common to these cards. The driver \ -supports depths 8, 15 16 and 24." - -PR = "${INC_PR}.0" - -DEPENDS += "virtual/libx11 randrproto libpciaccess" - -COMPATIBLE_HOST = '(i.86|x86_64).*-linux' - -RRECOMMENDS_${PN} += "xserver-xorg-module-libint10" - -SRC_URI += "file://Remove-mibstore.h.patch" - -SRC_URI[md5sum] = "3eddd393fba79550e012d717499d58ad" -SRC_URI[sha256sum] = "144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3" diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb new file mode 100644 index 0000000000..4052f703b8 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb @@ -0,0 +1,21 @@ +require xorg-driver-video.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=a1f0610ebdc6f314a9fa5102a8c5c1b0" + +SUMMARY = "X.Org X server -- Generic Vesa video driver" + +DESCRIPTION = "vesa is an Xorg driver for generic VESA video cards. It \ +can drive most VESA-compatible video cards, but only makes use of the \ +basic standard VESA core that is common to these cards. The driver \ +supports depths 8, 15 16 and 24." + +PR = "${INC_PR}.0" + +DEPENDS += "virtual/libx11 randrproto libpciaccess" + +COMPATIBLE_HOST = '(i.86|x86_64).*-linux' + +RRECOMMENDS_${PN} += "xserver-xorg-module-libint10" + +SRC_URI[md5sum] = "3690a5356ed121b1a7dfb59a6dcf4bf9" +SRC_URI[sha256sum] = "ce8b75e5a40e9dae76f2ac9e2880f7f73a848653ca2eed5880f52dc2c0d3aef8" -- cgit v1.2.3-54-g00ecf