diff options
author | jschauma <jschauma@pkgsrc.org> | 2004-01-20 02:48:33 +0000 |
---|---|---|
committer | jschauma <jschauma@pkgsrc.org> | 2004-01-20 02:48:33 +0000 |
commit | 752229d66a77d9b9a71f08cf5034a88d9c8612b4 (patch) | |
tree | 53511c5e43e4fb10658a8b773e2d73f4ae4bf3d3 /graphics/MesaLib | |
parent | 058cb97977edbddc82057274485296dbc0fe84d8 (diff) | |
download | pkgsrc-752229d66a77d9b9a71f08cf5034a88d9c8612b4.tar.gz |
Update Mesa and friends to version 6.0:
Changes since 5.2:
New:
- full OpenGL 1.5 support
- updated GL/glext.h file to version 21
Changes:
- changed max framebuffer size to 4Kx4K (MAX_WIDTH/HEIGHT in config.h)
Bug fixes:
- fixed bug in UNCLAMPED_FLOAT_TO_UBYTE macro; solves a color
clamping issue
- updated suno5-gcc configs
- glColor3 functions sometimes resulted in undefined alpha values
- fixed FP divide by zero error seen on VMS with xlockmore, others
- fixed vertex/fragment program debug problem (bug 873011)
- building on AIX with gcc works now
- glDeleteProgramsARB failed for ARB fragment programs (bug 876160)
- glDrawRangeElements tried to modify potentially read-only storage
- updated files for building on Windows
Changes since 5.0.2:
New features:
- reorganized directory tree
- GL_ARB_vertex/fragment_program extensions (Michal Krol & Karl Rasche)
- GL_ATI_texture_env_combine3 extension (Ian Romanick)
- GL_SGI_texture_color_table extension (Eric Plante)
- GL_NV_fragment_program extension
- GL_NV_light_max_exponent extension
- GL_EXT_texture_rectangle (identical to GL_NV_texture_rectangle)
- GL_ARB_occlusion_query extension
- GL_ARB_point_sprite extension
- GL_ARB_texture_non_power_of_two extension
- GL_IBM_multimode_draw_arrays extension
- GL_EXT_texture_mirror_clamp extension (Ian Romanick)
- GL_ARB_vertex_buffer_object extension
- new X86 feature detection code (Petr Sebor)
- less memory used for display lists and vertex buffers
- demo of per-pixel lighting with a fragment program (demos/fplight.c)
- new version (18) of glext.h header
- new spriteblast.c demo of GL_ARB_point_sprite
- faster glDrawPixels in X11 driver in some cases (see RELNOTES-5.1)
- faster glCopyPixels in X11 driver in some cases (see RELNOTES-5.1)
Bug fixes:
- really enable OpenGL 1.4 features in DOS driver.
- fixed issues in glDrawPixels and glCopyPixels for very wide images
- glPixelMapf/ui/usv()'s size parameter is GLsizei, not GLint
- fixed some texgen bugs reported by Daniel Borca
- fixed wglMakeCurrent(NULL, NULL) bug (#835861)
- fixed glTexSubImage3D z-offset bug (Cedric Gautier)
- fixed RGBA blend enable bug (Ville Syrjala)
- glAccum is supposed to be a no-op in selection/feedback mode
- fixed texgen bug #597589 (John Popplewell)
Changes:
- dropped API trace feature (src/Trace/)
- documentation overhaul. merged with website content. more html.
- glxgears.c demo updated to use GLX swap rate extensions
- glTexImage1/2/3D now allows width/height/depth = 0
- disable SPARC asm code on Linux (bug 852204)
Diffstat (limited to 'graphics/MesaLib')
-rw-r--r-- | graphics/MesaLib/Makefile | 19 | ||||
-rw-r--r-- | graphics/MesaLib/PLIST | 20 | ||||
-rw-r--r-- | graphics/MesaLib/distinfo | 13 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-aa | 8 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-ab | 26 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-ac | 33 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-ad | 13 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-ae | 17 |
8 files changed, 78 insertions, 71 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 556ddae69d5..d1cb9c3c4d5 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.27 2004/01/05 11:47:33 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2004/01/20 02:48:33 jschauma Exp $ PKGNAME= MesaLib-${MESA_VERSION} -PKGREVISION= 2 WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//} MAINTAINER= rh@NetBSD.org COMMENT= Graphics library similar to SGI's OpenGL @@ -12,12 +11,11 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= yes USE_X11= yes -USE_PKGINSTALL= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --without-glut -CONF_FILES= ${PREFIX}/share/examples/mesa/mesa.conf \ - ${PKG_SYSCONFDIR}/mesa.conf -BUILD_DIRS= ${WRKSRC}/src +#USE_PKGINSTALL= yes +#CONF_FILES= ${PREFIX}/share/examples/mesa/mesa.conf \ +# ${PKG_SYSCONFDIR}/mesa.conf + +INSTLIBS= libGL.so.1.5 libGLw.so.1.0 libOSMesa.so.6.0 .include "../../mk/bsd.prefs.mk" @@ -26,7 +24,10 @@ BUILD_DIRS= ${WRKSRC}/src CONFIGURE_ARGS+= --disable-sparc .endif -post-install: +pre-build: + ${RM} -fr ${WRKSRC}/src/glu + +do-install: ${INSTALL_DATA_DIR} ${PREFIX}/include/GL cd ${WRKSRC}/include/GL; for hdr in \ gl.h gl_mangle.h glext.h glx.h glxext.h glx_mangle.h \ diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST index 71fb5e6a317..0ca51f1cf26 100644 --- a/graphics/MesaLib/PLIST +++ b/graphics/MesaLib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2003/11/18 16:10:55 jschauma Exp $ +@comment $NetBSD: PLIST,v 1.12 2004/01/20 02:48:33 jschauma Exp $ include/GL/gl.h include/GL/gl_mangle.h include/GL/glext.h @@ -9,14 +9,16 @@ include/GL/osmesa.h include/GL/xmesa.h include/GL/xmesa_x.h include/GL/xmesa_xf86.h -lib/libGL.a -lib/libGL.la +lib/libGL_pic.a lib/libGL.so -lib/libGL.so.5 -lib/libGL.so.5.502 -lib/libOSMesa.a -lib/libOSMesa.la +lib/libGL.so.1 +lib/libGL.so.1.5 +lib/libGLw_pic.a +lib/libGLw.so +lib/libGLw.so.1 +lib/libGLw.so.1.0 +lib/libOSMesa_pic.a lib/libOSMesa.so -lib/libOSMesa.so.4 -lib/libOSMesa.so.4.502 +lib/libOSMesa.so.6 +lib/libOSMesa.so.6.0 @unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE} diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index d7331859abb..d446ac2fef1 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.15 2003/11/18 16:10:55 jschauma Exp $ +$NetBSD: distinfo,v 1.16 2004/01/20 02:48:33 jschauma Exp $ -SHA1 (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) = a49234ad74d6c67b2727c1dd8a8c8e1ed7f63192 -Size (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) = 1719544 bytes -SHA1 (patch-aa) = 7fa63dca0edfc41812b5432cbabd861ec52cec33 -SHA1 (patch-ac) = 723c70827840465f3b7f07e0852107ddcdc0c0c1 -SHA1 (patch-ad) = 807b07b1505735f23dd4148c8c838df08af6333e -SHA1 (patch-ae) = 58bb48fb84edae72ecfb62682061cf6d723fe100 +SHA1 (Mesa-6.0/MesaLib-6.0.tar.bz2) = 00f0ac27fbc3eddfdbc84de482f16b64b904d60c +Size (Mesa-6.0/MesaLib-6.0.tar.bz2) = 1487379 bytes +SHA1 (patch-aa) = fb0c20f46b1a060d559d7157c991ab1d10aac28a +SHA1 (patch-ab) = 0426be52c00f40b9a631813d3cbdf2cee47c39cb +SHA1 (patch-ac) = 97d7257c14998706f725bc8420bd4b34ee27dba4 diff --git a/graphics/MesaLib/patches/patch-aa b/graphics/MesaLib/patches/patch-aa index 7474cf7a9e9..573eed573af 100644 --- a/graphics/MesaLib/patches/patch-aa +++ b/graphics/MesaLib/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2003/03/09 19:04:53 jschauma Exp $ +$NetBSD: patch-aa,v 1.6 2004/01/20 02:48:33 jschauma Exp $ ---- src/X86/assyntax.h.orig Tue Nov 19 15:17:48 2002 -+++ src/X86/assyntax.h Tue Nov 19 15:18:34 2002 -@@ -965,7 +965,8 @@ +--- ./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 @@ #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 new file mode 100644 index 00000000000..c7b7d52f4f6 --- /dev/null +++ b/graphics/MesaLib/patches/patch-ab @@ -0,0 +1,26 @@ +$NetBSD: patch-ab,v 1.9 2004/01/20 02:48:33 jschauma Exp $ + +--- Make-config.orig 2004-01-15 09:23:54.000000000 -0500 ++++ Make-config 2004-01-19 18:29:14.000000000 -0500 +@@ -778,19 +778,14 @@ + "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 \ diff --git a/graphics/MesaLib/patches/patch-ac b/graphics/MesaLib/patches/patch-ac index 10b2f43ba88..f3a2093ebdb 100644 --- a/graphics/MesaLib/patches/patch-ac +++ b/graphics/MesaLib/patches/patch-ac @@ -1,13 +1,22 @@ -$NetBSD: patch-ac,v 1.3 2003/11/18 16:10:56 jschauma Exp $ +$NetBSD: patch-ac,v 1.4 2004/01/20 02:48:33 jschauma Exp $ ---- src/Makefile.in.orig 2003-11-07 11:58:20.000000000 -0500 -+++ src/Makefile.in 2003-11-13 21:45:41.000000000 -0500 -@@ -187,7 +187,7 @@ - program_transform_name = @program_transform_name@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ --sysconfdir = @sysconfdir@ -+sysconfdir = @datadir@/examples/mesa - target_alias = @target_alias@ - use_si_glu = @use_si_glu@ - +--- Makefile.orig 2004-01-19 18:31:20.000000000 -0500 ++++ Makefile 2004-01-19 18:31:54.000000000 -0500 +@@ -79,7 +79,7 @@ + @echo " make linux-icc for Linux with the Intel C/C++ compiler" + @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" +@@ -115,7 +115,7 @@ + linux-alpha-static linux-alpha \ + linux-ppc-static linux-ppc \ + linux-sparc linux-sparc5 linux-sparc-ultra \ +-mklinux netbsd osf1 openbsd qnx \ ++mklinux pkgsrc osf1 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 \ diff --git a/graphics/MesaLib/patches/patch-ad b/graphics/MesaLib/patches/patch-ad deleted file mode 100644 index 684eea5f205..00000000000 --- a/graphics/MesaLib/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2003/11/09 02:23:18 jschauma Exp $ - ---- configure.orig 2003-11-08 19:10:36.000000000 -0500 -+++ configure 2003-11-08 19:10:53.000000000 -0500 -@@ -7121,7 +7121,7 @@ - if test "x$enable_optim" = xyes; then - if test "x$enable_debug" = xno && test "x$enable_prof" = xno; then - if test "x$GCC" = xyes; then -- CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fstrict-aliasing" -+ CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fno-strict-aliasing" - case "$host" in - i*86-*-*) CFLAGS="$CFLAGS -malign-loops=2 -malign-jumps=2 -malign-functions=2";; - esac diff --git a/graphics/MesaLib/patches/patch-ae b/graphics/MesaLib/patches/patch-ae deleted file mode 100644 index d5f41da33a8..00000000000 --- a/graphics/MesaLib/patches/patch-ae +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2003/11/18 16:10:56 jschauma Exp $ - ---- src/GGI/Makefile.am.orig 2003-11-13 21:47:55.000000000 -0500 -+++ src/GGI/Makefile.am 2003-11-13 21:48:04.000000000 -0500 -@@ -7,10 +7,10 @@ - ggimesaconfdatadir = ${sysconfdir}/ggi - ggimesaconfdata_DATA = ggimesa.conf - --INCLUDES += -I$(top_srcdir)/include -I$(top_srcdir)/src/GGI/include \ -+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/GGI/include \ - -I$(top_srcdir)/src $(GGI_CFLAGS) - --DEFS += -DGGIMESACONFFILE=\"$(ggimesaconfdatadir)/ggimesa.conf\" -+DEFS = -DGGIMESACONFFILE=\"$(ggimesaconfdatadir)/ggimesa.conf\" - - if HAVE_GGI - # Build a libtool convenience library. |