Commit graph

39 commits

Author SHA1 Message Date
minskim
8d6135e7d6 Make the glut library link against required libraries. Bump
PKGREVISION of glut.
2005-06-07 14:31:48 +00:00
jlam
95fd1f6ec9 Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc.
Several changes are involved since they are all interrelated.  These
changes affect about 1000 files.

The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk.  bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files.  Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred.  This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.

The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages.  Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc.  This modification is a nod toward LOCALBASE=/usr.  The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.

The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc.  The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.

The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files.  Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories.  These files are used as input
to imake since imake can't use stdin for that purpose.

The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead.  This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed.  Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries.  Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
2005-06-01 18:02:37 +00:00
veego
a5ff41f7f3 Bump the PKGREVISION again, due too the change in graphics/MesaLib:
Fix the last commit which didn't record the correct rpath for the X11
libraries due too the usage of two -rpath options for libtool.
2005-02-24 06:36:18 +00:00
grant
20e453e2c1 libglut needs symbols from libXi, so explicitly link against it.
fixes unresolved symbols at runtime on Solaris. bump PKGREVISION
of glut.
2005-02-23 13:57:35 +00:00
grant
12cd809a9d whitespace fix 2005-02-23 13:04:47 +00:00
minskim
9d94b6fd74 Move PKG_INSTALLATION_TYPES to Makefile.common so that it is defined
before including bsd.prefs.mk.
2004-10-31 00:53:10 +00:00
minskim
41a793d84e Define USE_BUILDLINK3 before including compiler.mk. Otherwise,
buildink3.mk of gcc* packages is not included.
2004-10-29 01:34:39 +00:00
adam
649b02607d 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)
2004-10-26 13:55:17 +00:00
tv
cb1bc94217 INSTALL_DATA -> INSTALL_LIB. 2004-10-13 18:00:08 +00:00
tv
c487cb967a Libtool fix for PR pkg/26633, and other issues. Update libtool to 1.5.10
in the process.  (More information on tech-pkg.)

Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and
installing .la files.

Bump PKGREVISION (only) of all packages depending directly on the above
via a buildlink3 include.
2004-10-03 00:12:51 +00:00
jlam
7657096bbc Turn MESA_REQD back into a public variable, and make it take a list of
values that MesaLib/buildlink3.mk converts into a single _MESA_REQD that
is the highest version required.  If including the Mesa/buildlink3.mk
file, then require the same version of Mesa as required by glut.
2004-02-11 02:03:41 +00:00
jlam
2f792ef154 Require at least the same versions of MesaLib and glu to build. 2004-02-10 23:25:19 +00:00
adam
5a6d2ca4f2 Mesa-6.0 packages now use LIBTOOL and finally build 2004-01-22 13:00:55 +00:00
agc
3ad1bdbf06 Move WRKSRC definition away from the first paragraph in a Makefile. 2004-01-20 12:18:15 +00:00
jschauma
cffc45e2f0 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)
2004-01-20 02:48:33 +00:00
jlam
580a53de35 bl3ify 2004-01-05 11:42:20 +00:00
jschauma
4a8261aac4 As suggested by Ron Roskens in PR pkg/23489 (closing that PR):
use si-glu sources to build a libGLU that includes GLU Polygon Tessellator
functions and use this new functionality in MesaDemos.

Bump PKGREVISIONs.
2003-11-28 18:41:03 +00:00
jschauma
87938dc3b7 Finally update Mesa and friends after the distfile changed on the website
without a version bump.  Changes made, according to the website, for
libtool/autofoo fixes.

Some changes from Ron Roskens:
glut depends upon graphics/glu (otherwise its linked against X11R6 libs)

MesaDemos:
 rather than using the pre-built distribution makefiles,
 use the automake/configure built makefiles which have
 the build dependencies all setup.

This closes PR pkg/23476.
2003-11-18 16:10:55 +00:00
jschauma
6e2383474d Patch Mesa's Makefile to use '-fno-strict-aliasing' rather than '-fstrict-aliasing',
as the code contains unsafe use of aliased pointers.
As suggested by tls@ in PR pkg/23381, closing said PR.
2003-11-09 02:23:18 +00:00
jmmv
6d9ccf016f Specify the category when including other files and when depending on other
packages.  From PR pkg/21864 by ccatrian at eml.cc.
2003-09-18 16:25:08 +00:00
jschauma
aa0aa518ac Finally remove support of Mesa 3.4.1 completely as discussed at length
on tech-pkg@ at various times.  This means that regardless of what kind of
GL support comes with X11, if a package depends on GL, Mesa 5.0.1 (or higher)
will be installed into ${LOCALBASE}.

Some troubleshooting after the latest patches by Krister Walfridsson.
2003-08-26 01:43:48 +00:00
grant
4083b24390 s/netbsd.org/NetBSD.org/ 2003-07-17 21:31:04 +00:00
drochner
fe29855bec update to 5.0.1
mostly a bugfix release
other changes:
- updated GL/gl_mangle.h file
- use glPolygonOffset in gloss demo to avoid z-fighting artifacts
- updated winpos and pointblast demos to use ARB extensions
- disable SPARC normal transformation code
2003-05-10 16:37:11 +00:00
jmc
74c2eb723e Test Mesa version and set shared library version in PLIST accordingly 2003-03-30 08:54:39 +00:00
jschauma
12c7eda41d Update Mesa and friends to version 5.0, using patches provided in PR pkg/19302.
At the same time, move Mesa and friends to LOCALBASE rather than X11BASE, so
that they can be installed regardless of XF version.  Introduce MESA_REQD variable
that can be set to 5.0, thus allowing systems with XF4 to indicate that the
provided version is not good enough.

