[arch-commits] Commit in xorg-server/trunk (5 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Mon Oct 12 17:46:10 UTC 2009
Date: Monday, October 12, 2009 @ 13:46:10
Author: andyrtr
Revision: 55323
upgpkg: xorg-server 1.7.0.901-1
new version 1.7.0.901(1.7.1RC1)
Modified:
xorg-server/trunk/PKGBUILD
Deleted:
xorg-server/trunk/dga.patch
xorg-server/trunk/dpms-dont-reset-lastdeviceeventtime.patch
xorg-server/trunk/dri2-dontcrash.patch
xorg-server/trunk/xinerama.patch
-------------------------------------------+
PKGBUILD | 27 +++----------
dga.patch | 55 ----------------------------
dpms-dont-reset-lastdeviceeventtime.patch | 43 ---------------------
dri2-dontcrash.patch | 33 ----------------
xinerama.patch | 26 -------------
5 files changed, 6 insertions(+), 178 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-10-12 17:40:54 UTC (rev 55322)
+++ PKGBUILD 2009-10-12 17:46:10 UTC (rev 55323)
@@ -1,16 +1,15 @@
# $Id$
-# Maintainer: Alexander Baldeck <kth5 at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=xorg-server
-pkgver=1.6.3.901
+pkgver=1.7.0.901
pkgrel=1
pkgdesc="X.Org X servers"
arch=('i686' 'x86_64')
license=('custom')
url="http://xorg.freedesktop.org"
-depends=('hal>=0.5.12' 'libgl' 'libxfont>=1.4.0' 'openssl>=0.9.8k' 'libpciaccess>=0.10.8' 'libxv>=1.0.4' 'pixman>=0.16.0' 'xcursor-themes' 'xkeyboard-config>=1.6' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.2.5')
-makedepends=('libx11>=1.2.2' 'mesa>=7.5.1' 'xf86driproto>=2.1.0' 'xtrans>=1.2.4' 'libxkbfile>=1.0.5' 'randrproto>=1.3.0' 'renderproto>=0.9.3' 'xcmiscproto>=1.2.0' 'bigreqsproto>=1.1.0' 'resourceproto>=1.0.2' 'videoproto>=2.3.0' 'compositeproto>=0.4' 'scrnsaverproto>=1.2.0' 'xf86dgaproto>=2.0.99.1' 'recordproto>=1.13.2' 'libgl>=7.5.1' 'glproto>=1.4.9' 'xorg-util-macros' 'xineramaproto>=1.1.99.1')
+depends=('hal>=0.5.13' 'libgl' 'libxfont>=1.4.1' 'openssl>=0.9.8k' 'libpciaccess>=0.10.9' 'libxv>=1.0.5' 'pixman>=0.16.2' 'xcursor-themes>=1.0.2' 'xkeyboard-config>=1.6' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.2.5')
+makedepends=('libx11>=1.3' 'mesa>=7.6' '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' 'recordproto>=1.14' 'libgl>=7.6' 'glproto>=1.4.10' 'xorg-util-macros>=1.3.0' 'xineramaproto>=1.2')
conflicts=('catalyst-utils<=9.2')
options=('!libtool')
provides=('x-server')
@@ -18,18 +17,10 @@
install=xorg-server.install
source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
xorg-redhat-die-ugly-pattern-die-die-die.patch
- dpms-dont-reset-lastdeviceeventtime.patch
- dri2-dontcrash.patch
- xinerama.patch
- dga.patch
xvfb-run
xvfb-run.1)
-md5sums=('8d43c4cb43e6a10550e68fbbcad10e9d'
+md5sums=('38c5cfbb5bda671aed9f390e9b7c34b4'
'1a336eb22e27cbf443ec5a2ecddfa93c'
- '9ea2e9f5a7192da23c5c573545fe9836'
- '03cd32862fbfe5f493e108ee7205ade6'
- '060aaa85d64d26915783e9f6837a666c'
- 'f426f93dfec972ba6f641a8e7d6a9256'
'52fd3effd80d7bc6c1660d4ecf23d31c'
'376c70308715cd2643f7bff936d9934b')
@@ -38,14 +29,8 @@
# Get rid of the ugly pattern
patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch" || return 1
- # Build fixes for new protos
- patch -Np1 -i "${srcdir}/xinerama.patch" || return 1
- patch -Np1 -i "${srcdir}/dga.patch" || return 1
+ # Fixes from http://wiki.x.org/wiki/Server17Branch
- # Fixes from http://wiki.x.org/wiki/Server16Branch
- patch -Np1 -i "${srcdir}/dpms-dont-reset-lastdeviceeventtime.patch" || return 1
- patch -Np1 -i "${srcdir}/dri2-dontcrash.patch" || return 1
-
# Fix dbus config path
sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.* || return 1
Deleted: dga.patch
===================================================================
--- dga.patch 2009-10-12 17:40:54 UTC (rev 55322)
+++ dga.patch 2009-10-12 17:46:10 UTC (rev 55323)
@@ -1,55 +0,0 @@
-From 6fffcd5825454a7fe58ffbcfb219f007cf38e731 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Thu, 27 Aug 2009 03:43:15 +0000
-Subject: xfree86: require xf86dgaproto 2.0.99.1.
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
----
-diff --git a/configure.ac b/configure.ac
-index 1ee81f9..378ac66 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1512,10 +1512,10 @@ if test "x$XORG" = xyes; then
- XORG_OS_PCI=$XORG_OS
- fi
- if test "x$DGA" = xauto; then
-- PKG_CHECK_MODULES(DGA, xf86dgaproto, [DGA=yes], [DGA=no])
-+ PKG_CHECK_MODULES(DGA, [xf86dgaproto >= 2.0.99.1], [DGA=yes], [DGA=no])
- fi
- if test "x$DGA" = xyes; then
-- XORG_MODULES="$XORG_MODULES xf86dgaproto"
-+ XORG_MODULES="$XORG_MODULES [xf86dgaproto >= 2.0.99.1]"
- PKG_CHECK_MODULES(DGA, xf86dgaproto)
- AC_DEFINE(DGA, 1, [Support DGA extension])
- AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
-diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
-index ad53408..2292175 100644
---- a/hw/xfree86/dixmods/extmod/modinit.h
-+++ b/hw/xfree86/dixmods/extmod/modinit.h
-@@ -37,8 +37,7 @@ extern void XFree86VidModeExtensionInit(INITARGS);
- #ifdef XFreeXDGA
- extern void XFree86DGAExtensionInit(INITARGS);
- extern void XFree86DGARegister(INITARGS);
--#define _XF86DGA_SERVER_
--#include <X11/extensions/xf86dgastr.h>
-+#include <X11/extensions/xf86dgaproto.h>
- #endif
-
- #ifdef DPMSExtension
-diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c
-index 6286659..7579f7d 100644
---- a/hw/xfree86/dixmods/extmod/xf86dga2.c
-+++ b/hw/xfree86/dixmods/extmod/xf86dga2.c
-@@ -22,9 +22,7 @@
- #include "cursorstr.h"
- #include "scrnintstr.h"
- #include "servermd.h"
--#define _XF86DGA_SERVER_
--#include <X11/extensions/xf86dga.h>
--#include <X11/extensions/xf86dgastr.h>
-+#include <X11/extensions/xf86dgaproto.h>
- #include "swaprep.h"
- #include "dgaproc.h"
- #include "xf86dgaext.h"
---
-cgit v0.8.2
Deleted: dpms-dont-reset-lastdeviceeventtime.patch
===================================================================
--- dpms-dont-reset-lastdeviceeventtime.patch 2009-10-12 17:40:54 UTC (rev 55322)
+++ dpms-dont-reset-lastdeviceeventtime.patch 2009-10-12 17:46:10 UTC (rev 55323)
@@ -1,43 +0,0 @@
-From c1d901d723c3bee523736eacc15b44a7dff484fe Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard at hughsie.com>
-Date: Fri, 14 Aug 2009 10:44:35 +0000
-Subject: Don't reset the lastDeviceEventTime when doing DPMS actions
-
-When we change the DPMS mode, don't play games with the last event time as
-this breaks applications using IDLETIME to turn the backlight off after a
-preset time.
-
-This patch fixes gnome-power-manager and xfce-power-manager
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
----
-diff --git a/Xext/dpms.c b/Xext/dpms.c
-index 21ba923..df63a8b 100644
---- a/Xext/dpms.c
-+++ b/Xext/dpms.c
-@@ -177,19 +177,10 @@ ProcDPMSForceLevel(ClientPtr client)
- if (!DPMSEnabled)
- return BadMatch;
-
-- if (stuff->level == DPMSModeOn) {
-- lastDeviceEventTime.milliseconds =
-- GetTimeInMillis();
-- } else if (stuff->level == DPMSModeStandby) {
-- lastDeviceEventTime.milliseconds =
-- GetTimeInMillis() - DPMSStandbyTime;
-- } else if (stuff->level == DPMSModeSuspend) {
-- lastDeviceEventTime.milliseconds =
-- GetTimeInMillis() - DPMSSuspendTime;
-- } else if (stuff->level == DPMSModeOff) {
-- lastDeviceEventTime.milliseconds =
-- GetTimeInMillis() - DPMSOffTime;
-- } else {
-+ if (stuff->level != DPMSModeOn &&
-+ stuff->level != DPMSModeStandby &&
-+ stuff->level != DPMSModeSuspend &&
-+ stuff->level != DPMSModeOff) {
- client->errorValue = stuff->level;
- return BadValue;
- }
---
-cgit v0.8.2
Deleted: dri2-dontcrash.patch
===================================================================
--- dri2-dontcrash.patch 2009-10-12 17:40:54 UTC (rev 55322)
+++ dri2-dontcrash.patch 2009-10-12 17:46:10 UTC (rev 55323)
@@ -1,33 +0,0 @@
-From df597709d71f47b8516e27c6fb1bfffd59de5e48 Mon Sep 17 00:00:00 2001
-From: Michel Dänzer <daenzer at vmware.com>
-Date: Tue, 23 Jun 2009 14:45:39 +0000
-Subject: dri2: Don't crash if pPriv is NULL.
-
----
-diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
-index 385c5e8..aead33b 100644
---- a/hw/xfree86/dri2/dri2.c
-+++ b/hw/xfree86/dri2/dri2.c
-@@ -186,10 +186,18 @@ do_get_buffers(DrawablePtr pDraw, int *width, int *height,
- int need_fake_front = 0;
- int have_fake_front = 0;
- int front_format = 0;
-- const int dimensions_match = (pDraw->width == pPriv->width)
-- && (pDraw->height == pPriv->height);
-+ int dimensions_match;
- int i;
-
-+ if (!pPriv) {
-+ *width = pDraw->width;
-+ *height = pDraw->height;
-+ *out_count = 0;
-+ return NULL;
-+ }
-+
-+ dimensions_match = (pDraw->width == pPriv->width)
-+ && (pDraw->height == pPriv->height);
-
- buffers = xalloc((count + 1) * sizeof(buffers[0]));
-
---
-cgit v0.8.2
Deleted: xinerama.patch
===================================================================
--- xinerama.patch 2009-10-12 17:40:54 UTC (rev 55322)
+++ xinerama.patch 2009-10-12 17:46:10 UTC (rev 55323)
@@ -1,26 +0,0 @@
-From a38ca0063c91ef221f20bf0c4ac0dc84ce07d557 Mon Sep 17 00:00:00 2001
-From: Benjamin Close <Benjamin.Close at clearchain.com>
-Date: Fri, 13 Feb 2009 04:14:53 +0000
-Subject: xext: Use proto header rather than the Xext include file, this prevents userspace being pulled in causing issues
-
-Signed-off-by: Benjamin Close <Benjamin.Close at clearchain.com>
-Acked-by: Peter Hutterer <peter.hutterer at who-t.net>
-Acked-by: Daniel Stone <daniel at fooishbar.org>
----
-diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h
-index 700c5a4..d413ff9 100644
---- a/Xext/panoramiX.h
-+++ b/Xext/panoramiX.h
-@@ -41,9 +41,8 @@ Equipment Corporation.
- #define _PANORAMIX_H_
-
- #define _PANORAMIX_SERVER
--#include <X11/extensions/panoramiXext.h>
-+#include <X11/extensions/panoramiXproto.h>
- #undef _PANORAMIX_SERVER
--
- #include "gcstruct.h"
-
-
---
-cgit v0.8.2
More information about the arch-commits
mailing list