From f497e1217c3045b04571e05b2265f0e995cc98d0 Mon Sep 17 00:00:00 2001 From: James Meyer <jams@linhes.org> Date: Thu, 9 Dec 2010 16:36:38 +0000 Subject: xorg-server: update to 1.9.2 Added QT crash patch --- abs/core/xorg-server/001_fedora_extramodes.patch | 85 ------- abs/core/xorg-server/10-evdev.conf | 39 ---- abs/core/xorg-server/PKGBUILD | 169 ++++++++++---- abs/core/xorg-server/__changelog | 4 +- abs/core/xorg-server/crash.patch | 11 + abs/core/xorg-server/xorg-server.install | 14 -- .../xorg-server/xserver-1.5-branch-4970d.patch | 246 --------------------- ...-1.5.0-force-SwitchCoreKeyboard-for-evdev.patch | 69 ------ .../xserver-1.5.3-AEI-on-by-default.patch | 108 --------- .../xorg-server/xserver-1.7.1-gamma-kdm-fix.patch | 34 --- abs/core/xorg-server/xserver-1.7.1-libcrypto.patch | 32 --- 11 files changed, 142 insertions(+), 669 deletions(-) delete mode 100644 abs/core/xorg-server/001_fedora_extramodes.patch delete mode 100644 abs/core/xorg-server/10-evdev.conf create mode 100644 abs/core/xorg-server/crash.patch delete mode 100644 abs/core/xorg-server/xorg-server.install delete mode 100644 abs/core/xorg-server/xserver-1.5-branch-4970d.patch delete mode 100644 abs/core/xorg-server/xserver-1.5.0-force-SwitchCoreKeyboard-for-evdev.patch delete mode 100644 abs/core/xorg-server/xserver-1.5.3-AEI-on-by-default.patch delete mode 100644 abs/core/xorg-server/xserver-1.7.1-gamma-kdm-fix.patch delete mode 100644 abs/core/xorg-server/xserver-1.7.1-libcrypto.patch diff --git a/abs/core/xorg-server/001_fedora_extramodes.patch b/abs/core/xorg-server/001_fedora_extramodes.patch deleted file mode 100644 index 30743b8..0000000 --- a/abs/core/xorg-server/001_fedora_extramodes.patch +++ /dev/null @@ -1,85 +0,0 @@ -From: Adam Jackson <ajax@redhat.com> -Date: Sun, 28 Oct 2007 09:37:52 +0100 -Subject: [PATCH] Fedora extra modes list - ---- -Index: xorg-server/hw/xfree86/common/extramodes -=================================================================== ---- xorg-server.orig/hw/xfree86/common/extramodes -+++ xorg-server/hw/xfree86/common/extramodes -@@ -3,16 +3,75 @@ - // - // $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $ - // -+// NOTE: Please keep all video modes sorted in order of X res, then Y res for -+// ease of maintenance and readability. - - # 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz - ModeLine "832x624" 57.284 832 864 928 1152 624 625 628 667 -Hsync -Vsync - -+# 1152x864 @ 60.00 Hz (GTF) hsync: 53.70 kHz; pclk: 81.62 MHz -+Modeline "1152x864" 81.62 1152 1216 1336 1520 864 865 868 895 -HSync +Vsync -+ -+# 1152x864 @ 70.00 Hz (GTF) hsync: 63.00 kHz; pclk: 96.77 MHz -+Modeline "1152x864" 96.77 1152 1224 1344 1536 864 865 868 900 -HSync +Vsync -+ -+# 1152x864 @ 75.00 Hz (GTF) hsync: 67.65 kHz; pclk: 104.99 MHz -+Modeline "1152x864" 104.99 1152 1224 1352 1552 864 865 868 902 -HSync +Vsync -+ -+# 1152x864 @ 85.00 Hz (GTF) hsync: 77.10 kHz; pclk: 119.65 MHz -+Modeline "1152x864" 119.65 1152 1224 1352 1552 864 865 868 907 -HSync +Vsync -+ -+# 1152x864 @ 85Hz (Red Hat custom modeline) -+ModeLine "1152x864" 121.5 1152 1216 1344 1568 864 865 868 911 +hsync -vsync -+ -+# 1152x864 @ 100.00 Hz (GTF) hsync: 91.50 kHz; pclk: 143.47 MHz -+Modeline "1152x864" 143.47 1152 1232 1360 1568 864 865 868 915 -HSync +Vsync -+ -+# 1360x768 59.96 Hz (CVT) hsync: 47.37 kHz; pclk: 72.00 MHz -+Modeline "1360x768" 72.00 1360 1408 1440 1520 768 771 781 790 +hsync -vsync -+ -+# 1360x768 59.80 Hz (CVT) hsync: 47.72 kHz; pclk: 84.75 MHz -+Modeline "1360x768" 84.75 1360 1432 1568 1776 768 771 781 798 -hsync +vsync -+ - # 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz - ModeLine "1400x1050" 122.0 1400 1488 1640 1880 1050 1052 1064 1082 +hsync +vsync - -+# 1400x1050 @ 70.00 Hz (GTF) hsync: 76.51 kHz; pclk: 145.06 MHz -+Modeline "1400x1050" 145.06 1400 1496 1648 1896 1050 1051 1054 1093 -HSync +Vsync -+ - # 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz - ModeLine "1400x1050" 155.8 1400 1464 1784 1912 1050 1052 1064 1090 +hsync +vsync - -+# 1400x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 179.26 MHz -+Modeline "1400x1050" 179.26 1400 1504 1656 1912 1050 1051 1054 1103 -HSync +Vsync -+ -+# 1440x900 @ 60.00 Hz (CVT) field rate 59.89 Hz; hsync: 55.93 kHz; pclk: 106.50 MHz -+Modeline "1440x900" 106.50 1440 1520 1672 1904 900 903 909 934 -HSync +Vsync -+ -+# 1600x1024 for SGI 1600 SW -+ModeLine "1600x1024" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 +Hsync +Vsync -+ -+# 1680x1050 59.88 Hz (CVT 1.76MA-R) hsync: 64.67 kHz; pclk: 119.00 MHz -+Modeline "1680x1050" 119.00 1680 1728 1760 1840 1050 1053 1059 1080 +hsync -vsync -+ -+# 1680x1050 59.95 Hz (CVT 1.76MA) hsync: 65.29 kHz; pclk: 146.25 MHz -+Modeline "1680x1050" 146.25 1680 1784 1960 2240 1050 1053 1059 1089 -hsync +vsync -+ -+# 1680x1050 69.88 Hz (CVT) hsync: 76.58 kHz; pclk: 174.00 MHz -+Modeline "1680x1050" 174.00 1680 1800 1976 2272 1050 1053 1059 1096 -hsync +vsync -+ -+# 1680x1050 74.89 Hz (CVT 1.76MA) hsync: 82.31 kHz; pclk: 187.00 MHz -+Modeline "1680x1050" 187.00 1680 1800 1976 2272 1050 1053 1059 1099 -hsync +vsync -+ -+# 1680x1050 84.94 Hz (CVT 1.76MA) hsync: 93.86 kHz; pclk: 214.75 MHz -+Modeline "1680x1050" 214.75 1680 1808 1984 2288 1050 1053 1059 1105 -hsync +vsync -+ -+# 1920x1080 59.93 Hz (CVT 2.07M9-R) hsync: 66.59 kHz; pclk: 138.50 MHz -+Modeline "1920x1080" 138.50 1920 1968 2000 2080 1080 1083 1088 1111 +hsync -vsync -+ -+# 1920x1200 59.95 Hz (CVT 2.30MA-R) hsync: 74.04 kHz; pclk: 154.00 MHz -+Modeline "1920x1200" 154.00 1920 1968 2000 2080 1200 1203 1209 1235 +hsync -vsync -+ - # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz - Modeline "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync - diff --git a/abs/core/xorg-server/10-evdev.conf b/abs/core/xorg-server/10-evdev.conf deleted file mode 100644 index 877aa4a..0000000 --- a/abs/core/xorg-server/10-evdev.conf +++ /dev/null @@ -1,39 +0,0 @@ -# Catchall classes for input devices -# We don't simply match on any device since that also adds accelerometers -# and other devices that we don't really want to use. The list below -# matches everything but joysticks. - -Section "InputClass" - Identifier "evdev pointer catchall" - MatchIsPointer "on" - MatchDevicePath "/dev/input/event*" - Driver "evdev" -EndSection - -Section "InputClass" - Identifier "evdev keyboard catchall" - MatchIsKeyboard "on" - MatchDevicePath "/dev/input/event*" - Driver "evdev" -EndSection - -Section "InputClass" - Identifier "evdev touchpad catchall" - MatchIsTouchpad "on" - MatchDevicePath "/dev/input/event*" - Driver "evdev" -EndSection - -Section "InputClass" - Identifier "evdev tablet catchall" - MatchIsTablet "on" - MatchDevicePath "/dev/input/event*" - Driver "evdev" -EndSection - -Section "InputClass" - Identifier "evdev touchscreen catchall" - MatchIsTouchscreen "on" - MatchDevicePath "/dev/input/event*" - Driver "evdev" -EndSection diff --git a/abs/core/xorg-server/PKGBUILD b/abs/core/xorg-server/PKGBUILD index d331299..91144d8 100644 --- a/abs/core/xorg-server/PKGBUILD +++ b/abs/core/xorg-server/PKGBUILD @@ -1,48 +1,37 @@ -# $Id: PKGBUILD 83339 2010-06-21 12:03:15Z jgc $ +# $Id: PKGBUILD 97822 2010-11-01 22:35:02Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> -pkgname=xorg-server -pkgver=1.8.1.902 -pkgrel=2 -pkgdesc="X.Org X servers" +pkgbase=xorg-server +pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') +pkgver=1.9.2 +pkgrel=1 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" -depends=('libgl' 'libxfont>=1.4.1' 'libgcrypt>=1.4.5' 'udev>=151' 'libpciaccess>=0.10.9' 'libxv>=1.0.5' 'pixman>=0.18.0' 'xcursor-themes>=1.0.2' 'xkeyboard-config>=1.8' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.3.2-2' 'inputproto>=2.0') -makedepends=('libx11>=1.3.3' 'mesa>=7.8.2' 'xf86driproto>=2.1.0' 'xtrans>=1.2.5' '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.8.2' 'glproto>=1.4.11' 'xorg-util-macros>=1.6.1' 'xineramaproto>=1.2' 'recordproto') -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') +makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres') options=('!libtool') -provides=('x-server') -groups=('xorg') -install=xorg-server.install -backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') -source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2 +source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xorg-redhat-die-ugly-pattern-die-die-die.patch xvfb-run xvfb-run.1 - 10-evdev.conf - 10-quirks.conf) -md5sums=('8a851466d13e4ee527cc782308532119' + 10-quirks.conf crash.patch) +md5sums=('5c8773499a6a8c1ddaedf33577ec9634' '1a336eb22e27cbf443ec5a2ecddfa93c' '52fd3effd80d7bc6c1660d4ecf23d31c' '376c70308715cd2643f7bff936d9934b' - 'e930e153d69968a795fe4e2ef5d9a5dc' 'd4f7dfc6be4ef4e2c6dd7632a9d88abe') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgbase}-${pkgver}" # Get rid of the ugly pattern patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch" + patch -Np1 -i "${srcdir}/crash.patch" - sed -i -e 's/\$(prefix)\/etc/\/etc/g' config/Makefile.* - - autoreconf ./configure --prefix=/usr \ --enable-ipv6 \ --enable-dri \ - --disable-dmx \ + --enable-dmx \ --enable-xvfb \ --enable-xnest \ --enable-composite \ @@ -60,34 +49,136 @@ build() { --disable-static \ --sysconfdir=/etc/X11 \ --localstatedir=/var \ - --with-fontrootdir=/usr/share/fonts \ --with-xkb-path=/usr/share/X11/xkb \ --with-xkb-output=/var/lib/xkb \ - --with-dri-driver-path=/usr/lib/xorg/modules/dri + --with-dri-driver-path=/usr/lib/xorg/modules/dri \ + --with-fontrootdir=/usr/share/fonts + make - make || return 1 + sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ + -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ + -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ + -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ + -i hw/Makefile } -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install +package_xorg-server-common() { + pkgdesc="Xorg server common files" + depends=('xkeyboard-config' 'xorg-xkb-utils' 'xorg-fonts-misc') - install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" - install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" + cd "${srcdir}/${pkgbase}-${pkgver}" + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" + install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" + + make -C xkb DESTDIR="${pkgdir}" install-data - rm -rf "${pkgdir}/var/log" + install -m755 -d "${pkgdir}/usr/share/man/man1" + install -m644 doc/Xserver.1 "${pkgdir}/usr/share/man/man1/" - install -m755 -d "${pkgdir}/var/lib/xkb" + install -m755 -d "${pkgdir}/usr/lib/xorg" + install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/" +} - # Install sane config files in /etc. I don't see the need for config files in /usr/share here, users will edit them anyways. - install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" - install -m644 "${srcdir}/10-evdev.conf" "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - rm -rf "${pkgdir}/usr/share/X11" +package_xorg-server() { + pkgdesc="Xorg X server" + depends=(libxdmcp libxfont udev libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev) + backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') + provides=('x-server') + groups=('xorg') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/etc/X11" + mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/" + install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/" + + rmdir "${pkgdir}/usr/share/X11" # Needed for non-mesa drivers, libgl will restore it mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + rm -rf "${pkgdir}/var" + + rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" + rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" + + rm -rf "${pkgdir}/usr/lib/pkgconfig" + rm -rf "${pkgdir}/usr/include" + rm -rf "${pkgdir}/usr/share/aclocal" +} + +package_xorg-server-xephyr() { + pkgdesc="A nested X server that runs as an X application" + depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common) + + cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING" +} + +package_xorg-server-xvfb() { + pkgdesc="Virtual framebuffer X server" + depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common) + + cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb" + make DESTDIR="${pkgdir}" install + + install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" + install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING" +} + +package_xorg-server-xnest() { + pkgdesc="A nested X server that runs as an X application" + depends=(libxfont libxext libgcrypt pixman xorg-server-common) + + cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING" } + +package_xorg-server-xdmx() { + pkgdesc="Distributed Multihead X Server and utilities" + depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common) + + cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING" +} + +package_xorg-server-devel() { + pkgdesc="Development files for the X.Org X server" + depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess) + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}/usr/bin" + rm -rf "${pkgdir}/usr/share/man" + rm -rf "${pkgdir}/usr/share/doc" + rm -rf "${pkgdir}/usr/share/X11" + rm -rf "${pkgdir}/usr/lib/xorg" + rm -rf "${pkgdir}/var" + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING" +} +md5sums=('5c8773499a6a8c1ddaedf33577ec9634' + '1a336eb22e27cbf443ec5a2ecddfa93c' + '52fd3effd80d7bc6c1660d4ecf23d31c' + '376c70308715cd2643f7bff936d9934b' + 'd4f7dfc6be4ef4e2c6dd7632a9d88abe' + 'f46bf7abb53b6d80b665c0c14c7346dd') diff --git a/abs/core/xorg-server/__changelog b/abs/core/xorg-server/__changelog index 2f87167..cd15789 100644 --- a/abs/core/xorg-server/__changelog +++ b/abs/core/xorg-server/__changelog @@ -1,3 +1 @@ - -added --enable-null-root-cursor to configure line. -jm - +add patch to stop xorg from crashing with qt diff --git a/abs/core/xorg-server/crash.patch b/abs/core/xorg-server/crash.patch new file mode 100644 index 0000000..1e10d1a --- /dev/null +++ b/abs/core/xorg-server/crash.patch @@ -0,0 +1,11 @@ +--- a/Xext/panoramiXprocs.c ++++ b/Xext/panoramiXprocs.c +@@ -634,7 +634,7 @@ int PanoramiXTranslateCoords(ClientPtr client) + rep.dstX = x - pDst->drawable.x; + rep.dstY = y - pDst->drawable.y; + if((pDst == screenInfo.screens[0]->root) || +- (pWin->drawable.id == screenInfo.screens[0]->screensaver.wid)) ++ (pDst->drawable.id == screenInfo.screens[0]->screensaver.wid)) + { + rep.dstX += screenInfo.screens[0]->x; + rep.dstY += screenInfo.screens[0]->y; diff --git a/abs/core/xorg-server/xorg-server.install b/abs/core/xorg-server/xorg-server.install deleted file mode 100644 index 89cfec0..0000000 --- a/abs/core/xorg-server/xorg-server.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { -cat << _EOF - - Input device handling has changed since xorg-server 1.5. - Please read http://wiki.archlinux.org/index.php/Xorg_input_hotplugging. - -_EOF -} - -post_upgrade() { - if [ "`vercmp $2 1.4.99.906`" -lt 0 ]; then - post_install - fi -} diff --git a/abs/core/xorg-server/xserver-1.5-branch-4970d.patch b/abs/core/xorg-server/xserver-1.5-branch-4970d.patch deleted file mode 100644 index 23cdab0..0000000 --- a/abs/core/xorg-server/xserver-1.5-branch-4970d.patch +++ /dev/null @@ -1,246 +0,0 @@ -diff -ruN xserver-4c6a89ee783d62fb75a738339351830c35b19a38/config/x11-input.fdi xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/config/x11-input.fdi ---- xserver-4c6a89ee783d62fb75a738339351830c35b19a38/config/x11-input.fdi 2008-11-05 20:39:01.000000000 +0000 -+++ xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/config/x11-input.fdi 2008-12-16 19:19:00.000000000 +0000 -@@ -64,8 +64,8 @@ - <merge key="input.x11_options.XkbRules" type="string">base</merge> - - <!-- If we're using Linux, we use evdev by default (falling back to -- keyboard otherwise). --> -- <merge key="input.x11_driver" type="string">keyboard</merge> -+ kbd otherwise). --> -+ <merge key="input.x11_driver" type="string">kbd</merge> - <merge key="input.x11_options.XkbModel" type="string">pc105</merge> - <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" - string="Linux"> -diff -ruN xserver-4c6a89ee783d62fb75a738339351830c35b19a38/exa/exa_accel.c xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/exa/exa_accel.c ---- xserver-4c6a89ee783d62fb75a738339351830c35b19a38/exa/exa_accel.c 2008-11-05 20:39:01.000000000 +0000 -+++ xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/exa/exa_accel.c 2008-12-16 19:19:00.000000000 +0000 -@@ -398,6 +398,10 @@ - RegionPtr srcregion = NULL, dstregion = NULL; - xRectangle *rects; - -+ /* avoid doing copy operations if no boxes */ -+ if (nbox == 0) -+ return; -+ - pSrcPixmap = exaGetDrawablePixmap (pSrcDrawable); - pDstPixmap = exaGetDrawablePixmap (pDstDrawable); - -diff -ruN xserver-4c6a89ee783d62fb75a738339351830c35b19a38/hw/xfree86/common/xf86Helper.c xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/hw/xfree86/common/xf86Helper.c ---- xserver-4c6a89ee783d62fb75a738339351830c35b19a38/hw/xfree86/common/xf86Helper.c 2008-11-05 20:39:01.000000000 +0000 -+++ xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/hw/xfree86/common/xf86Helper.c 2008-12-16 19:19:00.000000000 +0000 -@@ -448,10 +448,6 @@ - #define GLOBAL_DEFAULT_DEPTH 24 - #endif - --#ifndef GLOBAL_DEFAULT_FBBPP --#define GLOBAL_DEFAULT_FBBPP 32 --#endif -- - _X_EXPORT Bool - xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp, - int depth24flags) -@@ -529,7 +525,6 @@ - if (depth > 0) - scrp->depth = depth; - } else { -- scrp->bitsPerPixel = GLOBAL_DEFAULT_FBBPP; - scrp->depth = GLOBAL_DEFAULT_DEPTH; - } - } -diff -ruN xserver-4c6a89ee783d62fb75a738339351830c35b19a38/hw/xfree86/os-support/linux/int10/linux.c xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/hw/xfree86/os-support/linux/int10/linux.c ---- xserver-4c6a89ee783d62fb75a738339351830c35b19a38/hw/xfree86/os-support/linux/int10/linux.c 2008-11-05 20:39:01.000000000 +0000 -+++ xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/hw/xfree86/os-support/linux/int10/linux.c 2008-12-16 19:19:00.000000000 +0000 -@@ -1,6 +1,6 @@ - /* - * linux specific part of the int10 module -- * Copyright 1999, 2000, 2001, 2002, 2003, 2004 Egbert Eich -+ * Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2008 Egbert Eich - */ - #ifdef HAVE_XORG_CONFIG_H - #include <xorg-config.h> -@@ -357,7 +357,10 @@ - "shmat(low_mem) error: %s\n",strerror(errno)); - return FALSE; - } -- -+ if (mprotect((void*)0, V_RAM, PROT_READ|PROT_WRITE|PROT_EXEC) != 0) -+ xf86DrvMsg(pInt->scrnIndex, X_ERROR, -+ "Cannot set EXEC bit on low memory: %s\n", strerror(errno)); -+ - if (((linuxInt10Priv*)pInt->private)->highMem >= 0) { - addr = shmat(((linuxInt10Priv*)pInt->private)->highMem, - (char*)HIGH_MEM, 0); -@@ -368,6 +371,11 @@ - "shmget error: %s\n",strerror(errno)); - return FALSE; - } -+ if (mprotect((void*)HIGH_MEM, HIGH_MEM_SIZE, -+ PROT_READ|PROT_WRITE|PROT_EXEC) != 0) -+ xf86DrvMsg(pInt->scrnIndex, X_ERROR, -+ "Cannot set EXEC bit on high memory: %s\n", -+ strerror(errno)); - } else { - if ((fd = open(DEV_MEM, O_RDWR, 0)) >= 0) { - if (mmap((void *)(V_BIOS), SYS_BIOS - V_BIOS, -diff -ruN xserver-4c6a89ee783d62fb75a738339351830c35b19a38/hw/xfree86/xaa/xaa.h xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/hw/xfree86/xaa/xaa.h ---- xserver-4c6a89ee783d62fb75a738339351830c35b19a38/hw/xfree86/xaa/xaa.h 2008-11-05 20:39:01.000000000 +0000 -+++ xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/hw/xfree86/xaa/xaa.h 2008-12-16 19:19:00.000000000 +0000 -@@ -2,6 +2,10 @@ - #ifndef _XAA_H - #define _XAA_H - -+#define XAA_VERSION_MAJOR 1 -+#define XAA_VERSION_MINOR 2 -+#define XAA_VERSION_RELEASE 1 -+ - /* - - ******** OPERATION SPECIFIC FLAGS ********* -diff -ruN xserver-4c6a89ee783d62fb75a738339351830c35b19a38/hw/xfree86/xaa/xaaInitAccel.c xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/hw/xfree86/xaa/xaaInitAccel.c ---- xserver-4c6a89ee783d62fb75a738339351830c35b19a38/hw/xfree86/xaa/xaaInitAccel.c 2008-11-05 20:39:01.000000000 +0000 -+++ xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/hw/xfree86/xaa/xaaInitAccel.c 2008-12-16 19:19:00.000000000 +0000 -@@ -103,7 +103,9 @@ - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, -- 1, 2, 0, -+ XAA_VERSION_MAJOR, -+ XAA_VERSION_MINOR, -+ XAA_VERSION_RELEASE, - ABI_CLASS_VIDEODRV, /* requires the video driver ABI */ - ABI_VIDEODRV_VERSION, - MOD_CLASS_NONE, -diff -ruN xserver-4c6a89ee783d62fb75a738339351830c35b19a38/hw/xfree86/xaa/xaawrap.h xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/hw/xfree86/xaa/xaawrap.h ---- xserver-4c6a89ee783d62fb75a738339351830c35b19a38/hw/xfree86/xaa/xaawrap.h 2008-11-05 20:39:01.000000000 +0000 -+++ xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/hw/xfree86/xaa/xaawrap.h 2008-12-16 19:19:00.000000000 +0000 -@@ -48,8 +48,8 @@ - XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE((PixmapPtr)(pDraw));\ - GCFuncs *oldFuncs = pGC->funcs;\ - pGC->funcs = pGCPriv->wrapFuncs;\ -- pGC->ops = pGCPriv->wrapOps -- -+ pGC->ops = pGCPriv->wrapOps; \ -+ SYNC_CHECK(pGC) - - #define XAA_PIXMAP_OP_EPILOGUE(pGC)\ - pGCPriv->wrapOps = pGC->ops;\ -diff -ruN xserver-4c6a89ee783d62fb75a738339351830c35b19a38/mi/miinitext.c xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/mi/miinitext.c ---- xserver-4c6a89ee783d62fb75a738339351830c35b19a38/mi/miinitext.c 2008-11-05 20:39:01.000000000 +0000 -+++ xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/mi/miinitext.c 2008-12-16 19:19:00.000000000 +0000 -@@ -661,7 +661,8 @@ - #endif - - #ifdef GLXEXT -- GlxPushProvider(&__glXDRISWRastProvider); -+ if (serverGeneration == 1) -+ GlxPushProvider(&__glXDRISWRastProvider); - if (!noGlxExtension) GlxExtensionInit(); - #endif - } -diff -ruN xserver-4c6a89ee783d62fb75a738339351830c35b19a38/os/utils.c xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/os/utils.c ---- xserver-4c6a89ee783d62fb75a738339351830c35b19a38/os/utils.c 2008-11-05 20:39:01.000000000 +0000 -+++ xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/os/utils.c 2008-12-16 19:19:00.000000000 +0000 -@@ -1702,7 +1702,7 @@ - int pid; - } *pidlist; - --void (*old_alarm)(int) = NULL; /* XXX horrible awful hack */ -+OsSigHandlerPtr old_alarm = NULL; /* XXX horrible awful hack */ - - pointer - Popen(char *command, char *type) -@@ -1726,7 +1726,7 @@ - } - - /* Ignore the smart scheduler while this is going on */ -- old_alarm = signal(SIGALRM, SIG_IGN); -+ old_alarm = OsSignal(SIGALRM, SIG_IGN); - if (old_alarm == SIG_ERR) { - perror("signal"); - return NULL; -@@ -1737,7 +1737,7 @@ - close(pdes[0]); - close(pdes[1]); - xfree(cur); -- if (signal(SIGALRM, old_alarm) == SIG_ERR) -+ if (OsSignal(SIGALRM, old_alarm) == SIG_ERR) - perror("signal"); - return NULL; - case 0: /* child */ -@@ -1914,7 +1914,7 @@ - /* allow EINTR again */ - OsReleaseSignals (); - -- if (old_alarm && signal(SIGALRM, old_alarm) == SIG_ERR) { -+ if (old_alarm && OsSignal(SIGALRM, old_alarm) == SIG_ERR) { - perror("signal"); - return -1; - } -diff -ruN xserver-4c6a89ee783d62fb75a738339351830c35b19a38/xkb/xkbEvents.c xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/xkb/xkbEvents.c ---- xserver-4c6a89ee783d62fb75a738339351830c35b19a38/xkb/xkbEvents.c 2008-11-05 20:39:01.000000000 +0000 -+++ xserver-4970d757a7364c1d2fb4db4e404e88e8ad989ddb/xkb/xkbEvents.c 2008-12-16 19:19:00.000000000 +0000 -@@ -109,7 +109,7 @@ - register CARD16 changed,bState; - - interest = kbd->xkb_interest; -- if (!interest) -+ if (!interest || !kbd->key || !kbd->key->xkbInfo) - return; - xkbi = kbd->key->xkbInfo; - state= &xkbi->state; -@@ -168,6 +168,9 @@ - unsigned time = 0,initialized; - CARD16 changed; - -+ if (!kbd->key || !kbd->key->xkbInfo) -+ return; -+ - xkbi = kbd->key->xkbInfo; - initialized= 0; - -@@ -291,7 +294,7 @@ - Time time = 0; - - interest = kbd->xkb_interest; -- if (!interest) -+ if (!interest || !kbd->key || !kbd->key->xkbInfo) - return; - xkbi = kbd->key->xkbInfo; - -@@ -401,6 +404,9 @@ - Time time = 0; - XID winID = 0; - -+ if (!kbd->key || !kbd->key->xkbInfo) -+ return; -+ - xkbi = kbd->key->xkbInfo; - - if ((force||(xkbi->desc->ctrls->enabled_ctrls&XkbAudibleBellMask))&& -@@ -616,11 +622,12 @@ - XkbInterestPtr interest; - Time time = 0; - -- xkbi = kbd->key->xkbInfo; - interest = kbd->xkb_interest; -- if (!interest) -+ if (!interest || !kbd->key || !kbd->key->xkbInfo) - return; - -+ xkbi = kbd->key->xkbInfo; -+ - initialized = 0; - pEv->mods= xkbi->state.mods; - pEv->group= xkbi->state.group; -@@ -996,6 +1003,10 @@ - ClientPtr client = NULL; - - found= False; -+ -+ if (!dev->key || !dev->key->xkbInfo) -+ return found; -+ - autoCtrls= autoValues= 0; - if ( dev->xkb_interest ) { - interest = dev->xkb_interest; diff --git a/abs/core/xorg-server/xserver-1.5.0-force-SwitchCoreKeyboard-for-evdev.patch b/abs/core/xorg-server/xserver-1.5.0-force-SwitchCoreKeyboard-for-evdev.patch deleted file mode 100644 index 2ac6095..0000000 --- a/abs/core/xorg-server/xserver-1.5.0-force-SwitchCoreKeyboard-for-evdev.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 638cab7e1dc3711f7fb04155bcdabf4b8895cc5e Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon, 4 Aug 2008 17:08:36 +0930 -Subject: [PATCH] xfree86: force SwitchCoreKeyboard for evdev devices (updated). - -If an evdev keyboard device is added through the HAL mechanism, force a -SwitchCoreKeyboard to load the evdev map into the VCK. This way, by the time a -client starts the evdev keymap is already there, leading to less pain lateron. - -Works if: -- all keyboards are hotplugged through HAL, and/or -- the xorg.conf keyboard uses the kbd driver. - -Has no effect (i.e. busted keymaps) if: -- an evdev keyboard device has been specified in the xorg.conf. -- we don't have a device at startup and plug a device in after starting the - desktop environment. -- if the device we use isn't the first one reported by HAL. - -If HAL isn't set up, this patch is a noop. ---- - hw/xfree86/common/xf86Xinput.c | 31 +++++++++++++++++++++++++++++++ - 1 files changed, 31 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c -index 710e787..dacc3dc 100644 ---- a/hw/xfree86/common/xf86Xinput.c -+++ b/hw/xfree86/common/xf86Xinput.c -@@ -423,6 +423,37 @@ NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev) - (!is_auto || xf86Info.autoEnableDevices)) - EnableDevice(dev); - -+ /* XXX: The VCK always starts with built-in defaults for keymap. These -+ * defaults are different to the evdev ones. When the first key is hit on -+ * an extension device, the keymap is copied into the VCK's and any -+ * changes made at runtime to the VCK map are lost. -+ * -+ * Assumption: if we have at least one evdev keyboard device, we can -+ * ignore kbd devices. Force a SwitchCoreKeyboard so the VCK has the same -+ * keymap as we do. -+ * -+ * Next time we hit a key, we don't change the map over anymore (see -+ * SwitchCoreKeyboard), and live happily ever after. -+ * Until we have 2 physical keyboards. Or the first real keyboard isn't -+ * actually the one we use. Oh well. -+ * -+ */ -+ if (dev->key) -+ { -+ InputInfoPtr info; -+ -+ /* Search if there is one other keyboard that uses evdev. */ -+ for (info = xf86InputDevs; info; info = info->next) -+ { -+ if (info != pInfo && info->dev && info->dev->key && -+ (strcmp(info->drv->driverName, "evdev") == 0)) -+ break; -+ } -+ -+ if (!info) -+ SwitchCoreKeyboard(dev); -+ } -+ - *pdev = dev; - return Success; - --- -1.5.5.1 - diff --git a/abs/core/xorg-server/xserver-1.5.3-AEI-on-by-default.patch b/abs/core/xorg-server/xserver-1.5.3-AEI-on-by-default.patch deleted file mode 100644 index d6cdf83..0000000 --- a/abs/core/xorg-server/xserver-1.5.3-AEI-on-by-default.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 15bf414daa83967fd1f24bd48bd01ea941c11ce2 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@redhat.com> -Date: Thu, 13 Nov 2008 10:17:33 +1000 -Subject: [PATCH] xfree86: AllowEmptyInput is true by default - update the xf86Info defaults. - -Also set AutoAddDevices and AutoEnableDevices to their defaults. - -And in doing so, switch the rest of the defaults over to named intializers. - -Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> -(cherry picked from commit 0b56b44addc323a00eb7cd86240cb0dd4275bcf8) - -Conflicts: - - hw/xfree86/common/xf86Globals.c ---- - hw/xfree86/common/xf86Globals.c | 69 ++++++++++++++++++++------------------ - 1 files changed, 36 insertions(+), 33 deletions(-) - -diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c -index f5babbc..a5edd82 100644 ---- a/hw/xfree86/common/xf86Globals.c -+++ b/hw/xfree86/common/xf86Globals.c -@@ -95,45 +95,48 @@ InputInfoPtr xf86InputDevs = NULL; - /* Globals that video drivers may not access */ - - xf86InfoRec xf86Info = { -- -1, /* consoleFd */ -- -1, /* vtno */ -- FALSE, /* vtSysreq */ -- SKWhenNeeded, /* ddxSpecialKeys */ -- NULL, /* pMouse */ -+ .consoleFd = -1, -+ .vtno = -1, -+ .vtSysreq = FALSE, -+ .ddxSpecialKeys = SKWhenNeeded, -+ .pMouse = NULL, - #ifdef XINPUT -- NULL, /* mouseLocal */ -+ .mouseLocal = NULL, - #endif -- -1, /* lastEventTime */ -- FALSE, /* vtRequestsPending */ -- FALSE, /* inputPending */ -- FALSE, /* dontVTSwitch */ -- FALSE, /* dontZap */ -- FALSE, /* dontZoom */ -- FALSE, /* notrapSignals */ -- FALSE, /* caughtSignal */ -- FALSE, /* sharedMonitor */ -- NULL, /* currentScreen */ -+ .lastEventTime = -1, -+ .vtRequestsPending = FALSE, -+ .inputPending = FALSE, -+ .dontVTSwitch = FALSE, -+ .dontZap = FALSE, -+ .dontZoom = FALSE, -+ .notrapSignals = FALSE, -+ .caughtSignal = FALSE, -+ .sharedMonitor = FALSE, -+ .currentScreen = NULL, - #ifdef CSRG_BASED -- -1, /* screenFd */ -- -1, /* consType */ -+ .screenFd = -1, -+ .consType = -1, - #endif -- FALSE, /* allowMouseOpenFail */ -- TRUE, /* vidModeEnabled */ -- FALSE, /* vidModeAllowNonLocal */ -- TRUE, /* miscModInDevEnabled */ -- FALSE, /* miscModInDevAllowNonLocal */ -- PCIOsConfig, /* pciFlags */ -- Pix24DontCare, /* pixmap24 */ -- X_DEFAULT, /* pix24From */ -+ .allowMouseOpenFail = FALSE, -+ .vidModeEnabled = TRUE, -+ .vidModeAllowNonLocal = FALSE, -+ .miscModInDevEnabled = TRUE, -+ .miscModInDevAllowNonLocal = FALSE, -+ .pciFlags = PCIOsConfig, -+ .pixmap24 = Pix24DontCare, -+ .pix24From = X_DEFAULT, - #ifdef __i386__ -- FALSE, /* pc98 */ -+ .pc98 = FALSE, - #endif -- TRUE, /* pmFlag */ -- LogNone, /* syncLog */ -- 0, /* estimateSizesAggressively */ -- FALSE, /* kbdCustomKeycodes */ -- FALSE, /* disableRandR */ -- X_DEFAULT /* randRFrom */ -+ .pmFlag = TRUE, -+ .log = LogNone, -+ .estimateSizesAggressively = 0, -+ .kbdCustomKeycodes = FALSE, -+ .disableRandR = FALSE, -+ .randRFrom = X_DEFAULT, -+ .allowEmptyInput = TRUE, -+ .autoAddDevices = TRUE, -+ .autoEnableDevices = TRUE - }; - const char *xf86ConfigFile = NULL; - const char *xf86InputDeviceList = NULL; --- -1.6.0.3 - diff --git a/abs/core/xorg-server/xserver-1.7.1-gamma-kdm-fix.patch b/abs/core/xorg-server/xserver-1.7.1-gamma-kdm-fix.patch deleted file mode 100644 index c62837e..0000000 --- a/abs/core/xorg-server/xserver-1.7.1-gamma-kdm-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -From acc64ce5be7383c09e88a23aab06ebc2403f2ca3 Mon Sep 17 00:00:00 2001 -From: Bill Nottingham <notting@redhat.com> -Date: Fri, 6 Nov 2009 10:32:27 +1000 -Subject: [PATCH] fix KDM gamma issue on vt switch - ---- - hw/xfree86/modes/xf86RandR12.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c -index 6ea9d26..ece12b9 100644 ---- a/hw/xfree86/modes/xf86RandR12.c -+++ b/hw/xfree86/modes/xf86RandR12.c -@@ -1761,6 +1761,7 @@ xf86RandR12Init12 (ScreenPtr pScreen) - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - rrScrPrivPtr rp = rrGetScrPriv(pScreen); - XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); -+ int i; - - rp->rrGetInfo = xf86RandR12GetInfo12; - rp->rrScreenSetSize = xf86RandR12ScreenSetSize; -@@ -1790,6 +1791,9 @@ xf86RandR12Init12 (ScreenPtr pScreen) - */ - if (!xf86RandR12SetInfo12 (pScreen)) - return FALSE; -+ for (i = 0; i < rp->numCrtcs; i++) { -+ xf86RandR12CrtcGetGamma(pScreen, rp->crtcs[i]); -+ } - return TRUE; - } - --- -1.6.5.1 - diff --git a/abs/core/xorg-server/xserver-1.7.1-libcrypto.patch b/abs/core/xorg-server/xserver-1.7.1-libcrypto.patch deleted file mode 100644 index ea33ea9..0000000 --- a/abs/core/xorg-server/xserver-1.7.1-libcrypto.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8875112f5c57ec5d575e717c5638fbc919145efb Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Mon, 16 Nov 2009 18:01:26 -0500 -Subject: [PATCH] configure: Only link against libcrypto - -openssl.pc will link you against libssl, which we don't need, and which -brings in another seven libraries we also don't need. This is still -bogus, we're really only trying to get a SHA1 routine, we could link it -statically and be even better off. ---- - configure.ac | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f69f97e..254d33d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1297,14 +1297,8 @@ if test "x$SHA1_LIB" = "x" ; then - fi - - if test "x$SHA1_LIB" = "x" ; then -- PKG_CHECK_EXISTS([OPENSSL], [openssl], [HAVE_OPENSSL_PKC=yes], -- [HAVE_OPENSSL_PKC=no]) -- if test "x$HAVE_OPENSSL_PKC" = xyes; then -- REQUIRED_LIBS="$REQUIRED_LIBS openssl" -- else - AC_CHECK_LIB([crypto], [SHA1_Init], [SHA1_LIB="-lcrypto"], - [AC_MSG_ERROR([OpenSSL must be installed in order to build the X server.])]) -- fi - fi - - PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS]) -- cgit v0.12