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.
Fix assertion triggered in pulsaudio by returning "unknown" instead
of NULL pointer when guessing application name.
Own improvements:
- Use getprogname on NetBSD as it wont return NULL
- Also identify stream as "SDL Application"
3rd party bugfixes:
- Pull buffer size and other fixes from pulsaudio developers.
http://0pointer.de/blog/projects/pa-plugin-for-sdl.html
Bump revision.
SDL 1.2.13 is a minor bug fix release.
General Notes
* Fixed link error when building with Intel Compiler 10.
* Removed stray C++ comment from public headers.
Unix Notes
* Fixed crash in SDL_SoftStretch() on secure operating systems.
* Fixed undefined symbol on X11 implementations without UTF-8 support.
* Worked around BadAlloc error when using XVideo on the XFree86 Intel Integrated Graphics driver.
* Scan for all joysticks on Linux instead of stopping at one that was removed.
* Fixed use of sdl-config arguments in sdl.m4
Mac OS X Notes
* SDL now builds on Mac OS X 10.5 (Leopard).
* Fixed high frequency crash involving text input.
* Fixed beeping when the escape key is pressed and UNICODE translation is enabled.
* Improved trackpad scrolling support.
* Fixed joystick hat reporting for certain joysticks.
1.2.12:
Added SDL_VIDEO_ALLOW_SCREENSAVER to override SDL's disabling
of the screensaver on Mac OS X and X11.
Also, many pkgsrc patches were integrated.
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
SDL 1.2.11 is a minor bug fix release.
Unix Notes
Dynamic X11 loading is only enabled with gcc 4 supporting -fvisibility=hidden. This fixes crashes related to symbol collisions, and allows building on Solaris and IRIX.
Fixed building SDL with Xinerama disabled.
Fixed DRI OpenGL library loading, using RTLD_GLOBAL in dlopen().
Added pkgconfig configuration support.
Mac OS X Notes
The Quartz video driver supports 32x32 cursors on Mac OS X 10.3 and above.
directly. This didn't work because dlopen uses the rpath of the foremost
binary (not libSDL's one); therefore, some libraries could not be found.
For example, qemu was not working at all because it only has PREFIX in
its rpath, not X11PREFIX, and so libSDL could not load libX11 resulting
in a very strange error message.
There seem to be other problems such as the aalib video output crashing
or the wscons output not working, but these aren't very important (maybe
the problems have already gone away with this fix, I don't know). Anyway,
I think the former is fixed in 1.2.11.
Bump PKGREVISION to 1.
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.
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).
aalib-x11 and aview-x11.
SDL dependencies change, so bump PKGREVISION (and BUILDLINK_RECOMMENDED)
for affected packages.
Addresses PR 32046 by Leonard Schmidt.
* Added support for direct color 8-bpp surfaces
* Altivec optimized blitters
* SDL.dll works on Windows 95 again
* Dropping a document onto an SDL app passes it as a command line parameter in MacOS X
* Fixed crash trying to allocate hardware surfaces on MacOS X
* Fixed short read problem with SDL_RWFromMem()
* Fixed gcc parse errors in SDL_audio.h on Windows
* Added support for Tru64 UNIX 4.X
* Improved RISC OS support
* Numerous improvements to the Atari port
* SDL_OPENGLBLIT is officially obsolete
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.
