* go to buildlink with fixesproto4 if using monolithic X.
* bump API_DEPENDS, older will be handled by fixesproto4.
* set xextprot requirement if using fixesproto from pkgsrc (XXX >=5.0).
* simplify builtin.mk, older will be handled by fixesproto4.
Update x11/fixesproto 4.1.1 to 5.0
(modular-xorg-server 1.11.1 needs this version)
From ChangeLog:
----------
Date: Mon Feb 28 09:53:30 2011 -0500
fixesproto 5.0
Date: Mon Nov 15 17:09:31 2010 -0500
fixesproto v5: Pointer barriers
v3: Review fixes:
- INT16 not CARD16 for coordinates
- BadDevice not BadMatch
Date: Fri Oct 29 21:01:26 2010 -0700
fixesproto 4.1.2
- Sun's copyrights now belong to Oracle
- config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
- Update Sun license notices to current X.Org standard form
- Use $(docdir) for fixesproto.txt install path
- Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
- Now that the INSTALL file is generated.
Allows running make maintainer-clean.
- INSTALL file is missing or incorrect #24206
- The file is copied from util-macros.
The copy in git is removed.
- README: file created or updated #24206
- Contains a set of URLs to freedesktop.org.
- NEWS: remove empty file #24206
- Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
- ChangeLog filename is known to Automake and requires no further
coding in the makefile.
- Makefile.am: INSTALL file is missing or incorrect #24206
- The standard GNU file on building/installing tarball is copied
using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS
Add INSTALL target
- configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242
- This macro aggregate a number of existing macros that sets commmon
X.Org components configuration options. It shields the configuration file from
future changes.
- .gitignore: use common defaults with custom section # 24239
- Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
4.1.1:
New requirement: xorg-macros 1.3
Add README with pointers to mailing lists, bugzilla, & git
Hide/ShowCursor works on all master pointers in XI2.
Document behaviour of CursorNotifies with XI2 servers.
Require macros 1.3 for XORG_DEFAULT_OPTIONS
Remove RCS tags
4.1:
renamed: .cvsignore -> .gitignore
Update XFixes protocol spec to match XFixes 4.0
Typo fixes in XFixes protocol spec
Move fixes protocol description to the new canonical location/name.
fixesproto: adjust to split xext headers
ChangeSaveSet with map=Unmap means 'unmap', not 'don't remap'
Janitor: Correct make distcheck and dont distribute autogen.sh
Adam Jackson (1):
fixesproto 4.1
Alan Coopersmith (3):
renamed: .cvsignore -> .gitignore
Update XFixes protocol spec to match XFixes 4.0
Typo fixes in XFixes protocol spec
Eric Anholt (1):
Move fixes protocol description to the new canonical location/name.
Julien Cristau (1):
fixesproto: adjust to split xext headers
Keith Packard (1):
ChangeSaveSet with map=Unmap means 'unmap', not 'don't remap'
Paulo Cesar Pereira de Andrade (1):
Janitor: Correct make distcheck and dont distribute autogen.sh
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.
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.
(e.g. NetBSD with bundled XFree86). Checking whether "X11_TYPE" is "xorg"
is obsolete and *not* equivalent to checking whether we are not using
modular X.org.
.if foo || bar
BAZ= no
.else
BAZ= yes
.endif
different from
.if foo
BAZ= no
.elif bar
BAZ= no
.else
BAZ= yes
.endif
in some situations exposed in this builtin.mk. Workaround this for now.
Needed for libXfixes in pkgsrc-wip. I tested with x11/Xfixes with
"native" XFree86 on NetBSD too.
From ChangeLog:
2006-3-13 Deron Johnson <deron.johnson@sun.com>
* configure.ac
* xfixesproto.h
* /xfixeswire.h
Xfixes Version 4.0: XFixesHideCursor, XFixesShowCursor
since they always need a C compiler, even when the source code is
completely in C++.
For some other packages, stated in the comment that a C compiler is
really not needed.
when X11_TYPE=xorg. Let them include x11.buildlink3.mk directly.
Remove the manual USE_BUILTIN declarations from xorg-libs/b3.mk.
This fixes a symmetry in the dependency list depending on whether
xorg-libs is installed already or not.
Discussed with jlam@
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
