# 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.

# F11 TODO list:

#

# Fix rhpxl to no longer need vesamodes/extramodes

%define pkgname xorg-server

%define gitdate 20090807

Summary:   X.Org X11 X server

Name:      xorg-x11-server

Version:   1.6.99

Release:   30.%{gitdate}%{?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

Source10:   xserver.pamd

# "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

#define __find_provides {nil}

Patch5: xserver-1.4.99-pic-libxf86config.patch

Patch10: xserver-1.6.99-linkmap.patch

# airlied to upstream for 1.7

Patch100: xserver-1.6.99-vga-arb.patch

# OpenGL compositing manager feature/optimization patches.

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

Patch104:  dri2-page-flip.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:

# This really could be done prettier.

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

# force mode debugging on for randr 1.2 drivers

Patch6002: xserver-1.5.1-mode-debug.patch

# FIXME

#Patch6004: xserver-1.5.99.3-dmx-xcalloc.patch

# don't build the (broken) acpi code

Patch6011: xserver-1.6.0-less-acpi-brokenness.patch

# Make autoconfiguration chose nouveau driver for NVIDIA GPUs

Patch6016: xserver-1.6.1-nouveau.patch

# ajax needs to upstream this

Patch6027: xserver-1.6.0-displayfd.patch

Patch6028: xserver-1.6.99-randr-error-debugging.patch

Patch6029: xserver-1.6.1-proc-cmdline.patch

Patch6030: xserver-1.6.99-right-of.patch

Patch6031: xserver-1.6.99-dri2-crash-fixes.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

# XXX dmx

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

BuildRequires: git-core

BuildRequires: automake autoconf libtool pkgconfig

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

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

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 libXi-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 >= 0.15.14

BuildRequires: libpciaccess-devel >= 0.10.6-1 openssl-devel byacc flex

BuildRequires: mesa-libGL-devel >= 7.6-0.6

# XXX silly...

BuildRequires: libdrm-devel >= 2.4.0 kernel-headers

BuildRequires: audit-libs-devel libselinux-devel >= 2.0.79-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

Requires: pixman >= 0.14.0

Requires: libselinux >= 2.0.79-1

Requires: xkbdata xkbcomp

%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

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

Requires: libdrm >= 2.4.0

Requires: fedora-setup-keyboard

# Dropped from F9 for being broken, uninstall it.

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

# Dropped from F11, use evdev instead

Obsoletes: xorg-x11-drv-calcomp <= 1.1.2-1.fc9

Obsoletes: xorg-x11-drv-citron <= 2.2.1-1.fc9

Obsoletes: xorg-x11-drv-diamondtouch <= 0.2.0-0.1.fc9

Obsoletes: xorg-x11-drv-digitaledge <= 1.1.1-1.fc9

Obsoletes: xorg-x11-drv-dmc <= 1.1.2-1.fc9

Obsoletes: xorg-x11-drv-dynapro <= 1.1.2-1.fc9

Obsoletes: xorg-x11-drv-jamstudio <= 1.2.0-1.fc9

Obsoletes: xorg-x11-drv-magellan <= 1.2.0-1.fc9

Obsoletes: xorg-x11-drv-microtouch <= 1.2.0-1.fc9

Obsoletes: xorg-x11-drv-palmax <= 1.2.0-1.fc9

Obsoletes: xorg-x11-drv-spaceorb <= 1.1.0-6.fc9

Obsoletes: xorg-x11-drv-summa <= 1.2.0-2.fc10

Obsoletes: xorg-x11-drv-tek4957 <= 1.2.0-1.fc9

Obsoletes: xorg-x11-drv-ur98 <= 1.1.0-5.fc9

Obsoletes: xorg-x11-drv-wiimote <= 0.0.1-1.fc9

# Force sufficiently new libpciaccess

Conflicts: libpciaccess < 0.10.6-1

%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.

%if 0

%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.

%endif

%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

# 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

BuildArch: noarch

%description source

Xserver source code needed to build VNC server (Xvnc)

%package -n libxf86config-devel

Summary: Xorg configuration parser library development files

Group: Development/Libraries

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

%description -n libxf86config-devel

Xorg configuration parser library development files

%prep

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

%if 0%{?gitdate}

git checkout -b fedora

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

if [ -z "$GIT_COMMITTER_NAME" ]; then

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

    git config user.name "Fedora X Ninjas"

fi

%else

git init

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 %{lua: for i, p in ipairs(patches) do print(p.." ") end}

%build

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

%if %{with_hw_servers}

%define dri_flags --with-dri-driver-path=%{drimoduledir}

%else

%define dri_flags --disable-dri

%endif

# --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 \

	%{dri_flags} \

	${CONFIGURE}

make %{?_smp_mflags}

%install

rm -rf $RPM_BUILD_ROOT

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

%if %{with_hw_servers}

rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/libxf8_16bpp.so

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

mkdir -p $RPM_BUILD_ROOT%{_datadir}/xorg

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

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d

install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xserver

%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 %{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 -- || :

%if !%{with_hw_servers}

    rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xorg-server.pc

    rm -f $RPM_BUILD_ROOT%{_datadir}/aclocal/xorg-server.m4

%endif

}

%clean

rm -rf $RPM_BUILD_ROOT

%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,-)

