xserver-xorg-video-modesetting: Changes to 'ubuntu'
debian/changelog | 7 +++++++
debian/patches/.gitignore | 1 +
debian/patches/series | 2 +-
debian/patches/support-32bpp-on-24bpp.patch | 13 +++++++++++++
4 files changed, 22 insertions(+), 1 deletion(-)
New commits:
commit 6d056079e3b22f7a2a3432425408ac01ff6dd4f6
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Apr 3 12:04:57 2013 +0200
Support 32-bpp pixmaps when 24 bpp is used. (LP: #1080674)
support-32bpp-on-24bpp.patch
diff --git a/debian/changelog b/debian/changelog
index 9459543..babef7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-modesetting (0.7.0-0ubuntu2) raring; urgency=low
+
+ * Support 32-bpp pixmaps when 24 bpp is used. (LP: #1080674)
+ - support-32bpp-on-24bpp.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Wed, 03 Apr 2013 12:01:18 +0200
+
xserver-xorg-video-modesetting (0.7.0-0ubuntu1) raring; urgency=low
* Merge from unreleased debian git.
diff --git a/debian/patches/.gitignore b/debian/patches/.gitignore
new file mode 100644
index 0000000..69f1bf4
--- /dev/null
+++ b/debian/patches/.gitignore
@@ -0,0 +1 @@
+!*.patch
diff --git a/debian/patches/series b/debian/patches/series
index fdffa2a..58ae276 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# placeholder
+support-32bpp-on-24bpp.patch
diff --git a/debian/patches/support-32bpp-on-24bpp.patch b/debian/patches/support-32bpp-on-24bpp.patch
new file mode 100644
index 0000000..4e9c5a8
--- /dev/null
+++ b/debian/patches/support-32bpp-on-24bpp.patch
@@ -0,0 +1,13 @@
+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;
+
Reply to: