rpms/Glide3/devel .cvsignore, 1.2, 1.3 Glide3.spec, 1.9, 1.10 sources, 1.2, 1.3 Glide3-64bit.patch, 1.3, NONE Glide3-amd3dnow.patch, 1.2, NONE Glide3-fixes.patch, 1.3, NONE Glide3-gcc4.patch, 1.2, NONE Glide3-lib64.patch, 1.1, NONE Glide3-new-autotools-bugfix.patch, 1.2, NONE Glide3-redhat-cleanup-1.patch, 1.1, NONE

Sat Aug 13 21:11:22 UTC 2005

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22480

Modified Files:
	.cvsignore Glide3.spec sources 
Removed Files:
	Glide3-64bit.patch Glide3-amd3dnow.patch Glide3-fixes.patch 
	Glide3-gcc4.patch Glide3-lib64.patch 
	Glide3-new-autotools-bugfix.patch 
	Glide3-redhat-cleanup-1.patch 
Log Message:
Work together with upstream, change to upstream CVS glide-devel-branch, intergrate all patches, enable VooDoo1 support, add 64 bit support to VooDoo2.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Glide3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	28 Apr 2005 18:39:19 -0000	1.2
+++ .cvsignore	13 Aug 2005 21:11:19 -0000	1.3
@@ -1 +1,2 @@
-Glide3-20010520.tar.bz2
+Glide3-20050813.tar.bz2
+glidelink.c


Index: Glide3.spec
===================================================================
RCS file: /cvs/extras/rpms/Glide3/devel/Glide3.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Glide3.spec	9 May 2005 18:52:34 -0000	1.9
+++ Glide3.spec	13 Aug 2005 21:11:19 -0000	1.10
@@ -1,8 +1,8 @@
 Name:    Glide3
-Version: 20010520
-Release: 36
+Version: 20050813
+Release: 1
 Summary: Glide3 runtime for the 3Dfx Voodoo family of cards
-# Glide3 is x86/alpha/ia64/x86_64 only, ia64 and x86_64 are untested
+# Glide3 is x86/alpha/ia64/x86_64 only, ia64 is untested
 ExclusiveArch: %{ix86} alpha ia64 x86_64
 
 Group:   User Interface/X Hardware Support
@@ -10,29 +10,23 @@
 URL:     http://glide.sourceforge.net
 
 # Create the Glide3 tarball by using:
-#   cvs -d :pserver:anonymous at cvs.glide.sourceforge.net:/cvsroot/glide co Glide3
+#   cvs -d :pserver:anonymous at cvs.glide.sourceforge.net:/cvsroot/glide \
+#     co -r glide-devel-branch Glide3
 #   pushd Glide3 ; find . -name CVS -type d |xargs rm -rf
 #   find . -name .cvsignore | xargs rm ; popd
 #   tar jcf Glide3-$(date +"%Y%m%d").tar.bz2 Glide3/
 Source0: %{name}-%{version}.tar.bz2
 Source1: glidelink.c
-Patch0:  Glide3-64bit.patch
-Patch1:  Glide3-new-autotools-bugfix.patch
-Patch2:  Glide3-redhat-cleanup-1.patch
-Patch3:  Glide3-fixes.patch
-Patch4:  Glide3-gcc4.patch
-Patch5:  Glide3-amd3dnow.patch
-Patch6:  Glide3-lib64.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: automake14 autoconf xorg-x11-devel
+BuildRequires: xorg-x11-devel
 
 %description
 Glide3 provides the necessary low-level interface glue between the Mesa
 3D graphics library, and 3Dfx Voodoo series of hardware. This package is
 required by the Xorg tdfx driver in order to provide 3D acceleration
 support for the 3Dfx Voodoo 3 & 5. This package also contains support for
-the Voodoo 2 in order to use the 3Dfx Voodoo 2 you need a special version
-of Mesa or a native Glide3 application.
+the Voodoo 2 & 1 in order to use the 3Dfx Voodoo 2 or 1 you need a special
+version of Mesa or a native Glide3 application.
 
 %package devel
 Summary: Development libraries and headers for Glide3
