# This package is an experiment in active integration of upstream SCM with

# Fedora packaging.  It works something like this:

#

# The "pristine" source is actually a git repo (with no working checkout).

# The first step of %%prep is to check it out and switch to a "fedora" branch.

# If you need to add a patch to the server, just do it like a normal git

# operation, dump it with git-format-patch to a file in the standard naming

# format, and add a PatchN: line.  If you want to push something upstream,

# check out the master branch, pull, cherry-pick, and push.  FIXME describe

# rebasing, add convenience 'make' targets maybe.

# F10 TODO list:

#

# Fix rhpxl to no longer need vesamodes/extramodes

%define pkgname xorg-server

#define gitdate 20090112

Summary:   X.Org X11 X server

Name:      xorg-x11-server

Version:   1.6.0

Release:   5%{?dist}

URL:       http://www.x.org

License:   MIT

Group:     User Interface/X

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if 0%{?gitdate}

# git snapshot.  to recreate, run:

# ./make-git-snapshot.sh `cat commitid`

Source0:   xorg-server-%{gitdate}.tar.bz2

Source1:   make-git-snapshot.sh

Source2:   commitid

%else

Source0:   http://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2

Source1:   gitignore

%endif

# keyboard enablement

Source10:  10-x11-keymap.fdi

# "useful" xvfb-run script

Source20:  http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh

# ABI version provides.

# XXX don't enable any of this yet.  for serious.

Source30: find-provides

#{expand:%%define prev__find_provides %{__find_provides}}

#define pc_path %{buildroot}/%{_libdir}/pkgconfig/xorg-server.pc

#define __find_provides %{SOURCE30} %{pc_path} %{prev__find_provides}

#define __find_provides %{nil}

# OpenGL compositing manager feature/optimization patches.

Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch

Patch101:  xserver-1.4.99-dont-backfill-bg-none.patch

Patch103:  xserver-1.5.0-bg-none-root.patch

# Red Hat specific tweaking, not intended for upstream

# XXX move these to the end of the list

Patch1003:  xserver-1.4.99-pic-libxf86config.patch

Patch2013:  xserver-1.4.99-document-fontpath-correctly.patch

Patch2014:  xserver-1.5.0-projector-fb-size.patch

# Trivial things to never merge upstream ever

# Don't merge this without protecting the gccisms.

Patch5001:  xserver-1.4.99-alloca-poison.patch

# This really could be done prettier.

Patch5002:  xserver-1.4.99-ssh-isnt-local.patch

Patch5007:  xserver-1.5.0-bad-fbdev-thats-mine.patch

# Workaround RH bug #449944

Patch5011: xserver-1.4.99-endian.patch

# force mode debugging on for randr 1.2 drivers

Patch6002: xserver-1.5.1-mode-debug.patch

Patch6004: xserver-1.5.99.3-dmx-xcalloc.patch

# cf. bug 482924

Patch6010: xserver-1.5.99.902-selinux-debugging.patch

# don't try intel on poulsbo

Patch6013: xserver-1.5.99.902-sod-off-poulsbo.patch

# https://bugs.freedesktop.org/show_bug.cgi?id=20087

Patch6015: xserver-1.5.99.902-vnc.patch

# Make autoconfiguration chose nouveau driver for NVIDIA GPUs

Patch6017: xserver-1.5.99.902-nouveau.patch

# from master, may end up in 1.6.1.

Patch6018: xserver-1.6.0-XIPropToInt.patch

Patch6019: xserver-1.6.0-XATOM_FLOAT.patch

Patch6020: xserver-1.6.0-preferred-thinko.patch

Patch6021: xserver-1.6.0-selinux-raw.patch

Patch6022: xserver-1.6.0-primary.patch

Patch6023: xserver-1.6.0-selinux-destroy.patch

%define moduledir	%{_libdir}/xorg/modules

%define drimoduledir	%{_libdir}/dri

