xorg-server: Changes to 'ubuntu'
debian/changelog | 8 ++++++--
debian/patches/166_fix_lpl_monitors.diff | 21 +++++++++++++++------
debian/patches/series | 2 +-
3 files changed, 22 insertions(+), 9 deletions(-)
New commits:
commit aad6a3494a2889054892587d78701e0620a6e745
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue May 13 00:04:29 2008 -0700
Releasing
diff --git a/debian/changelog b/debian/changelog
index 4cc513b..3d2624b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.4.1~git20080131-1ubuntu10) UNRELEASED; urgency=low
+xorg-server (2:1.4.1~git20080131-1ubuntu10) intrepid; urgency=low
[Timo Aaltonen]
* 166_fix_lpl_monitors.diff:
- fix LPL monitors properly (LP: #204065)
-
+
[Martin-Eric Racine]
* 167_xf86AutoConfig_geode_addition.diff:
- Autodetect geode video devices (LP: #219630)
@@ -15,7 +15,7 @@ xorg-server (2:1.4.1~git20080131-1ubuntu10) UNRELEASED; urgency=low
- Fix crash on PS3 due to closing a dir that wasn't successfully opened
(LP: #217647)
- -- Bryce Harrington <bryce@ubuntu.com> Mon, 12 May 2008 23:32:40 -0700
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 13 May 2008 00:03:40 -0700
xorg-server (2:1.4.1~git20080131-1ubuntu9) hardy; urgency=low
commit 2f9af00118f34c677d30cbf2f086ac2ef153b690
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue May 13 00:02:52 2008 -0700
Fixing up patches to apply
diff --git a/debian/changelog b/debian/changelog
index e5cdac6..4cc513b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,15 +3,19 @@ xorg-server (2:1.4.1~git20080131-1ubuntu10) UNRELEASED; urgency=low
[Timo Aaltonen]
* 166_fix_lpl_monitors.diff:
- fix LPL monitors properly (LP: #204065)
+
+ [Martin-Eric Racine]
* 167_xf86AutoConfig_geode_addition.diff:
- Autodetect geode video devices (LP: #219630)
[Bryce Harrington]
+ * 166_fix_lpl_monitors.diff:
+ - Modified to apply to Ubuntu
* 168_closedir.patch:
- Fix crash on PS3 due to closing a dir that wasn't successfully opened
(LP: #217647)
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 22 Apr 2008 11:56:55 +0300
+ -- Bryce Harrington <bryce@ubuntu.com> Mon, 12 May 2008 23:32:40 -0700
xorg-server (2:1.4.1~git20080131-1ubuntu9) hardy; urgency=low
diff --git a/debian/patches/166_fix_lpl_monitors.diff b/debian/patches/166_fix_lpl_monitors.diff
index 06028b2..d6dadef 100644
--- a/debian/patches/166_fix_lpl_monitors.diff
+++ b/debian/patches/166_fix_lpl_monitors.diff
@@ -11,25 +11,34 @@ other place.
RH BZ 435216
---
---- a/hw/xfree86/modes/xf86EdidModes.c
-+++ b/hw/xfree86/modes/xf86EdidModes.c
-@@ -108,13 +108,6 @@ static Bool quirk_prefer_large_75 (int s
+[Modified by Bryce Harrington to apply to Ubuntu]
+
+diff -Nurp xorg-server-1.4.1~git20080131-patched/hw/xfree86/modes/xf86EdidModes.c xorg-server-1.4.1~git20080131-working/hw/xfree86/modes/xf86EdidModes.c
+--- xorg-server-1.4.1~git20080131-patched/hw/xfree86/modes/xf86EdidModes.c 2008-05-12 17:52:40.000000000 -0700
++++ xorg-server-1.4.1~git20080131-working/hw/xfree86/modes/xf86EdidModes.c 2008-05-12 23:07:43.000000000 -0700
+@@ -104,17 +104,6 @@ static Bool quirk_prefer_large_75 (int s
static Bool quirk_detailed_h_in_cm (int scrnIndex, xf86MonPtr DDC)
{
- /* Bug #10304: "LGPhilipsLCD LP154W01-A5" */
- /* Bug #12784: "LGPhilipsLCD LP154W01-TLA2" */
-- /* Red Hat #435216 "LGPhilipsLCD LP154W01-TLAE" */
- if (memcmp (DDC->vendor.name, "LPL", 4) == 0 &&
-- (DDC->vendor.prod_id == 0 || DDC->vendor.prod_id == 0x2a00))
+- DDC->vendor.prod_id == 0)
- return TRUE;
-
+- /* LP Bug #127827; "LGPhilipsLCD LP154W01-TLAE" */
+- if (memcmp (DDC->vendor.name, "LPL", 4) == 0 &&
+- DDC->vendor.prod_id == 10752)
+- return TRUE;
+-
/* Bug #11603: Funai Electronics PM36B */
if (memcmp (DDC->vendor.name, "FCM", 4) == 0 &&
DDC->vendor.prod_id == 13600)
-@@ -137,7 +130,7 @@ static Bool quirk_detailed_use_maximum_s
+@@ -136,8 +125,9 @@ static Bool quirk_detailed_v_in_cm (int
+ static Bool quirk_detailed_use_maximum_size (int scrnIndex, xf86MonPtr DDC)
{
/* Bug #10304: LGPhilipsLCD LP154W01-A5 */
++ /* LP Bug #127827; "LGPhilipsLCD LP154W01-TLAE" */
if (memcmp (DDC->vendor.name, "LPL", 4) == 0 &&
- DDC->vendor.prod_id == 0)
+ (DDC->vendor.prod_id == 0 || DDC->vendor.prod_id == 0x2a00))
diff --git a/debian/patches/series b/debian/patches/series
index 48631b5..381b6dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -61,5 +61,5 @@
164_fix_context_sharing.diff
165_fedora_xserver-1.5.0-xaa-option-inversion.patch
166_fix_lpl_monitors.diff
-167_xf86AutoConfig_geode_addition.diff
+167_xf86AutoConfig_geode_addition.diff -p0
168_closedir.patch
commit c3caaefb2abf784f3fdab5c24f49a98e597c936a
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Mon May 12 23:26:19 2008 -0700
Revert "Adding patch from martin-eric for autoconfing geode"
This reverts commit 106eb60ef00bf703b13beee720615b540bb9604d.
diff --git a/debian/changelog b/debian/changelog
index e8c51d2..e5cdac6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,11 +11,7 @@ xorg-server (2:1.4.1~git20080131-1ubuntu10) UNRELEASED; urgency=low
- Fix crash on PS3 due to closing a dir that wasn't successfully opened
(LP: #217647)
- [Martin-Eric Racine]
- * 169_xf86AutoConfig_geode_addition.patch:
- - Add autoconfig support for geode chipset (LP: #220510)
-
- -- Bryce Harrington <bryce@ubuntu.com> Mon, 12 May 2008 17:42:08 -0700
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 22 Apr 2008 11:56:55 +0300
xorg-server (2:1.4.1~git20080131-1ubuntu9) hardy; urgency=low
diff --git a/debian/patches/169_xf86AutoConfig_geode_addition.diff b/debian/patches/169_xf86AutoConfig_geode_addition.diff
deleted file mode 100644
index 0f04f91..0000000
--- a/debian/patches/169_xf86AutoConfig_geode_addition.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- xorg-server-1.4.1~git20080131/hw/xfree86/common/xf86AutoConfig.c.orig 2008-02-01 05:31:28.000000000 +0200
-+++ xorg-server-1.4.1~git20080131/hw/xfree86/common/xf86AutoConfig.c 2008-04-19 20:05:41.000000000 +0300
-@@ -160,12 +160,13 @@ videoPtrToDriverName(pciVideoPtr info)
- {
- /*
- * things not handled yet:
-- * amd/cyrix/nsc
-+ * cyrix/nsc. should be merged into geode anyway.
- * xgi
- */
-
- switch (info->vendor)
- {
-+ case 0x1022: return "geode";
- case 0x1142: return "apm";
- case 0xedd8: return "ark";
- case 0x1a03: return "ast";
diff --git a/debian/patches/series b/debian/patches/series
index 5c05e29..48631b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -63,4 +63,3 @@
166_fix_lpl_monitors.diff
167_xf86AutoConfig_geode_addition.diff
168_closedir.patch
-169_xf86AutoConfig_geode_addition.diff
commit 106eb60ef00bf703b13beee720615b540bb9604d
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Mon May 12 17:43:28 2008 -0700
Adding patch from martin-eric for autoconfing geode
diff --git a/debian/changelog b/debian/changelog
index e5cdac6..e8c51d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,11 @@ xorg-server (2:1.4.1~git20080131-1ubuntu10) UNRELEASED; urgency=low
- Fix crash on PS3 due to closing a dir that wasn't successfully opened
(LP: #217647)
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 22 Apr 2008 11:56:55 +0300
+ [Martin-Eric Racine]
+ * 169_xf86AutoConfig_geode_addition.patch:
+ - Add autoconfig support for geode chipset (LP: #220510)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Mon, 12 May 2008 17:42:08 -0700
xorg-server (2:1.4.1~git20080131-1ubuntu9) hardy; urgency=low
diff --git a/debian/patches/169_xf86AutoConfig_geode_addition.diff b/debian/patches/169_xf86AutoConfig_geode_addition.diff
new file mode 100644
index 0000000..0f04f91
--- /dev/null
+++ b/debian/patches/169_xf86AutoConfig_geode_addition.diff
@@ -0,0 +1,17 @@
+--- xorg-server-1.4.1~git20080131/hw/xfree86/common/xf86AutoConfig.c.orig 2008-02-01 05:31:28.000000000 +0200
++++ xorg-server-1.4.1~git20080131/hw/xfree86/common/xf86AutoConfig.c 2008-04-19 20:05:41.000000000 +0300
+@@ -160,12 +160,13 @@ videoPtrToDriverName(pciVideoPtr info)
+ {
+ /*
+ * things not handled yet:
+- * amd/cyrix/nsc
++ * cyrix/nsc. should be merged into geode anyway.
+ * xgi
+ */
+
+ switch (info->vendor)
+ {
++ case 0x1022: return "geode";
+ case 0x1142: return "apm";
+ case 0xedd8: return "ark";
+ case 0x1a03: return "ast";
diff --git a/debian/patches/series b/debian/patches/series
index 48631b5..5c05e29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -63,3 +63,4 @@
166_fix_lpl_monitors.diff
167_xf86AutoConfig_geode_addition.diff
168_closedir.patch
+169_xf86AutoConfig_geode_addition.diff
Reply to: