aa81af7
# 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,
bd41e02
# check out the master branch, pull, cherry-pick, and push.
afcbbe2
48dc8f4
#global gitdate 20131118
48dc8f4
%global stable_abi 1
243e82a
3a2d311
%if !0%{?gitdate} || %{stable_abi}
243e82a
# Released ABI versions.  Have to keep these manually in sync with the
243e82a
# source because rpm is a terrible language.
50633b0
%global ansic_major 0
50633b0
%global ansic_minor 4
48dc8f4
%global videodrv_major 15
48dc8f4
%global videodrv_minor 0
48dc8f4
%global xinput_major 20
48dc8f4
%global xinput_minor 0
48dc8f4
%global extension_major 8
50633b0
%global extension_minor 0
813c021
%endif
a8fb842
813c021
%if 0%{?gitdate}
243e82a
# For git snapshots, use date for major and a serial number for minor
50633b0
%global minor_serial 0
50633b0
%global git_ansic_major %{gitdate}
50633b0
%global git_ansic_minor %{minor_serial}
50633b0
%global git_videodrv_major %{gitdate}
50633b0
%global git_videodrv_minor %{minor_serial}
50633b0
%global git_xinput_major %{gitdate}
50633b0
%global git_xinput_minor %{minor_serial}
50633b0
%global git_extension_major %{gitdate}
50633b0
%global git_extension_minor %{minor_serial}
243e82a
%endif
243e82a
50633b0
%global pkgname xorg-server
Kristian Høgsberg ce50e2c
mharris 683564b
Summary:   X.Org X11 X server
mharris dc2469d
Name:      xorg-x11-server
88eb91a
Version:   1.15.0
e366185
Release:   4%{?gitdate:.%{gitdate}}%{dist}
mharris dc2469d
URL:       http://www.x.org
a133a7b
License:   MIT
mharris dc2469d
Group:     User Interface/X
mharris 83c9ed8
f54fe15
#VCS:      git:git://git.freedesktop.org/git/xorg/xserver
37a43ab
%if 0%{?gitdate}
6757c65
# git snapshot.  to recreate, run:
afcbbe2
# ./make-git-snapshot.sh `cat commitid`
973c76f
#Source0:   xorg-server-%{gitdate}.tar.xz
973c76f
Source0:   http://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.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
eee5ef9
3cdd9e5
Source4:   10-quirks.conf
mharris 83c9ed8
611fa3c
Source10:   xserver.pamd
611fa3c
b87ee0a
# "useful" xvfb-run script
1b89ad9
Source20:  http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh
1b89ad9
a8fb842
# for requires generation in drivers
d7ae664
Source30: xserver-sdk-abi-requires.release
d7ae664
Source31: xserver-sdk-abi-requires.git
d7ae664
d7ae664
# maintainer convenience script
d7ae664
Source40: driver-abi-rebuild.sh
aa9281b
973c76f
# xwayland.  trivial rebase onto master:
48dc8f4
# http://cgit.freedesktop.org/~ajax/xserver/log/?h=wayland-f21
488b3f2
Patch0101: 0001-dbe-Cleanup-in-CloseScreen-hook-not-ext-CloseDown.patch
488b3f2
Patch0102: 0002-xkb-Add-struct-XkbCompContext.patch
488b3f2
Patch0103: 0003-xkb-Split-out-code-to-start-and-finish-xkbcomp.patch
488b3f2
Patch0104: 0004-xkb-Add-XkbCompileKeymapFromString.patch
0ba3053
Patch0105: 0005-os-Add-a-function-to-create-a-client-for-an-fd.patch
0ba3053
Patch0106: 0006-Export-xf86NewInputDevice-and-xf86AllocateInput.patch
48dc8f4
Patch0107: 0007-Add-redirect-window-for-input-device-feature.patch
48dc8f4
Patch0108: 0008-dri2-Introduce-a-third-version-of-the-AuthMagic-func.patch
48dc8f4
Patch0109: 0009-Add-xwayland-module.patch
48dc8f4
Patch0110: 0010-xwayland-Add-a-HW_WAYLAND-flag-to-let-drivers-explic.patch
48dc8f4
Patch0111: 0011-xwayland-shm-don-t-create-alpha-buffers-if-the-windo.patch
48dc8f4
Patch0112: 0012-xwayland-handle-global-object-destruction.patch
48dc8f4
Patch0113: 0013-xwayland-add-support-for-multiple-outputs.patch
48dc8f4
Patch0114: 0014-xwayland-Probe-outputs-on-preinit.patch
48dc8f4
Patch0115: 0015-XFree86-Load-wlshm-driver-as-fallback-for-Wayland.patch
48dc8f4
Patch0116: 0016-XWayland-Don-t-send-out-of-bounds-damage-co-ordinate.patch
48dc8f4
Patch0117: 0017-xwayland-Introduce-an-auto-mode-for-enable-wayland.patch
48dc8f4
Patch0118: 0018-XWayland-Don-t-hardcode-DRM-libs-and-lwayland-client.patch
48dc8f4
Patch0119: 0019-XWayland-Support-16bpp-X-surfaces-in-DRM-SHM.patch
48dc8f4
Patch0120: 0020-xwayland-Remove-Xdnd-selection-watching-code.patch
48dc8f4
Patch0121: 0021-xf86Init-trim-out-non-wayland-capable-servers-from-d.patch
48dc8f4
Patch0122: 0022-Add-XORG_WAYLAND-symbol-to-xorg-config.h.in.patch
48dc8f4
Patch0123: 0023-Fix-fallback-loading-of-the-wayland-driver.patch
48dc8f4
Patch0124: 0024-xwayland-Don-t-include-xorg-server.h.patch
48dc8f4
Patch0125: 0025-os-Don-t-include-xorg-server.h.patch
48dc8f4
Patch0126: 0026-os-Also-define-ListenOnOpenFD-and-AddClientOnOpenFD-.patch
48dc8f4
Patch0127: 0027-xwayland-Remove-unused-variables.patch
48dc8f4
Patch0128: 0028-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch
48dc8f4
Patch0129: 0029-XWayland-Don-t-commit-empty-surfaces.patch
48dc8f4
Patch0130: 0030-xwayland-Also-look-for-wlglamor.patch
48dc8f4
Patch0131: 0031-xwayland-Add-wlglamor-the-right-way.patch
48dc8f4
Patch0132: 0032-xwayland-Don-t-redirect-windows-leave-it-to-the-wm.patch
48dc8f4
Patch0133: 0033-xwayland-Fix-hidden-cursor.patch
48dc8f4
Patch0134: 0034-xkb-Repurpose-XkbCopyDeviceKeymap-to-apply-a-given-k.patch
48dc8f4
Patch0135: 0035-xkb-Factor-out-a-function-to-copy-a-keymap-s-control.patch
48dc8f4
Patch0136: 0036-xwayland-Handle-keymap-changes.patch
48dc8f4
Patch0137: 0037-xwayland-Fix-re-wrapping-of-RealizeWindow.patch
48dc8f4
Patch0138: 0038-xwayland-Adapt-to-1.15-Damage-API.patch
178065c
# restore ABI
178065c
Patch0200: 0001-mustard-Restore-XkbCopyDeviceKeymap.patch
e366185
# Submitted upstream: http://lists.freedesktop.org/archives/wayland-devel/2014-February/013218.html
e366185
# but likely to be rendered irrelevant by pending present support:
e366185
# http://lists.freedesktop.org/archives/wayland-devel/2014-February/013219.html
e366185
# and queried as to correctness:
e366185
# http://lists.freedesktop.org/archives/wayland-devel/2014-February/013227.html
e366185
# so may wind up never being merged. View with concern. Adding just because
e366185
# even this imperfect patch is probably better than XWayland being entirely
e366185
# busted in Rawhide:
e366185
# https://bugzilla.gnome.org/show_bug.cgi?id=724443
e366185
# https://bugzilla.redhat.com/show_bug.cgi?id=1065109
e366185
# - adamw 2014/02
e366185
Patch0201: xwayland_destroy_wl_buffers.patch
973c76f
18de5fa
# Trivial things to never merge upstream ever:
4edb4ea
# This really could be done prettier.
Peter Hutterer 4c175ee
Patch5002: xserver-1.4.99-ssh-isnt-local.patch
35b909d
bce3795
# ajax needs to upstream this
f76b04d
Patch6030: xserver-1.6.99-right-of.patch
73b55c8
#Patch6044: xserver-1.6.99-hush-prerelease-warning.patch
704bf42
f8a5524
Patch7025: 0001-Always-install-vbe-and-int10-sdk-headers.patch
a33d443
359cc84
# do not upstream - do not even use here yet
fc48514
Patch7027: xserver-autobind-hotplug.patch
fc48514
7d6636e
# Fix multiple monitors in reverse optimus configurations
7d6636e
Patch8040: 0001-rrcrtc-brackets-are-hard-lets-go-shopping.patch
7d6636e
Patch8041: 0001-pixmap-fix-reverse-optimus-support-with-multiple-hea.patch
Peter Hutterer 5e49381
973c76f
# extra magic to be upstreamed
973c76f
Patch9001: 0001-xfree86-Only-look-at-wayland-capable-drivers-when-wa.patch
973c76f
Patch9002: 0001-xwayland-Just-send-the-bounding-box-of-the-damage.patch
Peter Hutterer 1dc0584
b662779
# submitted: http://lists.x.org/archives/xorg-devel/2013-October/037996.html
b662779
Patch9100: exa-only-draw-valid-trapezoids.patch
b662779
Peter Hutterer 9804384
# in pull request http://patchwork.freedesktop.org/patch/19468/
Peter Hutterer 9804384
Patch9103: 0001-dix-fix-button-state-check-before-changing-a-button-.patch
Peter Hutterer 9804384
50633b0
%global moduledir	%{_libdir}/xorg/modules
50633b0
%global drimoduledir	%{_libdir}/dri
50633b0
%global sdkdir		%{_includedir}/xorg
mharris 9e7c1dd
4febb50
%ifarch s390 s390x
50633b0
%global with_hw_servers 0
f7f3689
%else
50633b0
%global with_hw_servers 1
mharris 9e7c1dd
%endif
mharris dc2469d
f7f3689
%if %{with_hw_servers}
50633b0
%global enable_xorg --enable-xorg
f7f3689
%else
50633b0
%global enable_xorg --disable-xorg
mharris 382d04d
%endif
mharris 382d04d
48dc8f4
%ifnarch %{ix86} x86_64
50633b0
%global no_int10 --disable-vbe --disable-int10-module
e862ba8
%endif
e862ba8
50633b0
%global kdrive --enable-kdrive --enable-xephyr --disable-xfake --disable-xfbdev
50633b0
%global xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg}
f7f3689
e57b98d
BuildRequires: systemtap-sdt-devel
8d95713
BuildRequires: git-core
5fadc5e
BuildRequires: automake autoconf libtool pkgconfig
973c76f
BuildRequires: xorg-x11-util-macros >= 1.17
78e07cf
48dc8f4
BuildRequires: xorg-x11-proto-devel >= 7.7-8
6260157
BuildRequires: xorg-x11-font-utils >= 7.2-11
7222836
48dc8f4
BuildRequires: xorg-x11-xtrans-devel >= 1.3.2
3941e59
BuildRequires: libXfont-devel libXau-devel libxkbfile-devel libXres-devel
3941e59
BuildRequires: libfontenc-devel libXtst-devel libXdmcp-devel
3941e59
BuildRequires: libX11-devel libXext-devel
520bba9
BuildRequires: libXinerama-devel libXi-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
d4760aa
%if !0%{?rhel}
15e2ab3
BuildRequires: wayland-devel pkgconfig(wayland-client)
48dc8f4
BuildRequires: pkgconfig(xshmfence) >= 1.1
d4760aa
%endif
d4760aa
BuildRequires: libXv-devel
973c76f
BuildRequires: pixman-devel >= 0.30.0
973c76f
BuildRequires: libpciaccess-devel >= 0.13.1 openssl-devel byacc flex
973c76f
BuildRequires: mesa-libGL-devel >= 9.2
f7f3689
# XXX silly...
a1e98f1
BuildRequires: libdrm-devel >= 2.4.0 kernel-headers
869288f
5280401
BuildRequires: audit-libs-devel libselinux-devel >= 2.0.86-1
f21d354
BuildRequires: libudev-devel
2b64932
%if !0%{?rhel}
e4a6a65
# libunwind is Exclusive for the following arches
bcd21a0
%ifarch aarch64 %{arm} hppa ia64 mips ppc ppc64 %{ix86} x86_64
Peter Hutterer 64241ad
BuildRequires: libunwind-devel
2b64932
%endif
e4a6a65
%endif
869288f
973c76f
BuildRequires: pkgconfig(xcb-aux) pkgconfig(xcb-image) pkgconfig(xcb-icccm)
973c76f
BuildRequires: pkgconfig(xcb-keysyms)
973c76f
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
973c76f
Requires: pixman >= 0.30.0
cdd3d22
Requires: xkeyboard-config xkbcomp
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
813c021
%if !0%{?gitdate} || %{stable_abi}
a8fb842
Provides: xserver-abi(ansic-%{ansic_major}) = %{ansic_minor}
a8fb842
Provides: xserver-abi(videodrv-%{videodrv_major}) = %{videodrv_minor}
a8fb842
Provides: xserver-abi(xinput-%{xinput_major}) = %{xinput_minor}
a8fb842
Provides: xserver-abi(extension-%{extension_major}) = %{extension_minor}
813c021
%endif
813c021
%if 0%{?gitdate}
813c021
Provides: xserver-abi(ansic-%{git_ansic_major}) = %{git_ansic_minor}
813c021
Provides: xserver-abi(videodrv-%{git_videodrv_major}) = %{git_videodrv_minor}
813c021
Provides: xserver-abi(xinput-%{git_xinput_major}) = %{git_xinput_minor}
813c021
Provides: xserver-abi(extension-%{git_extension_major}) = %{git_extension_minor}
813c021
%endif
d4760aa
%if !0%{?rhel}
15e2ab3
# this is expected to be temporary, since eventually it will be implied by
15e2ab3
# the server version.  the serial number here is just paranoia in case we
15e2ab3
# need to do something lockstep between now and upstream merge
15e2ab3
Provides: xserver-abi(xwayland) = 1
d4760aa
%endif
813c021
625d26e
%if 0%{?fedora} > 17
625d26e
# Dropped from F18, use a video card instead
05e96c7
# in F17 updates-testing: 0.7.4-1.fc17
625d26e
Obsoletes: xorg-x11-drv-ark <= 0.7.3-15.fc17
625d26e
Obsoletes: xorg-x11-drv-chips <= 1.2.4-8.fc18
625d26e
Obsoletes: xorg-x11-drv-s3 <= 0.6.3-14.fc17
625d26e
Obsoletes: xorg-x11-drv-tseng <= 1.2.4-12.fc17
625d26e
%endif
625d26e
a8fb842
494b014
Requires: xorg-x11-server-common >= %{version}-%{release}
f21d354
Requires: system-setup-keyboard
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
494b014
Requires: xorg-x11-server-common >= %{version}-%{release}
mharris dc2469d
Provides: Xnest
mharris dc2469d
mharris dc2469d
%description Xnest
48dc8f4
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
mharris dc2469d
%package Xdmx
mharris dc2469d
Summary: Distributed Multihead X Server and utilities
mharris dc2469d
Group: User Interface/X
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.
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
494b014
Requires: xorg-x11-server-common >= %{version}-%{release}
f79834a
# required for xvfb-run
f79834a
Requires: xorg-x11-xauth
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
48dc8f4
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
mharris 382d04d
Requires: xorg-x11-util-macros
mharris 2025148
Requires: xorg-x11-proto-devel
9eb4ebc
Requires: pkgconfig pixman-devel libpciaccess-devel
7345582
Provides: xorg-x11-server-static
74b976e
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 2766b34
BuildArch: noarch
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
973c76f
#setup -q -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
973c76f
%setup -q -n %{pkgname}-%{version}
6757c65
973c76f
#if 0%{?gitdate}
973c76f
%if 0
Kristian Høgsberg ef7113f
git checkout -b fedora
6757c65
sed -i 's/git/&+ssh/' .git/config
520bba9
if [ -z "$GIT_COMMITTER_NAME" ]; then
520bba9
    git config user.email "x@fedoraproject.org"
