Patchwork [1/1] xf86-video-modesetting: upgrade to 0.8.0

login
register
mail settings
Submitter Jonathan Liu
Date July 3, 2013, 6:04 a.m.
Message ID <1372831460-6435-2-git-send-email-net147@gmail.com>
Download mbox | patch
Permalink /patch/52863/
State Accepted
Commit b9056faa8b5c8e86e399b452ad57bad945be937c
Headers show

Comments

Jonathan Liu - July 3, 2013, 6:04 a.m.
Removed patch integrated upstream.

Signed-off-by: Jonathan Liu <net147@gmail.com>
---
 ...ort-32-bpp-pixmaps-when-24-bpp-fb-is-used.patch | 31 ----------------------
 .../xorg-driver/xf86-video-modesetting_0.7.0.bb    |  9 -------
 .../xorg-driver/xf86-video-modesetting_0.8.0.bb    |  7 +++++
 3 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-modesetting/support-32-bpp-pixmaps-when-24-bpp-fb-is-used.patch
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.7.0.bb
 create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.8.0.bb
Ross Burton - July 3, 2013, 3:22 p.m.
Hi,

In the future, please use -M so that the diff is clearer than delete/add.

Ross

Patch

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-modesetting/support-32-bpp-pixmaps-when-24-bpp-fb-is-used.patch b/meta/recipes-graphics/xorg-driver/xf86-video-modesetting/support-32-bpp-pixmaps-when-24-bpp-fb-is-used.patch
deleted file mode 100644
index c351757..0000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-modesetting/support-32-bpp-pixmaps-when-24-bpp-fb-is-used.patch
+++ /dev/null
@@ -1,31 +0,0 @@ 
-Upstream-Status: Backport
-Signed-off-by: Jonathan Liu <net147@gmail.com>
-
-From cba29fd8c2f605ed66718aa3a6b5833deb5d4cf9 Mon Sep 17 00:00:00 2001
-From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
-Date: Wed, 3 Apr 2013 12:08:44 +0200
-Subject: [PATCH] support 32 bpp pixmaps when 24 bpp fb is used.
-
-Fixes background corruption in ubuntu.
-
-Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
----
- src/driver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/driver.c b/src/driver.c
-index 06d6d53..742aadd 100644
---- a/src/driver.c
-+++ b/src/driver.c
-@@ -650,7 +650,7 @@ PreInit(ScrnInfoPtr pScrn, int flags)
- #endif
-     drmmode_get_default_bpp(pScrn, &ms->drmmode, &defaultdepth, &defaultbpp);
-     if (defaultdepth == 24 && defaultbpp == 24)
--	    bppflags = Support24bppFb;
-+	    bppflags = SupportConvert32to24 | Support24bppFb;
-     else
- 	    bppflags = PreferConvert24to32 | SupportConvert24to32 | Support32bppFb;
-     
--- 
-1.8.3
-
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.7.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.7.0.bb
deleted file mode 100644
index 9f43402..0000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.7.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@ 
-require xorg-driver-video.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=5e53d3fcadb1c23d122ad63cb099a918"
-
-DESCRIPTION = "X.Org X server -- modesetting display driver"
-
-SRC_URI += "file://support-32-bpp-pixmaps-when-24-bpp-fb-is-used.patch"
-
-SRC_URI[md5sum] = "38e64eb09cef9bdf1de400bbe9818321"
-SRC_URI[sha256sum] = "2bc55f776eaee7b4e13df13238d36c4facf1cdca095a11519baf2376f5c996ac"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.8.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.8.0.bb
new file mode 100644
index 0000000..035f47d
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.8.0.bb
@@ -0,0 +1,7 @@ 
+require xorg-driver-video.inc
+LIC_FILES_CHKSUM = "file://COPYING;md5=5e53d3fcadb1c23d122ad63cb099a918"
+
+DESCRIPTION = "X.Org X server -- modesetting display driver"
+
+SRC_URI[md5sum] = "1a25d6210257d4e493daf048f8b705a9"
+SRC_URI[sha256sum] = "13dc349e9aa50987ab2479d27d6879cda2c1f9ad8c8d3a1422a2f53c36f047f8"