%define sdkdir		%{_includedir}/xorg

%ifarch s390 s390x

%define with_hw_servers 0

%else

%define with_hw_servers 1

%endif

%if %{with_hw_servers}

%define enable_xorg --enable-xorg

%else

%define enable_xorg --disable-xorg

%endif

%define kdrive --enable-kdrive --enable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev

%define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg} --enable-dmx

BuildRequires: git-core

BuildRequires: automake autoconf libtool pkgconfig

BuildRequires: xorg-x11-util-macros >= 1.1.5

BuildRequires: xorg-x11-proto-devel >= 7.4-10

BuildRequires: xorg-x11-xtrans-devel >= 1.2.2-1

BuildRequires: libXfont-devel libXau-devel libxkbfile-devel libXres-devel

BuildRequires: libfontenc-devel libXtst-devel libXdmcp-devel

BuildRequires: libX11-devel libXext-devel

BuildRequires: libXinerama-devel

BuildRequires: freetype freetype-devel

# DMX config utils buildreqs.

BuildRequires: libXt-devel libdmx-devel libXmu-devel libXrender-devel

BuildRequires: libXi-devel libXpm-devel libXaw-devel libXfixes-devel

# Broken, this is global, should be Xephyr-only

BuildRequires: libXv-devel

# openssl? really?

BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex

BuildRequires: mesa-libGL-devel >= 7.1-0.37

# should be useless now...

# BuildRequires: mesa-source >= 7.1-0.36

# XXX silly...

BuildRequires: libdrm-devel >= 2.4.0 kernel-devel

%if %{with_hw_servers}

Requires: libdrm >= 2.4.0

Requires: fedora-setup-keyboard

%endif

BuildRequires: audit-libs-devel libselinux-devel >= 2.0.59-1

BuildRequires: hal-devel dbus-devel

# All server subpackages have a virtual provide for the name of the server

# they deliver.  The Xorg one is versioned, the others are intentionally

# unversioned.

%description

X.Org X11 X server

%package common

Summary: Xorg server common files

Group: User Interface/X

%description common

Common files shared among all X servers.

%if %{with_hw_servers}

%package Xorg

Summary: Xorg X server

Group: User Interface/X

Provides: Xorg = %{version}-%{release}

Provides: Xserver

%ifarch %{ix86} x86_64

Requires: xorg-x11-drv-vesa

%else

Requires: xorg-x11-drv-fbdev

%endif

Requires: xorg-x11-drv-void xorg-x11-drv-evdev >= 2.1.0-3

# virtuals.  XXX fix the xkbcomp fork() upstream.

Requires: xkbdata xkbcomp

Requires: xorg-x11-server-common >= %{version}-%{release}

# Dropped from F9 for being broken, uninstall it.

Obsoletes: xorg-x11-drv-magictouch <= 1.0.0.5-5.fc8

# Force sufficiently new libpciaccess

Conflicts: libpciaccess < 0.9.1-2

%description Xorg

X.org X11 is an open source implementation of the X Window System.  It

provides the basic low level functionality which full fledged

graphical user interfaces (GUIs) such as GNOME and KDE are designed

upon.

%endif

%package Xnest

Summary: A nested server.

Group: User Interface/X

Obsoletes: xorg-x11-Xnest

Requires: xorg-x11-server-common >= %{version}-%{release}

Provides: Xnest

%description Xnest

Xnest is an X server, which has been implemented as an ordinary

X application.  It runs in a window just like other X applications,

but it is an X server itself in which you can run other software.  It

is a very useful tool for developers who wish to test their

applications without running them on their real X server.

%package Xdmx

Summary: Distributed Multihead X Server and utilities

Group: User Interface/X

Obsoletes: xorg-x11-Xdmx

Requires: xorg-x11-server-common >= %{version}-%{release}

Provides: Xdmx

%description Xdmx

Xdmx is proxy X server that provides multi-head support for multiple displays