520bba9
    git config user.name "Fedora X Ninjas"
520bba9
fi
afcbbe2
%else
520bba9
git init
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.
a37d437
git am -p1 %{patches} < /dev/null
a8fb842
813c021
%if %{with_hw_servers} && 0%{?stable_abi}
a8fb842
# check the ABI in the source against what we expect.
a8fb842
getmajor() {
a8fb842
    grep -i ^#define.ABI.$1_VERSION hw/xfree86/common/xf86Module.h |
a8fb842
    tr '(),' '   ' | awk '{ print $4 }'
a8fb842
}
a8fb842
a8fb842
getminor() {
a8fb842
    grep -i ^#define.ABI.$1_VERSION hw/xfree86/common/xf86Module.h |
a8fb842
    tr '(),' '   ' | awk '{ print $5 }'
a8fb842
}
a8fb842
a8fb842
test `getmajor ansic` == %{ansic_major}
a8fb842
test `getminor ansic` == %{ansic_minor}
a8fb842
test `getmajor videodrv` == %{videodrv_major}
a8fb842
test `getminor videodrv` == %{videodrv_minor}
a8fb842
test `getmajor xinput` == %{xinput_major}
a8fb842
test `getminor xinput` == %{xinput_minor}
a8fb842
test `getmajor extension` == %{extension_major}
a8fb842
test `getminor extension` == %{extension_minor}
a8fb842
a8fb842
%endif
38f17a6
mharris dc2469d
%build
mharris aa15493
50633b0
%global default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
fed3940
662973f
%if %{with_hw_servers}
0988cc4
%global dri_flags --with-dri-driver-path=%{drimoduledir} --enable-dri2 %{?!rhel:--enable-dri3}
662973f
%else
50633b0
%global dri_flags --disable-dri
662973f
%endif
662973f
d62a092
%if 0%{?fedora}
50633b0
%global bodhi_flags --with-vendor-name="Fedora Project"
d4760aa
%global wayland --with-wayland
d4760aa
%endif
d4760aa
d4760aa
# ick
d4760aa
%if 0%{?rhel}
d4760aa
sed -i 's/WAYLAND_SCANNER_RULES.*//g' configure.ac
d62a092
%endif
d62a092
f7f3689
# --with-pie ?
Peter Hutterer a035615
autoreconf -f -v --install || exit 1
c9ff459
# export CFLAGS="${RPM_OPT_FLAGS}"
48dc8f4
# XXX without dtrace
d4760aa
06b805d
%configure --enable-maintainer-mode %{xservers} \
mharris 683564b
	--disable-static \
