Up to [cvs.NetBSD.org] / pkgsrc / devel / SDL
Request diff between arbitrary revisions
Keyword substitution: kv
Default branch: MAIN
SDL: add a user-configurable mk.conf option to decide whether to use SDL or sdl12-compat. This is disabled by default until sdl12-compat is in a better state (e.g. dosbox does not work for me). use the original SDL 1.2: SDL12_TYPE= retro use sdl12-compat: SDL12_TYPE= compat
SDL: add BUILDLINK_INCDIRS, as with SDL2
Pass --disable-sdltest on Darwin when using GNU configure, fixes various issues (crashes, hangs) when building SDL packages in a session which isn't logged into the console. Tested in a full bulk build, some packages issue warnings for it being an unrecognized option but I cannot see any failures due to it, and it fixes a reasonable number of package builds.
Recursive revbump following MesaLib update, categories a through f.
Changes 1.2.14: * Added cast macros for correct usage with C++: SDL_reinterpret_cast(type, expression) SDL_static_cast(type, expression) * Added SDL_VIDEO_FULLSCREEN_DISPLAY as a preferred synonym for SDL_VIDEO_FULLSCREEN_HEAD on X11. * Added SDL_DISABLE_LOCK_KEYS environment variable to enable normal up/down events for Caps-Lock and Num-Lock keys.
Simply and speed up buildlink3.mk files and processing. This changes the buildlink3.mk files to use an include guard for the recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS, BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of enter/exit marker, which can be used to reconstruct the tree and to determine first level includes. Avoiding := for large variables (BUILDLINK_ORDER) speeds up parse time as += has linear complexity. The include guard reduces system time by avoiding reading files over and over again. For complex packages this reduces both %user and %sys time to half of the former time.
Add support for XRandR via x11/libXrandr. Bump PKGREVISION.
Removed some code duplication from the buildlink3 files by using the new pkg-build-options.mk procedure.
Modular Xorg support.
Replace mk/bsd.prefs.mk includes with bsd.fast.prefs.mk includes. The redundant parsing of bsd.prefs.mk is mostly avoided now and parse time e.g. for x11/kdebase3 gets reduced by up to 10%.
Switch to modular buildlinks. XXX Should libX11 be a build dependency?
Include x11.b3.mk since SDL/SDL_syswm.h includes Xlib.h.
Change the format of BUILDLINK_ORDER to contain depth information as well, and add a new helper target and script, "show-buildlink3", that outputs a listing of the buildlink3.mk files included as well as the depth at which they are included. For example, "make show-buildlink3" in fonts/Xft2 displays: zlib fontconfig iconv zlib freetype2 expat freetype2 Xrender renderproto
Track information in a new variable BUILDLINK_ORDER that informs us of the order in which buildlink3.mk files are (recursively) included by a package Makefile.
Add direct dependency on libiconv. With default options, this was pulled in via arts->glib2->libiconv, so no (and especially no recursive) PKGREVISION bump.
Exclude Darwin also in buildlink3.mk
Make aalib an option, enabled by default
We don't need to include buildlink3 files for "arts" and "esound" because they are properly dlopen()ed. Pointed out by Thomas Klausner.
Include buildlink3 files for "arts", "esound" and "nas" if support for these package has been compiled into the "SDL" package. Based on a patch provided by Thomas Klausner in private e-mail.
Update to 1.2.10. Package changes: Merge SDL-arts, SDL-esound, and SDL-nas packages back as options, all defaulting to on (add "-arts -esound -nas" to PKG_OPTIONS.SDL to get the previous behaviour of this package). Reason: trying to get and stay in sync with upstream, who decided not to take back the relevant changes. Ok jmmv@ Also follow upstream w.r.t. library version numbers; bump BUILDLINK_API_DEPENDS for that (no real reason to diverge here). Most patches have been integrated upstream. Changes in 1.2.10: 1.2.10: If SDL_OpenAudio() is passed zero for the desired format fields, the following environment variables will be used to fill them in: SDL_AUDIO_FREQUENCY SDL_AUDIO_FORMAT SDL_AUDIO_CHANNELS SDL_AUDIO_SAMPLES If an environment variable is not specified, it will be set to a reasonable default value. Added support for the SDL_VIDEO_FULLSCREEN_HEAD environment variable, currently supported on X11 Xinerama configurations. Added SDL_GL_SWAP_CONTROL to wait for vsync in OpenGL applications. Added SDL_GL_ACCELERATED_VISUAL to guarantee hardware acceleration. Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set. SDL_SetVideoMode() now accepts 0 for width or height and will use the current video mode (or the desktop mode if no mode has been set.) Added SDL_GetKeyRepeat() Added SDL_config.h, with defaults for various build environments.
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).
Recursive revision bump / recommended bump for gettext ABI change.
Update BUILDLINK_RECOMMENDED for aalib dependency change. Noted by reed@.
Convert aalib to options framework, adding an 'x11' option, and remove aalib-x11 and aview-x11. SDL dependencies change, so bump PKGREVISION (and BUILDLINK_RECOMMENDED) for affected packages. Addresses PR 32046 by Leonard Schmidt.
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.
Use MesaLib/bl3 and glu/bl3 instead of Mesa/bl3, which also pulls in an unnecessary dependency on glut. Addresses PR 29799 by Richard Rauch.
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.
Don't pull in Mesa on IRIX - patch by Staffan Thomén (duck@IRC)
SDL/SDL_opengl.h includes GL/glu.h, so we need to use graphics/Mesa/buildlink[23].mk to pull in glu.
Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly by moving the inclusion of buildlink3.mk files outside of the protected region. This bug would be seen by users that have set PREFER_PKGSRC or PREFER_NATIVE to non-default values. BUILDLINK_PACKAGES should be ordered so that for any package in the list, that package doesn't depend on any packages to the left of it in the list. This ordering property is used to check for builtin packages in the correct order. The problem was that including a buildlink3.mk file for <pkg> correctly ensured that <pkg> was removed from BUILDLINK_PACKAGES and appended to the end. However, since the inclusion of any other buildlink3.mk files within that buildlink3.mk was in a region that was protected against multiple inclusion, those dependencies weren't also moved to the end of BUILDLINK_PACKAGES.
Reorder location and setting of BUILDLINK_PACKAGES to match template buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
Append to BUILDLINK_DEPENDS.<pkg> instead of setting a default value. In the normal case when BUILDLINK_DEPENDS.<pkg> isn't specified, it receives a value only once due to the multiple inclusion protection in the bulldlink3.mk files. In the case where a package includes several buildlink3.mk files that each want a slightly different version of another dependency, having BUILDLINK_DEPENDS.<pkg> be a list allows for the strictest <pkg> dependency to be matched.
Use S/+$// instead of C/\+$// to save a backslash. Very highly recommended by seb :)
Re-arrange to match example buildlink3.mk file in bsd.buildlink3.mk.
Initial sprinkling of work-in-progress buildlink3.mk files for using the buildlink3 framework.