attached to different machines (each of which is running a typical X server).

When Xinerama is used with Xdmx, the multiple displays on multiple machines

are presented to the user as a single unified screen.  A simple application

for Xdmx would be to provide multi-head support using two desktop machines,

each of which has a single display device attached to it.  A complex

application for Xdmx would be to unify a 4 by 4 grid of 1280x1024 displays

(each attached to one of 16 computers) into a unified 5120x4096 display.

%package Xvfb

Summary: A X Windows System virtual framebuffer X server.

Group: User Interface/X

# xvfb-run is GPLv2, rest is MIT

License: MIT and GPLv2

Obsoletes: xorg-x11-Xvfb

Requires: xorg-x11-server-common >= %{version}-%{release}

Provides: Xvfb

%description Xvfb

Xvfb (X Virtual Frame Buffer) is an X server that is able to run on

machines with no display hardware and no physical input devices.

Xvfb simulates a dumb framebuffer using virtual memory.  Xvfb does

not open any devices, but behaves otherwise as an X display.  Xvfb

is normally used for testing servers.

%package Xephyr

Summary: A nested server.

Group: User Interface/X

Requires: xorg-x11-server-common >= %{version}-%{release}

Provides: Xephyr

%description Xephyr

Xephyr is an X server, which has been implemented as an ordinary

X application.  It runs in a window just like other X applications,

but it is an X server itself in which you can run other software.  It

is a very useful tool for developers who wish to test their

applications without running them on their real X server.  Unlike

Xnest, Xephyr renders to an X image rather than relaying the

X protocol, and therefore supports the newer X extensions like

Render and Composite.

%if %{with_hw_servers}

%package devel

Summary: SDK for X server driver module development

Group: User Interface/X

Obsoletes: xorg-x11-sdk xorg-x11-server-sdk

Requires: xorg-x11-util-macros

Requires: xorg-x11-proto-devel

Requires: pkgconfig pixman-devel libpciaccess-devel

Requires(pre): xorg-x11-filesystem >= 0.99.2-3

Provides: libxf86config-devel = %{version}-%{release}

# Virtual provide for transition.  Delete me someday.

Provides: xorg-x11-server-sdk = %{version}-%{release}

%description devel

The SDK package provides the developmental files which are necessary for

developing X server driver modules, and for compiling driver modules

outside of the standard X11 source code tree.  Developers writing video

drivers, input drivers, or other X modules should install this package.

%endif

%package source

Summary: Xserver source code required to build VNC server (Xvnc)

Group: Development/Libraries

%description source

Xserver source code needed to build VNC server (Xvnc)

%prep

%setup -q -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}

%if 0%{?gitdate}

git checkout -b fedora

sed -i 's/git/&+ssh/' .git/config

%else

git init-db

if [ -z "$GIT_COMMITTER_NAME" ]; then

    git config user.email "x@fedoraproject.org"

    git config user.name "Fedora X Ninjas"

fi

cp %{SOURCE1} .gitignore

git add .

git commit -a -q -m "%{version} baseline."

%endif

# Apply all the patches.

#git am -p1 %{patches}

git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)

%build

%define default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"

# --with-rgb-path should be superfluous now ?

# --with-pie ?

autoreconf -v --install || exit 1

export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS"

%configure --enable-maintainer-mode %{xservers} \

	--disable-static \

	--with-pic \

	--with-int10=x86emu \

	--with-default-font-path=%{default_font_path} \

	--with-module-dir=%{moduledir} \

	--with-builderstring="Build ID: %{name} %{version}-%{release}" \

	--with-xkb-output=%{_localstatedir}/lib/xkb \

	--enable-install-libxf86config \

	--enable-xselinux --enable-record \

	--with-dri-driver-path=%{drimoduledir} \

	${CONFIGURE}

make %{?_smp_mflags}

%install

rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT moduledir=%{moduledir}

%if %{with_hw_servers}

mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}

