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

[Dennis Gilmore (ausil)]

Author: ausil

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xorg-x11-drv-sunffb-git-checkout.sh 
	xorg-x11-drv-sunffb-remove-dri.patch xorg-x11-drv-sunffb.spec 
Log Message:
initial import



--- NEW FILE import.log ---
xorg-x11-drv-sunffb-1_1_0-5_fc9_git20080526:HEAD:xorg-x11-drv-sunffb-1.1.0-5.fc9.git20080526.src.rpm:1212727885


--- NEW FILE xorg-x11-drv-sunffb-git-checkout.sh ---
#!/bin/bash
DATE=$(date +%Y%m%d)
WORK_DIR=xf86-video-sunffb-$DATE

rm -rf $WORK_DIR
git clone git://anongit.freedesktop.org/git/xorg/driver/xf86-video-sunffb $WORK_DIR
tar -cjvf xf86-video-sunffb-$DATE.tar.bz2 $WORK_DIR
rm -rf $WORK_DIR


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

--- NEW FILE xorg-x11-drv-sunffb-remove-dri.patch ---
diff --git a/configure.ac b/configure.ac
index 06bfe6e..938c58d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,9 +38,14 @@ AM_MAINTAINER_MODE
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 case $host_cpu in
+    sparc64*)
+        CCASFLAGS="-x assembler-with-cpp -Wa,"
+        SPARC=yes
+    ;;
     sparc*)
         CCASFLAGS="-x assembler-with-cpp -Wa,-Av9a"
         SPARC=yes
+    ;;
 esac
 AM_PROG_AS
 AC_PROG_CC
@@ -53,10 +58,6 @@ AC_ARG_WITH(xorg-module-dir,
             [moduledir="$withval"],
             [moduledir="$libdir/xorg/modules"])
 
-AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
-                                  [Disable DRI support [[default=auto]]]),
-              [DRI="$enableval"],
-              [DRI=auto])
 
 # Checks for extensions
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
@@ -72,34 +73,6 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 # Checks for header files.
 AC_HEADER_STDC
 
-if test "$DRI" != no; then
-        AC_CHECK_FILE([${sdkdir}/dri.h],
-                      [have_dri_h="yes"], [have_dri_h="no"])
-        AC_CHECK_FILE([${sdkdir}/sarea.h],
-                      [have_sarea_h="yes"], [have_sarea_h="no"])
-        AC_CHECK_FILE([${sdkdir}/dristruct.h],
-                      [have_dristruct_h="yes"], [have_dristruct_h="no"])
-fi
-
-AC_MSG_CHECKING([whether to include DRI support])
-if test x$DRI = xauto; then
-        if test "$have_dri_h" = yes -a \
-                "$have_sarea_h" = yes -a \
-                "$have_dristruct_h" = yes; then
-                DRI="yes"
-        else
-                DRI="no"
-        fi
-fi
-AC_MSG_RESULT([$DRI])
-
-AM_CONDITIONAL(DRI, test x$DRI = xyes)
-if test "$DRI" = yes; then
-        PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
-        AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
-        AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
-fi
-
 AM_CONDITIONAL(SPARC, test x$SPARC = xyes)
 
 AC_SUBST([DRI_CFLAGS])
diff --git a/src/Makefile.am b/src/Makefile.am
index 44b256e..71c3c1c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,7 +49,3 @@ sunffb_drv_la_SOURCES = \
          ffb_wid.c \
          $(SPARC_ASM_SRC)
 
-if DRI 
-sunffb_drv_la_SOURCES += \
-         ffb_drishare.h
-endif


--- NEW FILE xorg-x11-drv-sunffb.spec ---
%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:   5%{?dist}.git%{gitdate}
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
License:   MIT
Group:     User Interface/X Hardware Support
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# we are not building sparc64 since we need to do some assembly work
ExclusiveArch: sparcv9 sparc64

BuildRequires: xorg-x11-server-devel
BuildRequires: automake autoconf gettext libtool

Requires:  xorg-x11-server-Xorg
%description 
X.Org X11 sunffb video driver.

%prep
%setup -q -n %{tarball}-%{gitdate} 
%patch0 -p1 

%build
./autogen.sh
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT%{moduledir} -name '*.la' | xargs rm -f --

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{driverdir}/*.so
%{_mandir}/man4/*.4*

%changelog
* Tue Jun 03 2008 Dennis Gilmore <dennis at ausil.us> 1.1.0-5.git20080526
- review fixes

* Tue May 27 2008 Dennis Gilmore <dennis at ausil.us> 1.1.0-4.git20080526
- apply patch removing dri support from configure.ac  dri was removed upstream
- change assembly options for sparc64

* Mon May 26 2008 Dennis Gilmore <dennis at ausil.us> 1.1.0-3.git20080526
- update to git snapshot

* Mon May 26 2008 Dennis Gilmore <dennis at ausil.us> 1.1.0-2
- spec cleanups

* Mon Jul 17 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.0-1
- Update to xorg 7.1

* Tue Oct 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
- Update BuildRoot to use Fedora Packaging Guidelines.
- Limit "ExclusiveArch" to sparc, sparc64

* Fri Sep 2 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-0
- Initial spec file for sunffb video driver generated automatically
  by my xorg-driverspecgen script.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sunffb/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Jun 2008 04:28:33 -0000	1.1
+++ .cvsignore	6 Jun 2008 04:51:59 -0000	1.2
@@ -0,0 +1 @@
+xf86-video-sunffb-20080526.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-sunffb/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Jun 2008 04:28:33 -0000	1.1
+++ sources	6 Jun 2008 04:51:59 -0000	1.2
@@ -0,0 +1 @@
+dd6e531c07969fd9a9346c8dad57e488  xf86-video-sunffb-20080526.tar.bz2