rpms/xorg-x11-server/FC-5 xf86Sbus.h, NONE, 1.1 xorg-x11-server.spec, 1.49, 1.50

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21652

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xf86Sbus.h 
Log Message:
* Fri May 19 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-9.FC5.3
- Enable alpha, sparc, sparc64 architectures to be buildable (untested, but
  feel free to submit patches in bugzilla if it does not work right)
- Add missing SBUS header for sparc architecture (#187357)



--- NEW FILE xf86Sbus.h ---
/*
 * Platform specific SBUS and OpenPROM access declarations.
 *
 * Copyright (C) 2000 Jakub Jelinek (jakub at redhat.com)
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.3 2001/04/20 17:02:43 tsi Exp $ */

#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif

#ifndef _XF86_SBUS_H
#define _XF86_SBUS_H

#if defined(linux)
#include <asm/types.h>
#include <linux/fb.h>
#include <asm/fbio.h>
#include <asm/openpromio.h>
#elif defined(SVR4)
#include <sys/fbio.h>
#include <sys/openpromio.h>
#elif defined(__OpenBSD__) && defined(__sparc64__)
/* XXX */
#elif defined(CSRG_BASED)
#if defined(__FreeBSD__)
#include <sys/types.h>
#include <sys/fbio.h>
#include <dev/ofw/openpromio.h>
#else
#include <machine/fbio.h>
#endif
#else
#include <sun/fbio.h>
#endif

#ifndef FBTYPE_SUNGP3
#define FBTYPE_SUNGP3 -1
#endif
#ifndef FBTYPE_MDICOLOR
#define FBTYPE_MDICOLOR -1
#endif
#ifndef FBTYPE_SUNLEO
#define FBTYPE_SUNLEO -1
#endif
#ifndef FBTYPE_TCXCOLOR
#define FBTYPE_TCXCOLOR -1
#endif
#ifndef FBTYPE_CREATOR
#define FBTYPE_CREATOR -1
#endif

#endif /* _XF86_SBUS_H */


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-5/xorg-x11-server.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- xorg-x11-server.spec	5 May 2006 06:15:45 -0000	1.49
+++ xorg-x11-server.spec	19 May 2006 05:18:20 -0000	1.50
@@ -4,13 +4,14 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   9.fc5.2
+Release:   9.FC5.3
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:   http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2
+Source10:  xf86Sbus.h
 Source100: comment-header-modefiles.txt
 
 Patch0:    xorg-x11-server-0.99.3-init-origins-fix.patch
@@ -46,7 +47,7 @@
 %define moduledir	%{_libdir}/xorg/modules
 %define sdkdir		%{_includedir}/xorg
 
-%ifarch %{ix86} x86_64 ppc ia64
+%ifarch %{ix86} x86_64 ppc ia64 alpha sparc sparc64
 %define xservers --enable-xorg --enable-dmx --enable-xvfb --enable-xnest
 %else
 %define xservers --disable-xorg --disable-dmx --enable-xvfb --enable-xnest
@@ -59,7 +60,7 @@
 # I can build one build with them enabled, install them, then disable it again.
 %define with_developer_utils	0
 
-%ifarch %{ix86} x86_64 ppc ia64
+%ifarch %{ix86} x86_64 ppc ia64 alpha sparc sparc64
 %define with_dri	1
 %else
 %define with_dri	0
@@ -242,6 +243,7 @@
 
 %prep
 %setup -q -n %{pkgname}-%{version}
+cp {%SOURCE10} hw/xfree86/os-support/bus/
 %patch0 -p0 -b .init-origins-fix
 #%patch1 -p0 -b .fbmmx-fix-for-non-SSE-cpu
 #%patch2 -p0 -b .rgb.txt-dix-config-fix
@@ -533,6 +535,11 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Fri May 19 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-9.FC5.3
+- Enable alpha, sparc, sparc64 architectures to be buildable (untested, but
+  feel free to submit patches in bugzilla if it does not work right)
+- Add missing SBUS header for sparc architecture (#187357)
+
 * Fri May 5 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-9.fc5.2
 - Merge xorg-x11-server-1.0.1-render-tris-CVE-2006-1526.patch security fix
   from 1.0.1-9.fc5.1.1 release from embargoed branch of CVS to FC-5 branch.