afcbbe2
# This package is an experiment in active integration of upstream SCM with
afcbbe2
# Fedora packaging.  It works something like this:
afcbbe2
#
afcbbe2
# The "pristine" source is actually a git repo (with no working checkout).
afcbbe2
# The first step of %%prep is to check it out and switch to a "fedora" branch.
afcbbe2
# If you need to add a patch to the server, just do it like a normal git
afcbbe2
# operation, dump it with git-format-patch to a file in the standard naming
afcbbe2
# format, and add a PatchN: line.  If you want to push something upstream,
afcbbe2
# check out the master branch, pull, cherry-pick, and push.  FIXME describe
afcbbe2
# rebasing, add convenience 'make' targets maybe.
afcbbe2
37a43ab
# F10 TODO list:
a8fcc0d
#
4dbca59
# Fix rhpxl to no longer need vesamodes/extramodes
a8fcc0d
mharris 5efabee
%define pkgname xorg-server
714b488
#define gitdate 20090112
Kristian Høgsberg ce50e2c
mharris 683564b
Summary:   X.Org X11 X server
mharris dc2469d
Name:      xorg-x11-server
629ea28
Version:   1.5.99.903
629ea28
Release:   1%{?dist}
mharris dc2469d
URL:       http://www.x.org
a133a7b
License:   MIT
mharris dc2469d
Group:     User Interface/X
mharris 683564b
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
mharris 83c9ed8
37a43ab
%if 0%{?gitdate}
6757c65
# git snapshot.  to recreate, run:
afcbbe2
# ./make-git-snapshot.sh `cat commitid`
6757c65
Source0:   xorg-server-%{gitdate}.tar.bz2
6757c65
Source1:   make-git-snapshot.sh
afcbbe2
Source2:   commitid
6757c65
%else
37a43ab
Source0:   http://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
b3fd507
Source1:   gitignore
6757c65
%endif
mharris 83c9ed8
59994a9
# keyboard enablement
59994a9
Source10:  10-x11-keymap.fdi
59994a9
Source11:  fedora-setup-keyboard
59994a9
b87ee0a
# "useful" xvfb-run script
1b89ad9
Source20:  http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh
1b89ad9
aa9281b
# ABI version provides.
43ea777
# XXX don't enable any of this yet.  for serious.
43ea777
#Source30: find-provides
43ea777
#{expand:%%define prev__find_provides %{__find_provides}}
43ea777
#define pc_path %{buildroot}/%{_libdir}/pkgconfig/xorg-server.pc
aa9281b
#define __find_provides %{SOURCE30} %{pc_path} %{prev__find_provides}
43ea777
#define __find_provides %{nil}
aa9281b
Kristian Høgsberg d470a6c
# OpenGL compositing manager feature/optimization patches.
Kristian Høgsberg d470a6c
Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
494b014
Patch101:  xserver-1.4.99-dont-backfill-bg-none.patch
Kristian Høgsberg a7e275b
Patch103:  xserver-1.5.0-bg-none-root.patch
Kristian Høgsberg 9675a54
94d8e40
# Red Hat specific tweaking, not intended for upstream
94d8e40
# XXX move these to the end of the list
494b014
Patch1003:  xserver-1.4.99-pic-libxf86config.patch
mharris dc2469d
8d95713
Patch2013:  xserver-1.4.99-document-fontpath-correctly.patch
b38b008
Patch2014:  xserver-1.5.0-projector-fb-size.patch
115cc5d
df76841
# Trivial things to never merge upstream ever
4edb4ea
# Don't merge this without protecting the gccisms.
Adam Tkac c3613d2
Patch5001:  xserver-1.4.99-alloca-poison.patch
4edb4ea
# This really could be done prettier.
Adam Tkac c3613d2
Patch5002:  xserver-1.4.99-ssh-isnt-local.patch
df76841
Adam Tkac c3613d2
Patch5007:  xserver-1.5.0-bad-fbdev-thats-mine.patch
35b909d
Adam Tkac 70f1f7f
# Workaround RH bug #449944
Adam Tkac 70f1f7f
Patch5011: xserver-1.4.99-endian.patch
91482be
91482be
# evdev keyboard map fix
b3fd507
# Patch5015: xserver-1.5.0-enable-selinux.patch
b7326ab
47a0d78
# force mode debugging on for randr 1.2 drivers
b87ee0a
Patch6002: xserver-1.5.1-mode-debug.patch
6baf601
7222836
Patch6004: xserver-1.5.99.3-dmx-xcalloc.patch
d62ea48
f490553
# cf. bug 482924
f490553
Patch6010: xserver-1.5.99.902-selinux-debugging.patch
6f00a81
57da029
# ensure HAL can start after X, upstream soon, not 1.6 yet.
57da029
Patch6012: xserver-1.5.99.902-listen-for-hal.patch
57da029
38a8c9f
# don't try intel on poulsbo
38a8c9f
Patch6013: xserver-1.5.99.902-sod-off-poulsbo.patch
38a8c9f
Adam Tkac 7f7f7d5
# https://bugs.freedesktop.org/show_bug.cgi?id=20087
Adam Tkac 7f7f7d5
Patch6015: xserver-1.5.99.902-vnc.patch
Adam Tkac 7f7f7d5
950fc24
# Make autoconfiguration chose nouveau driver for NVIDIA GPUs
950fc24
Patch6017: xserver-1.5.99.902-nouveau.patch
950fc24
mharris 1651c54
%define moduledir	%{_libdir}/xorg/modules
Kristian Høgsberg 2a0fe97
%define drimoduledir	%{_libdir}/dri
mharris aa15493
%define sdkdir		%{_includedir}/xorg
mharris 9e7c1dd
mharris a30689e
%ifarch s390 s390x
mharris a30689e
%define with_hw_servers 0
f7f3689
%else
f7f3689
%define with_hw_servers 1
mharris 9e7c1dd
%endif
mharris dc2469d
f7f3689
%if %{with_hw_servers}
f7f3689
%define enable_xorg --enable-xorg
f7f3689
%else
f7f3689
%define enable_xorg --disable-xorg
mharris 382d04d
%endif
mharris 382d04d
a97fe36
%define kdrive --enable-kdrive --enable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev
06b805d
%define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg} --enable-dmx
f7f3689
8d95713
BuildRequires: git-core
5fadc5e
BuildRequires: automake autoconf libtool pkgconfig
f7f3689
BuildRequires: xorg-x11-util-macros >= 1.1.5
78e07cf
7222836
BuildRequires: xorg-x11-proto-devel >= 7.4-10
7222836
7222836
BuildRequires: xorg-x11-xtrans-devel >= 1.2.2-1
3941e59
BuildRequires: libXfont-devel libXau-devel libxkbfile-devel libXres-devel
3941e59
BuildRequires: libfontenc-devel libXtst-devel libXdmcp-devel
3941e59
BuildRequires: libX11-devel libXext-devel
7222836
BuildRequires: libXinerama-devel
7222836
BuildRequires: freetype freetype-devel
mharris 8b3540d
f7f3689
# DMX config utils buildreqs.
3941e59
BuildRequires: libXt-devel libdmx-devel libXmu-devel libXrender-devel
3941e59
BuildRequires: libXi-devel libXpm-devel libXaw-devel libXfixes-devel
3941e59
8bd842d
# Broken, this is global, should be Xephyr-only
8bd842d
BuildRequires: libXv-devel
8bd842d
47b92a5
# openssl? really?
be4c6e6
BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex
5f7794b
BuildRequires: mesa-libGL-devel >= 7.1-0.37
Adam Tkac c3613d2
# should be useless now...
Adam Tkac c3613d2
# BuildRequires: mesa-source >= 7.1-0.36
f7f3689
# XXX silly...
9718679
BuildRequires: libdrm-devel >= 2.4.0 kernel-devel
f7f3689
%if %{with_hw_servers}
3941e59
Requires: libdrm >= 2.4.0
mharris 382d04d
%endif
869288f
6332481
BuildRequires: audit-libs-devel libselinux-devel >= 2.0.59-1
becf1b4
BuildRequires: hal-devel dbus-devel
869288f
f7f3689
# All server subpackages have a virtual provide for the name of the server
f7f3689
# they deliver.  The Xorg one is versioned, the others are intentionally
f7f3689
# unversioned.
f7f3689
mharris dc2469d
%description
mharris 683564b
X.Org X11 X server
mharris dc2469d
494b014
%package common
494b014
Summary: Xorg server common files
494b014
Group: User Interface/X
494b014
494b014
%description common
494b014
Common files shared among all X servers.
494b014
mharris a30689e
%if %{with_hw_servers}
mharris dc2469d
%package Xorg
mharris 683564b
Summary: Xorg X server
mharris dc2469d
Group: User Interface/X
f7f3689
Provides: Xorg = %{version}-%{release}
f7f3689
Provides: Xserver
562c606
%ifarch %{ix86} x86_64
562c606
Requires: xorg-x11-drv-vesa
562c606
%else
562c606
Requires: xorg-x11-drv-fbdev
562c606
%endif
80eb898
Requires: xorg-x11-drv-void xorg-x11-drv-evdev >= 2.1.0-3
f7f3689
# virtuals.  XXX fix the xkbcomp fork() upstream.
f7f3689
Requires: xkbdata xkbcomp
494b014
Requires: xorg-x11-server-common >= %{version}-%{release}
98afae8
# Dropped from F9 for being broken, uninstall it.
98afae8
Obsoletes: xorg-x11-drv-magictouch <= 1.0.0.5-5.fc8
70fbb3a
# Force sufficiently new libpciaccess
70fbb3a
Conflicts: libpciaccess < 0.9.1-2
mharris dc2469d
mharris dc2469d
%description Xorg
mharris dc2469d
X.org X11 is an open source implementation of the X Window System.  It
mharris dc2469d
provides the basic low level functionality which full fledged
mharris dc2469d
graphical user interfaces (GUIs) such as GNOME and KDE are designed
mharris dc2469d
upon.
mharris a30689e
%endif
mharris dc2469d
f7f3689
mharris dc2469d
%package Xnest
mharris dc2469d
Summary: A nested server.
mharris dc2469d
Group: User Interface/X
06b805d
Obsoletes: xorg-x11-Xnest
494b014
Requires: xorg-x11-server-common >= %{version}-%{release}
mharris dc2469d
Provides: Xnest
mharris dc2469d
mharris dc2469d
%description Xnest
mharris dc2469d
Xnest is an X server, which has been implemented as an ordinary
mharris dc2469d
X application.  It runs in a window just like other X applications,
mharris dc2469d
but it is an X server itself in which you can run other software.  It
mharris dc2469d
is a very useful tool for developers who wish to test their
mharris dc2469d
applications without running them on their real X server.
mharris dc2469d
f7f3689
mharris dc2469d
%package Xdmx
mharris dc2469d
Summary: Distributed Multihead X Server and utilities
mharris dc2469d
Group: User Interface/X
mharris 1bd453c
Obsoletes: xorg-x11-Xdmx
494b014
Requires: xorg-x11-server-common >= %{version}-%{release}
mharris dc2469d
Provides: Xdmx
mharris dc2469d
mharris dc2469d
%description Xdmx
mharris dc2469d
Xdmx is proxy X server that provides multi-head support for multiple displays
mharris dc2469d
attached to different machines (each of which is running a typical X server).
mharris dc2469d
When Xinerama is used with Xdmx, the multiple displays on multiple machines
mharris dc2469d
are presented to the user as a single unified screen.  A simple application
mharris dc2469d
for Xdmx would be to provide multi-head support using two desktop machines,
mharris dc2469d
each of which has a single display device attached to it.  A complex
mharris dc2469d
application for Xdmx would be to unify a 4 by 4 grid of 1280x1024 displays
mharris dc2469d
(each attached to one of 16 computers) into a unified 5120x4096 display.
f7f3689
mharris dc2469d
mharris dc2469d
%package Xvfb
mharris dc2469d
Summary: A X Windows System virtual framebuffer X server.
mharris dc2469d
Group: User Interface/X
1b89ad9
# xvfb-run is GPLv2, rest is MIT
1b89ad9
License: MIT and GPLv2
06b805d
Obsoletes: xorg-x11-Xvfb
494b014
Requires: xorg-x11-server-common >= %{version}-%{release}
mharris dc2469d
Provides: Xvfb
mharris dc2469d
mharris dc2469d
%description Xvfb
mharris dc2469d
Xvfb (X Virtual Frame Buffer) is an X server that is able to run on
mharris dc2469d
machines with no display hardware and no physical input devices.
mharris dc2469d
Xvfb simulates a dumb framebuffer using virtual memory.  Xvfb does
mharris dc2469d
not open any devices, but behaves otherwise as an X display.  Xvfb
mharris dc2469d
is normally used for testing servers.
mharris dc2469d
304cf10
304cf10
%package Xephyr
304cf10
Summary: A nested server.
304cf10
Group: User Interface/X
494b014
Requires: xorg-x11-server-common >= %{version}-%{release}
304cf10
Provides: Xephyr
304cf10
304cf10
%description Xephyr
304cf10
Xephyr is an X server, which has been implemented as an ordinary
304cf10
X application.  It runs in a window just like other X applications,
304cf10
but it is an X server itself in which you can run other software.  It
304cf10
is a very useful tool for developers who wish to test their
304cf10
applications without running them on their real X server.  Unlike
304cf10
Xnest, Xephyr renders to an X image rather than relaying the
304cf10
X protocol, and therefore supports the newer X extensions like
304cf10
Render and Composite.
304cf10
f7f3689
mharris a30689e
%if %{with_hw_servers}
494b014
%package devel
mharris dc2469d
Summary: SDK for X server driver module development
mharris dc2469d
Group: User Interface/X
06b805d
Obsoletes: xorg-x11-sdk xorg-x11-server-sdk
mharris 382d04d
Requires: xorg-x11-util-macros
mharris 2025148
Requires: xorg-x11-proto-devel
9eb4ebc
Requires: pkgconfig pixman-devel libpciaccess-devel
mharris 83c9ed8
Requires(pre): xorg-x11-filesystem >= 0.99.2-3
mharris 1d1b706
Provides: libxf86config-devel = %{version}-%{release}
494b014
# Virtual provide for transition.  Delete me someday.
494b014
Provides: xorg-x11-server-sdk = %{version}-%{release}
mharris 1d1b706
494b014
%description devel
mharris dc2469d
The SDK package provides the developmental files which are necessary for
mharris dc2469d
developing X server driver modules, and for compiling driver modules
mharris dc2469d
outside of the standard X11 source code tree.  Developers writing video
mharris dc2469d
drivers, input drivers, or other X modules should install this package.
mharris a30689e
%endif
f7f3689
Adam Tkac aeec5f9
%package source
Adam Tkac aeec5f9
Summary: Xserver source code required to build VNC server (Xvnc)
Adam Tkac aeec5f9
Group: Development/Libraries
Adam Tkac aeec5f9
Adam Tkac aeec5f9
%description source
Adam Tkac aeec5f9
Xserver source code needed to build VNC server (Xvnc)
mharris dc2469d
mharris dc2469d
%prep
6757c65
%setup -q -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
6757c65
37a43ab
%if 0%{?gitdate}
Kristian Høgsberg ef7113f
git checkout -b fedora
6757c65
sed -i 's/git/&+ssh/' .git/config
afcbbe2
%else
714b488
git init-db
7a1f6e4
if [ -z "$GIT_COMMITTER_NAME" ]; then
714b488
    git config user.email "x@fedoraproject.org"
