* Wed Apr 11 2007 Adam Jackson <ajax@redhat.com> 1.2.99.905-4
- xserver-1.3.0-no-prerelease-warning.patch: Hush the useless prerelease warning if we happen to be building one (and even if not).
This commit is contained in:
parent
65a4e80308
commit
98df0b56fc
@ -9,7 +9,7 @@
|
||||
Summary: X.Org X11 X server
|
||||
Name: xorg-x11-server
|
||||
Version: 1.2.99.905
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
URL: http://www.x.org
|
||||
License: MIT/X11
|
||||
Group: User Interface/X
|
||||
@ -50,6 +50,7 @@ Patch1006: xorg-x11-server-1.1.1-no-scanpci.patch
|
||||
Patch1007: xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch
|
||||
Patch1008: xorg-x11-server-1.2.0-xf86config-comment-less.patch
|
||||
Patch1009: xorg-x11-server-1.2.0-maxpixclock-option.patch
|
||||
Patch1010: xserver-1.3.0-no-prerelease-warning.patch
|
||||
|
||||
Patch2001: xserver-1.2.0-geode-mmx.patch
|
||||
Patch2002: xserver-1.2.0-xephyr-keysym-madness.patch
|
||||
@ -281,6 +282,7 @@ Xserver source code needed to build VNC server (Xvnc)
|
||||
%patch1007 -p1 -b .xf1bpp
|
||||
%patch1008 -p1 -b .comment-less
|
||||
%patch1009 -p1 -b .maxpixclock
|
||||
%patch1010 -p1 -b .prerelease-warning
|
||||
|
||||
%patch2001 -p1 -b .geode-mmx
|
||||
%patch2002 -p1 -b .xephyr-keysym
|
||||
@ -551,6 +553,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Apr 11 2007 Adam Jackson <ajax@redhat.com> 1.2.99.905-4
|
||||
- xserver-1.3.0-no-prerelease-warning.patch: Hush the useless prerelease
|
||||
warning if we happen to be building one (and even if not).
|
||||
|
||||
* Tue Apr 10 2007 Adam Jackson <ajax@redhat.com> 1.2.99.905-3
|
||||
- xserver-1.3.0-domain-obiwan.patch: Fix a PCI domain off-by-one. (#235861)
|
||||
- xserver-1.3.0-x86emu-imul-int64.patch: Fix imul in x86emu. (#235861)
|
||||
|
22
xserver-1.3.0-no-prerelease-warning.patch
Normal file
22
xserver-1.3.0-no-prerelease-warning.patch
Normal file
@ -0,0 +1,22 @@
|
||||
--- xorg-server-1.2.99.905/configure.ac.jx 2007-04-06 16:52:25.000000000 -0400
|
||||
+++ xorg-server-1.2.99.905/configure.ac 2007-04-06 17:45:10.000000000 -0400
|
||||
@@ -238,7 +238,7 @@
|
||||
;;
|
||||
x86_64*|amd64*)
|
||||
use_x86_asm="yes"
|
||||
- I386_VIDEO=yes
|
||||
+ I386_VIDEO=no
|
||||
case $host_os in
|
||||
*freebsd*) AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;;
|
||||
*netbsd*) AC_DEFINE(USE_I386_IOPL, 1, [BSD i386 iopl])
|
||||
--- xorg-server-1.2.99.905/hw/xfree86/common/xf86Init.c.jx 2007-01-31 19:55:51.000000000 -0500
|
||||
+++ xorg-server-1.2.99.905/hw/xfree86/common/xf86Init.c 2007-04-11 12:32:24.000000000 -0400
|
||||
@@ -1770,7 +1770,7 @@
|
||||
static void
|
||||
xf86PrintBanner()
|
||||
{
|
||||
-#if PRE_RELEASE
|
||||
+#if 0
|
||||
ErrorF("\n"
|
||||
"This is a pre-release version of the X server from " XVENDORNAME ".\n"
|
||||
"It is not supported in any way.\n"
|
Loading…
Reference in New Issue
Block a user