fixups and add currently available patches from Mesa web page
This commit is contained in:
parent
fb6fbc78d7
commit
f4d2216f66
@ -1,10 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 1999/03/07 05:50:47 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 1999/03/09 02:09:08 brad Exp $
|
||||
# $FreeBSD: Makefile,v 1.30 1998/11/11 05:37:18 asami Exp $
|
||||
|
||||
DISTNAME= MesaLib-3.0
|
||||
PKGNAME= MesaGL-3.0
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= ftp://iris.ssec.wisc.edu/pub/Mesa/ \
|
||||
|
||||
NEEDED_VERSION= 1.64
|
||||
|
||||
MASTER_SITES= ftp://ftp.mesa3d.org/mesa/ \
|
||||
ftp://iris.ssec.wisc.edu/pub/Mesa/ \
|
||||
ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
|
||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MesaDemos-3.0.tar.gz
|
||||
|
||||
@ -13,32 +17,33 @@ MAINTAINER= brad@openbsd.org
|
||||
WRKSRC= ${WRKDIR}/Mesa-3.0
|
||||
|
||||
USE_X11= yes
|
||||
LIBS= libMesaGL libMesaGLU
|
||||
|
||||
.if (${MACHINE_ARCH} == "i386")
|
||||
ALL_TARGET= openbsd-386
|
||||
.else
|
||||
ALL_TARGET= openbsd
|
||||
.endif
|
||||
|
||||
SHLIB_VERSION= 3.0
|
||||
GLUT_VERSION= 3.7
|
||||
|
||||
do-install:
|
||||
.for file in ${LIBS}
|
||||
${INSTALL_DATA} ${WRKSRC}/lib/${file}_pic.a ${PREFIX}/lib
|
||||
${INSTALL_DATA} ${WRKSRC}/lib/${file}.so.${SHLIB_VERSION} ${PREFIX}/lib
|
||||
${LN} -fs ${file}.so.${SHLIB_VERSION} ${PREFIX}/lib/${file}.so
|
||||
.endfor
|
||||
${INSTALL_DATA} ${WRKSRC}/lib/libglut_pic.a ${PREFIX}/lib
|
||||
${INSTALL_DATA} ${WRKSRC}/lib/libMesaGL.a ${PREFIX}/lib
|
||||
${INSTALL_DATA} ${WRKSRC}/lib/libMesaGLU.a ${PREFIX}/lib
|
||||
${INSTALL_DATA} ${WRKSRC}/lib/libglut.a ${PREFIX}/lib
|
||||
@${LN} -fs libMesaGL.a ${PREFIX}/lib/libGL.a
|
||||
@${LN} -fs libMesaGLU.a ${PREFIX}/lib/libGLU.a
|
||||
${INSTALL_DATA} ${WRKSRC}/lib/libMesaGL.so.${SHLIB_VERSION} ${PREFIX}/lib
|
||||
@${LN} -fs libMesaGL.so.${SHLIB_VERSION} ${PREFIX}/lib/libMesaGL.so
|
||||
@${LN} -fs libMesaGL.so.${SHLIB_VERSION} ${PREFIX}/lib/libGL.so.${SHLIB_VERSION}
|
||||
@${LN} -fs libMesaGL.so ${PREFIX}/lib/libGL.so
|
||||
${INSTALL_DATA} ${WRKSRC}/lib/libMesaGLU.so.${SHLIB_VERSION} ${PREFIX}/lib
|
||||
@${LN} -fs libMesaGLU.so.${SHLIB_VERSION} ${PREFIX}/lib/libMesaGLU.so
|
||||
@${LN} -fs libMesaGLU.so.${SHLIB_VERSION} ${PREFIX}/lib/libGLU.so.${SHLIB_VERSION}
|
||||
@${LN} -fs libMesaGLU.so ${PREFIX}/lib/libGLU.so
|
||||
${INSTALL_DATA} ${WRKSRC}/lib/libglut.so.${GLUT_VERSION} ${PREFIX}/lib
|
||||
${LN} -fs libglut.so.${GLUT_VERSION} ${PREFIX}/lib/libglut.so
|
||||
.for file in GL GLU
|
||||
@${LN} -fs libMesa${file}_pic.a ${PREFIX}/lib/lib${file}_pic.a
|
||||
@${LN} -fs libMesa${file}.so.${SHLIB_VERSION} ${PREFIX}/lib/lib${file}.so.${SHLIB_VERSION}
|
||||
@${LN} -fs libMesa${file}.so ${PREFIX}/lib/lib${file}.so
|
||||
.endfor
|
||||
@${LN} -fs libglut.so.${GLUT_VERSION} ${PREFIX}/lib/libglut.so
|
||||
@${MKDIR} ${PREFIX}/include/GL
|
||||
${INSTALL_DATA} ${WRKSRC}/include/GL/* ${PREFIX}/include/GL
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
.if !defined(NO_SHARED_LIBS)
|
||||
ALL_TARGET= openbsd
|
||||
.else
|
||||
BROKEN= "Currently does not build correctly"
|
||||
.endif
|
||||
|
33
graphics/MesaGL/files/mklib.openbsd-static
Executable file
33
graphics/MesaGL/files/mklib.openbsd-static
Executable file
@ -0,0 +1,33 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Make a standard Unix .a library file with 'ar q'
|
||||
|
||||
#--common--------------------------------------------------------------
|
||||
|
||||
# Usage: mklib libname major minor file.o ...
|
||||
#
|
||||
# First argument is name of output library (LIBRARY)
|
||||
# Second arg is major version number (MAJOR)
|
||||
# Third arg is minor version number (MINOR)
|
||||
# Rest of arguments are object files (OBJECTS)
|
||||
|
||||
LIBRARY=$1
|
||||
shift 1
|
||||
|
||||
MAJOR=$1
|
||||
shift 1
|
||||
|
||||
MINOR=$1
|
||||
shift 1
|
||||
|
||||
OBJECTS=$*
|
||||
|
||||
#--platform-------------------------------------------------------------
|
||||
|
||||
set -x
|
||||
|
||||
rm -f ${LIBRARY}
|
||||
ar cq ${LIBRARY} ${OBJECTS}
|
||||
ranlib ${LIBRARY}
|
||||
|
||||
cp ${LIBRARY} ../lib
|
@ -1,19 +1,18 @@
|
||||
--- Make-config.orig Sat Aug 29 23:27:56 1998
|
||||
+++ Make-config Sat Mar 6 23:20:12 1999
|
||||
@@ -817,6 +817,17 @@
|
||||
+++ Make-config Sun Mar 7 17:29:58 1999
|
||||
@@ -817,6 +817,16 @@
|
||||
"MAKELIB = ../mklib.openbsd" \
|
||||
"XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi"
|
||||
|
||||
+openbsd-386:
|
||||
+openbsd-static:
|
||||
+ $(MAKE) $(MFLAGS) targets \
|
||||
+ "GL_LIB = libMesaGL.so" \
|
||||
+ "GLU_LIB = libMesaGLU.so" \
|
||||
+ "GLUT_LIB = libglut.so" \
|
||||
+ "GL_LIB = libMesaGL.a" \
|
||||
+ "GLU_LIB = libMesaGLU.a" \
|
||||
+ "GLUT_LIB = libglut.a" \
|
||||
+ "CC = cc" \
|
||||
+ "CFLAGS = -O3 -ffast-math -fPIC -I/usr/X11R6/include -DSHM -DHZ=100" -DUSE_X86_ASM\
|
||||
+ "MAKELIB = ../mklib.openbsd" \
|
||||
+ "CFLAGS = -O2 -I/usr/X11R6/include -DSHM -DHZ=100" \
|
||||
+ "MAKELIB = ../mklib.openbsd-static" \
|
||||
+ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi"
|
||||
+ "ASM_SOURCES = asm_386.S"
|
||||
+
|
||||
openstep:
|
||||
$(MAKE) -f Makefile.OpenStep targets \
|
||||
|
@ -1,10 +1,10 @@
|
||||
--- Makefile.orig Sat Mar 6 23:23:58 1999
|
||||
+++ Makefile Sat Mar 6 23:26:09 1999
|
||||
--- Makefile.orig Mon Aug 31 23:14:24 1998
|
||||
+++ Makefile Sun Mar 7 03:59:05 1999
|
||||
@@ -172,6 +172,7 @@
|
||||
@echo " make next-x86-x11 for NeXT on Intel x86 with X11"
|
||||
@echo " make next-x11 for NeXT with X11"
|
||||
@echo " make openbsd for OpenBSD systems"
|
||||
+ @echo " make openbsd-386 for OpenBSD systems, w/ Intel assembly"
|
||||
+ @echo " make openbsd-static for OpenBSD systems, w/o shared libs"
|
||||
@echo " make openstep for NeXT systems with OPENSTEP 4.0"
|
||||
@echo " make openstep-dynlib for NeXT systems with OPENSTEP 4.0, shared libs"
|
||||
@echo " make os2-x11 for OS/2 with XFree86"
|
||||
@ -13,7 +13,7 @@
|
||||
linux-sparc5-elf \
|
||||
lynxos machten-2.2 machten-4.0 \
|
||||
-mklinux netbsd next-x86-x11 next-x11 osf1 osf1-sl openbsd qnx sco \
|
||||
+mklinux netbsd next-x86-x11 next-x11 osf1 osf1-sl openbsd openbsd-386 qnx sco \
|
||||
+mklinux netbsd next-x86-x11 next-x11 osf1 osf1-sl openbsd openbsd-static qnx sco \
|
||||
solaris-x86 solaris-x86-gcc sunSolaris-CC \
|
||||
sunos4 sunos4-sl sunos4-gcc sunos4-gcc-sl sunos4-gcc-x11r6-sl \
|
||||
sunos5 sunos5-sl sunos5-ultra sunos5-ultra-sl sunos5-gcc sunos5-gcc-sl \
|
||||
|
20
graphics/MesaGL/patches/patch-ac
Normal file
20
graphics/MesaGL/patches/patch-ac
Normal file
@ -0,0 +1,20 @@
|
||||
--- mklib.openbsd.orig Sun Mar 7 16:36:30 1999
|
||||
+++ mklib.openbsd Sun Mar 7 16:39:26 1999
|
||||
@@ -40,12 +40,11 @@
|
||||
|
||||
VERSION="${MAJOR}.${MINOR}"
|
||||
|
||||
-echo "Building PIC library $LIBRARY"
|
||||
-rm -f ${LIBRARY}_pic.a ${LIBRARY}.so.${VERSION}
|
||||
-ar cq ${LIBRARY}_pic.a ${OBJECTS}
|
||||
-ranlib ${LIBRARY}_pic.a
|
||||
+rm -f ${LIBRARY}.a ${LIBRARY}.so.${VERSION}
|
||||
+ar cq ${LIBRARY}.a ${OBJECTS}
|
||||
+ranlib ${LIBRARY}.a
|
||||
|
||||
-ld -x -Bshareable -Bforcearchive -o ${LIBRARY}.so.${VERSION} ${LIBRARY}_pic.a
|
||||
+ld -x -Bshareable -Bforcearchive -o ${LIBRARY}.so.${VERSION} ${LIBRARY}.a
|
||||
|
||||
-cp ${LIBRARY}_pic.a ${LIBRARY}.so.${VERSION} ../lib
|
||||
+cp ${LIBRARY}.a ${LIBRARY}.so.${VERSION} ../lib
|
||||
ln -s ../lib/${LIBRARY}.so.${VERSION} ../lib/${LIBRARY}.so
|
105
graphics/MesaGL/patches/patch-ad
Normal file
105
graphics/MesaGL/patches/patch-ad
Normal file
@ -0,0 +1,105 @@
|
||||
--- src/copypix.c.orig Sun Mar 7 19:12:34 1999
|
||||
+++ src/copypix.c Sun Mar 7 19:13:11 1999
|
||||
@@ -1,4 +1,4 @@
|
||||
-/* $Id: patch-ad,v 1.1 1999/03/09 02:09:09 brad Exp $ */
|
||||
+/* $Id: patch-ad,v 1.1 1999/03/09 02:09:09 brad Exp $ */
|
||||
|
||||
/*
|
||||
* Mesa 3-D graphics library
|
||||
@@ -23,6 +23,9 @@
|
||||
|
||||
/*
|
||||
* $Log: patch-ad,v $
|
||||
* Revision 1.1 1999/03/09 02:09:09 brad
|
||||
* fixups and add currently available patches from Mesa web page
|
||||
*
|
||||
+ * Revision 3.9 1998/09/25 03:03:01 brianp
|
||||
+ * fixed front/back alpha copy bug per Sam Jordan
|
||||
+ *
|
||||
* Revision 3.8 1998/07/17 03:24:16 brianp
|
||||
* added Pixel.ScaleOrBiasRGBA field
|
||||
*
|
||||
@@ -71,9 +74,10 @@
|
||||
|
||||
|
||||
|
||||
-static void copy_rgb_pixels( GLcontext* ctx,
|
||||
- GLint srcx, GLint srcy, GLint width, GLint height,
|
||||
- GLint destx, GLint desty )
|
||||
+static void copy_rgba_pixels( GLcontext* ctx,
|
||||
+ GLint srcx, GLint srcy,
|
||||
+ GLint width, GLint height,
|
||||
+ GLint destx, GLint desty )
|
||||
{
|
||||
GLdepth zspan[MAX_WIDTH];
|
||||
GLubyte rgba[MAX_WIDTH][4];
|
||||
@@ -81,6 +85,7 @@
|
||||
GLint sy, dy, stepy;
|
||||
GLint i, j;
|
||||
GLboolean setbuffer;
|
||||
+ GLubyte *saveAlpha;
|
||||
const GLboolean zoom = ctx->Pixel.ZoomX!=1.0F || ctx->Pixel.ZoomY!=1.0F;
|
||||
|
||||
/* Determine if copy should be done bottom-to-top or top-to-bottom */
|
||||
@@ -114,36 +119,46 @@
|
||||
}
|
||||
|
||||
/* If read and draw buffer are different we must do buffer switching */
|
||||
- setbuffer = ctx->Pixel.ReadBuffer!=ctx->Color.DrawBuffer;
|
||||
-
|
||||
+ saveAlpha = ctx->Buffer->Alpha;
|
||||
+ setbuffer = ctx->Pixel.ReadBuffer != ctx->Color.DrawBuffer;
|
||||
for (j=0; j<height; j++, sy+=stepy, dy+=stepy) {
|
||||
if (setbuffer) {
|
||||
(*ctx->Driver.SetBuffer)( ctx, ctx->Pixel.ReadBuffer );
|
||||
+ if (ctx->Pixel.ReadBuffer == GL_FRONT)
|
||||
+ ctx->Buffer->Alpha = ctx->Buffer->FrontAlpha;
|
||||
+ else
|
||||
+ ctx->Buffer->Alpha = ctx->Buffer->BackAlpha;
|
||||
}
|
||||
gl_read_rgba_span( ctx, width, srcx, sy, rgba );
|
||||
-
|
||||
if (ctx->Pixel.ScaleOrBiasRGBA) {
|
||||
gl_scale_and_bias_rgba( ctx, width, rgba );
|
||||
}
|
||||
if (ctx->Pixel.MapColorFlag) {
|
||||
gl_map_rgba( ctx, width, rgba );
|
||||
}
|
||||
-
|
||||
if (setbuffer) {
|
||||
(*ctx->Driver.SetBuffer)( ctx, ctx->Color.DrawBuffer );
|
||||
+ if (ctx->Color.DrawBuffer == GL_FRONT)
|
||||
+ ctx->Buffer->Alpha = ctx->Buffer->FrontAlpha;
|
||||
+ else
|
||||
+ ctx->Buffer->Alpha = ctx->Buffer->BackAlpha;
|
||||
}
|
||||
if (quick_draw && dy>=0 && dy<ctx->Buffer->Height) {
|
||||
(*ctx->Driver.WriteRGBASpan)( ctx, width, destx, dy, rgba, NULL );
|
||||
+
|
||||
}
|
||||
else if (zoom) {
|
||||
gl_write_zoomed_rgba_span( ctx, width, destx, dy, zspan, rgba, desty);
|
||||
}
|
||||
else {
|
||||
- gl_write_rgba_span( ctx, width, destx, dy, zspan, rgba, GL_BITMAP );
|
||||
+ gl_write_rgba_span( ctx, width, destx, dy, zspan, rgba, GL_BITMAP
|
||||
+);
|
||||
}
|
||||
}
|
||||
-}
|
||||
|
||||
+ /* Restore current alpha buffer pointer */
|
||||
+ ctx->Buffer->Alpha = saveAlpha;
|
||||
+}
|
||||
|
||||
|
||||
static void copy_ci_pixels( GLcontext* ctx,
|
||||
@@ -368,7 +383,7 @@
|
||||
desty = (GLint) (ctx->Current.RasterPos[1] + 0.5F);
|
||||
|
||||
if (type==GL_COLOR && ctx->Visual->RGBAflag) {
|
||||
- copy_rgb_pixels( ctx, srcx, srcy, width, height, destx, desty );
|
||||
+ copy_rgba_pixels( ctx, srcx, srcy, width, height, destx, desty );
|
||||
}
|
||||
else if (type==GL_COLOR && !ctx->Visual->RGBAflag) {
|
||||
copy_ci_pixels( ctx, srcx, srcy, width, height, destx, desty );
|
58
graphics/MesaGL/patches/patch-ae
Normal file
58
graphics/MesaGL/patches/patch-ae
Normal file
@ -0,0 +1,58 @@
|
||||
--- src/get.c.orig Sun Mar 7 19:14:22 1999
|
||||
+++ src/get.c Sun Mar 7 19:14:27 1999
|
||||
@@ -1,8 +1,8 @@
|
||||
-/* $Id: patch-ae,v 1.1 1999/03/09 02:09:09 brad Exp $ */
|
||||
+/* $Id: patch-ae,v 1.1 1999/03/09 02:09:09 brad Exp $ */
|
||||
|
||||
/*
|
||||
* Mesa 3-D graphics library
|
||||
- * Version: 3.0
|
||||
+ * Version: 3.1
|
||||
* Copyright (C) 1995-1998 Brian Paul
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
@@ -23,6 +23,9 @@
|
||||
|
||||
/*
|
||||
* $Log: patch-ae,v $
|
||||
* Revision 1.1 1999/03/09 02:09:09 brad
|
||||
* fixups and add currently available patches from Mesa web page
|
||||
*
|
||||
+ * Revision 3.16 1998/10/01 02:51:39 brianp
|
||||
+ * added GL_MAX_3D_TEXTURE_SIZE support to glGet*()
|
||||
+ *
|
||||
* Revision 3.15 1998/07/29 04:09:33 brianp
|
||||
* getting polygon stipple on/off state was broken
|
||||
*
|
||||
@@ -588,6 +591,7 @@
|
||||
*params = INT_TO_BOOL(MAX_PROJECTION_STACK_DEPTH);
|
||||
break;
|
||||
case GL_MAX_TEXTURE_SIZE:
|
||||
+ case GL_MAX_3D_TEXTURE_SIZE:
|
||||
*params = INT_TO_BOOL(max_texture_size(ctx));
|
||||
break;
|
||||
case GL_MAX_TEXTURE_STACK_DEPTH:
|
||||
@@ -1447,6 +1451,7 @@
|
||||
*params = (GLdouble) MAX_PROJECTION_STACK_DEPTH;
|
||||
break;
|
||||
case GL_MAX_TEXTURE_SIZE:
|
||||
+ case GL_MAX_3D_TEXTURE_SIZE:
|
||||
*params = (GLdouble) max_texture_size(ctx);
|
||||
break;
|
||||
case GL_MAX_TEXTURE_STACK_DEPTH:
|
||||
@@ -2303,6 +2308,7 @@
|
||||
*params = (GLfloat) MAX_PROJECTION_STACK_DEPTH;
|
||||
break;
|
||||
case GL_MAX_TEXTURE_SIZE:
|
||||
+ case GL_MAX_3D_TEXTURE_SIZE:
|
||||
*params = (GLfloat) max_texture_size(ctx);
|
||||
break;
|
||||
case GL_MAX_TEXTURE_STACK_DEPTH:
|
||||
@@ -3160,6 +3166,7 @@
|
||||
*params = (GLint) MAX_PROJECTION_STACK_DEPTH;
|
||||
break;
|
||||
case GL_MAX_TEXTURE_SIZE:
|
||||
+ case GL_MAX_3D_TEXTURE_SIZE:
|
||||
*params = max_texture_size(ctx);
|
||||
break;
|
||||
case GL_MAX_TEXTURE_STACK_DEPTH:
|
34
graphics/MesaGL/patches/patch-af
Normal file
34
graphics/MesaGL/patches/patch-af
Normal file
@ -0,0 +1,34 @@
|
||||
--- src/misc.c.orig Sun Mar 7 19:14:46 1999
|
||||
+++ src/misc.c Sun Mar 7 19:14:51 1999
|
||||
@@ -23,6 +23,9 @@
|
||||
|
||||
/*
|
||||
* $Log: patch-af,v $
|
||||
* Revision 1.1 1999/03/09 02:09:09 brad
|
||||
* fixups and add currently available patches from Mesa web page
|
||||
*
|
||||
+ * Revision 3.14.1 1999/02/17 22:00:00 brianp
|
||||
+ * fixed bug when clearing color buffer with RGBA or index masking
|
||||
+ *
|
||||
* Revision 3.14 1998/09/18 02:32:02 brianp
|
||||
* fixed alpha clear problem reported by Sam Jordan
|
||||
*
|
||||
@@ -260,8 +263,17 @@
|
||||
width = ctx->Buffer->Xmax - ctx->Buffer->Xmin + 1;
|
||||
|
||||
/* let device driver try to clear the buffers */
|
||||
- newMask = (*ctx->Driver.Clear)( ctx, mask, !ctx->Scissor.Enabled,
|
||||
+ if ((mask & GL_COLOR_BUFFER_BIT) != 0 && ctx->Color.SWmasking) {
|
||||
+ /* driver can't clear color buffer with color/index masking */
|
||||
+ GLbitfield mask2 = mask & (~GL_COLOR_BUFFER_BIT);
|
||||
+ newMask = (*ctx->Driver.Clear)( ctx, mask2, !ctx->Scissor.Enabled,
|
||||
x, y, width, height );
|
||||
+ newMask |= GL_COLOR_BUFFER_BIT;
|
||||
+ }
|
||||
+ else {
|
||||
+ newMask = (*ctx->Driver.Clear)( ctx, mask, !ctx->Scissor.Enabled,
|
||||
+ x, y, width, height );
|
||||
+ }
|
||||
|
||||
/* check if only clearing of alpha buffer needed */
|
||||
if ( (mask & GL_COLOR_BUFFER_BIT) &&
|
47
graphics/MesaGL/patches/patch-ag
Normal file
47
graphics/MesaGL/patches/patch-ag
Normal file
@ -0,0 +1,47 @@
|
||||
--- src/pixel.c.orig Sun Mar 7 19:15:18 1999
|
||||
+++ src/pixel.c Sun Mar 7 19:15:22 1999
|
||||
@@ -1,4 +1,4 @@
|
||||
-/* $Id: patch-ag,v 1.1 1999/03/09 02:09:09 brad Exp $ */
|
||||
+/* $Id: patch-ag,v 1.1 1999/03/09 02:09:09 brad Exp $ */
|
||||
|
||||
/*
|
||||
* Mesa 3-D graphics library
|
||||
@@ -23,6 +23,9 @@
|
||||
|
||||
/*
|
||||
* $Log: patch-ag,v $
|
||||
* Revision 1.1 1999/03/09 02:09:09 brad
|
||||
* fixups and add currently available patches from Mesa web page
|
||||
*
|
||||
+ * Revision 3.7 1998/09/29 01:35:41 brianp
|
||||
+ * glPixelStore() now handles GL_PACK/UNPACK_IMAGE_HEIGHT
|
||||
+ *
|
||||
* Revision 3.6 1998/07/17 03:23:47 brianp
|
||||
* added a bunch of const's
|
||||
*
|
||||
@@ -113,6 +116,12 @@
|
||||
ctx->Pack.RowLength = param;
|
||||
}
|
||||
break;
|
||||
+ case GL_PACK_IMAGE_HEIGHT:
|
||||
+ if (param<0)
|
||||
+ gl_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
|
||||
+ else
|
||||
+ ctx->Pack.ImageHeight = param;
|
||||
+ break;
|
||||
case GL_PACK_SKIP_PIXELS:
|
||||
if (param<0) {
|
||||
gl_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
|
||||
@@ -151,6 +160,12 @@
|
||||
ctx->Unpack.RowLength = param;
|
||||
}
|
||||
break;
|
||||
+ case GL_UNPACK_IMAGE_HEIGHT:
|
||||
+ if (param<0)
|
||||
+ gl_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
|
||||
+ else
|
||||
+ ctx->Unpack.ImageHeight = param;
|
||||
+ break;
|
||||
case GL_UNPACK_SKIP_PIXELS:
|
||||
if (param<0) {
|
||||
gl_error( ctx, GL_INVALID_VALUE, "glPixelStore(param)" );
|
56
graphics/MesaGL/patches/patch-ah
Normal file
56
graphics/MesaGL/patches/patch-ah
Normal file
@ -0,0 +1,56 @@
|
||||
--- src/teximage.c.orig Sun Mar 7 19:15:47 1999
|
||||
+++ src/teximage.c Sun Mar 7 19:15:52 1999
|
||||
@@ -1,4 +1,4 @@
|
||||
-/* $Id: patch-ah,v 1.1 1999/03/09 02:09:10 brad Exp $ */
|
||||
+/* $Id: patch-ah,v 1.1 1999/03/09 02:09:10 brad Exp $ */
|
||||
|
||||
/*
|
||||
* Mesa 3-D graphics library
|
||||
@@ -23,6 +23,9 @@
|
||||
|
||||
/*
|
||||
* $Log: patch-ah,v $
|
||||
* Revision 1.1 1999/03/09 02:09:10 brad
|
||||
* fixups and add currently available patches from Mesa web page
|
||||
*
|
||||
+ * Revision 3.13 1998/09/25 03:07:34 brianp
|
||||
+ * fixed out-of-bounds memory access on X86 (Sven Panne)
|
||||
+ *
|
||||
* Revision 3.12 1998/09/18 02:32:40 brianp
|
||||
* fixed proxy texture internal format bug reported by Sam Jordon
|
||||
*
|
||||
@@ -279,6 +282,16 @@
|
||||
|
||||
|
||||
|
||||
+/* Need this to prevent an out-of-bounds memory access when using
|
||||
+ * X86 optimized code.
|
||||
+ */
|
||||
+#ifdef USE_X86_ASM
|
||||
+# define EXTRA_BYTE 1
|
||||
+#else
|
||||
+# define EXTRA_BYTE 0
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
/*
|
||||
* Given a gl_image, apply the pixel transfer scale, bias, and mapping
|
||||
* to produce a gl_texture_image. Convert image data to GLubytes.
|
||||
@@ -328,7 +341,7 @@
|
||||
texImage->Height2 = 1 << texImage->HeightLog2;
|
||||
texImage->Depth2 = 1 << texImage->DepthLog2;
|
||||
texImage->MaxLog2 = MAX2( texImage->WidthLog2, texImage->HeightLog2 );
|
||||
- texImage->Data = (GLubyte *) malloc( numPixels * components );
|
||||
+ texImage->Data = (GLubyte *) malloc( numPixels * components + EXTRA_BYTE );
|
||||
|
||||
if (!texImage->Data) {
|
||||
/* out of memory */
|
||||
@@ -775,7 +788,7 @@
|
||||
/* XXX should we really allocate memory for the image or let it be NULL? */
|
||||
/*texImage->Data = NULL;*/
|
||||
|
||||
- texImage->Data = (GLubyte *) malloc( numPixels * components );
|
||||
+ texImage->Data = (GLubyte *) malloc( numPixels * components + EXTRA_BYTE );
|
||||
|
||||
/*
|
||||
* Let's see if anyone finds this. If glTexImage2D() is called with
|
@ -15,15 +15,19 @@ include/GL/osmesa3.h
|
||||
include/GL/svgamesa.h
|
||||
include/GL/wmesa.h
|
||||
include/GL/xmesa.h
|
||||
lib/libGL.a
|
||||
lib/libGL.so
|
||||
lib/libGL.so.3.0
|
||||
lib/libGLU.a
|
||||
lib/libGLU.so
|
||||
lib/libMesaGL_pic.a
|
||||
lib/libGLU.so.3.0
|
||||
lib/libMesaGL.a
|
||||
lib/libMesaGL.so
|
||||
lib/libMesaGL.so.3.0
|
||||
lib/libMesaGLU_pic.a
|
||||
lib/libMesaGLU.a
|
||||
lib/libMesaGLU.so
|
||||
lib/libMesaGLU.so.3.0
|
||||
lib/libglut_pic.a
|
||||
lib/libglut.a
|
||||
lib/libglut.so
|
||||
lib/libglut.so.3.7
|
||||
@dirrm include/GL
|
||||
|
23
graphics/MesaGL/pkg/PLIST.noshared
Normal file
23
graphics/MesaGL/pkg/PLIST.noshared
Normal file
@ -0,0 +1,23 @@
|
||||
include/GL/dosmesa.h
|
||||
include/GL/foomesa.h
|
||||
include/GL/fxmesa.h
|
||||
include/GL/ggimesa.h
|
||||
include/GL/gl.h
|
||||
include/GL/gl_mangle.h
|
||||
include/GL/glu.h
|
||||
include/GL/glu_mangle.h
|
||||
include/GL/glut.h
|
||||
include/GL/glx.h
|
||||
include/GL/glx_mangle.h
|
||||
include/GL/mglmesa.h
|
||||
include/GL/osmesa.h
|
||||
include/GL/osmesa3.h
|
||||
include/GL/svgamesa.h
|
||||
include/GL/wmesa.h
|
||||
include/GL/xmesa.h
|
||||
lib/libGL.a
|
||||
lib/libGLU.a
|
||||
lib/libMesaGL.a
|
||||
lib/libMesaGLU.a
|
||||
lib/libglut.a
|
||||
@dirrm include/GL
|
3
graphics/MesaGL/scripts/configure
vendored
Normal file
3
graphics/MesaGL/scripts/configure
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
#!/bin/sh
|
||||
|
||||
cp ${FILESDIR}/mklib.openbsd-static ${WRKSRC}/
|
Loading…
Reference in New Issue
Block a user