%config %attr(0644,root,root) %{_sysconfdir}/pam.d/xserver

%{_bindir}/X

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

%{_bindir}/cvt

%{_bindir}/gtf

%dir %{_datadir}/xorg

%{_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

%{_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*

%if 0

%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*

%endif

%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}/pkgconfig/xorg-server.pc

%dir %{_includedir}/xorg

%{sdkdir}/*.h

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

%endif

%files source

%defattr(-, root, root, -)

%{xserver_source_dir}

%files -n libxf86config-devel

%defattr(-, root, root, -)

%{_libdir}/libxf86config.a

%changelog

* Fri Aug 07 2009 Dave Airlie <airlied@redhat.com> 1.6.99-30.20090807

- goddamit: reapply picify libxf86config.a hopefully

* Fri Aug 07 2009 Dave Airlie <airlied@redhat.com> 1.6.99-29.20090807

- rebase upstream

- libxf86config.a revenge, brought back .a upstream, doesn't work as .so

* Thu Aug 06 2009 Adam Jackson <ajax@redhat.com> 1.6.99-28.20090804

- xserver-1.6.99-dri2-crash-fixes.patch: don't cough and die just because

  the driver had the gall not to register a SwapBuffers handler.

* Wed Aug 05 2009 Adam Jackson <ajax@redhat.com> 1.6.99-27.20090804

- xserver-1.6.99-vga-arb.patch: Fix crashes from miscompilation without

  xorg-config.h.

* Wed Aug 05 2009 Dave Airlie <airlied@redhat.com> 1.6.99-26.20090804

- fix VGA arb device lookup - noticed by mclasen in qemu

* Tue Aug 04 2009 Dave Airlie <airlied@redhat.com> 1.6.99-25.20090804

- fix VGA arb fatal error

* Tue Aug 04 2009 Dave Airlie <airlied@redhat.com> 1.6.99-24.20090804

- update server snapshot + add VGA arbitration

* Mon Aug 03 2009 Adam Jackson <ajax@redhat.com> 1.6.99-23.20090724

- Un-Requires xorg-x11-filesystem

* Wed Jul 29 2009 Kristian Høgsberg <krh@redhat.com> - 1.6.99-22.20090724

- Add DRI2 page flipping feature.

* Tue Jul 28 2009 Adam Jackson <ajax@redhat.com> 1.6.99-21.20090724

- xserver-1.6.99-right-of.patch: Default to right-of initial placement

  for RANDR 1.2 drivers with enough virtual space.

* Tue Jul 28 2009 Adam Jackson <ajax@redhat.com> 1.6.99-20.20090724

- xserver-1.6.99-use-pci-access-boot.patch: Some chips (thanks Intel) will

  change their PCI class at runtime if you disable their VGA decode, so

  consider both 0x0300 and 0x0380 classes when looking for the boot VGA.

* Tue Jul 28 2009 Adam Jackson <ajax@redhat.com> 1.6.99-19.20090724

- xserver-1.6.99-randr-error-debugging.patch: Dump RANDR protocol errors

  to the log.

- Un-package xf8_16bpp, no one cares.

* Mon Jul 27 2009 Dave Airlie <airlied@redhat.com> 1.6.99-18.20090724

- xserver-1.6.99-use-pci-access-boot.patch: use pciaccess boot vga

- not sure what is up with the Conflicts stuff

* Sat Jul 25 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99-17.20090724

- Bump release number.

* Fri Jul 24 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99-16.20090724

- Today's git snapshot.

* Thu Jul 23 2009 Adam Jackson <ajax@redhat.com> 1.6.99-16.20090721

- xserver-1.6.99-linkmap.patch: Print load offsets of all DSOs on backtrace

  so we can addr2line afterwards.

* Tue Jul 21 2009 Adam Jackson <ajax@redhat.com> 1.6.99-15.20090721

- Today's git snapshot.

* Wed Jul 15 2009 Adam Jackson <ajax@redhat.com> 1.6.99-14.20090715

- Move PAM config file here from xdm.

* Wed Jul 15 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99-13.20090715

- Today's git snapshot.

* Tue Jul 14 2009 Adam Jackson <ajax@redhat.com> 1.6.99-12.20090714

- Today's git snapshot.

- Drop the %%pre script for Xorg, everyone ought to be migrated by now.

* Fri Jul 10 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99-11.20090710

- Today's git snapshot.

- xserver-1.6.0-no-i810.patch: Drop.

* Tue Jul 07 2009 Adam Jackson <ajax@redhat.com> 1.6.99-10.20090707

- Today's git snapshot.

- xserver-1.4.99-pic-libxf86config.patch: Drop.

- xserver-1.4.99-document-fontpath-correctly.patch: Typo fixes.

- libxf86config subpackages.

* Mon Jul 06 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99-9.20090706

- Today's git snapshot.

- xserver-1.5.0-bad-fbdev-thats-mine.patch: Drop. Merged upstream.

* Mon Jun 29 2009 Adam Jackson <ajax@redhat.com> 1.6.99-8.20090618

- Move xkb requires to -common subpackage, Xephyr needs them too.

* Mon Jun 29 2009 Adam Jackson <ajax@redhat.com> 1.6.99-7.20090618

- xserver-1.5.99.902-selinux-debugging.patch: Drop.

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

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

* Tue Jun 23 2009 Adam Tkac <atkac redhat com> 1.6.99-6.20090618

- build xorg-x11-server-source as noarch

* Tue Jun 23 2009 Ben Skeggs <bskeggs@redhat.com> 1.6.99-5.20090618

- update nouveau autoconfig patch from F11

* Mon Jun 22 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99-4.20090618

- move libxf86config.so to devel package, libxf86config.so.* stays in the

  Xorg package.

* Sun Jun 21 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99-3.20090618

- Move libxf86config files to package xorg-x11-server-Xorg, libxf86config is

  a shared lib now and required by the Xorg binary.

* Fri Jun 19 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99-2.20090618

- add missing commitid file.

* Thu Jun 18 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99.1.20090618

- Today's git snapshot.

- disable Xdmx - it's broken upstream

- Removing patches merged upstream or obsolete.

  xserver-1.4.99-endian.patch - obsolete with autoconf 2.63-1 (#449944)

  xserver-1.5.99.902-sod-off-poulsbo.patch - upstream

  xserver-1.6.0-selinux-less.patch - upstream

  xserver-1.5.99.902-vnc.patch - upstream

  xserver-1.6.0-restore-zap.patch - upstream

  xserver-1.6.0-xinerama-cursors.patch - upstream

  xserver-1.6.0-xinerama-crashes.patch - obsolete, server 1.6 only

  xserver-1.6.1-xkbsendmap.patch - upstream

  xserver-1.6.0-randr-xinerama-crash.patch - upstream

  xserver-1.6.1-avoid-malloc-for-logging.patch - upstream

  xserver-1.6.1-exa-avoid-swapped-out.patch - upstream

  xserver-1.6.1-exa-create-pixmap2.patch -  upstream

  xserver-1.6.1-fix-glx-drawable.patch - upstream

  xserver-1.6.1-randr-gamma.patch - upstream 

  xserver-1.6.1-vt-switch.patch - obsolete

  xserver-1.6.1-pea-quirk.patch - will be upstream

* Tue Apr 14 2009 Adam Jackson <ajax@redhat.com> 1.6.1-1

- xserver 1.6.1

* Mon Apr 13 2009 Adam Jackson <ajax@redhat.com> 1.6.0-20

- Obsolete a bunch of input drivers. (#493221)

* Thu Apr 09 2009 Adam Jackson <ajax@redhat.com> 1.6.0-19

- xserver-1.6.0-no-i810.patch: Don't try to load i810.

* Thu Apr 09 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.0-18

- xserver-1.6.0-restore-zap.patch: Restore default off for DontZap.

* Mon Apr 06 2009 Adam Jackson <ajax@redhat.com> 1.6.0-17

- xserver-1.6.0-displayfd.patch: Add -displayfd commandline option.

* Mon Mar 30 2009 Adam Jackson <ajax@redhat.com> 1.6.0-16

- Don't nuke ModulePath lines in xorg.conf anymore.  If you're still doing

  this it's probably because you need to. (#490294)

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

- xserver-1.6.0-xtest-pointerscreen.patch: set POINTER_SCREEN flag for core

  XTestFakeInput events (#490984)

- xserver-1.6.0-xinerama-cursors.patch: don't display SW cursors when

  switching screens.

- xserver-1.6.0-xinerama-crashes.patch: don't crash on key repeats in xinerama

  setups.

* Wed Mar 18 2009 Adam Jackson <ajax@redhat.com> 1.6.0-14

- s390 fixes (Karsten Hopp)

* Thu Mar 12 2009 Adam Jackson <ajax@redhat.com> 1.6.0-13

- xselinux-1.6.0-selinux-nlfd.patch: Acquire the netlink socket from selinux,

  check it ourselves rather than having libselinux bang on it all the time.

* Wed Mar 11 2009 Adam Jackson <ajax@redhat.com> 1.6.0-12

- Requires: pixman >= 0.14.0

* Wed Mar 11 2009 Adam Jackson <ajax@redhat.com> 1.6.0-11

- xserver-1.6.0-less-acpi-brokenness.patch: Don't build the (broken)

  ACPI code.

* Wed Mar 11 2009 Adam Jackson <ajax@redhat.com> 1.6.0-10

- xserver-1.6.0-selinux-less.patch: Don't init selinux unless the policy

  says to be an object manager.

* Fri Mar 06 2009 Dennis Gilmore <dennis@ausil.us> 1.6.0-9

- BR kernel-headers not kernel-devel

* Fri Mar 06 2009 Adam Jackson <ajax@redhat.com> 1.6.0-8

- xserver-1.6.0-primary.patch: Really, only look at VGA devices. (#488869)

* Thu Mar 05 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.0-7

- Remove 10-x11-keymap.fdi, this is provided by fedora-setup-keyboard now.

* Wed Mar 04 2009 Adam Jackson <ajax@redhat.com> 1.6.0-6

- Move fedora-setup-keyboard (and libdrm) Requires to the Xorg subpackage,

  since they won't do anything at the top level.

- Remove BR: freetype freetype-devel.

- xserver-1.6.0-primary.patch: Only consider actual VGA devices.

* 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