debian/changelog | 16 +++++- debian/patches/166_nullptr_xinerama_keyrepeat.patch | 15 ----- debian/patches/198_nohwaccess.patch | 52 -------------------- debian/patches/201_report-real-dpi.patch | 46 ----------------- debian/patches/209_add_legacy_bgnone_option.patch | 22 -------- debian/patches/series | 4 - 6 files changed, 14 insertions(+), 141 deletions(-)
New commits: commit e7d3fda981a1bbca3ce47029eb5e8581c2a14b97 Author: Bryce Harrington <[email protected]> Date: Mon Jun 4 19:16:26 2012 -0700 Drop several patches no longer needed, as discussed on ubuntu-x@. diff --git a/debian/changelog b/debian/changelog index 9b56bf9..ea59df6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -xorg-server (2:1.12.1.902-1ubuntu1) UNRELEASED; urgency=medium +xorg-server (2:1.12.1.902-1ubuntu2) UNRELEASED; urgency=medium + [ Maarten Lankhorst ] * Refresh patches to apply on x-server 1.12 - patch-x-indent.sh from xorg-pkg-tools was used to redo coding style * Deleted following patches because they have been committed upstream @@ -11,7 +12,18 @@ xorg-server (2:1.12.1.902-1ubuntu1) UNRELEASED; urgency=medium * Non-trivial refresh of 500_pointer_barrier_thresholds.diff, based on xorg-edgers * Rest was refreshed with patch-x-indent.sh to survive coding style changes - -- Maarten Lankhorst <[email protected]> Mon, 21 May 2012 21:08:48 +0200 + [ Bryce Harrington ] + * Drop 209_add_legacy_bgnone_option.patch: lightdm and other *dm's have + switched to the new standard -background option. No need to continue + providing the legacy -nr synonym. + * Drop 201_report-real-dpi.patch: Commented out in series. + * Drop 198_nohwaccess.patch: Rootless-X no longer a development focus + for us; the patch would need reworked anyway to provide proper + support. + * Drop 166_nullptr_xinerama_keyrepeat.patch: Fixed differently upstream + in commit 24e682d0, as verified by original reporter. + + -- Bryce Harrington <[email protected]> Mon, 04 Jun 2012 19:12:23 -0700 xorg-server (2:1.12.1.902-1) unstable; urgency=medium diff --git a/debian/patches/166_nullptr_xinerama_keyrepeat.patch b/debian/patches/166_nullptr_xinerama_keyrepeat.patch deleted file mode 100644 index e18f5db..0000000 --- a/debian/patches/166_nullptr_xinerama_keyrepeat.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/mi/mipointer.c b/mi/mipointer.c -index de6698a..907f2e4 100644 ---- a/mi/mipointer.c -+++ b/mi/mipointer.c -@@ -362,6 +362,10 @@ miPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) - SetupScreen(pScreen); - pPointer = MIPOINTER(pDev); - -+ /* Null pointer causes crash on keyrepeat with Xinerama LP: (#324465) */ -+ if (pPointer == NULL) -+ return; -+ - if (pPointer->pScreen != pScreen) { - (*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, TRUE); - changedScreen = TRUE; diff --git a/debian/patches/198_nohwaccess.patch b/debian/patches/198_nohwaccess.patch deleted file mode 100644 index 6f25661..0000000 --- a/debian/patches/198_nohwaccess.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c -index c938b87..35e73e1 100644 ---- a/hw/xfree86/os-support/linux/lnx_init.c -+++ b/hw/xfree86/os-support/linux/lnx_init.c -@@ -44,6 +44,7 @@ static int activeVT = -1; - static char vtname[11]; - static struct termios tty_attr; /* tty state to restore */ - static int tty_mode; /* kbd mode to restore */ -+Bool NoHwAccess = FALSE; - - static void - drain_console(int fd, void *closure) -@@ -313,6 +314,10 @@ xf86ProcessArgument(int argc, char *argv[], int i) - KeepTty = TRUE; - return 1; - } -+ if (!strcmp(argv[i], "-nohwaccess")) { -+ NoHwAccess = TRUE; -+ return (1); -+ } - - if ((argv[i][0] == 'v') && (argv[i][1] == 't')) { - if (sscanf(argv[i], "vt%2d", &xf86Info.vtno) == 0) { -@@ -331,4 +336,6 @@ xf86UseMsg(void) - ErrorF("vtXX use the specified VT number\n"); - ErrorF("-keeptty "); - ErrorF("don't detach controlling tty (for debugging only)\n"); -+ ErrorF("-nohwaccess "); -+ ErrorF("don't access hardware ports directly\n"); - } -diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c -index 3526a21..9650597 100644 ---- a/hw/xfree86/os-support/linux/lnx_video.c -+++ b/hw/xfree86/os-support/linux/lnx_video.c -@@ -46,6 +46,7 @@ - #include <asm/mtrr.h> - #endif - -+extern Bool NoHwAccess; - static Bool ExtendedEnabled = FALSE; - - #ifdef __ia64__ -@@ -488,6 +489,9 @@ xf86EnableIO(void) - int fd; - unsigned int ioBase_phys; - #endif -+ /* Fake it... */ -+ if (NoHwAccess) -+ return TRUE; - - if (ExtendedEnabled) - return TRUE; diff --git a/debian/patches/201_report-real-dpi.patch b/debian/patches/201_report-real-dpi.patch deleted file mode 100644 index 253f38d..0000000 --- a/debian/patches/201_report-real-dpi.patch +++ /dev/null @@ -1,46 +0,0 @@ -Description: Report physical DPI when EDID data exists. - . - This reverts git commit fff00df94d7ebd18a8e24537ec96073717375a3f, which - made X report 96DPI via the core protocol. - . - We want to make this policy decision higher up the stack than the X server, - so revert this and make X report the physical DPI when the EDID contains - physical size data. -Author: Christopher James Halse Rogers <[email protected]> - -Index: xorg-server/hw/xfree86/modes/xf86RandR12.c -=================================================================== ---- xorg-server.orig/hw/xfree86/modes/xf86RandR12.c 2010-08-03 15:59:57.750272356 +1000 -+++ xorg-server/hw/xfree86/modes/xf86RandR12.c 2010-08-03 16:00:00.750380508 +1000 -@@ -805,6 +805,7 @@ - else - { - xf86OutputPtr output = xf86CompatOutput(pScrn); -+ rrScrPriv(pScreen); - - if (output && - output->conf_monitor && -@@ -817,6 +818,23 @@ - mmWidth = output->conf_monitor->mon_width; - mmHeight = output->conf_monitor->mon_height; - } -+ else if (pScrPriv && pScrPriv->primaryOutput) -+ { -+ /* Calculate DPI based on primary display size, not the entire display size */ -+ mmWidth = pScrPriv->primaryOutput->mmWidth * width / pScrPriv->primaryOutput->crtc->mode->mode.width; -+ mmHeight = pScrPriv->primaryOutput->mmHeight * height / pScrPriv->primaryOutput->crtc->mode->mode.height; -+ } -+ else if (output && output->crtc && output->crtc->mode.HDisplay && -+ output->mm_width && output->mm_height) -+ { -+ /* -+ * If the output has a mode and a declared size, use that -+ * to scale the screen size -+ */ -+ DisplayModePtr mode = &output->crtc->mode; -+ mmWidth = output->mm_width * width / mode->HDisplay; -+ mmHeight = output->mm_height * height / mode->VDisplay; -+ } - else - { - /* diff --git a/debian/patches/209_add_legacy_bgnone_option.patch b/debian/patches/209_add_legacy_bgnone_option.patch deleted file mode 100644 index e292652..0000000 --- a/debian/patches/209_add_legacy_bgnone_option.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/os/utils.c b/os/utils.c -index 30592d2..e9c17d0 100644 ---- a/os/utils.c -+++ b/os/utils.c -@@ -506,6 +506,8 @@ UseMsg(void) - ErrorF("-nolisten string don't listen on protocol\n"); - ErrorF("-noreset don't reset after last client exists\n"); - ErrorF("-background [none] create root window with no background\n"); -+ ErrorF -+ ("-nr (Ubuntu-specific) Synonym for -background none\n"); - ErrorF("-reset reset after last client exists\n"); - ErrorF("-p # screen-saver pattern duration (minutes)\n"); - ErrorF("-pn accept failure to listen on all ports\n"); -@@ -825,6 +827,8 @@ ProcessCommandLine(int argc, char *argv[]) - UseMsg(); - } - } -+ else if (strcmp(argv[i], "-nr") == 0) -+ bgNoneRoot = TRUE; - else if (strcmp(argv[i], "-maxbigreqsize") == 0) { - if (++i < argc) { - long reqSizeArg = atol(argv[i]); diff --git a/debian/patches/series b/debian/patches/series index 1dc1574..291778c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,18 +12,14 @@ 157_check_null_modes.patch 162_null_crtc_in_rotation.patch 165_man_xorg_conf_no_device_ident.patch -166_nullptr_xinerama_keyrepeat.patch 167_nullptr_xisbread.patch 168_glibc_trace_to_stderr.patch 172_cwgetbackingpicture_nullptr_check.patch 188_default_primary_to_first_busid.patch 190_cache-xkbcomp_output_for_fast_start_up.patch 191-Xorg-add-an-extra-module-path.patch -198_nohwaccess.patch 200_randr-null.patch -#201_report-real-dpi.patch 208_switch_on_release.diff -209_add_legacy_bgnone_option.patch 226_fall_back_to_autoconfiguration.patch 227_null_ptr_midispcur.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
