diff options
author | adam <adam> | 2004-10-26 13:55:17 +0000 |
---|---|---|
committer | adam <adam> | 2004-10-26 13:55:17 +0000 |
commit | 67d8a6fd5d3396a23b76cb46eadb07b14777a271 (patch) | |
tree | 415efe7d6f5be72ec84c4a7f74c26af42f5c1da8 /graphics/MesaLib | |
parent | cdfc1333d8f9ad06fcfbde4dc26b590c7f944b66 (diff) | |
download | pkgsrc-67d8a6fd5d3396a23b76cb46eadb07b14777a271.tar.gz |
Changes 6.2:
New:
- enabled GL_ARB_texture_rectangle (same as GL_NV_texture_rectangle)
- updated Doxygen support (Jose Fonseca)
Changes:
- some GGI driver updates (Christoph Egger, bug 1025977)
Bug fixes:
- Omit GL_ARB_texture_non_power_of_two from list of OpenGL 1.5 features
- fixed a few compilation issues on IRIX
- fixed a matrix classification bug (reported by Wes Bethel)
- we weren't reseting the vertex/fragment program error state
before parsing (Dave Reveman)
- adjust texcoords for sampling texture rectangles (Dave Reveman)
- glGet*(GL_MAX_VERTEX_ATTRIBS_ARB) wasn't implemented
- repeated calls to glDeleteTexture(t) could lead to a crash
- fixed potential ref count bugs in VBOs and vertex/fragment programs
- spriteblast demo didn't handle window size changes correctly
- glTexSubImage didn't handle pixels=NULL correctly for PBOs
- fixed color index mode glDrawPixels bug (Karl Schultz)
Changes 6.1:
New:
- Revamped Makefile system
- glXUseRotatedXFont() utility (see xdemos/xuserotfont.c)
- internal driver interface changes related to texture object
allocation, vertex/fragment programs, BlendEquationSeparate, etc.
- option to walk triangle edges with double-precision floats
(Justin Novosad of Discreet) (see config.h file)
- support for AUX buffers in software GLX driver
- updated glext.h to version 24 and glxext.h to version 6
- new MESA_GLX_FORCE_ALPHA and MESA_GLX_DEPTH_BITS env vars
- updated BeOS support (Philippe Houdoin)
Changes:
- fragment fog interpolation is perspective corrected now
- new glTexImage code, much cleaner, may be a bit faster
Bug fixes:
- glArrayElement in display lists didn't handle generic vertex attribs
- glFogCoord didn't always work properly
- ARB_fragment_program fog options didn't work
- frag prog TEX instruction no longer incorrectly divides s,t,r by q
- ARB frag prog TEX and TEXP instructions now use LOD=0
- glTexEnviv in display lists didn't work
- glRasterPos didn't do texgen or apply texture matrix
- GL_DOUBLE-valued vertex arrays were broken in some cases
- fixed texture rectangle edge/border sampling bugs
- sampling an incomplete texture in a fragment program would segfault
- glTexImage was missing a few error checks
- fixed some minor glGetTexParameter glitches
- GL_INTENSITY was mistakenly accepted as a to glTexImage
- fragment program writes to RC/HC register were broken
- fixed a few glitches in GL_HP_occlusion_test extension
- glBeginQueryARB and glEndQueryARB didn't work inside display lists
- vertex program state references were broken
- fixed triangle color interpolation bug on AIX (Shane Blackett)
- fixed a number of minor memory leaks (bug #1002030)
Diffstat (limited to 'graphics/MesaLib')
-rw-r--r-- | graphics/MesaLib/Makefile | 8 | ||||
-rw-r--r-- | graphics/MesaLib/distinfo | 25 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-aa | 8 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-ab | 38 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-ac | 39 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-ad | 48 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-ae | 20 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-af | 20 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-ag | 23 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-ah | 24 |
10 files changed, 135 insertions, 118 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 03368486989..657fb44a087 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,17 +1,13 @@ -# $NetBSD: Makefile,v 1.34 2004/10/13 18:00:08 tv Exp $ -# +# $NetBSD: Makefile,v 1.35 2004/10/26 13:55:37 adam Exp $ PKGNAME= MesaLib-${MESA_VERSION} -PKGREVISION= 2 COMMENT= Graphics library similar to SGI's OpenGL -.include "../../graphics/Mesa/Makefile.common" +.include "../Mesa/Makefile.common" PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= yes -#CONF_FILES= ${PREFIX}/share/examples/mesa/mesa.conf \ -# ${PKG_SYSCONFDIR}/mesa.conf INSTLIBS= ${WRKSRC}/src/mesa/libGL.la \ ${WRKSRC}/src/glw/libGLw.la \ diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index c0873df74e5..e55adeaeb8f 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -1,13 +1,14 @@ -$NetBSD: distinfo,v 1.19 2004/04/09 13:06:06 adam Exp $ +$NetBSD: distinfo,v 1.20 2004/10/26 13:55:37 adam Exp $ -SHA1 (Mesa-6.0.1/MesaLib-6.0.1.tar.bz2) = e396e28d693cd7abfe8e3d4d726dfc28b3b335a2 -Size (Mesa-6.0.1/MesaLib-6.0.1.tar.bz2) = 1496291 bytes -SHA1 (Mesa-6.0.1/MesaDemos-6.0.1.tar.bz2) = 8831d9af0a1afbdee29838460d5340f4612d7cd6 -Size (Mesa-6.0.1/MesaDemos-6.0.1.tar.bz2) = 915558 bytes -SHA1 (patch-aa) = fb0c20f46b1a060d559d7157c991ab1d10aac28a -SHA1 (patch-ab) = 81919e13455eeacc8830869fc96e3e9379c2a559 -SHA1 (patch-ac) = 9c780cee963a99801b3a29176c00942fc5ef938f -SHA1 (patch-ad) = 20f6f7eb1fc9b36d37e5aa147c3ed6914b365710 -SHA1 (patch-ae) = 21f1a8cfb13fca033196daf25e3d9183d74d6441 -SHA1 (patch-af) = c4f604ca18ead3aa0f55b68751ca6a870bfbdfe0 -SHA1 (patch-ag) = 8455363b6a7d94b43784209c21133b3015cfde70 +SHA1 (Mesa-6.2/MesaLib-6.2.tar.bz2) = dc8cc87138729ab6b5002c91e02f8c41a9dbdd35 +Size (Mesa-6.2/MesaLib-6.2.tar.bz2) = 1615788 bytes +SHA1 (Mesa-6.2/MesaDemos-6.2.tar.bz2) = 10a3303093be1b69243e639377ecee299e34d98c +Size (Mesa-6.2/MesaDemos-6.2.tar.bz2) = 1005757 bytes +SHA1 (patch-aa) = 90457ea124a42150e3a37b48e1e0691597668606 +SHA1 (patch-ab) = c963edcd2deb5b0cc6bf79814b0c0c14ad2c5f12 +SHA1 (patch-ac) = b1ce4c041d07894817cf473f06b7caab5bb70cb2 +SHA1 (patch-ad) = 0d8bee8806d2c5c23acf2bf4744f64efc1c73d7d +SHA1 (patch-ae) = b7fd3c2af1e40536f9e5a2b0409342aaee7fef1f +SHA1 (patch-af) = fce796cba87fb5f1bab32bfd095dcb1d4320fdc8 +SHA1 (patch-ag) = 4026f44a2f0135e4d1800c689bf5805bc3a0fd48 +SHA1 (patch-ah) = 8ccfd1734accf9ed3920d42e9208eef5a9d233cf diff --git a/graphics/MesaLib/patches/patch-aa b/graphics/MesaLib/patches/patch-aa index 573eed573af..faffb125a1a 100644 --- a/graphics/MesaLib/patches/patch-aa +++ b/graphics/MesaLib/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.6 2004/01/20 02:48:33 jschauma Exp $ +$NetBSD: patch-aa,v 1.7 2004/10/26 13:55:37 adam Exp $ ---- ./src/mesa/x86/assyntax.h.orig 2004-01-19 15:28:07.000000000 -0500 -+++ ./src/mesa/x86/assyntax.h 2004-01-19 15:28:36.000000000 -0500 -@@ -967,7 +967,8 @@ +--- src/mesa/x86/assyntax.h.orig 2004-04-26 10:10:25.000000000 +0000 ++++ src/mesa/x86/assyntax.h +@@ -985,7 +985,8 @@ SECTION _DATA public align=16 class=DATA #if defined(Lynx) || (defined(SYSV) || defined(SVR4)) \ || (defined(__linux__) || defined(__OS2ELF__)) && defined(__ELF__) \ diff --git a/graphics/MesaLib/patches/patch-ab b/graphics/MesaLib/patches/patch-ab index ca93eb2f385..4b7715535a4 100644 --- a/graphics/MesaLib/patches/patch-ab +++ b/graphics/MesaLib/patches/patch-ab @@ -1,26 +1,14 @@ -$NetBSD: patch-ab,v 1.11 2004/04/09 13:06:06 adam Exp $ +$NetBSD: patch-ab,v 1.12 2004/10/26 13:55:37 adam Exp $ ---- Make-config.orig 2004-03-30 14:47:13.000000000 +0000 -+++ Make-config -@@ -1172,19 +1172,14 @@ mklinux: - "GLUT_CFLAGS = -fexceptions" \ - "APP_LIB_DEPS = -lmoto -L/usr/X11/lib -lXmu -lX11 -lm" - --netbsd: -+pkgsrc: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ - "GL_LIB = libGL.so" \ - "GLU_LIB = libGLU.so" \ - "GLUT_LIB = libglut.so" \ - "GLW_LIB = libGLw.so" \ - "OSMESA_LIB = libOSMesa.so" \ -- "CC = gcc" \ -- "CXX = g++" \ -- "CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100" \ -- "CXXFLAGS = -O2 -fPIC" \ -- "GLUT_CFLAGS = -fexceptions" \ -- "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" -+ "APP_LIB_DEPS = -L${PREFIX}/lib -L${X11PREFIX}/lib -lXext -lXmu -lXi -lX11 -lm" - - openbsd: - $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ +--- /dev/null 2004-10-25 16:57:21.000000000 +0000 ++++ configs/pkgsrc +@@ -0,0 +1,9 @@ ++# Configuration for NetBSD ++ ++include $(TOP)/configs/default ++ ++CONFIG_NAME = pkgsrc ++ ++# Compiler and flags ++APP_LIB_DEPS = -L$(LIB_DIR) -L${PREFIX}/lib -L${X11PREFIX}/lib -lXext -lXmu -lXi -lX11 -lm ++ diff --git a/graphics/MesaLib/patches/patch-ac b/graphics/MesaLib/patches/patch-ac index 4a51d050dbf..efe3ce9fbac 100644 --- a/graphics/MesaLib/patches/patch-ac +++ b/graphics/MesaLib/patches/patch-ac @@ -1,22 +1,21 @@ -$NetBSD: patch-ac,v 1.5 2004/04/09 13:06:06 adam Exp $ +$NetBSD: patch-ac,v 1.6 2004/10/26 13:55:37 adam Exp $ ---- Makefile.orig 2004-04-02 23:29:33.000000000 +0000 +--- Makefile.orig 2004-10-01 21:34:29.000000000 +0000 +++ Makefile -@@ -104,7 +104,7 @@ default: - @echo " make linux-ia64-ecc-static-nothreads for Linux IA64 with the Intel C/C++ compiler, static, no threads" - @echo " make lynxos for LynxOS systems with GCC" - @echo " make mklinux for Linux on Power Macintosh" -- @echo " make netbsd for NetBSD 1.0 systems with GCC" -+ @echo " make pkgsrc for pkgsrc systems" - @echo " make openbsd for OpenBSD systems" - @echo " make openstep for OpenStep/MacOSX Server systems" - @echo " make osf1 for DEC Alpha systems with OSF/1" -@@ -152,7 +152,7 @@ linux-glide linux-x86-glide linux-glide- - linux-alpha-static linux-alpha \ - linux-ppc-static linux-ppc \ - linux-sparc linux-sparc5 linux-sparc-ultra \ --mklinux netbsd osf1 osf1-nothreads openbsd qnx \ -+mklinux pkgsrc osf1 osf1-nothreads openbsd qnx \ - solaris-x86 solaris-x86-gcc \ - sunos4 sunos4-sl sunos4-gcc sunos4-gcc-sl sunos4-gcc-x11r6-sl \ - sunos5 sunos5-smp sunos5-gcc sunos5-gcc-debug \ +@@ -2,7 +2,7 @@ + + TOP = . + +-SUBDIRS = src progs ++SUBDIRS = src + + + default: $(TOP)/configs/current +@@ -98,6 +98,7 @@ linux-x86-64-static \ + linux-x86-glide \ + linux-x86-static \ + netbsd \ ++pkgsrc \ + openbsd \ + osf1 \ + solaris-x86 \ diff --git a/graphics/MesaLib/patches/patch-ad b/graphics/MesaLib/patches/patch-ad index e4263a04ed6..c0d5b338fed 100644 --- a/graphics/MesaLib/patches/patch-ad +++ b/graphics/MesaLib/patches/patch-ad @@ -1,9 +1,9 @@ -$NetBSD: patch-ad,v 1.4 2004/04/09 13:06:06 adam Exp $ +$NetBSD: patch-ad,v 1.5 2004/10/26 13:55:37 adam Exp $ ---- src/mesa/Makefile.X11.orig 2004-03-24 19:27:19.000000000 +0000 -+++ src/mesa/Makefile.X11 -@@ -53,10 +53,10 @@ OBJECTS = \ - ##### RULES ##### +--- src/mesa/Makefile.orig 2004-08-16 17:11:10.000000000 +0000 ++++ src/mesa/Makefile +@@ -12,10 +12,10 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$ + .c.o: - $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ @@ -14,27 +14,35 @@ $NetBSD: patch-ad,v 1.4 2004/04/09 13:06:06 adam Exp $ + ${LIBTOOL} --mode=compile $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ - # need some special rules here, unfortunately -@@ -95,18 +95,16 @@ targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$ + # Figure out what to make here +@@ -112,22 +112,20 @@ subdirs: # Make the GL library - $(LIBDIR)/$(GL_LIB): $(OBJECTS) -- $(TOP)/bin/mklib -o $(GL_LIB_NAME) -major $(GL_MAJOR) \ -- -minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIBDIR) \ -- $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS) -+ ${LIBTOOL} --mode=link ${CC} -o ${GL_LIB:.so=.la} ${OBJECTS:.o=.lo} \ + $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) +- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GL_LIB) -major $(GL_MAJOR) \ +- -minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIB_DIR) \ +- $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS) ++ ${LIBTOOL} --mode=link ${CC} -o ${GL_LIB_NAME:.so=.la} \ ++ ${STAND_ALONE_OBJECTS:.o=.lo} \ + -rpath ${PREFIX}/lib -version-info ${GL_MAJOR}:${GL_MINOR} - # Make the OSMesa library - $(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS) - if [ ${OSMESA_LIB} ] ; then \ -- $(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) -major $(MESA_MAJOR) \ + $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS) + if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \ +- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \ +- -minor $(MESA_MINOR) -patch $(MESA_TINY) \ +- -install $(LIB_DIR) $(MKLIB_OPTIONS) \ +- $(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \ ++ ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB_NAME:.so=.la} \ ++ ${OSMESA16_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \ ++ -version-info ${MESA_MAJOR}:${MESA_MINOR} ; \ + else \ +- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \ - -minor $(MESA_MINOR) -patch $(GL_TINY) \ -- $(MKLIB_OPTIONS) -install $(LIBDIR) \ -- $(OSMESA_LIB_DEPS) $(OSMESA_OBJECTS) ; \ -+ ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB:.so=.la} \ -+ ${OSMESA_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \ +- -install $(LIB_DIR) $(MKLIB_OPTIONS) \ +- $(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \ ++ ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB_NAME:.so=.la} \ ++ ${OSMESA_DRIVER_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \ + -version-info ${MESA_MAJOR}:${MESA_MINOR} ; \ fi diff --git a/graphics/MesaLib/patches/patch-ae b/graphics/MesaLib/patches/patch-ae index 672153c7bb8..d3f15db4b6c 100644 --- a/graphics/MesaLib/patches/patch-ae +++ b/graphics/MesaLib/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.4 2004/04/09 13:06:06 adam Exp $ +$NetBSD: patch-ae,v 1.5 2004/10/26 13:55:37 adam Exp $ ---- src/glw/Makefile.X11.orig 2004-03-24 20:04:30.000000000 +0000 -+++ src/glw/Makefile.X11 -@@ -28,7 +28,7 @@ OBJECTS = $(SOURCES:.c=.o) +--- src/glw/Makefile.orig 2004-06-25 22:51:39.000000000 +0000 ++++ src/glw/Makefile +@@ -17,7 +17,7 @@ OBJECTS = $(GLW_SOURCES:.c=.o) ##### RULES ##### .c.o: @@ -11,15 +11,15 @@ $NetBSD: patch-ae,v 1.4 2004/04/09 13:06:06 adam Exp $ -@@ -45,9 +45,8 @@ targets: $(LIBDIR)/$(GLW_LIB) message +@@ -33,9 +33,8 @@ clean: # Make the library - $(LIBDIR)/$(GLW_LIB): $(OBJECTS) -- $(TOP)/bin/mklib -o GLw -major $(MAJOR) -minor $(MINOR) \ -- -patch $(TINY) $(MKLIB_OPTIONS) -install $(LIBDIR) \ + $(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS) +- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLW_LIB) -major $(MAJOR) -minor $(MINOR) \ +- -patch $(TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \ - $(GLW_LIB_DEPS) $(OBJECTS) -+ ${LIBTOOL} --mode=link ${CC} -o ${GLW_LIB:.so=.la} ${OBJECTS:.o=.lo} \ ++ ${LIBTOOL} --mode=link ${CC} -o ${GLW_LIB_NAME:.so=.la} ${OBJECTS:.o=.lo} \ + -rpath ${PREFIX}/lib -version-info ${MAJOR}:${MINOR} - message: + # diff --git a/graphics/MesaLib/patches/patch-af b/graphics/MesaLib/patches/patch-af index 8c50001a4c4..e23126ff90a 100644 --- a/graphics/MesaLib/patches/patch-af +++ b/graphics/MesaLib/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.2 2004/04/09 13:06:06 adam Exp $ +$NetBSD: patch-af,v 1.3 2004/10/26 13:55:37 adam Exp $ ---- src/glu/sgi/Makefile.X11.orig 2004-03-24 20:02:03.000000000 +0000 -+++ src/glu/sgi/Makefile.X11 -@@ -119,9 +119,11 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS) +--- src/glu/sgi/Makefile.orig 2004-08-16 07:46:28.000000000 +0000 ++++ src/glu/sgi/Makefile +@@ -115,9 +115,11 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS) ##### RULES ##### .c.o: @@ -14,16 +14,16 @@ $NetBSD: patch-af,v 1.2 2004/04/09 13:06:06 adam Exp $ $(CXX) -c $(INCDIRS) $(CXXFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@ -@@ -140,10 +142,8 @@ targets: $(LIBDIR)/$(GLU_LIB) +@@ -136,10 +138,8 @@ $(LIB_DIR): # Make the library: - $(LIBDIR)/$(GLU_LIB): $(OBJECTS) -- $(TOP)/bin/mklib -o $(GLU_LIB_NAME) -major $(GLU_MAJOR) \ + $(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) +- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLU_LIB) -major $(GLU_MAJOR) \ - -minor $(GLU_MINOR) -patch $(GLU_TINY) \ -- $(MKLIB_OPTIONS) -cplusplus -install $(LIBDIR) \ +- -cplusplus $(MKLIB_OPTIONS) -install $(LIB_DIR) \ - $(GLU_LIB_DEPS) $(OBJECTS) -+ ${LIBTOOL} --mode=link ${CXX} -o ${GLU_LIB:.so=.la} ${OBJECTS:.o=.lo} \ ++ ${LIBTOOL} --mode=link ${CXX} -o ${GLU_LIB_NAME:.so=.la} ${OBJECTS:.o=.lo} \ + -rpath ${PREFIX}/lib -version-info ${GLU_MAJOR}:${GLU_MINOR} - + clean: diff --git a/graphics/MesaLib/patches/patch-ag b/graphics/MesaLib/patches/patch-ag index fb639ca10cf..f9b2ba0c78e 100644 --- a/graphics/MesaLib/patches/patch-ag +++ b/graphics/MesaLib/patches/patch-ag @@ -1,24 +1,25 @@ -$NetBSD: patch-ag,v 1.2 2004/04/09 13:06:06 adam Exp $ +$NetBSD: patch-ag,v 1.3 2004/10/26 13:55:37 adam Exp $ ---- src/glut/glx/Makefile.X11.orig 2004-03-24 20:02:51.000000000 +0000 -+++ src/glut/glx/Makefile.X11 -@@ -82,6 +82,7 @@ OBJECTS = $(SOURCES:.c=.o) +--- src/glut/glx/Makefile.orig 2004-06-25 22:51:39.000000000 +0000 ++++ src/glut/glx/Makefile +@@ -80,6 +80,7 @@ OBJECTS = $(SOURCES:.c=.o) ##### RULES ##### .c.o: + ${LIBTOOL} --mode=compile \ - $(CC) -c -I$(INCDIR) $(CFLAGS) $(GLUT_CFLAGS) $< + $(CC) -c -I$(TOP)/include $(CFLAGS) $(GLUT_CFLAGS) $< -@@ -101,9 +102,8 @@ targets: $(LIBDIR)/$(GLUT_LIB) +@@ -91,10 +92,8 @@ default: $(LIB_DIR)/$(GLUT_LIB_NAME) # Make the library - $(LIBDIR)/$(GLUT_LIB): $(OBJECTS) -- $(TOP)/bin/mklib -o glut -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \ -- -patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIBDIR) \ + $(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) +- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLUT_LIB) \ +- -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \ +- -patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \ - $(GLUT_LIB_DEPS) $(OBJECTS) -+ ${LIBTOOL} --mode=link ${CC} -o ${GLUT_LIB:.so=.la} ${OBJECTS:.o=.lo} \ ++ ${LIBTOOL} --mode=link ${CC} -o ${GLUT_LIB_NAME:.so=.la} ${OBJECTS:.o=.lo} \ + -rpath ${PREFIX}/lib -version-info ${GLUT_MAJOR}:${GLUT_MINOR} - include $(TOP)/Make-config + clean: diff --git a/graphics/MesaLib/patches/patch-ah b/graphics/MesaLib/patches/patch-ah new file mode 100644 index 00000000000..3f00083d244 --- /dev/null +++ b/graphics/MesaLib/patches/patch-ah @@ -0,0 +1,24 @@ +$NetBSD: patch-ah,v 1.1 2004/10/26 13:55:56 adam Exp $ + +--- configs/default.orig 2004-10-25 17:21:49.000000000 +0000 ++++ configs/default +@@ -14,10 +14,6 @@ MESA_TINY=0 + DRM_SOURCE_PATH=$(TOP)/../drm + + # Compiler and flags +-CC = cc +-CXX = CC +-CFLAGS = -O +-CXXFLAGS = -O + GLU_CFLAGS = + + # Misc tools and flags +@@ -52,7 +48,7 @@ GLW_SOURCES = GLwDrawA.c + + # Directories + LIB_DIR = $(TOP)/lib +-INSTALL_PREFIX = /usr/local ++INSTALL_PREFIX = ${PREFIX} + SRC_DIRS = mesa glu glut/glx glw + GLU_DIRS = sgi + DRIVER_DIRS = x11 osmesa |