cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove MesaGL, this is now known as Mesa

Browse Source
This commit is contained in:
brad 1999-06-20 23:43:13 +00:00
parent 1e5b0bc720
commit bb8a87a541
16 changed files with 0 additions and 432 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
graphics/MesaGL/Makefile
View File

@ -1,52 +0,0 @@
# $OpenBSD: Makefile,v 1.7 1999/06/11 13:33:27 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/ \
ftp://ftp.enst.fr/distfiles/ \
ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/ \
ftp://ftp.mesa3d.org/mesa/
DISTFILES= ${DISTNAME}.tar.gz MesaDemos-3.0.tar.gz
NEEDED_VERSION= 1.64
HOMEPAGE= http://www.mesa3d.org/
MAINTAINER= brad@openbsd.org
WRKSRC= ${WRKDIR}/Mesa-3.0
USE_X11= yes
SHLIB_VERSION= 3.0
GLUT_VERSION= 3.7
do-install:
${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
${MKDIR} ${PREFIX}/include/GL
${INSTALL_DATA} ${WRKSRC}/include/GL/* ${PREFIX}/include/GL
@if [ -f ${WRKSRC}/lib/libMesaGL.so.${SHLIB_VERSION} ]; then \
${INSTALL_DATA} ${WRKSRC}/lib/libMesaGL.so.${SHLIB_VERSION} ${PREFIX}/lib; \
${LN} -fs libMesaGL.so.${SHLIB_VERSION} ${PREFIX}/lib/libGL.so.${SHLIB_VERSION}; \
fi
@if [ -f ${WRKSRC}/lib/libMesaGLU.so.${SHLIB_VERSION} ]; then \
${INSTALL_DATA} ${WRKSRC}/lib/libMesaGLU.so.${SHLIB_VERSION} ${PREFIX}/lib; \
${LN} -fs libMesaGLU.so.${SHLIB_VERSION} ${PREFIX}/lib/libGLU.so.${SHLIB_VERSION}; \
fi
@if [ -f ${WRKSRC}/lib/libglut.so.${GLUT_VERSION} ]; then \
${INSTALL_DATA} ${WRKSRC}/lib/libglut.so.${GLUT_VERSION} ${PREFIX}/lib; \
fi
${LDCONFIG} -m ${PREFIX}/lib
.include <bsd.port.mk>
.if defined(NO_SHARED_LIBS)
ALL_TARGET= openbsd-static
.else
ALL_TARGET= openbsd
.endif

6
graphics/MesaGL/files/md5
View File

@ -1,6 +0,0 @@
MD5 (MesaDemos-3.0.tar.gz) = 6ec326092bf8f634a23f7203dc66baad
MD5 (MesaLib-3.0.tar.gz) = 34af82a8ab6b8283ea77855f3fdf7ef5
RMD160 (MesaDemos-3.0.tar.gz) = 316d6ab48efa69d5fa66eab50f491c90dc4fd562
RMD160 (MesaLib-3.0.tar.gz) = 07d1e8221b46b7e0cd358eeb18f7d1833d052566
SHA1 (MesaDemos-3.0.tar.gz) = 6461da67eb83c8b3a6aeeefe00f5f76cd77c9b7e
SHA1 (MesaLib-3.0.tar.gz) = 4b297bcde4b70d2f38763b18e3eaa22961e34f68

33
graphics/MesaGL/files/mklib.openbsd-static
View File

@ -1,33 +0,0 @@
#!/bin/sh
# Make a standard Unix .a library file with 'ar cq'
#--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

19
graphics/MesaGL/patches/patch-aa
View File

@ -1,19 +0,0 @@
--- Make-config.orig Sat Aug 29 23:27:56 1998
+++ 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-static:
+ $(MAKE) $(MFLAGS) targets \
+ "GL_LIB = libMesaGL.a" \
+ "GLU_LIB = libMesaGLU.a" \
+ "GLUT_LIB = libglut.a" \
+ "CC = cc" \
+ "CFLAGS = -O2 -I/usr/X11R6/include -DSHM -DHZ=100" \
+ "MAKELIB = ../mklib.openbsd-static" \
+ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi"
+
openstep:
$(MAKE) -f Makefile.OpenStep targets \
"GL_LIB = libMesaGL.a" \

30
graphics/MesaGL/patches/patch-ab
View File

@ -1,30 +0,0 @@
--- Makefile.orig Thu Mar 18 16:32:11 1999
+++ Makefile Thu Mar 18 16:34:08 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-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"
@@ -221,7 +222,7 @@
linux-ppc linux-ppc-so \
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-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 \
@@ -234,10 +235,6 @@
cd src ; $(MAKE) $@
cd src-glu ; $(MAKE) $@
if [ -d src-glut ] ; then cd src-glut ; $(MAKE) $@ ; fi
- if [ -d demos ] ; then cd demos ; $(MAKE) $@ ; fi
- if [ -d xdemos ] ; then cd xdemos ; $(MAKE) $@ ; fi
- if [ -d samples ] ; then cd samples ; $(MAKE) $@ ; fi
- if [ -d book ] ; then cd book ; $(MAKE) $@ ; fi
irix6-n32 irix6-n32-dso irix6-gcc-n32-sl:

20
graphics/MesaGL/patches/patch-ac
View File

@ -1,20 +0,0 @@
--- mklib.openbsd.orig Tue Oct 21 19:34:34 1997
+++ mklib.openbsd Tue Apr 13 23:18:42 1999
@@ -40,12 +40,10 @@
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
-ln -s ../lib/${LIBRARY}.so.${VERSION} ../lib/${LIBRARY}.so
+cp ${LIBRARY}.a ${LIBRARY}.so.${VERSION} ../lib

86
graphics/MesaGL/patches/patch-ad
View File

@ -1,86 +0,0 @@
--- src/copypix.c.orig Mon Mar 8 22:33:30 1999
+++ src/copypix.c Mon Mar 8 22:35:18 1999
@@ -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 );

34
graphics/MesaGL/patches/patch-ae
View File

@ -1,34 +0,0 @@
--- src/get.c.orig Sun Mar 7 19:14:22 1999
+++ src/get.c Sun Mar 7 19:14:27 1999
@@ -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:

21
graphics/MesaGL/patches/patch-af
View File

@ -1,21 +0,0 @@
--- src/misc.c.orig Sun Mar 7 19:14:46 1999
+++ src/misc.c Sun Mar 7 19:14:51 1999
@@ -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) &&

28
graphics/MesaGL/patches/patch-ag
View File

@ -1,28 +0,0 @@
--- src/pixel.c.orig Sun Mar 7 19:15:18 1999
+++ src/pixel.c Sun Mar 7 19:15:22 1999
@@ -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)" );

37
graphics/MesaGL/patches/patch-ah
View File

@ -1,37 +0,0 @@
--- src/teximage.c.orig Sun Mar 7 19:15:47 1999
+++ src/teximage.c Sun Mar 7 19:15:52 1999
@@ -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

1
graphics/MesaGL/pkg/COMMENT
View File

@ -1 +0,0 @@
graphics library similar to SGI's OpenGL

10
graphics/MesaGL/pkg/DESCR
View File

@ -1,10 +0,0 @@
Mesa is a 3-D graphics library with an API which is very similar to that
of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax
or state machine, it is being used with authorization from Silicon Graphics,
Inc. However, the author makes no claim that Mesa is in any way a
compatible replacement for OpenGL or associated with Silicon Graphics, Inc.
Those who want a licensed implementation of OpenGL should contact a licensed
vendor. This software is distributed under the terms of the GNU Library
General Public License, see the LICENSE file for details.
paulo@isr.uc.pt

29
graphics/MesaGL/pkg/PLIST
View File

@ -1,29 +0,0 @@
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/libGL.so.3.0
lib/libGLU.a
lib/libGLU.so.3.0
lib/libMesaGL.a
lib/libMesaGL.so.3.0
lib/libMesaGLU.a
lib/libMesaGLU.so.3.0
lib/libglut.a
lib/libglut.so.3.7
@exec /sbin/ldconfig -m %B
@dirrm include/GL

23
graphics/MesaGL/pkg/PLIST.noshared
View File

@ -1,23 +0,0 @@
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
View File

@ -1,3 +0,0 @@
#!/bin/sh
cp ${FILESDIR}/mklib.openbsd-static ${WRKSRC}/