All packages using Mesa, MesaLib, glu or glut will get a PKGREVISION bump
over the next few days.
2003-03-09 19:04:52 +00:00
jlam
ce99281f43 glut requires MesaLib headers in order to build. 2002-11-17 08:37:20 +00:00
seb
5c1f8f408e Remove do-{build,install} targets by using {CONFIGURE,BUILD}_DIRS. 2002-10-30 15:15:16 +00:00
jlam
e2afa97f51 Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
2002-08-25 18:38:05 +00:00
jlam
f79573370a Mechanical changes to 375 files to change dependency patterns of the form
foo-* to foo-[0-9]*.  This is to cause the dependencies to match only the
packages whose base package name is "foo", and not those named "foo-bar".
A concrete example is p5-Net-* matching p5-Net-DNS as well as p5-Net.  Also
change dependency examples in Packages.txt to reflect this.
2001-09-27 23:17:41 +00:00
jlam
63fc151cb9 Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references
to ${X11BASE} in the header and library search paths into references to
${LOCALBASE}/share/x11-links.  These packages should now be strongly-
buildlinked regardless of whether xpkgwedge is installed.

Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
2001-08-29 22:41:00 +00:00
jlam
d6ddbc4286 Mark as USE_BUILDLINK_ONLY. 2001-07-14 03:07:34 +00:00
fredb
47b501671a Update ${HOMEPAGE} for Mesa and family. 2001-07-06 00:49:05 +00:00
tron
f21d2ac951 Remove "ftp.mesa3d.org" from master list because it is an alias name for
"download.sourceforge.net" these days.
2001-05-31 05:54:45 +00:00
hubertf
31f5ce665c Trivia - What's wrong in this picture:
smaug% grep 'MesaLib.*3.4' */*/Makefile*
graphics/Mesa/Makefile:DEPENDS+=	MesaLib-3.4:../../graphics/MesaLib
graphics/MesaLib/Makefile:DISTNAME=	MesaLib-3.4.1

Invent a variable MESA_VERSION in Mesa/Makefile.common and use it.
2001-04-12 20:38:25 +00:00
drochner
5000ff6534 update to 3.4.1
Changes:
  New:
    - fixed some Linux build problems
    - fixed some Windows build problems
    - GL_EXT_texture_env_dot3 extension (Gareth Hughes)
  Bug fixes:
    - added RENDER_START/RENDER_FINISH macros for glCopyTexImage in DRI
    - various state-update code changes needed for DRI bugs
    - disabled pixel transfer ops in glColorTable commands, not needed
    - fixed bugs in glCopyConvolutionFilter1D/2D, glGetConvolutionFilter
    - updated sources and fixed compile problems in widgets-mesa/
    - GLX_PBUFFER enum value was wrong in glx.h
    - fixed a glColorMaterial lighting bug
    - fixed bad args to Read/WriteStencilSpan in h/w stencil clear function
    - glXCopySubBufferMESA() Y position was off by one
    - Error checking of glTexSubImage3D() was broken (bug 128775)
    - glPopAttrib() didn't restore all derived Mesa state correctly
    - Better glReadPixels accuracy for 16bpp color - fixes lots of OpenGL
      conformance problems at 16bpp.
    - clearing depth buffer with scissoring was broken, would segfault
    - OSMesaGetDepthBuffer() returned bad bytesPerValue value
    - fixed a line clipping bug (reported by Craig McDaniel)
    - fixed RGB color over/underflow bug for very tiny triangles
  Known problems:
    - NURBS or evaluator surfaces inside display lists don't always work
2001-03-23 12:36:53 +00:00
wiz
a2a4d06c6f Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT. 2001-02-16 15:22:13 +00:00
drochner
422b29d263 update to Mesa 3.4
Changes:
    New:
    - optimized glDrawPixels for glPixelZoom(1,-1)
    Bug Fixes:
    - widgets-mesa/src/*.c files were missing from 3.3 distro
    - include/GL/mesa_wgl.h file was missing from 3.3 distro
    - fixed some Win32 compile problems
    - texture object priorities weren't getting initialized to 1.0
    - glAreTexturesResident return value was wrong when using hardware
    - glXUseXFont segfaulted when using 3dfx driver (via MESA_GLX_FX)
    - glReadPixels with GLushort packed types was broken
    - fixed a few bugs in the GL_EXT_texture_env_combine texture code
    - glPush/PopAttrib(GL_ENABLE_BIT) mishandled multi-texture enables
    - fixed some typos/bugs in the VB code
    - glDrawPixels(GL_COLOR_INDEX) to RGB window didn't work
    - optimized glDrawPixels paths weren't being used
    - per-fragment fog calculation didn't work without a Z buffer
    - improved blending accuracy, fixes Glean  blendFunc test failures
    - glPixelStore(GL_PACK/UNPACK_SKIP_IMAGES) wasn't handled correctly
    - glXGetProcAddressARB() didn't always return the right address
    - gluBuild[12]DMipmaps() didn't grok the GL_BGR pixel format
    - texture matrix changes weren't always detected (GLUT projtex demo)
    - fixed random color problem in vertex fog code
    - fixed Glide-related bug that let Quake get a 24-bit Z buffer
    Changes:
    - finished internal support for compressed textures for DRI
2000-12-12 17:22:38 +00:00
tron
5feac46ad5 Use "${MASTER_SITE_SOURCEFORGE}". 2000-11-11 17:49:22 +00:00
rh
188c865f8e Initial import of glut-3.2.1, the GLUT graphics library of the new split-up
Mesa system.
2000-10-15 11:48:44 +00:00