714b488
    git config user.name "Fedora X Ninjas"
7a1f6e4
fi
b3fd507
cp %{SOURCE1} .gitignore
714b488
git add .
714b488
git commit -a -q -m "%{version} baseline."
37a43ab
%endif
7a1f6e4
37a43ab
# Apply all the patches.
714b488
#git am -p1 %{patches}
Adam Tkac f3bef3a
git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
38f17a6
mharris dc2469d
%build
mharris aa15493
fed3940
%define default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
fed3940
f7f3689
# --with-rgb-path should be superfluous now ?
f7f3689
# --with-pie ?
6757c65
autoreconf -v --install || exit 1
Adam Tkac 7c0bdc9
export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS"
06b805d
%configure --enable-maintainer-mode %{xservers} \
mharris 683564b
	--disable-static \
998c064
	--with-pic \
9d75614
	--with-int10=x86emu \
fed3940
	--with-default-font-path=%{default_font_path} \
mharris 382d04d
	--with-module-dir=%{moduledir} \
6824c6b
	--with-builderstring="Build ID: %{name} %{version}-%{release}" \
mharris 382d04d
	--with-xkb-output=%{_localstatedir}/lib/xkb \
mharris aa15493
	--enable-install-libxf86config \
49d4d93
	--enable-xselinux --enable-record \
