debian/changelog | 16 ++++++++++++++-- hw/xfree86/common/xf86Helper.c | 5 ----- 2 files changed, 14 insertions(+), 7 deletions(-)
New commits: commit 93637bfb425767870134448c44ab0b65df6ad0c5 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Tue Nov 11 23:17:16 2008 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 936f8f4..ea16a0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.5.3-1) UNRELEASED; urgency=low +xorg-server (2:1.5.3-1) experimental; urgency=low [ Loic Minier ] * Shut up rmdir error when trying to remove dirs; this might confuse @@ -12,7 +12,7 @@ xorg-server (2:1.5.3-1) UNRELEASED; urgency=low * Enable the record extension (closes: #504303). * Merge changes from 2:1.4.2-8. - -- Loic Minier <[EMAIL PROTECTED]> Wed, 15 Oct 2008 21:50:15 +0200 + -- Julien Cristau <[EMAIL PROTECTED]> Tue, 11 Nov 2008 23:17:14 +0100 xorg-server (2:1.5.2-1) experimental; urgency=low commit bf2ca2eadea35f814d3157cd2d5064b6e7a32f46 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Tue Nov 11 20:47:24 2008 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 8186d92..0137782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.4.2-8) UNRELEASED; urgency=low +xorg-server (2:1.4.2-8) unstable; urgency=low * Add patch from Petr Salinger to fix PCI domain support on kfreebsd (closes: #499501). @@ -7,7 +7,7 @@ xorg-server (2:1.4.2-8) UNRELEASED; urgency=low actually supports (closes: #504819, #486925); cherry-picked from upstream git. - -- Julien Cristau <[EMAIL PROTECTED]> Mon, 06 Oct 2008 18:37:08 +0200 + -- Julien Cristau <[EMAIL PROTECTED]> Tue, 11 Nov 2008 20:46:52 +0100 xorg-server (2:1.4.2-7) unstable; urgency=low commit f03646c4074409ca98406ec0c71e47407971ab8c Author: Julien Cristau <[EMAIL PROTECTED]> Date: Fri Nov 7 21:04:24 2008 +0100 update changelog diff --git a/debian/changelog b/debian/changelog index 53babc4..8186d92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ xorg-server (2:1.4.2-8) UNRELEASED; urgency=low * Add patch from Petr Salinger to fix PCI domain support on kfreebsd (closes: #499501). + * xfree86: xf86SetDepthBpp needs to respect the driver's depth24flags. + Instead of forcing a 32bpp framebuffer, we pick a value that the driver + actually supports (closes: #504819, #486925); cherry-picked from upstream + git. -- Julien Cristau <[EMAIL PROTECTED]> Mon, 06 Oct 2008 18:37:08 +0200 commit f6d8e366f8b922f7e711f4c29b5ea11ec4f8b342 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Fri Nov 7 17:36:38 2008 +0100 xfree86: xf86SetDepthBpp needs to respect the driver's depth24flags When setting the depth to 24, leave bpp unset so the logic to pick a supported value is used instead of ignoring the driver's preference and forcing 32 bpp. (cherry picked from commit 991c88b7542164194be73573e7644164416ea90c) diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 7adac73..b6e0787 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -466,10 +466,6 @@ xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad) #define GLOBAL_DEFAULT_DEPTH 24 #endif -#ifndef GLOBAL_DEFAULT_FBBPP -#define GLOBAL_DEFAULT_FBBPP 32 -#endif - _X_EXPORT Bool xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp, int depth24flags) @@ -547,7 +543,6 @@ xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp, if (depth > 0) scrp->depth = depth; } else { - scrp->bitsPerPixel = GLOBAL_DEFAULT_FBBPP; scrp->depth = GLOBAL_DEFAULT_DEPTH; } } commit ab83e47b93d2c6add5514304cbe21b31f88b5d4e Author: Julien Cristau <[EMAIL PROTECTED]> Date: Mon Oct 6 18:38:04 2008 +0200 Add patch from Petr Salinger to fix PCI domain support on kfreebsd diff --git a/debian/changelog b/debian/changelog index cc60ed9..53babc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xorg-server (2:1.4.2-8) UNRELEASED; urgency=low + + * Add patch from Petr Salinger to fix PCI domain support on kfreebsd + (closes: #499501). + + -- Julien Cristau <[EMAIL PROTECTED]> Mon, 06 Oct 2008 18:37:08 +0200 + xorg-server (2:1.4.2-7) unstable; urgency=low * Update debian/copyright to the SGI Free Software License B, version 2.0. diff --git a/debian/patches/53_Properly-initialize-io.pi_sel.pc_domain-on-kfreebsd.patch b/debian/patches/53_Properly-initialize-io.pi_sel.pc_domain-on-kfreebsd.patch new file mode 100644 index 0000000..acb6c6c --- /dev/null +++ b/debian/patches/53_Properly-initialize-io.pi_sel.pc_domain-on-kfreebsd.patch @@ -0,0 +1,32 @@ +From 43b9645e4f5343757613c422c9e1204ba826d1f7 Mon Sep 17 00:00:00 2001 +From: Petr Salinger <[EMAIL PROTECTED]> +Date: Mon, 6 Oct 2008 18:33:31 +0200 +Subject: [PATCH] Properly initialize io.pi_sel.pc_domain on kfreebsd + +--- + hw/xfree86/os-support/bus/freebsdPci.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/hw/xfree86/os-support/bus/freebsdPci.c b/hw/xfree86/os-support/bus/freebsdPci.c +index 63c00b2..b1f3dbd 100644 +--- a/hw/xfree86/os-support/bus/freebsdPci.c ++++ b/hw/xfree86/os-support/bus/freebsdPci.c +@@ -133,6 +133,7 @@ freebsdPciCfgRead(PCITAG tag, int off) + { + struct pci_io io; + int error; ++ io.pi_sel.pc_domain = PCI_DOM_FROM_TAG(tag); + io.pi_sel.pc_bus = BUS(tag); + io.pi_sel.pc_dev = DFN(tag) >> 3; + io.pi_sel.pc_func = DFN(tag) & 7; +@@ -148,6 +149,7 @@ static void + freebsdPciCfgWrite(PCITAG tag, int off, CARD32 val) + { + struct pci_io io; ++ io.pi_sel.pc_domain = PCI_DOM_FROM_TAG(tag); + io.pi_sel.pc_bus = BUS(tag); + io.pi_sel.pc_dev = DFN(tag) >> 3; + io.pi_sel.pc_func = DFN(tag) & 7; +-- +1.5.6.5 + diff --git a/debian/patches/series b/debian/patches/series index 55ff4fa..5c1b515 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -26,6 +26,7 @@ 50_Make-RandRQueryVersion-return-1.1-for-swapped-client.patch 51_xevie-length.diff 52_xevie-swap-replies.diff +53_Properly-initialize-io.pi_sel.pc_domain-on-kfreebsd.patch 91_ttf2pt1 91_ttf2pt1_updates 92_xprint-security-holes-fix.patch -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]