[arch-commits] Commit in xorg-server/trunk (PKGBUILD git-fixes.patch)
Jan de Groot
jgc at archlinux.org
Wed Feb 17 20:06:01 UTC 2010
Date: Wednesday, February 17, 2010 @ 15:06:00
Author: jgc
Revision: 69117
upgpkg: xorg-server 1.7.5-1
Update to 1.7.5 - remove old patch, no git fixes since release
Modified:
xorg-server/trunk/PKGBUILD
Deleted:
xorg-server/trunk/git-fixes.patch
-----------------+
PKGBUILD | 8 --
git-fixes.patch | 206 ------------------------------------------------------
2 files changed, 3 insertions(+), 211 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-02-17 19:43:59 UTC (rev 69116)
+++ PKGBUILD 2010-02-17 20:06:00 UTC (rev 69117)
@@ -2,13 +2,13 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=xorg-server
-pkgver=1.7.4.901
+pkgver=1.7.5
pkgrel=1
pkgdesc="X.Org X servers"
arch=('i686' 'x86_64')
license=('custom')
url="http://xorg.freedesktop.org"
-depends=('hal>=0.5.14' 'libgl' 'libxfont>=1.4.1' 'openssl>=0.9.8k' 'libpciaccess>=0.10.9' 'libxv>=1.0.5' 'pixman>=0.16.4' 'xcursor-themes>=1.0.2' 'xkeyboard-config>=1.8' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.2.5' 'inputproto>=2.0')
+depends=('hal>=0.5.14' 'libgl' 'libxfont>=1.4.1' 'openssl>=0.9.8k' 'libpciaccess>=0.10.9' 'libxv>=1.0.5' 'pixman>=0.16.6' 'xcursor-themes>=1.0.2' 'xkeyboard-config>=1.8' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.2.5' 'inputproto>=2.0')
makedepends=('libx11>=1.3' 'mesa>=7.7' 'xf86driproto>=2.1.0' 'xtrans>=1.2.4' 'libxkbfile>=1.0.6' 'randrproto>=1.3.1' 'renderproto>=0.11' 'xcmiscproto>=1.2.0' 'bigreqsproto>=1.1.0' 'resourceproto>=1.1.0' 'videoproto>=2.3.0' 'compositeproto>=0.4.1' 'scrnsaverproto>=1.2.0' 'xf86dgaproto>=2.1' 'libgl>=7.7' 'glproto>=1.4.10' 'xorg-util-macros>=1.3.0' 'xineramaproto>=1.2')
conflicts=('catalyst-utils<=9.2' 'xf86-input-calcomp' 'xf86-input-citron' 'xf86-input-digitaledge' 'xf86-input-dmc' 'xf86-input-dynapro' 'xf86-input-elo2300'
'xf86-input-jamstudio' 'xf86-input-magellan' 'xf86-input-magictouch' 'xf86-input-microtouch' 'xf86-input-palmax' 'xf86-input-spaceorb' 'xf86-input-summa' 'xf86-input-tek4957' 'xf86-input-ur98' 'xf86-video-vga' 'xf86-video-intel-legacy' 'nvidia-96xx-utils<96.43.14' 'nvidia-173xx-utils<173.14.21')
@@ -20,14 +20,12 @@
xorg-redhat-die-ugly-pattern-die-die-die.patch
xserver-1.7.1-libcrypto.patch
xserver-1.7.1-gamma-kdm-fix.patch
- git-fixes.patch
xvfb-run
xvfb-run.1)
-md5sums=('e1656bd2fd362299dc7bae489525a9da'
+md5sums=('2856130aebf56e3df7b7d9be419bfb28'
'1a336eb22e27cbf443ec5a2ecddfa93c'
'957d429cad03ac87281b7e40d963497c'
'8eae23916552e609c36ecae1827c2e9d'
- 'fb936bccf2d385da4946c4137eca5d2f'
'52fd3effd80d7bc6c1660d4ecf23d31c'
'376c70308715cd2643f7bff936d9934b')
Deleted: git-fixes.patch
===================================================================
--- git-fixes.patch 2010-02-17 19:43:59 UTC (rev 69116)
+++ git-fixes.patch 2010-02-17 20:06:00 UTC (rev 69117)
@@ -1,206 +0,0 @@
-From a191318f8dde2a4ff47c051244e8c88e8f92883a Mon Sep 17 00:00:00 2001
-From: Christian Zander <chzander at nvidia.com>
-Date: Mon, 11 Jan 2010 20:29:07 +0000
-Subject: x86emu: Respect the LEA 67h address size prefix.
-
-Signed-off-by: Christian Zander <chzander at nvidia.com>
-Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
-Tested-by: Tiago Vignatti <tiago.vignatti at nokia.com>
-Signed-off-by: Keith Packard <keithp at keithp.com>
-(cherry picked from commit f57bc0ede8e018c7e264b917927c42a018cd1d5a)
----
-diff --git a/hw/xfree86/x86emu/ops.c b/hw/xfree86/x86emu/ops.c
-index 37ae2c9..21a0347 100644
---- a/hw/xfree86/x86emu/ops.c
-+++ b/hw/xfree86/x86emu/ops.c
-@@ -6567,42 +6567,62 @@ Handles opcode 0x8d
- static void x86emuOp_lea_word_R_M(u8 X86EMU_UNUSED(op1))
- {
- int mod, rl, rh;
-- u16 *srcreg;
- uint destoffset;
-
--/*
-- * TODO: Need to handle address size prefix!
-- *
-- * lea eax,[eax+ebx*2] ??
-- */
--
- START_OF_INSTR();
- DECODE_PRINTF("LEA\t");
- FETCH_DECODE_MODRM(mod, rh, rl);
- switch (mod) {
- case 0:
-- srcreg = DECODE_RM_WORD_REGISTER(rh);
-- DECODE_PRINTF(",");
-- destoffset = decode_rm00_address(rl);
-- DECODE_PRINTF("\n");
-- TRACE_AND_STEP();
-- *srcreg = (u16)destoffset;
-+ if (M.x86.mode & SYSMODE_PREFIX_ADDR) {
-+ u32 *srcreg = DECODE_RM_LONG_REGISTER(rh);
-+ DECODE_PRINTF(",");
-+ destoffset = decode_rm00_address(rl);
-+ DECODE_PRINTF("\n");
-+ TRACE_AND_STEP();
-+ *srcreg = (u32)destoffset;
-+ } else {
-+ u16 *srcreg = DECODE_RM_WORD_REGISTER(rh);
-+ DECODE_PRINTF(",");
-+ destoffset = decode_rm00_address(rl);
-+ DECODE_PRINTF("\n");
-+ TRACE_AND_STEP();
-+ *srcreg = (u16)destoffset;
-+ }
- break;
- case 1:
-- srcreg = DECODE_RM_WORD_REGISTER(rh);
-- DECODE_PRINTF(",");
-- destoffset = decode_rm01_address(rl);
-- DECODE_PRINTF("\n");
-- TRACE_AND_STEP();
-- *srcreg = (u16)destoffset;
-+ if (M.x86.mode & SYSMODE_PREFIX_ADDR) {
-+ u32 *srcreg = DECODE_RM_LONG_REGISTER(rh);
-+ DECODE_PRINTF(",");
-+ destoffset = decode_rm01_address(rl);
-+ DECODE_PRINTF("\n");
-+ TRACE_AND_STEP();
-+ *srcreg = (u32)destoffset;
-+ } else {
-+ u16 *srcreg = DECODE_RM_WORD_REGISTER(rh);
-+ DECODE_PRINTF(",");
-+ destoffset = decode_rm01_address(rl);
-+ DECODE_PRINTF("\n");
-+ TRACE_AND_STEP();
-+ *srcreg = (u16)destoffset;
-+ }
- break;
- case 2:
-- srcreg = DECODE_RM_WORD_REGISTER(rh);
-- DECODE_PRINTF(",");
-- destoffset = decode_rm10_address(rl);
-- DECODE_PRINTF("\n");
-- TRACE_AND_STEP();
-- *srcreg = (u16)destoffset;
-+ if (M.x86.mode & SYSMODE_PREFIX_ADDR) {
-+ u32 *srcreg = DECODE_RM_LONG_REGISTER(rh);
-+ DECODE_PRINTF(",");
-+ destoffset = decode_rm10_address(rl);
-+ DECODE_PRINTF("\n");
-+ TRACE_AND_STEP();
-+ *srcreg = (u32)destoffset;
-+ } else {
-+ u16 *srcreg = DECODE_RM_WORD_REGISTER(rh);
-+ DECODE_PRINTF(",");
-+ destoffset = decode_rm10_address(rl);
-+ DECODE_PRINTF("\n");
-+ TRACE_AND_STEP();
-+ *srcreg = (u16)destoffset;
-+ }
- break;
- case 3: /* register to register */
- /* undefined. Do nothing. */
---
-cgit v0.8.3-6-g21f6
-From 66b6e2fd49fdc650703e56aa176a902e4921251c Mon Sep 17 00:00:00 2001
-From: Pierre-Loup A. Griffais <pgriffais at nvidia.com>
-Date: Wed, 27 Jan 2010 22:03:03 +0000
-Subject: Fix source pictures getting random transforms after 2d6a8f668342a5190cdf43b5.
-
-*xoff and *yoff were uninitialized for source-only pictures.x
-
-Signed-off-by: Pierre-Loup A. Griffais <pgriffais at nvidia.com>
-Reviewed-by: Aaron Plattner <aplattner at nvidia.com>
-Signed-off-by: Keith Packard <keithp at keithp.com>
-(cherry picked from commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1)
----
-diff --git a/fb/fbpict.c b/fb/fbpict.c
-index f9f4343..c046bae 100644
---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
-@@ -453,6 +453,7 @@ image_from_pict_18 (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
- else if (sp->type == SourcePictTypeConical)
- image = create_conical_gradient_image (gradient);
- }
-+ *xoff = *yoff = 0;
- }
-
- if (image)
---
-cgit v0.8.3-6-g21f6
-From 734a6b9c2150ce38cf120e179cdac9d3c625434e Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith at sun.com>
-Date: Wed, 27 Jan 2010 06:25:04 +0000
-Subject: Avoid segfaults in XF86VidMode GammaRamp functions if randr_crtc is NULL
-
-Fixes crash when xscreensaver tries to use GammaRamp calls to fade out
-http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6915712
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
-Reviewed-by: Keith Packard <keithp at keithp.com>
-Signed-off-by: Keith Packard <keithp at keithp.com>
----
-diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
-index 08f557c..edd5ae9 100644
---- a/hw/xfree86/common/xf86cmap.c
-+++ b/hw/xfree86/common/xf86cmap.c
-@@ -1004,12 +1004,14 @@ xf86ChangeGammaRamp(
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
- RRCrtcPtr crtc = config->output[config->compat_output]->crtc->randr_crtc;
-
-- if (crtc->gammaSize != size)
-- return BadValue;
-+ if (crtc) {
-+ if (crtc->gammaSize != size)
-+ return BadValue;
-
-- RRCrtcGammaSet(crtc, red, green, blue);
-+ RRCrtcGammaSet(crtc, red, green, blue);
-
-- return Success;
-+ return Success;
-+ }
- }
-
- if(CMapScreenKey == NULL)
-@@ -1077,7 +1079,8 @@ xf86GetGammaRampSize(ScreenPtr pScreen)
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
- RRCrtcPtr crtc = config->output[config->compat_output]->crtc->randr_crtc;
-
-- return crtc->gammaSize;
-+ if (crtc)
-+ return crtc->gammaSize;
- }
-
- if(CMapScreenKey == NULL) return 0;
-@@ -1106,17 +1109,19 @@ xf86GetGammaRamp(
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
- RRCrtcPtr crtc = config->output[config->compat_output]->crtc->randr_crtc;
-
-- if (crtc->gammaSize < size)
-- return BadValue;
-+ if (crtc) {
-+ if (crtc->gammaSize < size)
-+ return BadValue;
-
-- if (!RRCrtcGammaGet(crtc))
-- return BadImplementation;
-+ if (!RRCrtcGammaGet(crtc))
-+ return BadImplementation;
-
-- memcpy(red, crtc->gammaRed, size * sizeof(*red));
-- memcpy(green, crtc->gammaGreen, size * sizeof(*green));
-- memcpy(blue, crtc->gammaBlue, size * sizeof(*blue));
-+ memcpy(red, crtc->gammaRed, size * sizeof(*red));
-+ memcpy(green, crtc->gammaGreen, size * sizeof(*green));
-+ memcpy(blue, crtc->gammaBlue, size * sizeof(*blue));
-
-- return Success;
-+ return Success;
-+ }
- }
-
- if(CMapScreenKey == NULL)
---
-cgit v0.8.3-6-g21f6
More information about the arch-commits
mailing list