998c064
	--with-dri-driver-path=%{drimoduledir} \
a549381
	${CONFIGURE}
mharris aa15493
f9826ac
make %{?_smp_mflags}
Kristian Høgsberg ce50e2c
mharris dc2469d
%install
mharris dc2469d
rm -rf $RPM_BUILD_ROOT
mharris aa15493
make install DESTDIR=$RPM_BUILD_ROOT moduledir=%{moduledir}
Kristian Høgsberg ce50e2c
mharris a30689e
%if %{with_hw_servers}
mharris dc2469d
mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
mharris dc2469d
mharris 0af35d4
# Install the vesamodes and extramodes files to let our install/config tools
mharris 0af35d4
# be able to parse the same modelist as the X server uses (rhpxl).
115cc5d
mkdir -p $RPM_BUILD_ROOT%{_datadir}/xorg
9e07a0f
install -m 0444 hw/xfree86/common/{vesa,extra}modes $RPM_BUILD_ROOT%{_datadir}/xorg/
59994a9
59994a9
# fedora-isms to slurp keyboard settings out of /etc/sysconfig/keyboard
59994a9
mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor
59994a9
install -m 0444 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor
59994a9
install -m 0755 %{SOURCE11} $RPM_BUILD_ROOT%{_bindir}
mharris a30689e
%endif
mharris 0af35d4
9d53449
# Make the source package
Adam Tkac aeec5f9
%define xserver_source_dir %{_datadir}/xorg-x11-server-source
9d53449
%define inst_srcdir %{buildroot}/%{xserver_source_dir}
Adam Tkac f3bef3a
mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/{xquartz/bundle,xfree86/common}}
9d53449
cp cpprules.in %{inst_srcdir}
Adam Tkac f3bef3a
cp {,%{inst_srcdir}/}hw/xquartz/bundle/cpprules.in
9d53449
cp xkb/README.compiled %{inst_srcdir}/xkb
9d53449
cp hw/xfree86/{xorgconf.cpp,Options} %{inst_srcdir}/hw/xfree86
9d53449
cp hw/xfree86/common/{vesamodes,extramodes} %{inst_srcdir}/hw/xfree86/common
Adam Tkac aeec5f9
ac0e240
install -m 0755 %{SOURCE20} $RPM_BUILD_ROOT%{_bindir}/xvfb-run
1b89ad9
Adam Tkac ee454c3
find . -type f | egrep '.*\.(c|h|am|ac|inc|m4|h.in|pc.in|man.pre|pl|txt)$' |
Adam Tkac 6d65eb0
xargs tar cf - | (cd %{inst_srcdir} && tar xf -)
Adam Tkac aeec5f9
0f2c2e4
# Remove unwanted files/dirs
mharris 382d04d
{
Kristian Høgsberg 5ee49e3
    rm -f $RPM_BUILD_ROOT%{_libdir}/X11/Options
0f2c2e4
    rm -f $RPM_BUILD_ROOT%{_bindir}/in?
mharris bdcccdf
    rm -f $RPM_BUILD_ROOT%{_bindir}/ioport
0f2c2e4
    rm -f $RPM_BUILD_ROOT%{_bindir}/out?
mharris bdcccdf
    rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak
mharris f71fb24
    rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcitweak.1*
mharris a30689e
    find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
mharris 382d04d
}
mharris 382d04d
mharris dc2469d
%clean
mharris dc2469d
rm -rf $RPM_BUILD_ROOT
mharris dc2469d
mharris a30689e
%if %{with_hw_servers}
mharris 3a3aa5e
%pre Xorg
mharris 3a3aa5e
{
3e0fc77
    pushd /etc/X11
3e0fc77
3e0fc77
    [ -e xorg.conf ] || return 0
3e0fc77
9e07a0f
    sed -i 's/^.*Load.*"(pex5|xie|xtt).*\n$"//gi' xorg.conf
9e07a0f
    sed -i 's/^\s*Driver(.*)"keyboard"/Driver\1"kbd"/gi' xorg.conf
9e07a0f
    sed -i 's/^.*Option.*"XkbRules".*"(xfree86|xorg)".*\n$//gi' xorg.conf
9e07a0f
    sed -i 's#^\s*RgbPath.*$##gi' xorg.conf
3e0fc77
    # lame, the nvidia driver needs to override this
3e0fc77
    if ! grep -q 'ModulePath.*nvidia' xorg.conf ; then
9e07a0f
      sed -i 's#^\s*ModulePath.*$##gi' xorg.conf
3e0fc77
    fi
3e0fc77
3e0fc77
    popd
mharris 171a920
} &> /dev/null || :
mharris a30689e
%endif
mharris 3a3aa5e
494b014
%files common
494b014
%defattr(-,root,root,-)
494b014
%{_mandir}/man1/Xserver.1*
9e07a0f
%{_libdir}/xorg/protocol.txt
494b014
%dir %{_localstatedir}/lib/xkb
494b014
%{_localstatedir}/lib/xkb/README.compiled
494b014
mharris dc2469d
mharris a30689e
%if %{with_hw_servers}
mharris dc2469d
%files Xorg
mharris dc2469d
%defattr(-,root,root,-)
mharris af712a9
%{_bindir}/X
add023b
%attr(4711, root, root) %{_bindir}/Xorg
46fa1ed
%{_bindir}/cvt
59994a9
%{_bindir}/fedora-setup-keyboard
59994a9
%{_bindir}/gtf
mharris 0af35d4
%dir %{_datadir}/xorg
59994a9
%{_datadir}/hal/fdi/policy/10osvendor/10-x11-keymap.fdi
mharris 0af35d4
%{_datadir}/xorg/vesamodes
mharris 0af35d4
%{_datadir}/xorg/extramodes
mharris dc2469d
%dir %{_libdir}/xorg
mharris dc2469d
%dir %{_libdir}/xorg/modules
mharris dc2469d
%dir %{_libdir}/xorg/modules/drivers
mharris 382d04d
%dir %{_libdir}/xorg/modules/extensions
mharris aa15493
%{_libdir}/xorg/modules/extensions/libglx.so
f7f3689
%{_libdir}/xorg/modules/extensions/libdri.so
86ffb30
%{_libdir}/xorg/modules/extensions/libdri2.so
mharris a3dab0f
%{_libdir}/xorg/modules/extensions/libdbe.so
mharris a3dab0f
%{_libdir}/xorg/modules/extensions/libextmod.so
49d4d93
%{_libdir}/xorg/modules/extensions/librecord.so
mharris dc2469d
%dir %{_libdir}/xorg/modules/input
mharris 382d04d
%dir %{_libdir}/xorg/modules/linux
mharris aa15493
%{_libdir}/xorg/modules/linux/libfbdevhw.so
mharris 382d04d
%dir %{_libdir}/xorg/modules/multimedia
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/bt829_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/fi1236_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/msp3430_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/tda8425_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/tda9850_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/tda9885_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/uda1380_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/libexa.so
mharris 382d04d
%{_libdir}/xorg/modules/libfb.so
mharris 382d04d
%{_libdir}/xorg/modules/libint10.so
mharris 382d04d
%{_libdir}/xorg/modules/libshadow.so
mharris 382d04d
%{_libdir}/xorg/modules/libshadowfb.so
mharris 382d04d
%{_libdir}/xorg/modules/libvbe.so
mharris 382d04d
%{_libdir}/xorg/modules/libvgahw.so
afcbbe2
%{_libdir}/xorg/modules/libwfb.so
mharris 382d04d
%{_libdir}/xorg/modules/libxaa.so
8d95713
%{_libdir}/xorg/modules/libxf8_16bpp.so
74d1670
%{_mandir}/man1/gtf.1*
74d1670
%{_mandir}/man1/Xorg.1*
Kristian Høgsberg 16cbfe9
%{_mandir}/man1/cvt.1*
mharris aa15493
%{_mandir}/man4/fbdevhw.4*
99319d2
%{_mandir}/man4/exa.4*
74d1670
%{_mandir}/man5/xorg.conf.5*
mharris a30689e
%endif
mharris dc2469d
mharris dc2469d
mharris dc2469d
%files Xnest
mharris dc2469d
%defattr(-,root,root,-)
mharris dc2469d
%{_bindir}/Xnest
74d1670
%{_mandir}/man1/Xnest.1*
mharris dc2469d
mharris dc2469d
mharris dc2469d
%files Xdmx
mharris dc2469d
%defattr(-,root,root,-)
mharris dc2469d
%{_bindir}/Xdmx
mharris 382d04d
%{_bindir}/dmxaddinput
mharris 382d04d
%{_bindir}/dmxaddscreen
mharris 382d04d
%{_bindir}/dmxreconfig
mharris 382d04d
%{_bindir}/dmxresize
mharris 382d04d
%{_bindir}/dmxrminput
mharris 382d04d
%{_bindir}/dmxrmscreen
mharris 382d04d
%{_bindir}/dmxtodmx
mharris 382d04d
%{_bindir}/dmxwininfo
mharris 382d04d
%{_bindir}/vdltodmx
mharris 382d04d
%{_bindir}/xdmx
mharris 382d04d
%{_bindir}/xdmxconfig
74d1670
%{_mandir}/man1/Xdmx.1*
74d1670
%{_mandir}/man1/dmxtodmx.1*
74d1670
%{_mandir}/man1/vdltodmx.1*
74d1670
%{_mandir}/man1/xdmxconfig.1*
mharris dc2469d
mharris dc2469d
mharris dc2469d
%files Xvfb
mharris dc2469d
%defattr(-,root,root,-)
mharris dc2469d
%{_bindir}/Xvfb
1b89ad9
%{_bindir}/xvfb-run
74d1670
%{_mandir}/man1/Xvfb.1*
mharris dc2469d
304cf10
304cf10
%files Xephyr
304cf10
%defattr(-,root,root,-)
304cf10
%{_bindir}/Xephyr
7222836
%{_mandir}/man1/Xephyr.1*
304cf10
f7f3689
mharris a30689e
%if %{with_hw_servers}
494b014
%files devel
mharris dc2469d
%defattr(-,root,root,-)
mharris aa15493
%{_libdir}/libxf86config.a
mharris dc2469d
%{_libdir}/pkgconfig/xorg-server.pc
mharris 0a0dee1
%dir %{_includedir}/xorg
mharris 1651c54
%{sdkdir}/*.h
mharris af712a9
%{_datadir}/aclocal/xorg-server.m4
mharris a30689e
%endif
f7f3689
494b014
Adam Tkac aeec5f9
%files source
Adam Tkac aeec5f9
%defattr(-, root, root, -)
9d53449
%{xserver_source_dir}
Adam Tkac aeec5f9
mharris dc2469d
mharris dc2469d
%changelog
629ea28
* Wed Feb 18 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.903-1
629ea28
- xserver 1.6. RC 3
629ea28
- remove patches merged into upstream.
629ea28
aa9281b
* Tue Feb 17 2009 Adam Jackson <ajax@redhat.com> 1.5.99.902-13
aa9281b
- xserver-1.5.99.902-randr-soft-getpanning.patch: Fail RRGetPanning softly
aa9281b
  when the driver doesn't support it.
aa9281b
950fc24
* Mon Feb 16 2009 Ben Skeggs <bskeggs@redhat.com> 1.5.99.902-12
950fc24
- xserver-1.5.99.902-nouveau.patch: select nouveau as default driver
950fc24
  for NVIDIA GPUs
950fc24
6f1b592
* Mon Feb 16 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-11
6f1b592
- xserver-1.5.99.902-xkb-colors.patch: don't confuse src and dst when copying
6f1b592
  color labels (#469572)
6f1b592
Adam Tkac 7f7f7d5
* Thu Feb 12 2009 Adam Tkac <atkac redhat com> 1.5.99.902-10
Adam Tkac 7f7f7d5
- don't call drv->UnInit if device doesn't have driver
Adam Tkac 7f7f7d5
306a46d
* Wed Feb 11 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-9
306a46d
- xserver-1.5.99.902-always-RAW.patch: always init the console to RAW mode.
306a46d
49d4d93
* Tue Feb 10 2009 Adam Jackson <ajax@redhat.com> 1.5.99.902-8
49d4d93
- Re-enable RECORD. (#472168)
49d4d93
38a8c9f
* Tue Feb 10 2009 Adam Jackson <ajax@redhat.com> 1.5.99.902-7
38a8c9f
- xserver-1.5.99.902-sod-off-poulsbo.patch: Don't try the intel driver on
38a8c9f
  GMA500. (#472674)
38a8c9f
57da029
* Tue Feb 10 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-6
57da029
- xserver-1.5.99.902-listen-for-hal.patch: listen for HAL startup
57da029
  notifications if it isn't running already.
57da029
70653e7
* Mon Feb 09 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-5
70653e7
- xserver-1.5.99.902-mediakeys-crash.patch: don't crash when multimedia keys
70653e7
  are pressed (#483435)
70653e7
f490553
* Sun Feb 08 2009 Adam Jackson <ajax@redhat.com> 1.5.99.902-4
f490553
- xserver-1.5.99.902-selinux-debugging.patch: Try to figure out why selinux
f490553
  class map setup fails.
f490553
- Remove mtrr header hack.
f490553
a5cb92a
* Fri Feb 06 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-3
a5cb92a
- Update 10-x11-keymap.fdi: only call fedora-setup-keyboard for devices with
a5cb92a
  input.capabilities = keyboard (#484217)
a5cb92a
010d2eb
* Wed Feb 04 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-2
010d2eb
- xserver-1.5.99.902-xinerama.patch: don't update the sprite root window in
010d2eb
  Xinerama setups (#473825)
010d2eb
53d63a9
* Tue Feb 03 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-1
53d63a9
- xserver 1.6. RC 2
53d63a9
c28ddfe
* Tue Jan 27 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.901-5
c28ddfe
- replace fedora-setup-keyboard with pure python one (#478431)
c28ddfe
6f00a81
* Tue Jan 27 2009 Dave Airlie <airlied@redhat.com> 1.5.99.901-4
6f00a81
- xserver-1.5.99.3-fix-core-fonts.patch (#478999)
6f00a81
Adam Tkac 7068bb5
* Mon Jan 26 2009 Adam Tkac <atkac redhat com> 1.5.99.901-3
Adam Tkac 7068bb5
- improved xserver-1.5.99.3-broken-mtrr-header.patch to unbreak mtrr.h again
Adam Tkac 7068bb5
Adam Tkac c0609f8
* Mon Jan 26 2009 Adam Tkac <atkac redhat com> 1.5.99.901-2
Adam Tkac c0609f8
- rebuild against new openssl
Adam Tkac c0609f8
714b488
* Tue Jan 13 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.901-1
714b488
- xserver 1.6 RC 1
714b488
- fix "git-xyz" to "git xyz"
714b488
- revert yesterdays changes to make-git-snapshot.sh, that was a bad idea.
714b488
66e1b5f
* Mon Jan 12 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.3-5
66e1b5f
- rebase to today's server-1.6-enterleave branch, current 1.6 plus enterleave
66e1b5f
  patches.
66e1b5f
- drop xserver-1.5.99.3-offscreen-pixmaps.patch - merged upstream
66e1b5f
- fix up git checkout in make-git-snapshot.sh to allow a remote branch to be
66e1b5f
  specified as $1.
66e1b5f
0cf7b6d
* Thu Jan 08 2009 Adam Jackson <ajax@redhat.com> 1.5.99.3-8
0cf7b6d
- xserver-1.5.99.3-broken-mtrr-header.patch: Unbreak broken mtrr.h.
0cf7b6d
19b9d55
* Wed Jan 07 2009 Adam Jackson <ajax@redhat.com> 1.5.99.3-7
19b9d55
- xserver-1.5.99.3-offscreen-pixmaps.patch: Turn off offscreen pixmaps in XAA.
19b9d55
  Again.  Sigh.
19b9d55
Adam Tkac f3bef3a
* Wed Jan 07 2009 Adam Tkac <atkac redhat com> 1.5.99.3-6
Adam Tkac f3bef3a
- use "git am" instead of "git-am"
Adam Tkac f3bef3a
- added more sources into xorg-x11-server-source to make source compilable
Adam Tkac f3bef3a
a97fe36
* Mon Dec 29 2008 Dave Airlie <airlied@redhat.com> 1.5.99.3-5
a97fe36
- remove unused build options - enable dri2
a97fe36
80eb898
* Wed Dec 24 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.3-4
80eb898
- xserver-1.5.99.3-ddx-rules.patch: enable the DDX to set the rules for the
80eb898
  core devices (#477712)
80eb898
- Require xorg-x11-drv-evdev 2.1.0-3 for ABI.
80eb898
086e210
* Mon Dec 22 2008 Adam Jackson <ajax@redhat.com> 1.5.99.3-3
086e210
- xserver-1.5.0-bad-fbdev-thats-mine.patch: Do the same for sbus that we do
086e210
  for pci.
086e210
4ef5ee7
* Mon Dec 22 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.3-2
4ef5ee7
- Update to today's server-1.6  branch tip.
4ef5ee7
7222836
* Fri Dec 19 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.3-1
7222836
- xserver 1.5.99.3
7222836
- drop patches merged into master
7222836
- xserver-1.5.99.3-dmx-xcalloc.patch: avoid dmx Xcalloc build errors
7222836
b87ee0a
* Wed Nov 05 2008 Adam Jackson <ajax@redhat.com> 1.5.3-1
b87ee0a
- xserver 1.5.3
b87ee0a
dfe451e
* Fri Oct 31 2008 Adam Jackson <ajax@redhat.com> 1.5.2-12
dfe451e
- xserver-1.5.2-drain-console.patch: Silently eat any input we get from the
dfe451e
  tty fd, lest terrible wakeup storms ensue.
dfe451e
562c606
* Tue Oct 28 2008 Adam Jackson <ajax@redhat.com> 1.5.2-11
562c606
- Un-require mouse and keyboard, we're an evdev shop now
562c606
- Drop some obsoletes from the F7 timeframe
562c606
- Require vesa on i386 and amd64, fbdev elsewhere
562c606
b6d8183
* Mon Oct 27 2008 Adam Jackson <ajax@redhat.com> 1.5.2-10
b6d8183
- xserver-1.5.0-bg-none-root.patch: Make it something the driver has to
b6d8183
  explicitly claim support for, so we don't get garbage when you do -nr
b6d8183
  on vesa for example.
b6d8183
d62ea48
* Mon Oct 27 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.2-9
d62ea48
- xserver-1.5.2-more-sanity-checks.patch: more sanity checks to stop vmmouse
d62ea48
  from segfaulting the server. #434807
d62ea48
d4d60d4
* Wed Oct 22 2008 Peter Hutterer <peter.hutterer@redhat.com>
50cbe39
- Update xserver-1.5.2-disable-kbd-mouse.patch: add line to xorg.conf man-page
50cbe39
  stating that devices are disabled if AEI is on.
50cbe39
50cbe39
* Wed Oct 22 2008 Peter Hutterer <peter.hutterer@redhat.com>
d4d60d4
- fix typo in xserver-1.5.2-no-duplicate-devices.patch
d4d60d4
6baf601
* Mon Oct 20 2008 Adam Jackson <ajax@redhat.com> 1.5.2-8
6baf601
- xserver-1.5.2-exa-sync-less.patch: Avoid migrating pixmaps out on
6baf601
  PutImage.
6baf601
6130143
* Mon Oct 20 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.2-7
6130143
- xserver-1.5.2-no-duplicate-devices.patch: don't re-add devices through HAL
6130143
  if they are already added (#467462).
6130143
36856bd
* Sun Oct 19 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.2-6
36856bd
- Update xserver-1.5.2-disable-kbd-mouse.patch: if no config file is present,
36856bd
  we need to force AllowEmptyInput on.
36856bd
9d98434
* Thu Oct 16 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.2-5
9d98434
- xserver-1.5.2-enable-RAW-console.patch: enable RAW mode for console, no need
9d98434
  for grabbing the evdev device anymore.
9d98434
- xserver-1.5.2-disable-kbd-mouse.patch: if AllowEmptyInput is on, don't allow
9d98434
  mouse or keyboard drivers.
9d98434
106cced
* Tue Oct 14 2008 Adam Jackson <ajax@redhat.com> 1.5.2-4
106cced
- xserver-1.5.2-lies-damn-lies-and-aspect-ratios.patch: Catch even more
106cced
  cases of the monitor encoding aspect ratio for size. (#458747)
106cced
3990250
* Tue Oct 14 2008 Adam Jackson <ajax@redhat.com> 1.5.2-3
3990250
- xserver-1.5.2-backtrace-defines.patch: Get HAVE_BACKTRACE defined even at
3990250
  the DIX level.
3990250
5435f0d
* Fri Oct 10 2008 Adam Jackson <ajax@redhat.com> 1.5.2-2
5435f0d
- xserver-1.5.1-global-backtrace.patch: Make backtraces possible from
5435f0d
  outside the xfree86 DDX.
5435f0d
- xserver-1.5.2-mieq-backtrace.patch: bt when we fill the input queue.
5435f0d
861a625
* Fri Oct 10 2008 Adam Jackson <ajax@redhat.com> 1.5.2-1
861a625
- xserver 1.5.2
861a625
- xserver-1.5.0-comment-out-glxdri2.c: Drop, no longer relevant.
861a625
- xserver-1.5.0-xkb-core-kbd-map-fix.patch: Drop, merged.
861a625
- xserver-1.5.1-int10-leaks.patch: Drop, merged.
861a625
851e267
* Fri Oct 10 2008 Adam Jackson <ajax@redhat.com> 1.5.1-11
851e267
- xserver-1.3.0-no-prerelease-warning.patch: Drop.
851e267
05c6c13
* Tue Oct 07 2008 Dave Airlie <airlied@redhat.com> 1.5.1-10
05c6c13
- actually apply exa fix patch
05c6c13
1288ee0
* Tue Oct 07 2008 Adam Jackson <ajax@redhat.com> 1.5.1-9
1288ee0
- xserver-1.5.1-xgi.patch: Move XGI cards onto the sis driver. (#453812)
1288ee0
f58fef1
* Tue Oct 07 2008 Adam Jackson <ajax@redhat.com> 1.5.1-8
f58fef1
- xserver-1.5.1-int10-leaks.patch: Shut up some useless int10 debugging and
f58fef1
  plug a memory leak.
f58fef1
47a0d78
* Tue Oct 7 2008 Adam Jackson <ajax@redhat.com> 1.5.1-7
47a0d78
- xserver-1.5.1-mode-debug.patch: Force mode debugging on.
47a0d78
586114b
* Tue Oct 7 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.1-6
586114b
- xserver-1.5.0-xkb-core-kbd-map-fix.patch: don't invent groups when mapping
586114b
  from xkb to core and back, and squash canonical types into explicit ones on
586114b
  core reconstruction (2 patches). #460545
586114b
6b2e48a
* Mon Oct 06 2008 Dave Airlie <airlied@redhat.com> 1.5.1-5
6b2e48a
- xserver-1.5.1-exa-fix-glyph-segfault.patch - fix EXA rects crash (462447)
6b2e48a
ac0e240
* Tue Sep 30 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.5.1-4
ac0e240
- fix typo. :P
ac0e240
1b89ad9
* Tue Sep 30 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.5.1-3
1b89ad9
- add xvfb-run helper script to Xvfb package
1b89ad9
b4b3d37
* Thu Sep 25 2008 Dave Airlie <airlied@redhat.com> 1.5.1-2
b4b3d37
- fix crash with x11perf on r500 modesetting
b4b3d37
e691cc2
* Tue Sep 23 2008 Adam Jackson <ajax@redhat.com> 1.5.1-1
e691cc2
- xserver 1.5.1
e691cc2
- Trim %%changelog.
e691cc2
3cb8a78
* Thu Sep 11 2008 Soren Sandmann <sandmann@redhat.com> 1.5.0-6
3cb8a78
- Comment out glxdri2.c since it doesn't compile. (krh says it
3cb8a78
  won't break at runtime). 
3cb8a78
5f7794b
* Thu Sep 11 2008 Soren Sandmann <sandmann@redhat.com> 1.5.0-5
5f7794b
- Bump BuildRequires on mesa-GL-devel. Maybe that will work.
5f7794b
6b932a1
* Thu Sep 11 2008 Soren Sandmann <sandmann@redhat.com> 1.5.0-4
6b932a1
- Bump BuildRequires on xorg-x11-proto-devel
6b932a1
b38b008
* Thu Sep 11 2008 Soren Sandmann <sandmann@redhat.com> 1.5.0-3
a1dac6f
- Change the external monitor patch to base off of amount of video ram.
a1dac6f
a1dac6f
* Thu Sep 11 2008 Soren Sandmann <sandmann@redhat.com> 1.5.0-3
b38b008
- Change the default screen limits to include room for a 1280 wide
b38b008
  projector.
b38b008
3c109f3
* Wed Sep 10 2008 Dave Airlie <airlied@redhat.com> 1.5.0-2
3c109f3
- bring master exa back
3c109f3
b3fd507
* Wed Sep 03 2008 Adam Jackson <ajax@redhat.com> 1.5.0-1
b3fd507
- xserver 1.5.0
b3fd507
- Revert to the EXA from 1.5.0, should be good enough one hopes.
b3fd507
- Add .gitignore from git, so working with the artificial git tree is less
b3fd507
  flakey.
b3fd507
5bdc964
* Mon Aug 25 2008 Adam Jackson <ajax@redhat.com> 1.4.99.906-10
5bdc964
- xserver-1.5.0-edid-backport.patch: Backport EDID updates from master.
5bdc964
a249815
* Wed Aug 20 2008 Adam Jackson <ajax@redhat.com> 1.4.99.906-9
a249815
- xserver-1.5.0-hide-cursor.patch: Suppress displaying the cursor until
a249815
  an app calls XDefineCursor().
a249815
Kristian Høgsberg a7e275b
* Thu Aug 14 2008 Kristian Høgsberg <krh@redhat.com> - 1.4.99.906-8
Kristian Høgsberg a7e275b
- Add bg-none-root patch for plymouth.
Kristian Høgsberg a7e275b
47cd370
* Thu Aug 14 2008 Dave Airlie <airlied@redhat.com> 1.4.99.906-7
47cd370
- EXA backport master EXA code for optimisations
47cd370
b7326ab
* Wed Aug 13 2008 Adam Jackson <ajax@redhat.com> 1.4.99.906-6
b7326ab
- xserver-1.5.0-enable-selinux.patch: Enable selinux again.
b7326ab
3262bac
* Tue Aug 05 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.4.99.906-5
3262bac
- xserver-1.5.0-xkb-fix-ProcXkbSetXYZ-to-work-on-all.patch: force xkb requests
3262bac
  to apply to all extension devices.
3262bac
- drop call-SwitchCoreKeyboard.patch
3262bac
- xserver-1.5.0-force-SwitchCoreKeyboard-for-evdev.patch: force
3262bac
  SwitchCoreKeyboard for evdev devices to push device keymap into core device.
3262bac
b1cd19c
* Mon Aug 04 2008 Adam Jackson <ajax@redhat.com> 1.4.99.906-4
59994a9
- 10-x11-keymap.fdi, fedora-setup-keyboard: Attempt to read keyboard settings
59994a9
  from /etc/sysconfig/keyboard and stuff them into hal.
59994a9
3262bac
* Mon Aug 04 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.4.99.906-3
3262bac
- xserver-1.5.0-call-SwitchCoreKeyboard-for-first-device.patch: force a keymap
3262bac
  switch to push the device keymap into the core device.
3262bac
bb998c6
* Thu Jul 31 2008 Adam Jackson <ajax@redhat.com> 1.4.99.906-2
bb998c6
- Drop the evdev keyboarding patch.
bb998c6
37a43ab
* Thu Jul 24 2008 Adam Jackson <ajax@redhat.com> 1.4.99.906-1
37a43ab
- 1.5RC6.
37a43ab
Adam Tkac 7c0bdc9
* Wed Jul 02 2008 Adam Tkac <atkac redhat com> 1.4.99.905-2.20080701
Adam Tkac 7c0bdc9
- build with -rdynamic to make dri_swrast happy
Adam Tkac 7c0bdc9
Adam Tkac c3613d2
* Mon Jun 30 2008 Adam Jackson <ajax@redhat.com> 1.4.99.905-1.20080701
Adam Tkac c3613d2
- 1.5RC5.
Adam Tkac c3613d2
Adam Tkac c3613d2
* Thu Jun 19 2008 Adam Tkac <atkac redhat com>
Adam Tkac 70f1f7f
- workaround broken AC_C_BIGENDIAN macro (#449944)
Adam Tkac 70f1f7f
Adam Tkac c3613d2
* Thu Jun 12 2008 Dave Airlie <airlied@redhat.com> 1.4.99.902-3.20080612
Adam Tkac c3613d2
- xserver-1.5.0-fix-single-aspect.patch - fix 2560x1600 on my monitor.
Adam Tkac c3613d2
Adam Tkac c3613d2
* Thu Jun 12 2008 Dave Airlie <airlied@redhat.com> 1.4.99.902-2.20080612
f4653f8
- cve-2008-1377: Record and Security Extension Input validation
f4653f8
- cve-2008-1379: MIT-SHM extension Input Validation flaw
f4653f8
- cve-2008-2360: Render AllocateGlyph extension Integer overflows
f4653f8
- cve-2008-2361: Render CreateCursor extension Integer overflows
f4653f8
- cve-2008-2362: Render Gradient extension Integer overflows
f4653f8
- Rebase to 1.5 head for security patches for above
f4653f8
Adam Tkac c3613d2
* Mon Jun 09 2008 Adam Jackson <ajax@redhat.com> 1.4.99.902-1.20080609
Adam Tkac c3613d2
- Today's git snapshot.
Adam Tkac c3613d2
Adam Tkac c3613d2
* Tue May 06 2008 Bill Nottingham <notting@redhat.com> 1.4.99.901-29.20080415
Adam Tkac c3613d2
- rebuild against new xorg-x11-xtrans-devel (#445303)
Adam Tkac c3613d2
Adam Tkac c3613d2
* Mon May 05 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-28.20080415
Adam Tkac c3613d2
- xserver-1.5.0-compiz-clip-fix.patch: Make compiz stop blinking every
Adam Tkac c3613d2
  so often. (#441219)
Adam Tkac c3613d2
Adam Tkac c3613d2
* Mon May 05 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-27.20080415
Adam Tkac c3613d2
- xserver-1.5.0-hal-closedown.patch: Fix a crash in the hal code when
Adam Tkac c3613d2
  closing a device.
Adam Tkac c3613d2
2840dd2
* Mon Apr 28 2008 Soren Sandmann <sandmann@redhat.com>
2840dd2
- Preserve user's CFLAGS
2840dd2
Adam Tkac c3613d2
* Thu Apr 24 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-26.20080415
Adam Tkac c3613d2
- xserver-1.5.0-no-evdev-keyboards-kthnx.patch: Disable evdev for keyboards
Adam Tkac c3613d2
  even on combo devices.  This means combo devices will go through the old
Adam Tkac c3613d2
  mouse driver too.  Oh well.  (#440380)
Adam Tkac c3613d2
Adam Tkac c3613d2
* Thu Apr 24 2008 Dave Airlie <airlied@redhat.com> 1.4.99.901-25.20080415
Adam Tkac c3613d2
- xserver-1.5.0-f-spot-screws-glx.patch: stop GLX crashing X server when
Adam Tkac c3613d2
  f-spot exists (#443299)
Adam Tkac c3613d2
Adam Tkac c3613d2
* Wed Apr 23 2008 Dave Airlie <airlied@redhat.com> 1.4.99.901-24.20080415
Adam Tkac c3613d2
- xserver-1.5.0-glcore-swap-no-crashy.patch: Fix issue with googleearth
Adam Tkac c3613d2
  crashing GLcore.
Adam Tkac c3613d2
Adam Tkac c3613d2
* Tue Apr 22 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-23.20080415
Adam Tkac c3613d2
- xserver-1.5.0-stenciled-visuals.patch: Prefer visuals with a stencil
Adam Tkac c3613d2
  buffer for the default GLX visual.  (Hans de Goede, #442510)
Adam Tkac c3613d2
6596e2d
* Tue Apr 15 2008 Dave Airlie <airlied@redhat.com> 1.4.99.901-22.20080415
6596e2d
- rebase to upstream server 1.5 branch from today - drop acr quirk
6596e2d
414f865
* Thu Apr 10 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-21.20080407
414f865
- xserver-1.5.0-selinux-off-by-default.patch: Re-disable selinux by default,
414f865
  again, in a way that lets you enable it if you really want to.
414f865
5f1265d
* Wed Apr 09 2008 Dave Airlie <airlied@redhat.com> 1.4.99.901-20.20080407
5f1265d
- xserver-1.5.0-quirk-acr.patch - add quirk for another monitor.
5f1265d
31a4dee
* Tue Apr 08 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-19.20080407
31a4dee
- Today's rebase.  Patch merge, some int10 fixes.
31a4dee
cf9e4ac
* Mon Apr 07 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-18.20080401
cf9e4ac
- xorg-x11-server-Red-Hat-extramodes.patch: Remove some of the more
cf9e4ac
  implausible modes.  Cargo cult programming woo.
cf9e4ac
cf9e4ac
* Fri Apr  4 2008 Kristian Høgsberg <krh@redhat.com> 1.4.99.901-17.20080401
Kristian Høgsberg 56cd34a
- Add xserver-1.5.0-dont-bitch-about-record.patch (don't try to load
Kristian Høgsberg 56cd34a
  librecord.so when we don't build it) and
Kristian Høgsberg 56cd34a
  xserver-1.5.0-handle-failing-dri-create-screen.patch (#440491).
Kristian Høgsberg 56cd34a
Kristian Høgsberg 1f8c132
* Wed Apr  2 2008 Kristian Høgsberg <krh@redhat.com> 1.4.99.901-16.20080401
Kristian Høgsberg 1f8c132
- Fix crash when DRI2 fails to initialize and crash when initializing
Kristian Høgsberg 1f8c132
  software GL visuals (#440175).
Kristian Høgsberg 1f8c132
Kristian Høgsberg 81c5019
* Tue Apr  1 2008 Kristian Høgsberg <krh@redhat.com> 1.4.99.901-15.20080401
Kristian Høgsberg 81c5019
- Rebase to new snapshot to pull in DRI2 direct rendering work.
Kristian Høgsberg 0c86ea8
- Stop shipping librecord.so.
Kristian Høgsberg 81c5019
32f1dca
* Tue Apr 01 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-14.20080314
32f1dca
- Remove vmmouse again, way too broken.  Let this be a lesson to you:
32f1dca
  never try.
32f1dca
78970a8
* Thu Mar 27 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-13.20080314
78970a8
- archify the vmmouse logic.
78970a8
d15d772
* Thu Mar 27 2008 Dave Airlie <airlied@redhat.com> 1.4.99.901-12.20080314
d15d772
- xserver-1.5.0-fix-lsl-quirk.patch - fix the LSL quirk (#435216)
d15d772
d15d772
* Wed Mar 26 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-11.20080314
1a87a54
- xserver-1.5.0-vmmouse.patch: Use vmmouse(4) for the automagic mouse
1a87a54
  section.  It'll just fall back to the mouse(4) driver anyway if it's
1a87a54
  not a vmmouse.
1a87a54
0414809
* Tue Mar 18 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-10.20080314
0414809
- xserver-1.5.0-no-evdev-keyboards-kthnx.patch: Sorry, evdev keyboarding is
0414809
  just too broken.
0414809
6332481
* Fri Mar 14 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-9.20080314
6332481
- Today's snapshot.  Mostly just patch merge with rawhide.
6332481
cae9d22
* Thu Mar 13 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-8.20080310
cae9d22
- xserver-1.5.0-aspect-match.patch: Fix the RANDR 1.2 initial configuration
cae9d22
  heuristic for the case where the best possible mode is the first one in
cae9d22
  the first monitor's mode list.
cae9d22
aea2eff
* Thu Mar 13 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-7.20080310
aea2eff
- xserver-1.5.0-xaa-sucks: Disable XAA offscreen pixmaps by default.  They're
aea2eff
  almost always a performance loss anyway.  Use Option "XaaOffscreenPixmaps"
aea2eff
  to turn them back on.
aea2eff
95b5d85
* Thu Mar 13 2008 Dave Airlie <airlied@redhat.com> 1.4.99.901-6.20080310
95b5d85
- fix fbdev probing with no hardware to not load fbdev if pci slot claimed
95b5d85
06d6788
* Wed Mar 12 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-5.20080310
06d6788
- xserver-1.5.0-unselinux.patch: Disable selinux extension for now.
06d6788
- xserver-1.5.0-ia64.patch: Fix ia64 PCI support. (#429878)
06d6788
Kristian Høgsberg ef7113f
* Tue Mar 11 2008 Kristian Høgsberg <krh@redhat.com> 1.4.99.901-4.20080310
Kristian Høgsberg ef7113f
- Checkout the tip of the git snapshot so we get the most recent DRI2
Kristian Høgsberg ef7113f
  texture from pixmap changes in the build.  Bump mesa build requires.
Kristian Høgsberg ef7113f
48d3153
* Tue Mar 11 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-3.20080310
c5ee03e
- New 1.5 snapshot.
c5ee03e
- xserver-1.5-x86emy.patch: Fix an x86emu quirk.
c5ee03e
00257b8
* Fri Mar 07 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-1.20080307
00257b8
- Today's 1.5 snapshot.
00257b8
98afae8
* Tue Mar 04 2008 Adam Jackson <ajax@redhat.com> 1.4.99.900-0.28.20080304
98afae8
- Today's 1.5 snapshot.
98afae8
- Obsolete: xorg-x11-drv-magictouch to get it uninstalled.
98afae8
f1f010e
* Mon Mar 03 2008 Adam Jackson <ajax@redhat.com> 1.4.99.900-0.27.20080303
f1f010e
- Switch to 1.5 branch and rebase.
f1f010e
0f5f540
* Thu Feb 28 2008 Jeremy Katz <katzj@redhat.com> - 1.4.99.1-0.26
0f5f540
- Pull in another SELinux fix from upstream
0f5f540
4913c6c
* Wed Feb 27 2008 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.25
4913c6c
- Today's git snapshot.  Selinux fixes, XKB crash fix.
4913c6c
4a841c3
* Tue Feb 26 2008 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.24
4a841c3
- Today's git snapshot.  PCI cleanups, AIGLX fix.
4a841c3
63213d7
* Fri Feb 22 2008 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.23
63213d7
- Today's git snapshot.  Xinerama and XKB fixes, patch merging, etc.
63213d7
- Remove some dead patches.
63213d7
b34eb7b
* Thu Feb 21 2008 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.22
b34eb7b
- Today's git snapshot, misc bugfixes.
8302c4a
becf1b4
* Fri Feb 15 2008 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.21
becf1b4
- Today's git snapshot.  Features DRI2 and input hotplugging.  Tasty.
becf1b4
70fbb3a
* Mon Feb 11 2008 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.20
70fbb3a
- Conflict against insufficiently new libpciaccess. (#390751)
70fbb3a
Adam Tkac ee454c3
* Tue Jan 29 2008 Adam Tkac <atkac redhat com> 1.4.99.1-0.19
Adam Tkac ee454c3
- added dix/protocol.txt to source subpackage
Adam Tkac ee454c3
277f8aa
* Fri Jan 18 2008 Dave Airlie <airlied@redhat.com> 1.4.99.1-0.18
277f8aa
- cve-2007-6429.patch: Fix patch to not break java apps
277f8aa
ac5c859
* Fri Jan 18 2008 Dave Airlie <airlied@redhat.com> 1.4.99.1-0.17
ac5c859
- cve-2007-5760.patch: XFree86-Misc Extension Invalid Array Index Vulnerability
ac5c859
- cve-2007-6427.patch: XInput Extension Memory Corruption Vulnerability
ac5c859
- cve-2007-6428.patch: TOG-CUP Extension Memory Corruption Vulnerability
ac5c859
- cve-2007-6429.patch: EVI and MIT-SHM Extension Integer Overflow Vulnerability
e20d4ef
- cve-2008-0006-server-fixup.patch: PCF Font Vulnerability - this patch isn't strictly required with new version of libXfont.
ac5c859
Kristian Høgsberg 9f506ed
* Wed Jan 16 2008 Kristian Høgsberg <krh@redhat.com> 1.4.99.1-0.16
Kristian Høgsberg 9f506ed
- Add xserver-1.4.99-engage-composite-crack-mode.patch to better hide
Kristian Høgsberg 9f506ed
  protocol side effects such as loss of grabs and focus when
Kristian Høgsberg 9f506ed
  redirecting/unredirecting windows (#350271).
Kristian Høgsberg 9f506ed
9e07a0f
* Mon Jan 07 2008 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.15
9e07a0f
- Today's git snapshot.  X-SELinux!
9e07a0f
- Drop the code to migrate from /etc/X11/XF86Config*.
9e07a0f
- s/perl -p -i -e/sed -i/g
9e07a0f
e6e366c
* Mon Jan 07 2008 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.14
e6e366c
- Sync with F8 bugfixes:
e6e366c
  - xorg-x11-server-Red-Hat-extramodes.patch: Don't supply non-CVT-R timings
e6e366c
    for 1920x{1080,1200}.
e6e366c
  - xserver-1.3.0-ignore-extra-entity.patch: If a driver doesn't support
e6e366c
    secondary entities, don't fatal error just ignore and keep going.
e6e366c
  - xserver-1.3.0-randr-fix-set-rotations-xinerama.patch: Attempt to stop
e6e366c
    xinerama segfaulting randr12.
e6e366c
4edb4ea
* Mon Dec 10 2007 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.13
4edb4ea
- xserver-1.4.99-alloca-poison.patch: Fatal error on {DE,}ALLOCATE_LOCAL
4edb4ea
  so we don't build broken drivers.
4edb4ea
- xserver-1.4.99-ssh-isnt-local.patch: Try harder to disable MIT-SHM for
4edb4ea
  ssh-forwarded connections.
4edb4ea
d9126b1
* Mon Dec 03 2007 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.12
d9126b1
- xserver-1.4.99-apm-typedefs.patch: Temporary hack for broken kernels that
d9126b1
  don't publish the /dev/apm_bios types.
d9126b1
8d95713
* Wed Nov 28 2007 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.11
8d95713
- Today's rebase.
8d95713
- BR on git-core instead of git.
8d95713
- Bump mesa-source BR to cope with extended CreatePixmap signature.
8d95713
- xserver-1.4.99-openchrome.patch: Use openchrome not via when running
8d95713
  without a config file.
8d95713
9eb4ebc
* Tue Nov 13 2007 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.10
9eb4ebc
- -devel Requires: pixman-devel and libpciaccess-devel.
d828d55
8bd842d
* Mon Nov 12 2007 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.8
8bd842d
- Fix buildrequires and other buildsystem nonsense.
8bd842d
06b805d
* Fri Nov 02 2007 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.6
06b805d
- Merge a bunch of the more trivial patches upstream.
06b805d
- New git snapshot containing the merged bits.
06b805d
- Remove unused patches.
06b805d
- Drop the XFree86 obsoletes.
06b805d
494b014
* Fri Nov 02 2007 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.5
494b014
- New git snapshot that fixes Xdmx build.
494b014
- Reenable Xdmx build.
494b014
- Rebase (or drop) the rest of our patches outside the PCI code.
494b014
- Add -common subpackage for shared files.
494b014
- Rename -sdk to -devel for verisimilitude.
494b014
- Simplify the %%configure line a bit.
494b014
3941e59
* Thu Nov 01 2007 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.4
3941e59
- Update mesa and libdrm buildreqs.
3941e59
- Reenable Xephyr build.
3941e59
3941e59
* Wed Oct 31 2007 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.3
3941e59
- Only invoke git-am once.
3941e59
- Disable building mfb and cfb as well.
3941e59
afcbbe2
* Wed Oct 31 2007 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.2
afcbbe2
- BuildRequires: git.
afcbbe2
- Manage the source directory as a git repo.
afcbbe2
- Use git-am(1) to apply patches instead of %patch.
afcbbe2
- Reformat a bunch of patches to conform to git-am's rules.
afcbbe2
- Add wfb to file manifest.
afcbbe2
- Drop afb, sorry Amiga users.
afcbbe2
- Delete the SecurityPolicy man page from the buildroot, until we have a
afcbbe2
  xorg-x11-server-common.
afcbbe2
- Update to today's snapshot.
afcbbe2
6757c65
* Wed Oct 31 2007 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.1
6757c65
- Begin rebasing to git master.  It almost builds, assuming you disable
6757c65
  glx, kdrive, and dmx, and remove like half the patches.