rpms/xorg-x11-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Today's git snapshot

Browse Source 
xserver-1.12-xaa-sdk-headers.patch: drop, a55214d11916b
This commit is contained in:
Peter Hutterer 2012-01-24 08:41:11 +10:00
parent afc2c6e766
commit b3d82f3676
5 changed files with 9 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ xorg-server-1.9.1.tar.bz2
/xorg-server-1.11.1.tar.bz2
/xorg-server-20111109.tar.xz
/xorg-server-20120103.tar.xz
/xorg-server-20120124.tar.xz

2
commitid
View File

@ -1 +1 @@
98cde254acb9b98337ddecf64c138d38c14ec2bf
954bb994842aa43a0f272858e65036c016b729a4

2
sources
View File

@ -1 +1 @@
1d57316232fb6d617b844639456239a6 xorg-server-20120103.tar.xz
6f5d63d685404c4232b7e60f70bcf579 xorg-server-20120124.tar.xz

11
xorg-x11-server.spec
View File

@ -9,7 +9,7 @@
# check out the master branch, pull, cherry-pick, and push. FIXME describe
# rebasing, add convenience 'make' targets maybe.
%define gitdate 20120103
%define gitdate 20120124
%define stable_abi 0
%if !0%{?gitdate} || %{stable_abi}
@ -48,7 +48,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.11.99.901
Release: 2%{?gitdate:.%{gitdate}}%{dist}
Release: 3%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@ -98,9 +98,6 @@ Patch6030: xserver-1.6.99-right-of.patch
# tests require Xorg
Patch7007: xserver-1.10.99.1-test.patch
# always install xaa headers even though we don't build the module
Patch7012: xserver-1.12-xaa-sdk-headers.patch
# Fix libselinux-triggered build error
# RedHat/Fedora-specific patch
Patch7013: xserver-1.12-Xext-fix-selinux-build-failure.patch
@ -560,6 +557,10 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir}
%changelog
* Tue Jan 24 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.11.99.901-3.20120124
- Today's git snapshot
- xserver-1.12-xaa-sdk-headers.patch: drop, a55214d11916b
* Wed Jan 04 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.11.99.901-2.20120103
- xserver-1.12-Xext-fix-selinux-build-failure.patch: fix build error
triggered by Red Hat-specific patch to libselinux

50
xserver-1.12-xaa-sdk-headers.patch
View File

@ -1,50 +0,0 @@
From 2267970ea31d81cd0b9d3ede2eaeec586168b464 Mon Sep 17 00:00:00 2001
From: Fedora X Ninjas <x@fedoraproject.org>
Date: Fri, 16 Dec 2011 17:15:04 -0500
Subject: [PATCH] Always install xaa sdk headers
Signed-off-by: Fedora X Ninjas <x@fedoraproject.org>
---
hw/xfree86/Makefile.am | 2 --
hw/xfree86/xaa/Makefile.am | 4 ++++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 4f08772..72be889 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -11,9 +11,7 @@ if XF86UTILS
XF86UTILS_SUBDIR = utils
endif
-if XAA
XAA_SUBDIR = xaa
-endif
if VGAHW
VGAHW_SUBDIR = vgahw
diff --git a/hw/xfree86/xaa/Makefile.am b/hw/xfree86/xaa/Makefile.am
index 7ebe0b9..78d9348 100644
--- a/hw/xfree86/xaa/Makefile.am
+++ b/hw/xfree86/xaa/Makefile.am
@@ -8,6 +8,8 @@ MSB_FIXED = mf-xaaBitmap.c mf-xaaStipple.c mf-xaaTEGlyph.c
MSB_3_FIXED = mf3-xaaBitmap.c mf3-xaaStipple.c
POLYSEG = s-xaaLine.c s-xaaDashLine.c
+if XAA
+
libxaa_la_LDFLAGS = -module -avoid-version
if COMPOSITE
libxaa_la_LIBADD = $(top_builddir)/miext/cw/libcw.la
@@ -60,6 +62,8 @@ ${MSB_3_FIXED}:
$(AM_V_GEN)echo "#define FIXEDBASE" >> $@
$(AM_V_GEN)echo '#include "$(srcdir)/${@:mf3-%=%}"' >> $@
+endif # XAA
+
DISTCLEANFILES = $(POLYSEG) \
$(LSB_FIRST) $(LSB_FIXED) $(MSB_FIRST) $(MSB_FIXED) \
$(LSB_3_FIRST) $(LSB_3_FIXED) $(MSB_3_FIRST) $(MSB_3_FIXED)
--
1.7.8