# Install the vesamodes and extramodes files to let our install/config tools

# be able to parse the same modelist as the X server uses (rhpxl).

mkdir -p $RPM_BUILD_ROOT%{_datadir}/xorg

install -m 0444 hw/xfree86/common/{vesa,extra}modes $RPM_BUILD_ROOT%{_datadir}/xorg/

# fedora-isms to slurp keyboard settings out of /etc/sysconfig/keyboard

mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor

install -m 0444 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor

%endif

# Make the source package

%define xserver_source_dir %{_datadir}/xorg-x11-server-source

%define inst_srcdir %{buildroot}/%{xserver_source_dir}

mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/{xquartz/bundle,xfree86/common}}

cp cpprules.in %{inst_srcdir}

cp {,%{inst_srcdir}/}hw/xquartz/bundle/cpprules.in

cp xkb/README.compiled %{inst_srcdir}/xkb

cp hw/xfree86/{xorgconf.cpp,Options} %{inst_srcdir}/hw/xfree86

cp hw/xfree86/common/{vesamodes,extramodes} %{inst_srcdir}/hw/xfree86/common

install -m 0755 %{SOURCE20} $RPM_BUILD_ROOT%{_bindir}/xvfb-run

find . -type f | egrep '.*\.(c|h|am|ac|inc|m4|h.in|pc.in|man.pre|pl|txt)$' |

xargs tar cf - | (cd %{inst_srcdir} && tar xf -)

# Remove unwanted files/dirs

{

    rm -f $RPM_BUILD_ROOT%{_libdir}/X11/Options

    rm -f $RPM_BUILD_ROOT%{_bindir}/in?

    rm -f $RPM_BUILD_ROOT%{_bindir}/ioport

    rm -f $RPM_BUILD_ROOT%{_bindir}/out?

    rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak

    rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcitweak.1*

    find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :

}

%clean

rm -rf $RPM_BUILD_ROOT

%if %{with_hw_servers}

%pre Xorg

{

    pushd /etc/X11

    [ -e xorg.conf ] || return 0

    sed -i 's/^.*Load.*"(pex5|xie|xtt).*\n$"//gi' xorg.conf

    sed -i 's/^\s*Driver(.*)"keyboard"/Driver\1"kbd"/gi' xorg.conf

    sed -i 's/^.*Option.*"XkbRules".*"(xfree86|xorg)".*\n$//gi' xorg.conf

    sed -i 's#^\s*RgbPath.*$##gi' xorg.conf

    # lame, the nvidia driver needs to override this

    if ! grep -q 'ModulePath.*nvidia' xorg.conf ; then

      sed -i 's#^\s*ModulePath.*$##gi' xorg.conf

    fi

    popd

} &> /dev/null || :

%endif

%files common

%defattr(-,root,root,-)

%{_mandir}/man1/Xserver.1*

%{_libdir}/xorg/protocol.txt

%dir %{_localstatedir}/lib/xkb

%{_localstatedir}/lib/xkb/README.compiled

%if %{with_hw_servers}

%files Xorg

%defattr(-,root,root,-)

%{_bindir}/X

%attr(4711, root, root) %{_bindir}/Xorg

%{_bindir}/cvt

%{_bindir}/gtf

%dir %{_datadir}/xorg

%{_datadir}/hal/fdi/policy/10osvendor/10-x11-keymap.fdi

%{_datadir}/xorg/vesamodes

%{_datadir}/xorg/extramodes

%dir %{_libdir}/xorg

%dir %{_libdir}/xorg/modules

%dir %{_libdir}/xorg/modules/drivers

%dir %{_libdir}/xorg/modules/extensions

%{_libdir}/xorg/modules/extensions/libglx.so

%{_libdir}/xorg/modules/extensions/libdri.so

%{_libdir}/xorg/modules/extensions/libdri2.so

%{_libdir}/xorg/modules/extensions/libdbe.so