998c064
	--with-pic \
e862ba8
	%{?no_int10} --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}" \
d62a092
	--with-os-name="$(hostname -s) $(uname -r)" \
mharris 382d04d
	--with-xkb-output=%{_localstatedir}/lib/xkb \
48dc8f4
        --without-dtrace \
488b3f2
	--disable-linux-acpi --disable-linux-apm \
48dc8f4
	--enable-xselinux --enable-record --enable-present \
f21d354
	--enable-config-udev \
f936b2f
	--disable-unit-tests \
d4760aa
	%{?wayland} \
d62a092
	%{dri_flags} %{?bodhi_flags} \
a549381
	${CONFIGURE}
520bba9
        
704bf42
make V=1 %{?_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}
d7ae664
rm -rf $RPM_BUILD_ROOT%{_libdir}/xorg/modules/multimedia/
mharris dc2469d
mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
mharris dc2469d
611fa3c
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
611fa3c
install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xserver
611fa3c
eee5ef9
mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
eee5ef9
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
eee5ef9
eee5ef9
# make sure the (empty) /etc/X11/xorg.conf.d is there, system-setup-keyboard
eee5ef9
# relies on it more or less.
eee5ef9
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
f21d354
a8fb842
mkdir -p $RPM_BUILD_ROOT%{_bindir}
243e82a
10e9e1a
%if %{stable_abi}
Peter Hutterer 70b4c71
install -m 755 %{SOURCE30} $RPM_BUILD_ROOT%{_bindir}/xserver-sdk-abi-requires
Peter Hutterer 70b4c71
%else
1f3418b
sed -e s/@MAJOR@/%{gitdate}/g -e s/@MINOR@/%{minor_serial}/g %{SOURCE31} > \
243e82a
    $RPM_BUILD_ROOT%{_bindir}/xserver-sdk-abi-requires
d11511e
chmod 755 $RPM_BUILD_ROOT%{_bindir}/xserver-sdk-abi-requires
243e82a
%endif
a8fb842
mharris a30689e
%endif
mharris 0af35d4
9d53449
# Make the source package
50633b0
%global xserver_source_dir %{_datadir}/xorg-x11-server-source
50633b0
%global inst_srcdir %{buildroot}/%{xserver_source_dir}
82739d8
mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/{xquartz/bundle,xfree86/common}}
Adam Tkac 07b355c
mkdir -p %{inst_srcdir}/{hw/dmx/doc,man,doc,hw/dmx/doxygen}
Adam Tkac f3bef3a
cp {,%{inst_srcdir}/}hw/xquartz/bundle/cpprules.in
82739d8
cp {,%{inst_srcdir}/}man/Xserver.man
Adam Tkac 46db593
cp {,%{inst_srcdir}/}doc/smartsched
Adam Tkac 07b355c
cp {,%{inst_srcdir}/}hw/dmx/doxygen/doxygen.conf.in
Adam Tkac 07b355c
cp {,%{inst_srcdir}/}xserver.ent.in
9d53449
cp xkb/README.compiled %{inst_srcdir}/xkb
520bba9
cp hw/xfree86/xorgconf.cpp %{inst_srcdir}/hw/xfree86
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 -)
7a95650
# SLEDGEHAMMER
7a95650
find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
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 -- || :
662973f
%if !%{with_hw_servers}
662973f
    rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xorg-server.pc
662973f
    rm -f $RPM_BUILD_ROOT%{_datadir}/aclocal/xorg-server.m4
06dd782
    rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/xorg-server
662973f
%endif
c11d4db
# wtf
48dc8f4
%ifnarch %{ix86} x86_64
c11d4db
    rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/lib{int10,vbe}.so
