[arch-commits] CVS update of extra/x11/xorg-server (2 files)
Alexander Baldeck
alexander at archlinux.org
Tue Dec 25 19:55:00 UTC 2007
Date: Tuesday, December 25, 2007 @ 14:55:00
Author: alexander
Path: /home/cvs-extra/extra/x11/xorg-server
Added: 121_only_switch_vt_when_active.diff (1.1)
Modified: PKGBUILD (1.44 -> 1.45)
* added missing patch
-------------------------------------+
121_only_switch_vt_when_active.diff | 31 +++++++++++++++++++++++++++
PKGBUILD | 38 +++++++++++++++++++++++++---------
2 files changed, 60 insertions(+), 9 deletions(-)
Index: extra/x11/xorg-server/121_only_switch_vt_when_active.diff
diff -u /dev/null extra/x11/xorg-server/121_only_switch_vt_when_active.diff:1.1
--- /dev/null Tue Dec 25 14:55:00 2007
+++ extra/x11/xorg-server/121_only_switch_vt_when_active.diff Tue Dec 25 14:55:00 2007
@@ -0,0 +1,31 @@
+diff -urP xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_init.c xorg-server-1.1.1+/hw/xfree86/os-support/linux/lnx_init.c
+--- xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_init.c 2006-07-05 14:31:41.000000000 -0400
++++ xorg-server-1.1.1+/hw/xfree86/os-support/linux/lnx_init.c 2006-09-21 01:23:57.000000000 -0400
+@@ -345,10 +345,25 @@
+
+ if (VTSwitch)
+ {
++ struct vt_stat vts;
++
+ /*
+- * Perform a switch back to the active VT when we were started
++ * Perform a switch back to the active VT when we were started.
++ * We cannot rely on vtSema to determine if the server was the
++ * active VT at the time of shutdown since it has already been
++ * released. Instead, we manually check the current VT and
++ * compare it with the VT we were running on.
+ */
+- if (activeVT >= 0) {
++ if (ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts) < 0)
++ {
++ /* If this failed, fall back to old behaviour
++ * of always switching. */
++ xf86Msg(X_WARNING,"xf86OpenConsole: VT_GETSTATE failed: %s\n",
++ strerror(errno));
++ vts.v_active = xf86Info.vtno;
++ }
++
++ if (activeVT >= 0 && vts.v_active == xf86Info.vtno) {
+ if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, activeVT) < 0)
+ xf86Msg(X_WARNING, "xf86CloseConsole: VT_ACTIVATE failed: %s\n",
+ strerror(errno));
Index: extra/x11/xorg-server/PKGBUILD
diff -u extra/x11/xorg-server/PKGBUILD:1.44 extra/x11/xorg-server/PKGBUILD:1.45
--- extra/x11/xorg-server/PKGBUILD:1.44 Sun Dec 23 16:09:10 2007
+++ extra/x11/xorg-server/PKGBUILD Tue Dec 25 14:55:00 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.44 2007/12/23 21:09:10 alexander Exp $
+# $Id: PKGBUILD,v 1.45 2007/12/25 19:55:00 alexander Exp $
# Maintainer: Alexander Baldeck <kth5 at archlinux.org>
# Contributor: Jan de Groot <jgc at archlinux.org>
pkgname=xorg-server
pkgver=1.4.0.90
-pkgrel=3
-_mesaver=7.0.1
+pkgrel=4
+_mesaver=7.0.2
pkgdesc="X.Org X servers"
arch=('i686' 'x86_64')
url="http://xorg.freedesktop.org"
@@ -25,7 +25,7 @@
http://downloads.sourceforge.net/mesa3d/MesaLib-${_mesaver}.tar.bz2
xorg-server-1.2.0-defaultdpi.patch
xorg-redhat-die-ugly-pattern-die-die-die.patch
- 001_ubuntu_add_extra_modelines_from_xorg.patch
+ xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
01-kernel-headers-fix.patch
02_libvgahw_gcc4_volatile_fix.diff
03_auto_load_driver.diff
@@ -46,6 +46,8 @@
92_xprint-security-holes-fix.patch
93_spooltodir_check_file_exists
93_xprint_fonts_fix
+ 107_fedora_dont_backfill_bg_none.patch
+ 110_fedora_no_move_damage.patch
144_fedora_xserver-1.3.0-xnest-exposures.patch
101_fedora-apm-typedefs.patch
142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch
@@ -53,13 +55,21 @@
120_fedora_xserver-xaa-evict-pixmaps.patch
121_only_switch_vt_when_active.diff
102_ubuntu_sharevts_load_cpu.patch
- 104_fedora_init_origins_fix.patch)
+ 104_fedora_init_origins_fix.patch
+ 133_psb_auto.patch
+ 00_mesa-create-libdir.patch
+ 01_mesa-fix-makefile.patch
+ 04_mesa-cleanup-osmesa-configs.patch)
build() {
+ cd ${startdir}/src/Mesa-${_mesaver}
+ patch -Np1 -i ${startdir}/src/00_mesa-create-libdir.patch || return 1
+ patch -Np1 -i ${startdir}/src/01_mesa-fix-makefile.patch || return 1
+ patch -Np1 -i ${startdir}/src/04_mesa-cleanup-osmesa-configs.patch || return 1
+
cd ${startdir}/src/${pkgname}-${pkgver}
# patches from Debian
- patch -Np1 -i ${startdir}/src/001_ubuntu_add_extra_modelines_from_xorg.patch || return 1
patch -Np1 -i ${startdir}/src/01-kernel-headers-fix.patch || return 1
patch -Np1 -i ${startdir}/src/02_libvgahw_gcc4_volatile_fix.diff || return 1
patch -Np1 -i ${startdir}/src/03_auto_load_driver.diff || return 1
@@ -80,6 +90,8 @@
patch -Np1 -i ${startdir}/src/92_xprint-security-holes-fix.patch || return 1
patch -Np1 -i ${startdir}/src/93_spooltodir_check_file_exists || return 1
patch -Np1 -i ${startdir}/src/93_xprint_fonts_fix || return 1
+ patch -Np1 -i ${startdir}/src/107_fedora_dont_backfill_bg_none.patch || return 1
+ patch -Np1 -i ${startdir}/src/110_fedora_no_move_damage.patch || return 1
patch -Np1 -i ${startdir}/src/144_fedora_xserver-1.3.0-xnest-exposures.patch || return 1
patch -Np1 -i ${startdir}/src/101_fedora-apm-typedefs.patch || return 1
patch -Np1 -i ${startdir}/src/142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch || return 1
@@ -88,10 +100,12 @@
patch -Np1 -i ${startdir}/src/121_only_switch_vt_when_active.diff || return 1
patch -Np1 -i ${startdir}/src/102_ubuntu_sharevts_load_cpu.patch || return 1
patch -Np1 -i ${startdir}/src/104_fedora_init_origins_fix.patch || return 1
+ patch -Np1 -i ${startdir}/src/133_psb_auto.patch || return 1
# Own patches
patch -Np1 -i ${startdir}/src/xorg-server-1.2.0-defaultdpi.patch || return 1
patch -Np3 -i ${startdir}/src/xorg-redhat-die-ugly-pattern-die-die-die.patch || return 1
+ patch -Np1 -i ${startdir}/src/xorg-x11-server-1.0.1-Red-Hat-extramodes.patch || return 1
#cd GL/
#./symlink-mesa.sh ${startdir}/src/Mesa-${_mesaver}/ . || return 1
@@ -144,10 +158,10 @@
${startdir}/pkg/usr/lib/xorg/modules/libwfb.so.1.4
}
md5sums=('bb16e969850dbb5d3805cb88d35656d0'
- 'c056abd763e899114bf745c9eedbf9ad'
+ '93e6ed7924ff069a4f883b4fce5349dc'
'e162134c68230f7b168430fe73b4881a'
'1a336eb22e27cbf443ec5a2ecddfa93c'
- '117ca8113ad0977a8f769734e8599a10'
+ 'e49b4a78cdc47a379ee49663acbabedc'
'7bedf609cd7717f58f991b6a9380b2a5'
'12a725071633d8140c22237efd954787'
'424e260a4b44d4b33c93a9d93b0b54d8'
@@ -168,6 +182,8 @@
'697454ba6f2c5f77a100693b72440079'
'acbca762bbb532f2577bd57b29660e11'
'430f5fae7a12e5052a5b03990c2b1fb7'
+ 'e1fb0c5e6990cec3ee8f79d9de010c16'
+ '0faff1bfae0c6378fae5d2875fb3972c'
'37755b716f0be03e4a243d907899b746'
'793548b46eaa5fca3acd810c9d58167d'
'586cf862905a9b571a5c6fae9b538650'
@@ -175,4 +191,8 @@
'151d3233c367b80253c0bbf1fe8d41c6'
'd7a5dd4cadf1ed70adc7e12fdf3133d2'
'128f9245b2787479fcbf082f9e148aa8'
- '1dc001817b7a3951a63876415ad1eb91')
+ '1dc001817b7a3951a63876415ad1eb91'
+ 'c6c0c98dd96cdb79584953ca8a235ffc'
+ '24e53452b440187da428bcc312e7f392'
+ '9188e10dc342c148c2e38207a78d8bac'
+ 'b835ae98bf846ae97041ff73360e2019')
More information about the arch-commits
mailing list