%{_libdir}/xorg/modules/extensions/libextmod.so

%{_libdir}/xorg/modules/extensions/librecord.so

%dir %{_libdir}/xorg/modules/input

%dir %{_libdir}/xorg/modules/linux

%{_libdir}/xorg/modules/linux/libfbdevhw.so

%dir %{_libdir}/xorg/modules/multimedia

%{_libdir}/xorg/modules/multimedia/bt829_drv.so

%{_libdir}/xorg/modules/multimedia/fi1236_drv.so

%{_libdir}/xorg/modules/multimedia/msp3430_drv.so

%{_libdir}/xorg/modules/multimedia/tda8425_drv.so

%{_libdir}/xorg/modules/multimedia/tda9850_drv.so

%{_libdir}/xorg/modules/multimedia/tda9885_drv.so

%{_libdir}/xorg/modules/multimedia/uda1380_drv.so

%{_libdir}/xorg/modules/libexa.so

%{_libdir}/xorg/modules/libfb.so

%{_libdir}/xorg/modules/libint10.so

%{_libdir}/xorg/modules/libshadow.so

%{_libdir}/xorg/modules/libshadowfb.so

%{_libdir}/xorg/modules/libvbe.so

%{_libdir}/xorg/modules/libvgahw.so

%{_libdir}/xorg/modules/libwfb.so

%{_libdir}/xorg/modules/libxaa.so

%{_libdir}/xorg/modules/libxf8_16bpp.so

%{_mandir}/man1/gtf.1*

%{_mandir}/man1/Xorg.1*

%{_mandir}/man1/cvt.1*

%{_mandir}/man4/fbdevhw.4*

%{_mandir}/man4/exa.4*

%{_mandir}/man5/xorg.conf.5*

%endif

%files Xnest

%defattr(-,root,root,-)

%{_bindir}/Xnest

%{_mandir}/man1/Xnest.1*

%files Xdmx

%defattr(-,root,root,-)

%{_bindir}/Xdmx

%{_bindir}/dmxaddinput

%{_bindir}/dmxaddscreen

%{_bindir}/dmxreconfig

%{_bindir}/dmxresize

%{_bindir}/dmxrminput

%{_bindir}/dmxrmscreen

%{_bindir}/dmxtodmx

%{_bindir}/dmxwininfo

%{_bindir}/vdltodmx

%{_bindir}/xdmx

%{_bindir}/xdmxconfig

%{_mandir}/man1/Xdmx.1*

%{_mandir}/man1/dmxtodmx.1*

%{_mandir}/man1/vdltodmx.1*

%{_mandir}/man1/xdmxconfig.1*

%files Xvfb

%defattr(-,root,root,-)

%{_bindir}/Xvfb

%{_bindir}/xvfb-run

%{_mandir}/man1/Xvfb.1*

%files Xephyr

%defattr(-,root,root,-)

%{_bindir}/Xephyr

%{_mandir}/man1/Xephyr.1*

%if %{with_hw_servers}

%files devel

%defattr(-,root,root,-)

%{_libdir}/libxf86config.a

%{_libdir}/pkgconfig/xorg-server.pc

%dir %{_includedir}/xorg

