alternative from mk/jpeg.buildlink3.mk
This allows selection of an alternative jpeg library (namely the x86 MMX,
SSE, SSE2 accelerated libjpeg-turbo) via JPEG_DEFAULT=libjpeg-turbo, and
follows the current standard model for alternatives (fam, motif, fuse etc).
The mechanical edits were applied via the following script:
#!/bin/sh
for d in */*; do
[ -d "$d" ] || continue
for i in "$d/"Makefile* "$d/"*.mk; do
case "$i" in *.orig|*"*"*) continue;; esac
out="$d/x"
sed -e 's;graphics/jpeg/buildlink3\.mk;mk/jpeg.buildlink3.mk;g' \
-e 's;BUILDLINK_PREFIX\.jpeg;JPEGBASE;g' \
< "$i" > "$out"
if cmp -s "$i" "$out"; then
rm -f "$out"
else
echo "Edited $i"
mv -f "$i" "$i.orig" && mv "$out" "$i"
fi
done
done
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).
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.
changes:
* Back out fmmode (buggy, unportable) for now
* Better tiled background support (makes various windowmanagers/terminal
emulators happier)
* fixed a bug with --action's and thumbnail mode
* Disabled thumbnail caching until a better spec can be sorted out (the
current freedesktop.org spec doesn't support custom sizing. feh does).
* New option --cycle-once to exit feh after one loop through a slideshow.
Requested by various people
Changes:
* Require giblib 1.2.4 now.
* Applied large patch from Claes Nasten <pekdon@pekdon.net>
* Several tweaks to thumbnail.c including support for the "Thumbnail
Managing Standard" described at freedesktop.org. Thumbnails are cached in
a way which makes them accessible to other programs, under ~/.thumbnails
using md5sum filenames.
* He had to invoke libpng directly to write out the comments/tags required
by the spec, but that seems to be a trend with feh now so what the hell :p
* Nice patch from JC <jcm314@yahoo.com>
* Alongside the original --action option, adds --action1 through --action9,
allowing you to define multiple actions which can be run using the number
keys. Lets you set up a list of commands for organising images.
* New method for rotating jpegs - does a lossless jpeg rotation (thanks,
IJG) and preserves EXIF data, as requested by many users :)
* Fix minor documentation omissions (debian bug reports)
* Various warning fixes from Claes Nasten <pekdon@pekdon.net>
* Support full X geometry flags
* removed extraneous XFlush
* switched to global file list length (avoid recalculating it
constantly)
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.
* Fix debian bug #193964. segv on 'm' followed by cursor movement.
* Patch from Eric Dorland <eric.dorland@mail.mcgill.ca>
* Set icon name as well as title on change.
* Patch from Rami Lehti <rammer@vapaa.dc.inet.fi>
* New option not to jump to start of filelist when it's re-sorted.
* Fix bug reloading http images that fail to download on subsequent
attempts.
Changes:
- Fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=169911
- Start of IPC code, not used yet.
- Experimental speedup for caption editing. Caches the bg pixmap for the
image (which doesn't change when you're just editing a caption) so only
the overlay needs to be re-rendered on each change to the caption.
Definitely makes a difference when editing captions on a large,
fullscreen image.
- Tweak event handling - don't nuke queued keyevents when we're accepting
input for caption entry.
- Fixed wrapping for long lines with no spaces
- Caption editing, also requested by David Blackman <david@whizziwig.com>
Hit 'c', edit caption, enter to confirm the changes or Escape to revert.
(Only when --captions-path has been specified).
- Spotted a couple of minor bugs as I went through stuff, fixed those two.
- New option --captions-path. Specify a path (relative to each image) to
a directory with captions in and feh will overlay them on the image. It
even does text wrapping and centering!
Example, run feh --captions-path captions testimages for image
testimages/donna1.jpg, feh will look for a caption in
testimages/captions/donna1.jpg.txt
* Experimental speedup for caption editing. Caches the bg pixmap for the
image (which doesn't change when you're just editing a caption) so only
the overlay needs to be re-rendered on each change to the caption.
Definitely makes a difference when editing captions on a large, fullscreen
image.
* Tweak event handling - don't nuke queued keyevents when we're accepting
input for caption entry.
* Fixed wrapping for long lines with no spaces
* Caption editing, also requested by David Blackman <david@whizziwig.com>
Hit 'c', edit caption, enter to confirm the changes or Escape to revert.
(Only when --captions-path has been specified).
* Spotted a couple of minor bugs as I went through stuff, fixed those two.
* New option --captions-path. Specify a path (relative to each image) to a
directory with captions in and feh will overlay them on the image. It even
does text wrapping and centering!
Example, run feh --captions-path captions testimages
for image testimages/donna1.jpg, feh will look for a caption in
testimages/captions/donna1.jpg.txt
* Fixed bug - segv when last image in slideshow is deleted.
* added requested screen-clip option (allows you to disable window size
clipping based on screen geometry; ie, you can make pathologically
large windows, assuming you have the images to do so)
* disabled xinerama geometry check when using feh to set the background.
* cleaned up spelling and capitalization in menus
* src/options.c: added 'Auto-Zoom' toggle to option menu
* feh.1: added info about --xinerama flag
* New beveled, off-white background image for menus.
* Added Xinerama support. Currently defaults to fullscreen on the
first head (this can be fixed with a little work).
* Move to buildlink2
* Tons of bugfixes
* stick in yudit.ttf. it's not as pretty, but it is, apparently, DFSG
compliant etc.
* add support for using the numeric keypad to scroll and zoom the
image.
* New menu colour/style - "feh -Tblack src/testimages"
* Add --zoom option.
* Use giblib fontstyles for menus, instead of hardcoding the shadow.
* Let users choose menu style with --menu-style. Standard giblib
semantics.
* make sure fullscreen windows are really fullscreen.
* feh uses giblib now
* When you set a bg with feh, it now stores the necessary
commandline to restore that bg in ~/.fehbg.
* Use < or > keys to do in place edit rotations, 90 degrees left
or right.
* Some basic in place editing.
* Slightly tweaked menu sliding behaviour.
all dependencies on packages depending on "png" which contain shared
libraries, all for the (imminent) update to the "png" package.
[List courtesy of John Darrow, courtesy of "bulk-build".]
Changes: The background setting works better under non-E window managers
(and has Eterm support). This release shows the zoom level while zooming
and has lots more menu items, including configuration changes (options
menu) and fullscreen/window mode switch on a per-window basis. There are
several other bugfixes and new features.