@@ -46,87 +40,58 @@
 
 %prep
 %setup -q -n Glide3
-%patch0 -p1 -b .64bit
-%patch1 -p1 -b .new-autotools-bugfix
-%patch2 -p1 -b .redhat-cleanup-1
-%patch3 -p1 -b .fix
-%patch4 -p1 -b .gcc4
-%patch5 -p1 -b .amd3dnow
-%ifarch x86_64
-%patch6 -p1 -b .lib64
-%endif
 
-%build
-aclocal-1.4
-libtoolize --copy --force
-automake-1.4 -a
-autoconf
 
+%build
 %ifarch %{ix86}
-%define configure_flags --enable-fx-debug=no --enable-amd3d
+%define glide_flags USE_X86=1 USE_3DNOW=1 USE_MMX=1 USE_SSE=1 USE_SSE2=1 TEXUS2=1
 %else
-%define configure_flags --enable-fx-debug=no
+%define glide_flags TEXUS2=1
 %endif
 
-mkdir build-5
-cd build-5
-ln -s ../configure configure
-%configure \
-        %{configure_flags} \
-        --enable-fx-glide-hw=h5 \
-        --enable-fx-dri-build
-make -f makefile.autoconf all
-cd ..
-
-mkdir build-3
-cd build-3
-ln -s ../configure configure
-%configure \
-        %{configure_flags} \
-        --enable-fx-glide-hw=h3 \
-        --enable-fx-dri-build
-make -f makefile.autoconf all
-cd ..
+make -f makefile.linux FX_GLIDE_HW=h5 DRI=1 XPATH=/usr/X11R6/%{_lib} \
+  OPTFLAGS="$RPM_OPT_FLAGS -Wno-unused-parameter" %{glide_flags}
+mv h5/lib/libglide3.so libglide3-v5.so
+make -f makefile.linux FX_GLIDE_HW=h5 realclean
+
+make -f makefile.linux FX_GLIDE_HW=h3 DRI=1 XPATH=/usr/X11R6/%{_lib} \
+  OPTFLAGS="$RPM_OPT_FLAGS -Wno-unused-parameter" %{glide_flags}
+mv h3/lib/libglide3.so libglide3-v3.so
+make -f makefile.linux FX_GLIDE_HW=h3 realclean
+
+make -f makefile.linux FX_GLIDE_HW=cvg \
+  OPTFLAGS="$RPM_OPT_FLAGS -Wno-unused-parameter" %{glide_flags}
+mv cvg/lib/libglide3x.so libglide3-v2.so
+make -f makefile.linux FX_GLIDE_HW=cvg realclean
 
-#Sorry, no 64 bit support for Voodoo2 (yet)
+#Sorry, no 64 bit support for Voodoo1 (yet)
 %ifarch %{ix86}
-mkdir build-2
-cd build-2
-ln -s ../configure configure
-%configure \
-        %{configure_flags} \
-        --enable-fx-glide-hw=cvg
-make -f makefile.autoconf all
-cd ..
+make -f makefile.linux FX_GLIDE_HW=sst1 \
+  OPTFLAGS="$RPM_OPT_FLAGS -Wno-unused-parameter" %{glide_flags}
+mv sst1/lib/libglide3x.so libglide3-v1.so
+make -f makefile.linux FX_GLIDE_HW=sst1 realclean
 %endif
 
-%install
-rm -rf $RPM_BUILD_ROOT
-cd build-5
-make -f makefile.autoconf install DESTDIR=$RPM_BUILD_ROOT
 
+%install
 %define libver 3.10.0
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}
-mv $RPM_BUILD_ROOT%{_libdir}/libglide3.so.%{libver} \
-	$RPM_BUILD_ROOT/%{_libdir}/libglide3-v5.so
-install -m 755 ../build-3/h3/glide3/src/.libs/libglide3.so.%{libver} \
-	$RPM_BUILD_ROOT/%{_libdir}/libglide3-v3.so
-%ifarch %{ix86}
-install -m 755 ../build-2/cvg/glide3/src/.libs/libglide3.so.%{libver} \
-	$RPM_BUILD_ROOT/%{_libdir}/libglide3-v2.so
-%endif
+mkdir -p $RPM_BUILD_ROOT/%{_includedir}/glide3
 