%{sdkdir}/*.h

%{_datadir}/aclocal/xorg-server.m4

%endif

%files source

%defattr(-, root, root, -)

%{xserver_source_dir}

%changelog

* Wed Mar 04 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.0-5

- Drop our own fedora-setup-keyboard script, Require: fedora-setup-keyboard

  package instead.

* Tue Mar 03 2009 Adam Jackson <ajax@redhat.com> 1.6.0-4

- xserver-1.6.0-selinux-raw.patch: Deal in raw contexts, to avoid paying

  the price for setrans on every object.

- xserver-1.6.0-primary.patch: Try harder to figure out what the primary

  video device is on machines with multiple GPUs.

- xserver-1.6.0-selinux-destroy.patch: Don't bother relabeling objects that

  are on the way to destruction.

* Mon Mar 02 2009 Adam Jackson <ajax@redhat.com> 1.6.0-3

- xserver-1.6.0-preferred-thinko.patch: Fix a thinko in output setup when

  only one head is attached.

* Fri Feb 27 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.0-2

- xserver-1.6.0-XIPropToInt.patch: add XIPropToInt helper function

  (requirement for XATOM_FLOAT patch)

- xserver-1.6.0-XATOM_FLOAT.patch: add support for float properties.

* Wed Feb 25 2009 Adam Jackson <ajax@redhat.com> 1.6.0-1

- xserver 1.6.0

* Wed Feb 18 2009 Adam Jackson <ajax@redhat.com> 1.5.99.903-3

- xserver-1.5.99.903-fontmod.h: Fix build against new libXfont.

* Wed Feb 18 2009 Adam Jackson <ajax@redhat.com> 1.5.99.903-2

- xserver-1.5.99.903-glx-visual-score.patch: Fix visual scoring.

* Wed Feb 18 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.903-1

- xserver 1.6. RC 3

- remove patches merged into upstream.

* Tue Feb 17 2009 Adam Jackson <ajax@redhat.com> 1.5.99.902-13

- xserver-1.5.99.902-randr-soft-getpanning.patch: Fail RRGetPanning softly

  when the driver doesn't support it.

* Mon Feb 16 2009 Ben Skeggs <bskeggs@redhat.com> 1.5.99.902-12

- xserver-1.5.99.902-nouveau.patch: select nouveau as default driver

  for NVIDIA GPUs

* Mon Feb 16 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-11

- xserver-1.5.99.902-xkb-colors.patch: don't confuse src and dst when copying

  color labels (#469572)

* Thu Feb 12 2009 Adam Tkac <atkac redhat com> 1.5.99.902-10

- don't call drv->UnInit if device doesn't have driver

* Wed Feb 11 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-9

- xserver-1.5.99.902-always-RAW.patch: always init the console to RAW mode.

* Tue Feb 10 2009 Adam Jackson <ajax@redhat.com> 1.5.99.902-8

- Re-enable RECORD. (#472168)

* Tue Feb 10 2009 Adam Jackson <ajax@redhat.com> 1.5.99.902-7

- xserver-1.5.99.902-sod-off-poulsbo.patch: Don't try the intel driver on

  GMA500. (#472674)

* Tue Feb 10 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-6

- xserver-1.5.99.902-listen-for-hal.patch: listen for HAL startup

  notifications if it isn't running already.

* Mon Feb 09 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-5

- xserver-1.5.99.902-mediakeys-crash.patch: don't crash when multimedia keys

  are pressed (#483435)

* Sun Feb 08 2009 Adam Jackson <ajax@redhat.com> 1.5.99.902-4

- xserver-1.5.99.902-selinux-debugging.patch: Try to figure out why selinux

  class map setup fails.

- Remove mtrr header hack.

* Fri Feb 06 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-3

- Update 10-x11-keymap.fdi: only call fedora-setup-keyboard for devices with

  input.capabilities = keyboard (#484217)

* Wed Feb 04 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-2

- xserver-1.5.99.902-xinerama.patch: don't update the sprite root window in

  Xinerama setups (#473825)

* Tue Feb 03 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-1

- xserver 1.6. RC 2

* Tue Jan 27 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.901-5

- replace fedora-setup-keyboard with pure python one (#478431)

* Tue Jan 27 2009 Dave Airlie <airlied@redhat.com> 1.5.99.901-4

- xserver-1.5.99.3-fix-core-fonts.patch (#478999)

* Mon Jan 26 2009 Adam Tkac <atkac redhat com> 1.5.99.901-3

- improved xserver-1.5.99.3-broken-mtrr-header.patch to unbreak mtrr.h again

* Mon Jan 26 2009 Adam Tkac <atkac redhat com> 1.5.99.901-2

- rebuild against new openssl

* Tue Jan 13 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.901-1

- xserver 1.6 RC 1

- fix "git-xyz" to "git xyz"

- revert yesterdays changes to make-git-snapshot.sh, that was a bad idea.

* Mon Jan 12 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.3-5

- rebase to today's server-1.6-enterleave branch, current 1.6 plus enterleave

  patches.

- drop xserver-1.5.99.3-offscreen-pixmaps.patch - merged upstream

- fix up git checkout in make-git-snapshot.sh to allow a remote branch to be

  specified as $1.

* Thu Jan 08 2009 Adam Jackson <ajax@redhat.com> 1.5.99.3-8

- xserver-1.5.99.3-broken-mtrr-header.patch: Unbreak broken mtrr.h.

* Wed Jan 07 2009 Adam Jackson <ajax@redhat.com> 1.5.99.3-7

- xserver-1.5.99.3-offscreen-pixmaps.patch: Turn off offscreen pixmaps in XAA.

  Again.  Sigh.

* Wed Jan 07 2009 Adam Tkac <atkac redhat com> 1.5.99.3-6

- use "git am" instead of "git-am"

- added more sources into xorg-x11-server-source to make source compilable

* Mon Dec 29 2008 Dave Airlie <airlied@redhat.com> 1.5.99.3-5

- remove unused build options - enable dri2

* Wed Dec 24 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.3-4

- xserver-1.5.99.3-ddx-rules.patch: enable the DDX to set the rules for the

  core devices (#477712)

- Require xorg-x11-drv-evdev 2.1.0-3 for ABI.

* Mon Dec 22 2008 Adam Jackson <ajax@redhat.com> 1.5.99.3-3

- xserver-1.5.0-bad-fbdev-thats-mine.patch: Do the same for sbus that we do

  for pci.

* Mon Dec 22 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.3-2

- Update to today's server-1.6  branch tip.

* Fri Dec 19 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.3-1

- xserver 1.5.99.3

- drop patches merged into master

- xserver-1.5.99.3-dmx-xcalloc.patch: avoid dmx Xcalloc build errors

* Wed Nov 05 2008 Adam Jackson <ajax@redhat.com> 1.5.3-1

- xserver 1.5.3

* Fri Oct 31 2008 Adam Jackson <ajax@redhat.com> 1.5.2-12

- xserver-1.5.2-drain-console.patch: Silently eat any input we get from the

  tty fd, lest terrible wakeup storms ensue.

* Tue Oct 28 2008 Adam Jackson <ajax@redhat.com> 1.5.2-11

- Un-require mouse and keyboard, we're an evdev shop now

- Drop some obsoletes from the F7 timeframe

- Require vesa on i386 and amd64, fbdev elsewhere

* Mon Oct 27 2008 Adam Jackson <ajax@redhat.com> 1.5.2-10

- xserver-1.5.0-bg-none-root.patch: Make it something the driver has to

  explicitly claim support for, so we don't get garbage when you do -nr

  on vesa for example.

* Mon Oct 27 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.2-9

- xserver-1.5.2-more-sanity-checks.patch: more sanity checks to stop vmmouse

  from segfaulting the server. #434807

* Wed Oct 22 2008 Peter Hutterer <peter.hutterer@redhat.com>

- Update xserver-1.5.2-disable-kbd-mouse.patch: add line to xorg.conf man-page

  stating that devices are disabled if AEI is on.

* Wed Oct 22 2008 Peter Hutterer <peter.hutterer@redhat.com>

- fix typo in xserver-1.5.2-no-duplicate-devices.patch

* Mon Oct 20 2008 Adam Jackson <ajax@redhat.com> 1.5.2-8

- xserver-1.5.2-exa-sync-less.patch: Avoid migrating pixmaps out on

  PutImage.

* Mon Oct 20 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.2-7

- xserver-1.5.2-no-duplicate-devices.patch: don't re-add devices through HAL

  if they are already added (#467462).

* Sun Oct 19 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.2-6

- Update xserver-1.5.2-disable-kbd-mouse.patch: if no config file is present,

  we need to force AllowEmptyInput on.

* Thu Oct 16 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.2-5

- xserver-1.5.2-enable-RAW-console.patch: enable RAW mode for console, no need

  for grabbing the evdev device anymore.

- xserver-1.5.2-disable-kbd-mouse.patch: if AllowEmptyInput is on, don't allow

  mouse or keyboard drivers.

* Tue Oct 14 2008 Adam Jackson <ajax@redhat.com> 1.5.2-4

- xserver-1.5.2-lies-damn-lies-and-aspect-ratios.patch: Catch even more

  cases of the monitor encoding aspect ratio for size. (#458747)

* Tue Oct 14 2008 Adam Jackson <ajax@redhat.com> 1.5.2-3

- xserver-1.5.2-backtrace-defines.patch: Get HAVE_BACKTRACE defined even at

  the DIX level.

* Fri Oct 10 2008 Adam Jackson <ajax@redhat.com> 1.5.2-2

- xserver-1.5.1-global-backtrace.patch: Make backtraces possible from

  outside the xfree86 DDX.

- xserver-1.5.2-mieq-backtrace.patch: bt when we fill the input queue.

* Fri Oct 10 2008 Adam Jackson <ajax@redhat.com> 1.5.2-1

- xserver 1.5.2

- xserver-1.5.0-comment-out-glxdri2.c: Drop, no longer relevant.

- xserver-1.5.0-xkb-core-kbd-map-fix.patch: Drop, merged.

- xserver-1.5.1-int10-leaks.patch: Drop, merged.

* Fri Oct 10 2008 Adam Jackson <ajax@redhat.com> 1.5.1-11

- xserver-1.3.0-no-prerelease-warning.patch: Drop.

* Tue Oct 07 2008 Dave Airlie <airlied@redhat.com> 1.5.1-10

- actually apply exa fix patch

* Tue Oct 07 2008 Adam Jackson <ajax@redhat.com> 1.5.1-9

- xserver-1.5.1-xgi.patch: Move XGI cards onto the sis driver. (#453812)

* Tue Oct 07 2008 Adam Jackson <ajax@redhat.com> 1.5.1-8

- xserver-1.5.1-int10-leaks.patch: Shut up some useless int10 debugging and

  plug a memory leak.

* Tue Oct 7 2008 Adam Jackson <ajax@redhat.com> 1.5.1-7

- xserver-1.5.1-mode-debug.patch: Force mode debugging on.

* Tue Oct 7 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.1-6

- xserver-1.5.0-xkb-core-kbd-map-fix.patch: don't invent groups when mapping

  from xkb to core and back, and squash canonical types into explicit ones on

  core reconstruction (2 patches). #460545

* Mon Oct 06 2008 Dave Airlie <airlied@redhat.com> 1.5.1-5

- xserver-1.5.1-exa-fix-glyph-segfault.patch - fix EXA rects crash (462447)

* Tue Sep 30 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.5.1-4

- fix typo. :P

* Tue Sep 30 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.5.1-3

- add xvfb-run helper script to Xvfb package

* Thu Sep 25 2008 Dave Airlie <airlied@redhat.com> 1.5.1-2

- fix crash with x11perf on r500 modesetting

* Tue Sep 23 2008 Adam Jackson <ajax@redhat.com> 1.5.1-1

- xserver 1.5.1

- Trim %%changelog.

* Thu Sep 11 2008 Soren Sandmann <sandmann@redhat.com> 1.5.0-6

- Comment out glxdri2.c since it doesn't compile. (krh says it

  won't break at runtime). 

* Thu Sep 11 2008 Soren Sandmann <sandmann@redhat.com> 1.5.0-5

- Bump BuildRequires on mesa-GL-devel. Maybe that will work.