xorg-server: Changes to 'ubuntu'
debian/changelog | 3 -
debian/patches/164_trap-aspect-ratios.patch | 59 ----------------------------
debian/patches/series | 1
3 files changed, 2 insertions(+), 61 deletions(-)
New commits:
commit 27a69e22f59a78e689a9191234156742e77fdf39
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Sun May 16 17:19:04 2010 -0400
Drop obsolete patch: 164_trap-aspect-ratios.patch
diff --git a/debian/changelog b/debian/changelog
index 9e072d0..91b2e22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -72,8 +72,9 @@ xorg-server (2:1.8.1-1ubuntu1) UNRELEASED; urgency=low
[ Robert Hooker ]
* Fix 190_cache-xkbcomp_output_for_fast_start_up.patch so it works.
+ * Drop 164_trap-aspect-ratios.patch: obsolete.
- -- Robert Hooker <sarvatt@ubuntu.com> Sun, 16 May 2010 15:19:13 -0400
+ -- Robert Hooker <sarvatt@ubuntu.com> Sun, 16 May 2010 17:13:42 -0400
xorg-server (2:1.8.1-1) experimental; urgency=low
diff --git a/debian/patches/164_trap-aspect-ratios.patch b/debian/patches/164_trap-aspect-ratios.patch
deleted file mode 100644
index 2203c44..0000000
--- a/debian/patches/164_trap-aspect-ratios.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/hw/xfree86/ddc/interpret_edid.c
-+++ b/hw/xfree86/ddc/interpret_edid.c
-@@ -54,6 +54,15 @@ static void get_whitepoint_section(Uchar
- static void get_detailed_timing_section(Uchar*, struct detailed_timings *);
- static Bool validate_version(int scrnIndex, struct edid_version *);
-
-+static Bool
-+is_standard_aspect_ratio(int x, int y)
-+{
-+ return ((x == 16 && y == 9) ||
-+ (x == 16 && y == 10) ||
-+ (x == 4 && y == 3) ||
-+ (x == 5 && y == 4));
-+}
-+
- static void
- find_ranges_section(struct detailed_monitor_section *det, void *ranges)
- {
-@@ -129,10 +138,7 @@ static void encode_aspect_ratio(xf86MonP
- * try to find the largest detailed timing that matches that aspect
- * ratio and use that to fill in the feature section.
- */
-- if ((m->features.hsize == 16 && m->features.vsize == 9) ||
-- (m->features.hsize == 16 && m->features.vsize == 10) ||
-- (m->features.hsize == 4 && m->features.vsize == 3) ||
-- (m->features.hsize == 5 && m->features.vsize == 4)) {
-+ if (is_standard_aspect_ratio(m->features.hsize, m->features.vsize)) {
-
- struct det_hv_parameter p;
- p.real_hsize = 0;
-@@ -156,6 +162,28 @@ static void encode_aspect_ratio(xf86MonP
- xf86Msg(X_INFO, "Quirked EDID physical size to %dx%d cm\n",
- m->features.hsize, m->features.vsize);
- }
-+
-+ /*
-+ * Some monitors do the reverse, putting real size in the global block
-+ * and aspect ratios in the detailed timings. Check, but only if we
-+ * think we've got a real physical size.
-+ */
-+ if (m->features.hsize && m->features.vsize) {
-+ for (i = 0; i < 4; i++) {
-+ if (m->det_mon[i].type == DT) {
-+ struct detailed_timings *timing;
-+ timing = &m->det_mon[i].section.d_timings;
-+
-+ if (is_standard_aspect_ratio(timing->h_size, timing->v_size)) {
-+ timing->h_size = m->features.hsize * 10;
-+ timing->v_size = m->features.vsize * 10;
-+ xf86Msg(X_INFO, "Quirked timing size to %dx%d mm\n",
-+ timing->h_size, timing->v_size);
-+
-+ }
-+ }
-+ }
-+ }
- }
-
- xf86MonPtr
diff --git a/debian/patches/series b/debian/patches/series
index 6d859ce..36a1e2e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,7 +17,6 @@
#143_default_to_vesa.patch
157_check_null_modes.patch
162_null_crtc_in_rotation.patch
-164_trap-aspect-ratios.patch
165_man_xorg_conf_no_device_ident.patch
166_nullptr_xinerama_keyrepeat.patch
167_nullptr_xisbread.patch
Reply to: