rpms/xorg-x11-drv-sunffb/devel sunffb-sparc64.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xorg-x11-drv-sunffb.spec, 1.3, 1.4 xorg-x11-drv-sunffb-git-checkout.sh, 1.1, NONE xorg-x11-drv-sunffb-remove-dri.patch, 1.1, NONE

[Dennis Gilmore]

Author: ausil

Update of /cvs/pkgs/rpms/xorg-x11-drv-sunffb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13836

Modified Files:
	.cvsignore sources xorg-x11-drv-sunffb.spec 
Added Files:
	sunffb-sparc64.patch 
Removed Files:
	xorg-x11-drv-sunffb-git-checkout.sh 
	xorg-x11-drv-sunffb-remove-dri.patch 
Log Message:
update to 1.2.0 patch asm to build sparc64


sunffb-sparc64.patch:

--- NEW FILE sunffb-sparc64.patch ---
diff -uNr xf86-video-sunffb-1.2.0-orig/src/ffb_asm.s xf86-video-sunffb-1.2.0/src/ffb_asm.s
--- xf86-video-sunffb-1.2.0-orig/src/ffb_asm.s	2008-08-15 14:49:00.000000000 -0500
+++ xf86-video-sunffb-1.2.0/src/ffb_asm.s	2009-04-11 12:33:42.000000000 -0500
@@ -24,6 +24,12 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_asm.s,v 1.1 2000/05/18 23:21:35 dawes Exp $ */
 
+
+#if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
+.register %g2,#scratch
+.register %g3,#scratch
+#endif
+
 /* Hardware register offsets */
 #define FFB_BY		0x0060
 #define FFB_DY		0x0068
diff -uNr xf86-video-sunffb-1.2.0-orig/src/VISmoveImage.s xf86-video-sunffb-1.2.0/src/VISmoveImage.s
--- xf86-video-sunffb-1.2.0-orig/src/VISmoveImage.s	2008-08-15 14:49:00.000000000 -0500
+++ xf86-video-sunffb-1.2.0/src/VISmoveImage.s	2009-04-11 12:07:36.000000000 -0500
@@ -79,6 +79,8 @@
 #if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
 #define SMUL			mulx
 #define ICC			xcc
+.register %g2,#scratch
+.register %g3,#scratch
 #else
 #define SMUL			smul
 #define ICC			icc


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sunffb/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jun 2008 04:51:59 -0000	1.2
+++ .cvsignore	11 Apr 2009 17:45:13 -0000	1.3
@@ -1 +1 @@
-xf86-video-sunffb-20080526.tar.bz2
+xf86-video-sunffb-1.2.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sunffb/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jun 2008 04:51:59 -0000	1.2
+++ sources	11 Apr 2009 17:45:13 -0000	1.3
@@ -1 +1 @@
-dd6e531c07969fd9a9346c8dad57e488  xf86-video-sunffb-20080526.tar.bz2
+816842de26bce8a935f3c9c3cfedbc42  xf86-video-sunffb-1.2.0.tar.bz2


Index: xorg-x11-drv-sunffb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sunffb/devel/xorg-x11-drv-sunffb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-drv-sunffb.spec	26 Feb 2009 11:15:48 -0000	1.3
+++ xorg-x11-drv-sunffb.spec	11 Apr 2009 17:45:14 -0000	1.4
@@ -1,25 +1,22 @@
 %define tarball xf86-video-sunffb
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir       %{moduledir}/drivers
-%define gitdate 20080526
 
 Summary:   Xorg X11 sunffb video driver
 Name:      xorg-x11-drv-sunffb
-Version:   1.1.0
-Release:   7%{?dist}.git%{gitdate}
+Version:   1.2.0
+Release:   1%{?dist}
 URL:       http://www.x.org
-#Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source0:   %{tarball}-%{gitdate}.tar.bz2
-Source1:   xorg-x11-drv-sunffb-git-checkout.sh
-Patch0:    xorg-x11-drv-sunffb-remove-dri.patch
+Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Patch0:    sunffb-sparc64.patch
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # we are not building sparc64 at this time because we need to do some assembly work
-ExclusiveArch: sparcv9
+ExclusiveArch: sparcv9 sparc64
 
-BuildRequires: xorg-x11-server-devel
+BuildRequires: xorg-x11-server-devel libdrm-devel
 BuildRequires: automake autoconf gettext libtool
 
 Requires:  xorg-x11-server-Xorg
@@ -27,11 +24,10 @@
 X.Org X11 sunffb video driver.
 
 %prep
-%setup -q -n %{tarball}-%{gitdate} 
+%setup -q -n %{tarball}-%{version} 
 %patch0 -p1 
 
 %build
-./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -50,6 +46,10 @@
 %{_mandir}/man4/*.4*
 
 %changelog
+* Sat Apr 11 2009 Dennis Gilmore <dennis at ausil.us> - 1.2.0-1
+- update to 1.2.0
+- enable sparc64 with asm patch
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-7.git20080526
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- xorg-x11-drv-sunffb-git-checkout.sh DELETED ---


--- xorg-x11-drv-sunffb-remove-dri.patch DELETED ---