Subject: version of builtin libXrandr
To: None <tech-pkg@netbsd.org>
From: Mark Davies <mark@mcs.vuw.ac.nz>
List: tech-pkg
Date: 10/17/2004 01:57:38
Some packages, including KDE, test for a sufficiently recent version of
libXrandr for their purposes by testing the existence of
XRRSetScreenConfigAndRate() which first appeared in XFree86 4.3.
However in x11/Xrandr/builtin.mk there is no way to distinguish between the
versions of Xrandr provided by XFree86 4.2, 4.3, 4.4 or anything newer. All
of them are treated as equivalent to Xrandr 1.0. In order to distinguish the
4.2 version of Xrandr from more recent I'd like to make the following change
to Xrandr/builtin.mk:
--- builtin.mk.orig 2004-07-28 00:28:55.000000000 +1200
+++ builtin.mk 2004-10-17 01:29:27.000000000 +1300
@@ -22,8 +22,9 @@
# the software. Match up Xrandr versions with XFree86 versions for an
# approximate determination of the Xrandr version.
#
-_XRANDR_VERSIONS= 1.0.2 1.0.1 1.0
-_XRANDR_1.0= 4.2 4.2.* 4.3 4.3.[0-9] 4.3.[0-9].* 4.3.[1-8][0-9]* 4.3.9[0-8]*
+_XRANDR_VERSIONS= 1.0.2 1.0.1 1.0 0.99
+_XRANDR_0.99= 4.2 4.2.*
+_XRANDR_1.0= 4.3 4.3.[0-9] 4.3.[0-9].* 4.3.[1-8][0-9]* 4.3.9[0-8]*
_XRANDR_1.0+= 4.3.99.* 4.[4-9]* 4.[1-9][0-9]*
. if !defined(XF86_VERSION)
XF86_VERSION= 3.3
Any objections?
Actually to maintain current behaviour should also change Xrandr/buildlink3.mk
as follows:
--- buildlink3.mk.orig 2004-10-04 23:38:43.000000000 +1300
+++ buildlink3.mk 2004-10-17 01:53:51.000000000 +1300
@@ -11,7 +11,7 @@
BUILDLINK_PACKAGES+= Xrandr
.if !empty(XRANDR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0
+BUILDLINK_DEPENDS.Xrandr+= Xrandr>=0.99
BUILDLINK_RECOMMENDED.Xrandr+= Xrandr>=1.0.2nb1
BUILDLINK_PKGSRCDIR.Xrandr?= ../../x11/Xrandr
.endif # XRANDR_BUILDLINK3_MK
Then the packages that care can explicitly add
BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0
cheers
mark