c11d4db
%endif
mharris 382d04d
}
mharris 382d04d
mharris dc2469d
%clean
mharris dc2469d
rm -rf $RPM_BUILD_ROOT
mharris dc2469d
mharris 3a3aa5e
494b014
%files common
494b014
%defattr(-,root,root,-)
ed9d6ac
%doc COPYING
494b014
%{_mandir}/man1/Xserver.1*
9e07a0f
%{_libdir}/xorg/protocol.txt
494b014
%dir %{_localstatedir}/lib/xkb
494b014
%{_localstatedir}/lib/xkb/README.compiled
494b014
2c6c5a5
%if 1
50633b0
%global Xorgperms %attr(4755, root, root)
3cf5861
%else
2c6c5a5
# disable until module loading is audited
50633b0
%global Xorgperms %attr(0711,root,root) %caps(cap_sys_admin,cap_sys_rawio,cap_dac_override=pe)
3cf5861
%endif
mharris dc2469d
mharris a30689e
%if %{with_hw_servers}
mharris dc2469d
%files Xorg
mharris dc2469d
%defattr(-,root,root,-)
611fa3c
%config %attr(0644,root,root) %{_sysconfdir}/pam.d/xserver
mharris af712a9
%{_bindir}/X
3cf5861
%{Xorgperms} %{_bindir}/Xorg
46fa1ed
%{_bindir}/cvt
59994a9
%{_bindir}/gtf
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
d4760aa
%if !0%{?rhel}
15e2ab3
%{_libdir}/xorg/modules/extensions/libxwayland.so
d4760aa
%endif
mharris dc2469d
%dir %{_libdir}/xorg/modules/input
c22de5d
%{_libdir}/xorg/modules/libfbdevhw.so
mharris 382d04d
%{_libdir}/xorg/modules/libexa.so
mharris 382d04d
%{_libdir}/xorg/modules/libfb.so
mharris 382d04d
%{_libdir}/xorg/modules/libshadow.so
mharris 382d04d
%{_libdir}/xorg/modules/libshadowfb.so
mharris 382d04d
%{_libdir}/xorg/modules/libvgahw.so
afcbbe2
%{_libdir}/xorg/modules/libwfb.so
48dc8f4
%ifarch %{ix86} x86_64
e862ba8
%{_libdir}/xorg/modules/libint10.so
e862ba8
%{_libdir}/xorg/modules/libvbe.so
e862ba8
%endif
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*
Peter Hutterer 379416a
%{_mandir}/man5/xorg.conf.d.5*
eee5ef9
%dir %{_sysconfdir}/X11/xorg.conf.d
eee5ef9
%dir %{_datadir}/X11/xorg.conf.d
eee5ef9
%{_datadir}/X11/xorg.conf.d/10-evdev.conf
eee5ef9
%{_datadir}/X11/xorg.conf.d/10-quirks.conf
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
12af377
%files Xdmx
12af377
%defattr(-,root,root,-)
12af377
%{_bindir}/Xdmx
12af377
%{_bindir}/dmxaddinput
12af377
%{_bindir}/dmxaddscreen
12af377
%{_bindir}/dmxreconfig
12af377
%{_bindir}/dmxresize
12af377
%{_bindir}/dmxrminput
12af377
%{_bindir}/dmxrmscreen
12af377
%{_bindir}/dmxtodmx
12af377
%{_bindir}/dmxwininfo
12af377
%{_bindir}/vdltodmx
f342378
%{_bindir}/dmxinfo
12af377
%{_bindir}/xdmxconfig
12af377
%{_mandir}/man1/Xdmx.1*
12af377
%{_mandir}/man1/dmxtodmx.1*
12af377
%{_mandir}/man1/vdltodmx.1*
12af377
%{_mandir}/man1/xdmxconfig.1*
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
ed9d6ac
%doc COPYING
48dc8f4
%defattr(-,root,root,-)
48dc8f4
#{_docdir}/xorg-server
a8fb842
%{_bindir}/xserver-sdk-abi-requires
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
%changelog
e366185
* Mon Feb 17 2014 Adam Williamson <awilliam@redhat.com> - 1.15.0-4
e366185
- fix xwayland crash under mutter (RH #1065109 , BGO #724443)
e366185
Peter Hutterer 9804384
* Wed Feb 05 2014 Peter Hutterer <peter.hutterer@redhat.com> 1.15.0-3
Peter Hutterer 9804384
- Prevent out-of-bounds access in check_butmap_change (#1061466)
Peter Hutterer 9804384
b662779
* Tue Jan 14 2014 Adam Jackson <ajax@redhat.com> 1.15.0-2
b662779
- exa-only-draw-valid-trapezoids.patch: Fix crash in exa.
b662779
88eb91a
* Mon Jan 13 2014 Adam Jackson <ajax@redhat.com> 1.15.0-1
88eb91a
- xserver 1.15.0
88eb91a
48dc8f4
* Tue Dec 17 2013 Adam Jackson <ajax@redhat.com> 1.14.99.904-1
48dc8f4
- 1.15RC4
48dc8f4
- Re-disable int10 on arm
48dc8f4
bcd21a0
* Mon Dec  2 2013 Peter Robinson <pbrobinson@fedoraproject.org> 1.14.99.902-2
bcd21a0
- Add aarch64 to platforms that have libunwind
bcd21a0
f29b368
* Wed Nov 20 2013 Adam Jackson <ajax@redhat.com> 1.14.99.902-1
0ba3053
- 1.15RC2
0ba3053
0550dec
* Mon Nov 18 2013 Adam Jackson <ajax@redhat.com> 1.14.99.901-6
0550dec
- Prefer fbdev to vesa, fixes fallback path on UEFI
0550dec
178065c
* Fri Nov 08 2013 Adam Jackson <ajax@redhat.com> 1.14.99.901-5
178065c
- Restore XkbCopyDeviceKeymap for (older) tigervnc
178065c
2ea4869
* Fri Nov 08 2013 Adam Jackson <ajax@redhat.com> 1.14.99.901-4
2ea4869
- Explicitly enable DRI2
2ea4869
d3a71ef
* Thu Nov 07 2013 Adam Jackson <ajax@redhat.com> 1.14.99.901-3
d3a71ef
- Merge Xinerama+{Damage,Render,Composite} fix series
d3a71ef
a275b7e
* Thu Nov 07 2013 Adam Jackson <ajax@redhat.com> 1.14.99.901-2
a275b7e
- Fix build with --disable-present
a275b7e
f936b2f
* Thu Nov 07 2013 Adam Jackson 
f936b2f
- Don't bother trying to build the unit tests for now
f936b2f
488b3f2
* Wed Nov 06 2013 Adam Jackson <ajax@redhat.com> 1.14.99.901-1
488b3f2
- 1.15RC1
488b3f2
d4760aa
* Mon Oct 28 2013 Adam Jackson <ajax@redhat.com> 1.14.99.3-2
d4760aa
- Don't build xwayland in RHEL
d4760aa
973c76f
* Fri Oct 25 2013 Adam Jackson <ajax@redhat.com> 1.14.99.3-1
973c76f
- xserver 1.14.99.3
973c76f
- xwayland branch refresh
973c76f
- Drop some F17-era Obsoletes
973c76f
- Update BuildReqs to match reality
973c76f
Peter Hutterer 1dc0584
* Wed Oct 23 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.3-6
Peter Hutterer 1dc0584
- Fix Xdmx cursor jumps (#1019821)
Peter Hutterer 1dc0584
75e761f
* Tue Oct 08 2013 Adam Jackson <ajax@redhat.com> 1.14.3-5
75e761f
- Snap wayland damage reports to the bounding box
75e761f
b147e31
* Thu Oct 03 2013 Adam Jackson <ajax@redhat.com> 1.14.3-4
b147e31
- Fix up fixing up the driver list after filtering out non-wayland
b147e31
3883152
* Wed Oct 02 2013 Adam Jackson <ajax@redhat.com> 1.14.3-3
3883152
- Only look at wayland-capable drivers when run with -wayland
3883152
15e2ab3
* Mon Sep 23 2013 Adam Jackson <ajax@redhat.com> 1.14.3-2
15e2ab3
- xwayland support
15e2ab3
Peter Hutterer 646abab
* Mon Sep 16 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.3-1
Peter Hutterer 646abab
- xserver 1.14.3
Peter Hutterer 646abab
Peter Hutterer 5e49381
* Tue Jul 30 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.2-9
Peter Hutterer 5e49381
- Fix active touch grabs, second touchpoint didn't get sent to client
Peter Hutterer 5e49381
- Fix version mismatch for XI 2.2+ clients (where a library supports > 2.2
Peter Hutterer 5e49381
  but another version than the originally requested one).
Peter Hutterer 5e49381
7d6636e
* Tue Jul 30 2013 Dave Airlie <airlied@redhat.com> 1.14.2-8
7d6636e
- fixes for multi-monitor reverse optimus
7d6636e
Peter Hutterer b89d797
* Mon Jul 22 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.2-7
Peter Hutterer b89d797
- Fix erroneous valuator 1 coordinate when an absolute device in relative
Peter Hutterer b89d797
  mode doesn't send y coordinates.
Peter Hutterer b89d797
Peter Hutterer 045334d
* Fri Jul 19 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.2-6
Peter Hutterer 045334d
- Add new version of the resolution-based scaling patch - scale y down
Peter Hutterer 045334d
  instead of x up. That gives almost the same behaviour as current
Peter Hutterer 045334d
  synaptics. Drop the synaptics quirk, this needs to be now removed from the
Peter Hutterer 045334d
  driver.
Peter Hutterer 045334d
Peter Hutterer 0e1e01a
* Mon Jul 15 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.2-5
Peter Hutterer 0e1e01a
- Fix logspam when trying to free a non-existant grab.
Peter Hutterer 0e1e01a
- Update touch patch to upstream version (from fdo #66720)
Peter Hutterer 0e1e01a
- re-add xephyr resizable patch, got lost in rebase (#976995)
Peter Hutterer 0e1e01a
Dave Airlie 9dc0b02
* Fri Jul 12 2013 Dave Airlie <airlied@redhat.com> 1.14.2-4
Dave Airlie 9dc0b02
- reapply dropped patch to fix regression (#981953)
Dave Airlie 9dc0b02
Peter Hutterer 9ed6772
* Tue Jul 09 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.2-3
Peter Hutterer 9ed6772
- Fix crash on 32-bit with virtual box guest additions (#972095)
Peter Hutterer 9ed6772
Peter Hutterer 198a41a
* Tue Jul 09 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.2-2
Peter Hutterer 198a41a
- Fix crash in gnome-shell when tapping a menu twice (fdo #66720)
Peter Hutterer 198a41a
Peter Hutterer d706dd8
* Thu Jul 04 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.2-1
Peter Hutterer d706dd8
- xorg-server 1.4.2
Peter Hutterer d706dd8
- drop merged patches
Peter Hutterer d706dd8
- Add a quirk to set the synaptics resolution to 0 by default. The pre-scale
Peter Hutterer d706dd8
  patch in the server clashes with synaptics inaccurate resolution numbers,
Peter Hutterer d706dd8
  causing the touchpad movement to be stunted.
Peter Hutterer d706dd8
Peter Hutterer a47080a
* Thu Jun 06 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.1.901-2
Peter Hutterer a47080a
- Backport the touch grab race condition patches from fdo #56578
Peter Hutterer a47080a
Peter Hutterer 6ed547a
* Thu Jun 06 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.1.901-1
Peter Hutterer 6ed547a
- xserver 1.14.2RC1
Peter Hutterer 6ed547a
Peter Hutterer 41c893e
* Tue Jun 04 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.1-4
Peter Hutterer 41c893e
- Update quirks for trackballs and the La-VIEW Technology Naos 5000 mouse
Peter Hutterer 41c893e
10c9b0a
* Sun Jun 02 2013 Adam Jackson <ajax@redhat.com> 1.14.1-3
10c9b0a
- Backport an arm/ppc crash fix from master (#965749)
10c9b0a
Peter Hutterer be419c1
* Tue May 14 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.1-2
Peter Hutterer be419c1
- Add -resizeable option to Xephyr, enable by default (#962572)
Peter Hutterer be419c1
- Fix crash on 24bpp host server (#518960)
Peter Hutterer be419c1
Dave Airlie 02cbf43
* Mon May 06 2013 Dave Airlie <airlied@redhat.com> 1.14.1-1
Dave Airlie 02cbf43
- upstream rebase
Dave Airlie 02cbf43
- reorganise the randr/gpu screen patches + backports
Dave Airlie 02cbf43
Peter Hutterer c2b476e
* Wed Apr 17 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.0-6
Peter Hutterer b3223c2
- CVE-2013-1940: Fix xf86FlushInput() to drain evdev events
Peter Hutterer b3223c2
  (#950438, #952949)
Peter Hutterer b3223c2
Dave Airlie 0bc3571
* Fri Apr 12 2013 Dave Airlie <airlied@redhat.com> 1.14.0-5
Dave Airlie 0bc3571
- reenable reverse optimus and some missing patch from F18
Dave Airlie 0bc3571
Dave Airlie becc53e
* Fri Apr 12 2013 Dave Airlie <airlied@redhat.com> 1.14.0-4
Dave Airlie becc53e
- fix bug with GPU hotplugging while VT switched
Dave Airlie b644e66
- reenable reverse optimus and some missing patch from F18
Dave Airlie becc53e
e4a6a65
* Fri Mar 22 2013 Dan Horák <dan@danny.cz> 1.14.0-3
4fdc2c7
- libunwind exists only on selected arches
e4a6a65
4febb50
* Thu Mar 14 2013 Adam Jackson <ajax@redhat.com> 1.14.0-2
2b64932
- Different RHEL customization
4febb50
Peter Hutterer cd9fdcb
* Thu Mar 07 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.0-1
Peter Hutterer cd9fdcb
- xserver 1.14
Peter Hutterer cd9fdcb
Peter Hutterer 64241ad
* Wed Mar 06 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.13.99.902-2
Peter Hutterer 64241ad
- Use libunwind for backtraces
Peter Hutterer 64241ad
2871f41
* Fri Feb 15 2013 Adam Jackson <ajax@redhat.com>
2871f41
- Drop -sdk Prov/Obs, changed to -devel in F9
2871f41
- Drop xorg-x11-X* Obsoletes, leftover from the modular transition in FC5
2871f41
Peter Hutterer 6588878
* Fri Feb 15 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.13.99.902-1
Peter Hutterer 6588878
- xserver 1.14RC2 from git
Peter Hutterer 6588878
Peter Hutterer a32adcb
* Thu Feb 14 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.13.99.901-5
Peter Hutterer a32adcb
- Fix scrolling for Evoluent Vertical Mouse 3 (#612140#c20)
Peter Hutterer a32adcb
Peter Hutterer 74a627e
* Fri Jan 25 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.13.99.901-4
Peter Hutterer 74a627e
- Add quirk for Evoluent Vertical Mouse 3, button mapping is quirky
Peter Hutterer 74a627e
  (#612140)
Peter Hutterer 74a627e
f8bb630
* Wed Jan 23 2013 Adam Jackson <ajax@redhat.com> 1.13.99.901-3
f8bb630
- Bump XI minor for barriers
f8bb630
4b53f71
* Wed Jan 09 2013 Adam Jackson <ajax@redhat.com> 1.13.99.901-2
4b53f71
- Pick up fixes from git
4b53f71
bd41e02
* Wed Jan 09 2013 Adam Jackson <ajax@redhat.com> 1.13.99.901-1
bd41e02
- xserver 1.14RC1
bd41e02
Peter Hutterer d0ca88f
* Tue Dec 18 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.13.1-1
Peter Hutterer d0ca88f
- server 1.13.1
Peter Hutterer d0ca88f
2f360aa
* Fri Dec 14 2012 Adam Jackson <ajax@redhat.com> 1.13.0-15
2f360aa
- Cherry-pick a fix for selection for TouchBegin from multiple clients
2f360aa
e961262
* Wed Dec 12 2012 Dave Airlie <airlied@redhat.com> 1.13.0-14
e961262
- add events for autoconfig of gpus devices, allow usb devices to notify gnome
e961262
0239e87
* Wed Dec 12 2012 Dave Airlie <airlied@redhat.com> 1.13.0-13
0239e87
- fix hotplug issue with usb devices and large screens
0239e87
61cf661
* Wed Dec 12 2012 Dave Airlie 
61cf661
- backout non-pci configuration less patch, its breaks multi-GPU
61cf661
0a9e416
* Fri Nov 30 2012 Adam Jackson <ajax@redhat.com> 1.13.0-11
0a9e416
- Bump default EQ length to reduce the number of unhelpful abrt reports
0a9e416
df01361
* Wed Nov 28 2012 Adam Jackson <ajax@redhat.com> 1.13.0-10
df01361
- Fix VT switch key handling
df01361
Peter Hutterer 45aae11
* Wed Nov 28 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.13.0-9
Peter Hutterer 45aae11
- Fix server crash when a XI 1.x device grab is activated on a disabled
Peter Hutterer 45aae11
  synaptics touchpad is disabled
Peter Hutterer 45aae11
Jiri Kastner db98613
* Tue Nov 27 2012 Jiri Kastner <jkastner@redhat.com> 1.13.0-8
Jiri Kastner db98613
- Fix for non-PCI configuration-less setups
Jiri Kastner db98613
Peter Hutterer 41e970c
* Wed Oct 31 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.13.0-7
Peter Hutterer 41e970c
- Fix build issues on new kernels caused by removal of _INPUT_H
Peter Hutterer 41e970c
Peter Hutterer f3b3030
* Tue Oct 30 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.13.0-6
Peter Hutterer 36c531d
- Add touchscreen fixes (including pointer emulation) #871064
Peter Hutterer 36c531d
8830e76
* Tue Sep 25 2012 Dave Airlie <airlied@redhat.com> 1.13.0-6
8830e76
- update server autobind patch to fix crash reported on irc
8830e76
Peter Hutterer 25c4b40
* Thu Sep 20 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.13.0-5
Peter Hutterer 25c4b40
- Set the transformation matrix to the unity matrix to avoid spurious cursor
Peter Hutterer 25c4b40
  jumps (#852841)
Peter Hutterer 25c4b40
5ec270c
* Fri Sep 14 2012 Dave Airlie <airlied@redhat.com> 1.13.0-4
5ec270c
- fix bug when hotplugging a monitor causes oops
5ec270c
1de259a
* Mon Sep 10 2012 Dave Airlie <airlied@redhat.com> 1.13.0-3
1de259a
- fix race across GPU power down and server startup
1de259a
7b51a11
* Mon Sep 10 2012 Dave Airlie <airlied@redhat.com> 1.13.0-2
7b51a11
- fix compat output segfault on output less gpus.
7b51a11
6441943
* Fri Sep 07 2012 Dave Airlie <airlied@redhat.com> 1.13.0-1
6441943
- rebase to upstream 1.13.0 release tarball
6441943
57b5b3a
* Fri Sep 07 2012 Dave Airlie <airlied@redhat.com> 1.12.99.905-5
57b5b3a
- fix prime offload with DRI2 compositors
57b5b3a
d62d149
* Mon Sep 03 2012 Dave Airlie <airlied@redhat.com> 1.12.99.905-4
d62d149
- fix multi-gpu after VT switch
d62d149
3d627e5
* Mon Aug 27 2012 Dave Airlie <airlied@redhat.com> 1.12.99.905-3
3d627e5
- port multi-seat video fixes from upstream
3d627e5
fc48514
* Fri Aug 24 2012 Dave Airlie <airlied@redhat.com> 1.12.99.905-2
fc48514
- reintroduce auto config but working this time
fc48514
- fix two recycle/exit crashes
fc48514
3f449eb
* Wed Aug 22 2012 Dave Airlie <airlied@redhat.com> 1.12.99.905-1
3f449eb
- rebase to 1.12.99.905 snapshot
3f449eb
359cc84
* Fri Aug 17 2012 Dave Airlie <airlied@redhat.com> 1.12.99.904-4
359cc84
- autobind was horribly broken on unplug - drop it like its hotplug.
359cc84
97c6429
* Fri Aug 17 2012 Dave Airlie <airlied@redhat.com> 1.12.99.904-3
97c6429
- add git fixes + autobind to gpu devices.
97c6429
f8a5524
* Wed Aug 15 2012 Adam Jackson <ajax@redhat.com> 1.12.99.904-2
f8a5524
- Always install int10 and vbe sdk headers
f8a5524
7a54649
* Wed Aug 08 2012 Dave Airlie <airlied@redhat.com> 1.12.99.904-1
7a54649
- rebase to 1.12.99.904 snapshot
7a54649
a33d443
* Fri Aug 03 2012 Adam Jackson <ajax@redhat.com> 1.12.99.903-6
a33d443
- Make failure to iopl non-fatal
a33d443
1b5034b
* Mon Jul 30 2012 Adam Jackson <ajax@redhat.com> 1.12.99.903-5
1b5034b
- No need to --disable-xaa explicitly anymore.
1b5034b
10e9e1a
* Thu Jul 26 2012 Adam Jackson <ajax@redhat.com> 1.12.99.903-4
10e9e1a
- Install xserver-sdk-abi-requires.release based on stable_abi not gitdate,
10e9e1a
  so drivers built against a server that Provides multiple ABI versions will
10e9e1a
  Require the stable version.
10e9e1a
813c021
* Thu Jul 26 2012 Adam Jackson <ajax@redhat.com> 1.12.99.903-3
813c021
- Make it possible to Provide: both stable and gitdate-style ABI versions.
813c021
Peter Hutterer 01909f5
* Thu Jul 26 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.12.99.903-2
Peter Hutterer 01909f5
- xserver-1.12-os-print-newline-after-printing-display-name.patch: drop,
Peter Hutterer 01909f5
  014ad46f1b353a95e2c4289443ee857cfbabb3ae
Peter Hutterer 01909f5
68143df
* Thu Jul 26 2012 Dave Airlie <airlied@redhat.com> 1.12.99.903-1
68143df
- rebase to 1.12.99.903 snapshot
68143df
2cc8816
* Wed Jul 25 2012 Dave Airlie <airlied@redhat.com> 1.12.99.902-3
2cc8816
- fix crash due to GLX being linked twice
2cc8816
4f552f0
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.99.902-2.20120717
4f552f0
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
4f552f0
5982524
* Wed Jul 18 2012 Dave Airlie <airlied@redhat.com> 1.12.99.902-1
5982524
- server 1.12.99.902
5982524
Peter Hutterer 7c84331
* Mon Jul 09 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.12.3-1
Peter Hutterer 7c84331
- server 1.12.3
Peter Hutterer 7c84331
Peter Hutterer 04385c3
* Tue Jun 26 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.12.2-4
Peter Hutterer 04385c3
- send keycode/event type down the wire when SlowKeys enable, otherwise
Peter Hutterer 04385c3
  GNOME won't warn about it (#816764)
Peter Hutterer 04385c3
Peter Hutterer beaa276
* Thu Jun 21 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.12.2-3
Peter Hutterer beaa276
- print newline after printing $DISPLAY to -displayfd (#824594)
Peter Hutterer beaa276
5e785a7
* Fri Jun 15 2012 Dan Horák <dan[at]danny.cz> 1.12.2-2
5e785a7
- fix build without xorg (aka s390x)
5e785a7
Peter Hutterer c2c1041
* Wed May 30 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.12.2-1
Peter Hutterer c2c1041
- xserver 1.12.2
Peter Hutterer c2c1041
12c02d7
* Fri May 25 2012 Dave Airlie <airlied@redhat.com> 1.12.1-2
12c02d7
- xserver-fix-pci-slot-claims.patch: backport slot claiming fix from master
f541db1
- xserver-1.12-modesetting-fallback.patch: add modesetting to fallback list
12c02d7
Peter Hutterer ed174bf
* Mon May 14 2012 Peter Hutterer <peter.hutterer@redhat.com>
Peter Hutterer ed174bf
- Drop xserver-1.10.99.1-test.patch:
Peter Hutterer ed174bf
  cd89482088f71ed517c2e88ed437e4752070c3f4 fixed it
Peter Hutterer ed174bf
Peter Hutterer a035615
* Mon May 14 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.12.1-1
Peter Hutterer a035615
- server 1.12.1
Peter Hutterer a035615
- force autoreconf to avoid libtool errors
Peter Hutterer a035615
- update patches for new indentation style.
Peter Hutterer a035615
Peter Hutterer 8a80c5b
* Mon May 14 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.12.0-6
Peter Hutterer 8a80c5b
- Make timers signal-safe (#814869)
Peter Hutterer 8a80c5b
4a558ce
* Sun May 13 2012 Dennis Gilmore <dennis@ausil.us> 1.12.0-5
4a558ce
- enable vbe on arm arches
4a558ce
625d26e
* Thu Apr 26 2012 Adam Jackson <ajax@redhat.com> 1.12.0-4
625d26e
- Obsolete some old video drivers in F18+
625d26e
9f782f7
* Wed Mar 21 2012 Adam Jackson <ajax@redhat.com> 1.12.0-3
9f782f7
- Tweak arches for RHEL
9f782f7
b2d817f
* Wed Mar 14 2012 Adam Jackson <ajax@redhat.com> 1.12.0-2
b2d817f
- Install Xorg mode 4755, there's no security benefit to 4711. (#712432)
b2d817f
Peter Hutterer 9add143
* Mon Mar 05 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.12.0-1
Peter Hutterer 9add143
- xserver 1.12
Peter Hutterer 9add143
- xserver-1.12-dix-reset-last.scroll-when-resetting-the-valuator-45.patch:
Peter Hutterer 9add143
  drop, 6f2838818
Peter Hutterer 9add143
e862ba8
* Thu Feb 16 2012 Adam Jackson <ajax@redhat.com> 1.11.99.903-2.20120215
e862ba8
- Don't pretend int10 is a thing on non-PC arches
e862ba8
Peter Hutterer d0eab1f
* Thu Feb 16 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.11.99.903-1.20120215
Peter Hutterer d0eab1f
- Server version is 1.11.99.903 now, use that.
Peter Hutterer d0eab1f
Peter Hutterer ed473e1
* Wed Feb 15 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.11.99.901-7.20120215
Peter Hutterer ed473e1
- Today's git snapshot
Peter Hutterer ed473e1
Peter Hutterer 70b4c71
* Sun Feb 12 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.11.99.901-6.20120124
Peter Hutterer 70b4c71
- Fix installation of xserver-sdk-abi-requires script, if stable_abi is set
Peter Hutterer 70b4c71
  always install the relese one, not the git one
Peter Hutterer 70b4c71
Peter Hutterer 40fc0b7
* Sat Feb 11 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.11.99.901-5.20120124
Peter Hutterer 40fc0b7
- ABI is considered stable now:
Peter Hutterer 40fc0b7
  video 12.0, input 16.0, extension 6.0, font 0.6, ansic 0.4
Peter Hutterer 40fc0b7
Peter Hutterer f1989bb
* Sat Feb 11 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.11.99.901-4.20120124
Peter Hutterer f1989bb
- xserver-1.12-dix-reset-last.scroll-when-resetting-the-valuator-45.patch:
Peter Hutterer f1989bb
  reset last.scroll on the device whenever the slave device switched to
Peter Hutterer f1989bb
  avoid jumps during scrolling (#788632).
Peter Hutterer f1989bb
Peter Hutterer b3d82f3
* Tue Jan 24 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.11.99.901-3.20120124
Peter Hutterer b3d82f3
- Today's git snapshot
Peter Hutterer b3d82f3
- xserver-1.12-xaa-sdk-headers.patch: drop, a55214d11916b
Peter Hutterer b3d82f3
Peter Hutterer afc2c6e
* Wed Jan 04 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.11.99.901-2.20120103
Peter Hutterer afc2c6e
- xserver-1.12-Xext-fix-selinux-build-failure.patch: fix build error
Peter Hutterer afc2c6e
  triggered by Red Hat-specific patch to libselinux
Peter Hutterer afc2c6e
Peter Hutterer 9aad602
* Tue Jan 03 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.11.99.901-1.20120103
Peter Hutterer 9aad602
- Git snapshot 98cde254acb9b98337ddecf64c138d38c14ec2bf
Peter Hutterer 9aad602
- xserver-1.11.99-optionstr.patch: drop
Peter Hutterer 9aad602
- 0001-Xext-don-t-swap-CARD8-in-SProcSELinuxQueryVersion.patch: drop
Peter Hutterer 9aad602
95edefe
* Fri Dec 16 2011 Adam Jackson <ajax@redhat.com> 1.11.99.1-11
95edefe
- Always install XAA SDK headers so drivers still build
95edefe
6be86fe
* Thu Dec 15 2011 Adam Jackson <ajax@redhat.com> 1.11.99.1-10
6be86fe
- --disable-xaa
6be86fe
4d1de9d
* Thu Dec 01 2011 Adam Jackson <ajax@redhat.com> 1.11.99.1-9
4d1de9d
- xserver-1.8-disable-vboxvideo.patch: Drop, should be fixed now
4d1de9d
- Drop vesamodes and extramodes, rhpxl is no more
4d1de9d
- Stop building libxf86config, pyxf86config will be gone soon
4d1de9d
567c120
* Tue Nov 29 2011 Dave Airlie <airlied@redhat.com> 1.11.99.1-8
567c120
- put optionstr.h into devel package
567c120
05bc5d1
* Mon Nov 21 2011 Adam Jackson <ajax@redhat.com> 1.11.99.1-7
05bc5d1
- Restore DRI1 until drivers are properly prepared for it
05bc5d1
c9ff459
* Thu Nov 17 2011 Adam Jackson <ajax@redhat.com> 1.11.99.1-6
c9ff459
- Disable DRI1
c9ff459
e09a7af
* Wed Nov 16 2011 Adam Jackson <ajax@redhat.com> 1.11.99.1-5
8fc20c5
- Obsolete some dead input drivers.
8fc20c5
1f3418b
* Mon Nov 14 2011 Adam Jackson <ajax@redhat.com> 1.11.99.1-3
d11511e
- Fix permissions on abi script when doing git snapshots
d11511e
d7ae664
* Wed Nov 09 2011 Peter Hutterer <peter.hutterer@redhat.com>  1.11.99.1-1.20111109
d7ae664
- Update to today's git snapshot
d7ae664
- xserver-1.6.1-nouveau.patch: drop, upstream
d7ae664
- xserver-1.10.99-config-add-udev-systemd-multi-seat-support.patch: drop,
d7ae664
  upstream
d7ae664
- 0001-dix-block-signals-when-closing-all-devices.patch: drop, upstream
d7ae664
243e82a
* Wed Nov 09 2011 Adam Jackson <ajax@redhat.com>
243e82a
- Change the ABI magic for snapshots
243e82a
Peter Hutterer 70574d9
* Mon Oct 24 2011 Peter Hutterer <peter.hutterer@redhat.com> 1.11.1-2
Peter Hutterer 70574d9
- Block signals when removing all input devices #737031
Peter Hutterer 70574d9
5e795c8
* Thu Oct 13 2011 Adam Jackson <ajax@redhat.com>
5e795c8
- Drop some Requires >= on things where we had newer versions in F14.
5e795c8
947c4d8
* Mon Sep 26 2011 Adam Jackson <ajax@redhat.com> 1.11.1-1
947c4d8
- xserver 1.11.1
947c4d8
Adam Tkac 07b355c
* Mon Sep 12 2011 Adam Tkac <atkac redhat com> 1.11.0-2
Adam Tkac 07b355c
- ship more files in the -source subpkg
Adam Tkac 07b355c
a4f769e
* Tue Sep 06 2011 Adam Jackson <ajax@redhat.com> 1.11.0-1
a4f769e
- xserver 1.11.0
a4f769e
82739d8
* Thu Aug 18 2011 Adam Jackson <ajax@redhat.com> 1.10.99.902-1.20110818
82739d8
- xserver 1.11rc2
82739d8
f79834a
* Fri Jul 29 2011 Dave Airlie <airlied@redhat.com> 1.10.99.1-10.2011051
f79834a
- xvfb-run requires xauth installed, fix requires (from jlaska on irc)
f79834a
Peter Hutterer 37aa2d6
* Wed Jul 27 2011 Peter Hutterer <peter.hutterer@redhat.com> 1.10.99.1-9.20110511
Peter Hutterer 37aa2d6
- Add support for multi-seat support from the config/udev backend.
Peter Hutterer 37aa2d6
06dd782
* Wed Jun 29 2011 Dan Horák <dan[at]danny.cz> 1.10.99.1-8.20110511
06dd782
- don't build tests when --disable-xorg is used like on s390(x)
06dd782
e57b98d
* Tue Jun 21 2011 Adam Jackson <ajax@redhat.com> 1.10.99.1-7.20110511
e57b98d
- BuildRequires: systemtap-sdt-devel, configure --with-dtrace
e57b98d
Adam Tkac dbd06c6
* Wed May 11 2011 Adam Tkac <atkac redhat com> 1.10.99.1-6.20110511
Adam Tkac dbd06c6
- include hw/dmx/doc/doxygen.conf.in in the -source subpkg
Adam Tkac dbd06c6
Peter Hutterer 47655a4
* Mon May 09 2011  1.10.99.1-5.20110511
Peter Hutterer 47655a4
- Today's server from git
Peter Hutterer 47655a4
- xserver-1.10-fix-trapezoids.patch: drop, c6cb70be1ed7cf7
Peter Hutterer 47655a4
- xserver-1.10-glx-pixmap-crash.patch: drop, 6a433b67ca15fd1
Peter Hutterer 47655a4
- xserver-1.10-bg-none-revert.patch: drop, dc0cf7596782087
Peter Hutterer 47655a4
e632931
* Thu Apr 21 2011 Hans de Goede <hdegoede@redhat.com> 1.10.99.1-4.20110418
e632931
- Drop xserver-1.9.0-qxl-fallback.patch, since the latest qxl driver
e632931
  supports both revision 1 and 2 qxl devices (#642153)
e632931
Søren Sandmann Pedersen 37c46bc
* Wed Apr 20 2011 Soren Sandmann <ssp@redhat.com> 1.10.99.1-3.20110418
Søren Sandmann Pedersen 37c46bc
- xserver-1.10-fix-trapezoids.patch: this patch is necessary to prevent
Søren Sandmann Pedersen 37c46bc
  trap corruption with pixman 0.21.8.
Søren Sandmann Pedersen 37c46bc
Peter Hutterer 4c175ee
* Tue Apr 19 2011 Peter Hutterer <peter.hutterer@redhat.com> 1.10.99.1-2.20110418
Peter Hutterer 4c175ee
- rebase all patches
Peter Hutterer 4c175ee
- xserver-1.10-vbe-malloc.patch: drop, d8caa782009abf4d
Peter Hutterer 4c175ee
- "git rm" all unused patches
Peter Hutterer 4c175ee
Peter Hutterer de81d95
* Mon Apr 18 2011 Peter Hutterer <peter.hutterer@redhat.com> 1.10.99.1-1.20110418
Peter Hutterer de81d95
- Today's server from git
Peter Hutterer de81d95
6debda7
* Wed Mar 30 2011 Adam Jackson <ajax@redhat.com> 1.10.0-7
6debda7
- xserver-1.10-glx-pixmap-crash.patch, xserver-1.10-bg-none-revert.patch:
6debda7
  bugfixes from xserver-next
6debda7
5db2302
* Tue Mar 22 2011 Adam Jackson <ajax@redhat.com> 1.10.0-6
5db2302
- Fix thinko in pointer barrier patch
5db2302
Adam Tkac 46db593
* Tue Mar 22 2011 Adam Tkac <atkac redhat com> 1.10.0-5
Adam Tkac 46db593
- add more files into -source subpkg
Adam Tkac 46db593
7d6d5ba
* Thu Mar 17 2011 Adam Jackson <ajax@redhat.com> 1.10.0-4
7d6d5ba
- xserver-1.10-pointer-barriers.patch: Backport CRTC confinement from master
7d6d5ba
  and pointer barriers from the development tree for same.
7d6d5ba
- xserver-1.10-vbe-malloc.patch: Fix a buffer overrun in the VBE code.
7d6d5ba
Peter Hutterer e108d14
* Fri Mar 11 2011 Peter Hutterer <peter.hutterer@redhat.com> 1.10.0-3
Peter Hutterer e108d14
- Add Xen virtual pointer quirk to 10-quirks.conf (#523914, #679699)
Peter Hutterer e108d14
2c6c5a5
* Wed Mar 09 2011 Adam Jackson <ajax@redhat.com> 1.10.0-2
f71c405
- Merge from F16:
f71c405
f71c405
    * Wed Mar 09 2011 Adam Jackson <ajax@redhat.com> 1.10.0-2
f71c405
    - Disable filesystem caps in paranoia until module loading is audited
f71c405
f71c405
    * Fri Feb 25 2011 Peter Hutterer <peter.hutterer@redhat.com> 1.9.99.902-1
f71c405
    - xserver 1.10.0
f71c405
    - server-1.9-99.901-xkb-repeat-issues.patch: drop, merged
f71c405
    - xserver-1.4.99-pic-libxf86config.patch: drop, see 60801ff8
f71c405
    - xserver-1.6.99-default-modes.patch: drop, see dc498b4
f71c405
    - xserver-1.7.1-multilib.patch: drop, see a16e282
f71c405
    - ABI bumps: xinput to 12.2, extension to 5.0, video to 10.0