-# For ix86 Point to v2 by default else v5, ldconfig doesn't like this?
-%ifarch %{ix86}
+install -m 755 *.so $RPM_BUILD_ROOT/%{_libdir}
+# Point to v2 by default
 ln -snf libglide3-v2.so $RPM_BUILD_ROOT%{_libdir}/libglide3.so.%{libver}
-%else
-ln -snf libglide3-v5.so $RPM_BUILD_ROOT%{_libdir}/libglide3.so.%{libver}
-%endif
 ln -snf libglide3.so.%{libver} $RPM_BUILD_ROOT%{_libdir}/libglide3.so.3
+ln -snf libglide3.so.%{libver} $RPM_BUILD_ROOT%{_libdir}/libglide3.so
 
-# We are not installing these, so lets delete them
-rm -f $RPM_BUILD_ROOT%{_libdir}/libglide3.{a,la}
+install -p -m 644 swlibs/fxmisc/3dfx.h $RPM_BUILD_ROOT/%{_includedir}/glide3
+install -p -m 644 h5/glide3/src/g3ext.h $RPM_BUILD_ROOT/%{_includedir}/glide3
+install -p -m 644 h5/glide3/src/glide.h $RPM_BUILD_ROOT/%{_includedir}/glide3
+install -p -m 644 h5/glide3/src/glidesys.h $RPM_BUILD_ROOT/%{_includedir}/glide3
+install -p -m 644 h5/glide3/src/glideutl.h $RPM_BUILD_ROOT/%{_includedir}/glide3
+install -p -m 644 swlibs/fxmisc/linutil.h $RPM_BUILD_ROOT/%{_includedir}/glide3
+install -p -m 644 h5/incsrc/sst1vid.h $RPM_BUILD_ROOT/%{_includedir}/glide3
+install -p -m 644 swlibs/texus2/lib/texus.h $RPM_BUILD_ROOT/%{_includedir}/glide3
 
 
 %clean
@@ -144,8 +109,9 @@
 %{_libdir}/libglide3.so.3
 %{_libdir}/libglide3.so.%{libver}
 %ifarch %{ix86}
-%{_libdir}/libglide3-v2.so
+%{_libdir}/libglide3-v1.so
 %endif
+%{_libdir}/libglide3-v2.so
 %{_libdir}/libglide3-v3.so
 %{_libdir}/libglide3-v5.so
 
@@ -156,8 +122,14 @@
 %{_libdir}/libglide3.so
 
 
-
 %changelog
+* Sat Aug 13 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 20050813-1
+- Work together with upstream to keep Glide alive, use upstream CVS
+  glide-devel-branch as a base.
+- Intergrate all our patches into upstream CVS glide-devel-branch.
+- New upstream branch (re)adds support for Voodoo1 (sst1).
+- Make Voodoo2 (cvg) code 64 bit clean (merged upstream).
+
 * Mon May  9 2005 Hans de Goede <j.w.r.degoede at hhs.nl>
 - Change -L/usr/X11R6/lib to -L/usr/X11R6/lib64 when building on
   x86_64 .


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Glide3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Apr 2005 18:39:19 -0000	1.2
+++ sources	13 Aug 2005 21:11:19 -0000	1.3
@@ -1 +1,2 @@
-6cd7e5926c2a97bb96add94ca6a54a0c  Glide3-20010520.tar.bz2
+8da72f671d9900645244f8db7e594f76  Glide3-20050813.tar.bz2
+99cf1d5972fd8ecb35498a4b99a24b59  glidelink.c


--- Glide3-64bit.patch DELETED ---


--- Glide3-amd3dnow.patch DELETED ---


--- Glide3-fixes.patch DELETED ---


--- Glide3-gcc4.patch DELETED ---


--- Glide3-lib64.patch DELETED ---


--- Glide3-new-autotools-bugfix.patch DELETED ---


--- Glide3-redhat-cleanup-1.patch DELETED ---


