rpms/Glide3-libGL/devel Glide3-libGL-README, NONE, 1.1 Glide3-libGL.sh, NONE, 1.1 Glide3-libGL.spec, NONE, 1.1 Mesa-6.2.1-64bit.patch, NONE, 1.1 Mesa-6.2.1-antialias.patch, NONE, 1.1 Mesa-6.2.1-config.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Mon Jan 16 21:22:31 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/Glide3-libGL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11162/devel
Modified Files:
.cvsignore sources
Added Files:
Glide3-libGL-README Glide3-libGL.sh Glide3-libGL.spec
Mesa-6.2.1-64bit.patch Mesa-6.2.1-antialias.patch
Mesa-6.2.1-config.patch
Log Message:
auto-import Glide3-libGL-6.2.1-3 on branch devel from Glide3-libGL-6.2.1-3.src.rpm
--- NEW FILE Glide3-libGL-README ---
Glide3-libGL provides a version of Mesa compiled to render 3D graphics
through Glide3, thus allowing hardware accelerated OpenGL on 3Dfx's 3D only
Voodoo 1 & 2 cards. Even with Glide3-libGL installed OpenGL programs will
normally still use the regular (possibly unaccelerated) videocard.
To use Glide3-libGL to run an OpenGL application on your 3Dfx Voodoo 1 or 2
start your application with the Glide3-libGL wrapper:
Glide3-libGL <appname> [args]
For example if you want to run ppracer without any args use:
Glide3-libGL ppracer
--- NEW FILE Glide3-libGL.sh ---
#!/bin/bash
# Script to run a program using the Glide3 for V1 / V2 version of Mesa
if [ $# -lt 1 ]; then
echo "`basename $0`, run a program using the Glide3 version of Mesa"
echo "Usage:"
echo "`basename $0` <program> [args]"
exit 1
fi
if [ -f /lib64/libc.so.6 ]; then
LIB=lib64
else
LIB=lib
fi
export MESA_GLX_FX=f
export LD_LIBRARY_PATH=/usr/$LIB/Glide3-libGL
exec "$@"
--- NEW FILE Glide3-libGL.spec ---
Name: Glide3-libGL
Version: 6.2.1
Release: 3
Summary: Glide3 OpenGL library for use with 3Dfx Voodoo 1 & 2 cards
Group: System Environment/Libraries
License: MIT/X11
URL: http://www.mesa3d.org/
Source0: http://dl.sf.net/mesa3d/MesaLib-%{version}.tar.bz2
Source1: Glide3-libGL.sh
Source2: Glide3-libGL-README
Patch0: Mesa-6.2.1-config.patch
Patch1: Mesa-6.2.1-64bit.patch
Patch2: Mesa-6.2.1-antialias.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libX11-devel libXext-devel libXt-devel libXi-devel libXmu-devel
BuildRequires: xorg-x11-proto-devel Glide3-devel
ExclusiveArch: %{ix86} x86_64
%description
This version of the Mesa OpenGL library renders 3D graphics using Glide3
for 3Dfx Voodoo 1 & 2 cards, thus allowing hardware accelerated OpenGL on
these 3D only cards. To start an OpenGL application on your Voodoo instead of
on your regular videocard type: "Glide3-libGL <appname> [args]".
You do NOT need this package if you have a 3Dfx Voodoo 3 or 5, the regular
mesa-libGL package supports these full (2D and 3D) video-cards through DRI
(For these 3Dfx cards you do need the regular Glide3 package though).
The Mesa 3D graphics library is a powerful and generic toolset for
creating hardware assisted computer graphics. To the extent that Mesa
utilizes the OpenGL command syntax or state machine, it is being used
with authorization from Silicon Graphics, Inc.
%prep
%setup -q -n Mesa-%{version}
%patch0 -p1 -b .config
%patch1 -p1 -b .64bit
%patch2 -p1 -b .antialias
install -p -m 644 %{SOURCE2} README.fedora
%build
%ifarch %{ix86}
TARGET=linux-x86-glide
%else
TARGET=linux-glide
%endif
make %{?_smp_mflags} LIB_DIR=\$\(TOP\)/%{_lib} ${TARGET}
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}/
mkdir -p $RPM_BUILD_ROOT%{_libdir}/Glide3-libGL/
install -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/Glide3-libGL
cp -a %{_lib}/libGL.so* $RPM_BUILD_ROOT%{_libdir}/Glide3-libGL/
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,0755)
%doc README.fedora docs/license.html
%{_bindir}/Glide3-libGL
%{_libdir}/Glide3-libGL
%changelog
* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 6.2.1-3
- Fixed up License.
* Sun Jan 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 6.2.1-2
- Recreated / redid patch0 and 1 as I lost them (stupid me).
- Added patch2 which adds proper support for anti-aliasing.
- Modified the BuildRequires and -config patch to work with modular-X.
- Changed name to Glide3-libGL, which IMHO really is the most correct name.
* Mon Aug 15 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 6.2.1-1
- Initial Fedora Extras package
Mesa-6.2.1-64bit.patch:
--- NEW FILE Mesa-6.2.1-64bit.patch ---
--- Mesa-6.2.1/include/GL/fxmesa.h.64bit 2004-02-10 08:46:07.000000000 +0100
+++ Mesa-6.2.1/include/GL/fxmesa.h 2006-01-15 09:48:06.000000000 +0100
@@ -66,11 +66,11 @@
GLAPI fxMesaContext GLAPIENTRY fxMesaCreateContext(GLuint win, GrScreenResolution_t,
GrScreenRefresh_t,
- const GLint attribList[]);
+ const long attribList[]);
GLAPI fxMesaContext GLAPIENTRY fxMesaCreateBestContext(GLuint win,
GLint width, GLint height,
- const GLint attribList[]);
+ const long attribList[]);
GLAPI void GLAPIENTRY fxMesaDestroyContext(fxMesaContext ctx);
GLAPI GLint GLAPIENTRY fxMesaSelectCurrentBoard(int n);
--- Mesa-6.2.1/src/mesa/drivers/glide/fxddtex.c.64bit 2006-01-15 10:53:41.000000000 +0100
+++ Mesa-6.2.1/src/mesa/drivers/glide/fxddtex.c 2006-01-15 10:53:44.000000000 +0100
@@ -239,7 +239,7 @@
tfxTexInfo *ti;
if (TDFX_DEBUG & VERBOSE_DRIVER) {
- fprintf(stderr, "fxDDTexBind(%d, %x)\n", tObj->Name, (GLuint)tObj->DriverData);
+ fprintf(stderr, "fxDDTexBind(%d, %lx)\n", tObj->Name, (unsigned long)tObj->DriverData);
}
if ((target != GL_TEXTURE_1D) && (target != GL_TEXTURE_2D))
@@ -295,8 +295,8 @@
tfxTexInfo *ti;
if (TDFX_DEBUG & VERBOSE_DRIVER) {
- fprintf(stderr, "fxDDTexParam(%d, %x, %s, %s)\n",
- tObj->Name, (GLuint) tObj->DriverData,
+ fprintf(stderr, "fxDDTexParam(%d, %lx, %s, %s)\n",
+ tObj->Name, (unsigned long) tObj->DriverData,
_mesa_lookup_enum_by_nr(pname),
_mesa_lookup_enum_by_nr(param));
}
@@ -581,8 +581,8 @@
/* per-texture palette */
tfxTexInfo *ti;
if (TDFX_DEBUG & VERBOSE_DRIVER) {
- fprintf(stderr, "fxDDTexPalette(%d, %x)\n",
- tObj->Name, (GLuint) tObj->DriverData);
+ fprintf(stderr, "fxDDTexPalette(%d, %lx)\n",
+ tObj->Name, (unsigned long) tObj->DriverData);
}
/* This might be a proxy texture. */
if (!tObj->Palette.Table)
@@ -1801,7 +1801,7 @@
for (i = 0; i < rows; i++) {
MEMCPY(dest, data, srcRowStride);
dest += destRowStride;
- data = (GLvoid *)((GLuint)data + (GLuint)srcRowStride);
+ data = (GLvoid *)((GLubyte*)data + srcRowStride);
}
/* [dBorca] Hack alert:
--- Mesa-6.2.1/src/mesa/drivers/glide/fxapi.c.64bit 2004-09-24 16:31:55.000000000 +0200
+++ Mesa-6.2.1/src/mesa/drivers/glide/fxapi.c 2006-01-15 09:48:06.000000000 +0100
@@ -267,7 +267,7 @@
fxMesaContext GLAPIENTRY
fxMesaCreateBestContext(GLuint win, GLint width, GLint height,
- const GLint attribList[])
+ const long attribList[])
{
int res = fxBestResolution(width, height);
@@ -285,7 +285,7 @@
fxMesaContext GLAPIENTRY
fxMesaCreateContext(GLuint win,
GrScreenResolution_t res,
- GrScreenRefresh_t ref, const GLint attribList[])
+ GrScreenRefresh_t ref, const long attribList[])
{
fxMesaContext fxMesa = NULL;
GLcontext *ctx = NULL, *shareCtx = NULL;
--- Mesa-6.2.1/src/mesa/drivers/x11/xm_api.c.64bit 2004-04-30 11:44:22.000000000 +0200
+++ Mesa-6.2.1/src/mesa/drivers/x11/xm_api.c 2006-01-15 09:48:06.000000000 +0100
@@ -1809,7 +1809,7 @@
fxEnvVar = _mesa_getenv("MESA_GLX_FX");
if (fxEnvVar) {
if (fxEnvVar[0]!='d') {
- int attribs[100];
+ long attribs[100];
int numAttribs = 0;
int hw;
if (v->mesa_visual.depthBits > 0) {
@@ -1833,7 +1833,7 @@
}
if (1) {
attribs[numAttribs++] = FXMESA_SHARE_CONTEXT;
- attribs[numAttribs++] = (int) &(c->mesa);
+ attribs[numAttribs++] = (long) &(c->mesa);
}
attribs[numAttribs++] = FXMESA_NONE;
--- Mesa-6.2.1/src/mesa/main/texstore.c.64bit 2004-08-25 17:59:49.000000000 +0200
+++ Mesa-6.2.1/src/mesa/main/texstore.c 2006-01-15 09:48:06.000000000 +0100
@@ -1830,7 +1830,7 @@
else {
/* using a PBO */
if ((const GLubyte *) pixels + imageSize >
- (const GLubyte *) packing->BufferObj->Size) {
+ (const GLubyte *)(unsigned long) packing->BufferObj->Size) {
/* out of bounds read! */
return NULL;
}
--- Mesa-6.2.1/src/mesa/main/bufferobj.c.64bit 2004-11-22 21:05:42.000000000 +0100
+++ Mesa-6.2.1/src/mesa/main/bufferobj.c 2006-01-15 09:48:06.000000000 +0100
@@ -412,11 +412,11 @@
format, type, depth-1, height-1, width);
- if ((const GLubyte *) start > (const GLubyte *) pack->BufferObj->Size) {
+ if ((const GLubyte *) start > (const GLubyte *)(unsigned long) pack->BufferObj->Size) {
/* This will catch negative values / wrap-around */
return GL_FALSE;
}
- if ((const GLubyte *) end > (const GLubyte *) pack->BufferObj->Size) {
+ if ((const GLubyte *) end > (const GLubyte *)(unsigned long) pack->BufferObj->Size) {
/* Image read goes beyond end of buffer */
return GL_FALSE;
}
--- Mesa-6.2.1/src/mesa/glapi/glapi.h.64bit 2004-12-08 16:07:30.000000000 +0100
+++ Mesa-6.2.1/src/mesa/glapi/glapi.h 2006-01-15 09:48:06.000000000 +0100
@@ -117,7 +117,7 @@
_glapi_get_proc_offset(const char *funcName);
-extern const _glapi_proc
+extern _glapi_proc
_glapi_get_proc_address(const char *funcName);
--- Mesa-6.2.1/src/mesa/glapi/glapi.c.64bit 2004-12-05 18:26:27.000000000 +0100
+++ Mesa-6.2.1/src/mesa/glapi/glapi.c 2006-01-15 09:48:06.000000000 +0100
@@ -532,7 +532,7 @@
* Return pointer to the named static (built-in) function.
* \return NULL if function not found.
*/
-static const _glapi_proc
+static _glapi_proc
get_static_proc_address(const char *funcName)
{
const glprocs_table_t * const f = find_entry( funcName );
@@ -837,7 +837,7 @@
* in the name of static functions, try generating a new API entrypoint on
* the fly with assembly language.
*/
-const _glapi_proc
+_glapi_proc
_glapi_get_proc_address(const char *funcName)
{
GLuint i;
Mesa-6.2.1-antialias.patch:
--- NEW FILE Mesa-6.2.1-antialias.patch ---
--- Mesa-6.2.1/src/mesa/drivers/glide/fxsetup.c.antialias 2006-01-15 20:28:01.000000000 +0100
+++ Mesa-6.2.1/src/mesa/drivers/glide/fxsetup.c 2006-01-15 20:38:46.000000000 +0100
@@ -2039,6 +2039,12 @@
/****************************** DD Enable ******************************/
/************************************************************************/
+/* from newer Glide3 fxglide.h, unfortunatly not in exported header files */
+#define GR_AA_ORDERED_OGL 0x00010000
+#define GR_AA_ORDERED_POINTS_OGL GR_AA_ORDERED_OGL+1
+#define GR_AA_ORDERED_LINES_OGL GR_AA_ORDERED_OGL+2
+#define GR_AA_ORDERED_TRIANGLES_OGL GR_AA_ORDERED_OGL+3
+
void
fxDDEnable(GLcontext * ctx, GLenum cap, GLboolean state)
{
@@ -2096,9 +2102,27 @@
fxMesa->new_state |= FX_NEW_CULL;
break;
case GL_LINE_SMOOTH:
- case GL_LINE_STIPPLE:
+ if (state)
+ grEnable(GR_AA_ORDERED_LINES_OGL);
+ else
+ grDisable(GR_AA_ORDERED_LINES_OGL);
+ fxMesa->new_state |= FX_NEW_TEXTURING;
+ break;
case GL_POINT_SMOOTH:
+ if (state)
+ grEnable(GR_AA_ORDERED_POINTS_OGL);
+ else
+ grDisable(GR_AA_ORDERED_POINTS_OGL);
+ fxMesa->new_state |= FX_NEW_TEXTURING;
+ break;
case GL_POLYGON_SMOOTH:
+ if (state)
+ grEnable(GR_AA_ORDERED_TRIANGLES_OGL);
+ else
+ grDisable(GR_AA_ORDERED_TRIANGLES_OGL);
+ fxMesa->new_state |= FX_NEW_TEXTURING;
+ break;
+ case GL_LINE_STIPPLE:
case GL_TEXTURE_1D:
case GL_TEXTURE_2D:
fxMesa->new_state |= FX_NEW_TEXTURING;
Mesa-6.2.1-config.patch:
--- NEW FILE Mesa-6.2.1-config.patch ---
--- Mesa-6.2.1/configs/linux-x86-glide.config 2004-09-13 23:04:20.000000000 +0200
+++ Mesa-6.2.1/configs/linux-x86-glide 2006-01-15 09:26:18.000000000 +0100
@@ -8,9 +8,9 @@
CC = gcc
CXX = g++
-CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
+CFLAGS = $(RPM_OPT_FLAGS) -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -DFX -I/usr/include/glide3
-CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+CXXFLAGS = $(RPM_OPT_FLAGS) -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
GLUT_CFLAGS = -fexceptions
@@ -18,7 +18,7 @@
ASM_SOURCES = $(X86_SOURCES) $(X86_API)
# Library/program dependencies
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm
+GL_LIB_DEPS = -lX11 -lXext -lglide3 -lm -lpthread
+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lglide3 -lm
--- Mesa-6.2.1/configs/default.config 2006-01-15 09:32:20.000000000 +0100
+++ Mesa-6.2.1/configs/default 2006-01-15 09:32:53.000000000 +0100
@@ -22,8 +22,8 @@
# Misc tools and flags
MKLIB_OPTIONS =
-MKDEP = makedepend
-MKDEP_OPTIONS = -Y -fdepend
+MKDEP = gcc -M
+MKDEP_OPTIONS = -MF depend
MAKE = make
# Library names (base name)
--- Mesa-6.2.1/configs/linux-glide.config 2004-09-13 23:06:22.000000000 +0200
+++ Mesa-6.2.1/configs/linux-glide 2006-01-15 09:26:18.000000000 +0100
@@ -8,13 +8,13 @@
CC = gcc
CXX = g++
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+CFLAGS = $(RPM_OPT_FLAGS) -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -DFX -I/usr/include/glide3
+CXXFLAGS = $(RPM_OPT_FLAGS) -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
GLUT_CFLAGS = -fexceptions
# Library/program dependencies
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm
+GL_LIB_DEPS = -lX11 -lXext -lglide3 -lm -lpthread
+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lglide3 -lm
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Glide3-libGL/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 16 Jan 2006 21:20:34 -0000 1.1
+++ .cvsignore 16 Jan 2006 21:22:30 -0000 1.2
@@ -0,0 +1 @@
+MesaLib-6.2.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Glide3-libGL/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 16 Jan 2006 21:20:34 -0000 1.1
+++ sources 16 Jan 2006 21:22:30 -0000 1.2
@@ -0,0 +1 @@
+f43228cd2bf70f583ef3275c1c545421 MesaLib-6.2.1.tar.bz2
More information about the fedora-extras-commits
mailing list