Up to [cvs.NetBSD.org] / pkgsrc / graphics / glu
Request diff between arbitrary revisions
Keyword substitution: kv
Default branch: MAIN
*/builtin.mk: Use ${_CROSS_DESTDIR:U} for build-time file checks. These are questions about the target system, whose files at build-time are all relative to ${_CROSS_DESTDIR} if it is defined, i.e., if USE_CROSS_COMPILE is set to yes. No change to native builds because ${_CROSS_DESTDIR:U} is empty in them. (Possible minor change by adding :Q to ${H_FOO} in command lines, but if this makes a difference it likely fixes problems.)
glu: update to 9.0.3. glu 9.0.3 drop autotools Remove deprecated register in C++17 apple: Fix compatibility version and current version of meson build to be... pkgconfig: meson build should match autotools requires pkgconfig: Drop unneeded lines from autotools build pkgconfig: Depend on opengl when built with libglvnd
graphics: align variable assignments pkglint -Wall -F --only aligned --only indent -r No manual corrections.
glu: correct path to mesa
graphics/*: remove redundant :Q modifiers pkgsrc doesn't support PREFIX with spaces or other special characters. Therefore it is not necessary to add the :Q modifier to this variable and several others.
Fix the builtin version detection by checking the pkgconfig files if they exist. Now gets 7.8.2 on netbsd-current instead of 4.0.4. (!)
Drop imake-check logic from X11 components' builtin.mk. Always use xorg-cf-files and imake from pkgsrc, replacing xpkgwedge. Always install man pages, not cat pages when using imake. Unify the various imake PLIST variables in preparation for dropping. Adjust xbattbar for the new expectations.
Merge cube-native-xorg, so that pkgsrc-current can be used with the native X.Org found in NetBSD-current. Thanks a lot to all who helped, especially Matthias Scheler who did repeated tests on Mac OS X and older versions of NetBSD to make sure the support for those platforms wouldn't be broken (or at least, not fatally, as I would still expect a few hiccups here and there, because there is only so much one can test in such limited time). On the infrastructure side, this branch brings pkgconfig-builtin.mk, in order to write very easily new builtin.mk files. It can actually handle more than just pkgconfig files, but it will provide a version if it finds such a file. x11.builtin.mk has also been made more useful and now all existing (and future!) native-X11-related builtin.mk files should include it.
Adapt to new x11.builtin.mk.
Over 1200 files touched but no revisions bumped :) RECOMMENDED is removed. It becomes ABI_DEPENDS. BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo. BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo. BUILDLINK_DEPENDS does not change. IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS which defaults to "yes". Added to obsolete.mk checking for IGNORE_RECOMMENDED. I did not manually go through and fix any aesthetic tab/spacing issues. I have tested the above patch on DragonFly building and packaging subversion and pkglint and their many dependencies. I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I have used IGNORE_RECOMMENDED for a long time). I have been an active user of IGNORE_RECOMMENDED since it was available. As suggested, I removed the documentation sentences suggesting bumping for "security" issues. As discussed on tech-pkg. I will commit to revbump, pkglint, pkg_install, createbuildlink separately. Note that if you use wip, it will fail! I will commit to pkgsrc-wip later (within day).
Avoid extra stat() calls by not repeatedly checking whether a file exists on the disk -- we can just check whether a variable defined by find-files.mk is "__nonexistent__" or not.
Changes 6.4: New: - Added a fast XOR line drawing function in Xlib driver - Added support for GL_ARB_texture_mirrored_repeat to savage driver (supported only on Savage4 hardware). Changes: - Mesa now packaged in three parts: Library, Demos and GLUT Bug fixes: - GLX_X_RENDERABLE token wasn't accepted by glXChooseFBConfig - Some files were present multiple times in the 6.3.2 tarballs - r200_vtxtmp_x86.S file was missing from 6.3.2 tarball (bug 4207) - glxgears_fbconfig demo didn't work (bug 4237) - fixed bug when bilinear sampling 2d textures with borders - glXCreatePbuffer() could segfault instead of returning 0 (bug 4235) - fixed undefined frexp and rand in X.org libGLcore.a (bug 4242) - fixed a few problems with proxy color tables (bug 4270) - fixed precision problem in Z clearing (bug 4395) - glBitmap, glDraw/CopyPixels mistakenly generated selection hits - fixed potential segfault caused by reading pixels outside of renderbuffer bounds - glGetTexLevelParameter didn't accept GL_TEXTURE_DEPTH_SIZE_ARB - fixed memory corruption bug involving software alpha buffers - glReadPixels clipped by window bounds was sometimes broken - glDraw/CopyPixels of stencil data ignored the stencil write mask - glReadPixels from a texture bound to a framebuffer object didn't work - glIsRender/FramebufferEXT weren't totally correct - fixed a number of point size attenuation/fade bugs - fixed glFogCoord bug 4729 - GLX encoding for transpose matrix functions was broken - fixed broken fragment program KIL and SWZ instructions - fragment programs that wrote result.depth.z didn't work Changes 6.4.1: Bug fixes: - redefining a vertex program string didn't take effect in TNL module - fixed occasional segfault upon vertex/fragment parsing error - vertex program LIT instruction didn't handle 0^0=1 correctly - fragment program fog option didn't work with glDrawPixels, glBitmap - USE_MGL_NAMESPACE didn't work for x86-64 - OSMesa demos were missing from previous release tarballs - fixed problem with float->ushort conversion in glClear (bug 4992) - popping of GL_EYE_PLANE texgen state was broken (bug 4996) - popping of GL_SPOT_DIRECTION light state was broken (bug 5005) - fixed occasional triangle color interpolation problem on VMS - work around invalid free() call (bug 5131) - fixed BSD X server compilation problem by including stdint.h
Coalesce the common makefile code in the builtin.mk file that inspect the X11 distribution using imake into mk/buildlink3/imake-check.mk. imake-check.mk calls out to a helper shell script mk/buildlink3/imake-check that generates the required Imakefiles and runs imake. Remove the now extraneous builtin-imake.mk files as the builtin.mk files can now contain the name of the imake symbol to check.
Only check for the existence of the first word of ${IMAKE} since it may contain a command plus arguments. We use the standard idiom to extract the first word of a list stored in a make variable: VAR_CMD= ${VAR:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//} XXX This can be replaced with a more succinct use of variable modifiers XXX when we update the bootstrap bmake to match the latest NetBSD make XXX sources, i.e.: XXX XXX VAR_CMD= ${VAR:[1]}
Don't require a read-write pkgsrc tree when invoking imake. We avoid this requirement by using TMPDIR as the read-write location demanded by using imake.
Use IMAKE_MAKE instead of MAKE to process the makefile generated by imake.
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.
Match the template builtin.mk file in bsd.builtin.mk, and make the two packages that use builtin.mk files (graphics/xpm and pkgtools/x11-links) use the new format correctly.
Move the definitions of MESA_REQD and _MESA_REQD to Mesa/version.mk and modify {MesaLib,glu}/{buildlink3,builtin}.mk accordingly. Also add the dependency on {MesaLib,glu}>=${_MESA_REQD} to the builtin.mk files so that we correctly check the built-in Mesa version against the dependency requirements.
Split out the code that deals with checking whether the software is built-in or not into a separate builtin.mk file. The code to deal checking for built-in software is much simpler to deal with in pkgsrc. The buildlink3.mk file for a package will be of the usual format regardless of the package, which makes it simpler for packagers to update a package. The builtin.mk file for a package must define a single yes/no variable USE_BUILTIN.<pkg> that is used by bsd.buildlink3.mk to decide whether to use the built-in software or to use the pkgsrc software.