sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-30 18:06:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Xorg server to 1.6.0

Browse source 
o Update randrproto, libXrandr and xrandr to 1.3.0
	o Update xf86-video-intel to 2.6.3
	o Update other less common drivers as needed
	o Mark a bunch of un-maintained input drivers ignored
	o Update the various slave X server ports as well
This commit is contained in:
Robert Noland 2009-04-04 04:04:01 +00:00
parent 4516674602
commit fd559155d1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=231570
61 changed files with 197 additions and 685 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mk/bsd.xorg.mk
View file

@ -53,7 +53,7 @@ CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
. if ${PORTNAME:M*input*}x != x
USE_XORG+= inputproto
. elif ${PORTNAME:M*video*}x != x
USE_XORG+= fontsproto renderproto
USE_XORG+= fontsproto renderproto xi
. else
IGNORE= doesn't contain either "driver" or "input"
. endif

2
x11-drivers/xf86-input-acecad/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= xf86-input-acecad
PORTVERSION= 1.2.2
PORTVERSION= 1.3.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

6
x11-drivers/xf86-input-acecad/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/driver/xf86-input-acecad-1.2.2.tar.bz2) = 2d6596b2b0cfa527b5ed4df2014684bf
SHA256 (xorg/driver/xf86-input-acecad-1.2.2.tar.bz2) = 953ebb7d7ed579ce648dd6f6a25307c37ad8230a0336ec6fc58247732835f26e
SIZE (xorg/driver/xf86-input-acecad-1.2.2.tar.bz2) = 230781
MD5 (xorg/driver/xf86-input-acecad-1.3.0.tar.bz2) = dd8821ea9239d86d67a84912f4702adf
SHA256 (xorg/driver/xf86-input-acecad-1.3.0.tar.bz2) = aedd5657984d45d76045cc61d54709f9c71e4296a4c06b318086ee320209b504
SIZE (xorg/driver/xf86-input-acecad-1.3.0.tar.bz2) = 247705

2
x11-drivers/xf86-input-calcomp/Makefile
View file

@ -15,4 +15,6 @@ COMMENT= X.Org calcomp input driver
XORG_CAT= driver
MAN4= calcomp.4x
IGNORE= Unmaintained upstream. Notify ${MAINTAINER} if you have this device.
.include <bsd.port.mk>

2
x11-drivers/xf86-input-citron/Makefile
View file

@ -16,4 +16,6 @@ COMMENT= X.Org citron input driver
XORG_CAT= driver
MAN4= citron.4x
IGNORE= Unmaintained upstream. Notify ${MAINTAINER} if you have this device.
.include <bsd.port.mk>

2
x11-drivers/xf86-input-digitaledge/Makefile
View file

@ -14,4 +14,6 @@ COMMENT= X.Org digitaledge input driver
XORG_CAT= driver
IGNORE= Unmaintained upstream. Notify ${MAINTAINER} if you have this device.
.include <bsd.port.mk>

2
x11-drivers/xf86-input-dmc/Makefile
View file

@ -15,4 +15,6 @@ COMMENT= X.Org dmc input driver
XORG_CAT= driver
MAN4= dmc.4x
IGNORE= Unmaintained upstream. Notify ${MAINTAINER} if you have this device.
.include <bsd.port.mk>

2
x11-drivers/xf86-input-dynapro/Makefile
View file

@ -15,4 +15,6 @@ COMMENT= X.Org dynapro input driver
XORG_CAT= driver
MAN4= dynapro.4x
IGNORE= Unmaintained upstream. Notify ${MAINTAINER} if you have this device.
.include <bsd.port.mk>

2
x11-drivers/xf86-input-elo2300/Makefile
View file

@ -14,4 +14,6 @@ COMMENT= X.Org elo2300 input driver
XORG_CAT= driver
IGNORE= Unmaintained upstream. Notify ${MAINTAINER} if you have this device.
.include <bsd.port.mk>

2
x11-drivers/xf86-input-fpit/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= xf86-input-fpit
PORTVERSION= 1.2.0
PORTVERSION= 1.3.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

6
x11-drivers/xf86-input-fpit/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/driver/xf86-input-fpit-1.2.0.tar.bz2) = 0f3e013d5ff58e0aba3d9e1d18830291
SHA256 (xorg/driver/xf86-input-fpit-1.2.0.tar.bz2) = 87e3dd97d57ddb520cafa5e68fa7846cfc3d9d71cb054cdf0e1d650c7b1cff7e
SIZE (xorg/driver/xf86-input-fpit-1.2.0.tar.bz2) = 242815
MD5 (xorg/driver/xf86-input-fpit-1.3.0.tar.bz2) = e5bfda480f25121e3c4222e5e1eb5880
SHA256 (xorg/driver/xf86-input-fpit-1.3.0.tar.bz2) = d1ced3b8c6d799c3af1c93e72dc571cb30d38083e1221b8ea0b2d4fc48a7eef8
SIZE (xorg/driver/xf86-input-fpit-1.3.0.tar.bz2) = 243747

2
x11-drivers/xf86-input-hyperpen/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= xf86-input-hyperpen
PORTVERSION= 1.2.0
PORTVERSION= 1.3.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

6
x11-drivers/xf86-input-hyperpen/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/driver/xf86-input-hyperpen-1.2.0.tar.bz2) = 175c1e1ad668ebbbe212c1e975dd14f9
SHA256 (xorg/driver/xf86-input-hyperpen-1.2.0.tar.bz2) = 689d1c5c1f21eed00ae03a01c57482f7bbef36d7e07156556c99febe28c7d413
SIZE (xorg/driver/xf86-input-hyperpen-1.2.0.tar.bz2) = 244682
MD5 (xorg/driver/xf86-input-hyperpen-1.3.0.tar.bz2) = c50d0da3206d18d9d94f720e3688eca5
SHA256 (xorg/driver/xf86-input-hyperpen-1.3.0.tar.bz2) = e7a13a7597fa32f05d595d05a66cf94c529ba8ce1d03249bb9da5be9512c4b7b
SIZE (xorg/driver/xf86-input-hyperpen-1.3.0.tar.bz2) = 236593

2
x11-drivers/xf86-input-jamstudio/Makefile
View file

@ -15,4 +15,6 @@ COMMENT= X.Org jamstudio input driver
XORG_CAT= driver
MAN4= js_x.4x
IGNORE= Unmaintained upstream. Notify ${MAINTAINER} if you have this device.
.include <bsd.port.mk>

2
x11-drivers/xf86-input-magellan/Makefile
View file

@ -14,4 +14,6 @@ COMMENT= X.Org magellan input driver
XORG_CAT= driver
IGNORE= Unmaintained upstream. Notify ${MAINTAINER} if you have this device.
.include <bsd.port.mk>

2
x11-drivers/xf86-input-microtouch/Makefile
View file

@ -15,4 +15,6 @@ COMMENT= X.Org microtouch input driver
XORG_CAT= driver
MAN4= microtouch.4x
IGNORE= Unmaintained upstream. Notify ${MAINTAINER} if you have this device.
.include <bsd.port.mk>

2
x11-drivers/xf86-input-palmax/Makefile
View file

@ -15,4 +15,6 @@ COMMENT= X.Org palmax input driver
XORG_CAT= driver
MAN4= palmax.4x
IGNORE= Unmaintained upstream. Notify ${MAINTAINER} if you have this device.
.include <bsd.port.mk>

2
x11-drivers/xf86-input-penmount/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= xf86-input-penmount
PORTVERSION= 1.3.0
PORTVERSION= 1.4.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

6
x11-drivers/xf86-input-penmount/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/driver/xf86-input-penmount-1.3.0.tar.bz2) = 24594c0222e631fedccc7c540c420b03
SHA256 (xorg/driver/xf86-input-penmount-1.3.0.tar.bz2) = 9cb4e0e83dcefe1ece814d638bd186785b6bc1debe1aa2101ce2a4ea0376805a
SIZE (xorg/driver/xf86-input-penmount-1.3.0.tar.bz2) = 243048
MD5 (xorg/driver/xf86-input-penmount-1.4.0.tar.bz2) = d5f1395b2dcefc7533ff5580e63f2066
SHA256 (xorg/driver/xf86-input-penmount-1.4.0.tar.bz2) = 8cb15e9a30f3602d22eba6c7bcca2c1040889ed0851c7b575273671c2da1bff1
SIZE (xorg/driver/xf86-input-penmount-1.4.0.tar.bz2) = 239577

2
x11-drivers/xf86-input-spaceorb/Makefile
View file

@ -15,4 +15,6 @@ COMMENT= X.Org spaceorb input driver
XORG_CAT= driver
IGNORE= Unmaintained upstream. Notify ${MAINTAINER} if you have this device.
.include <bsd.port.mk>

2
x11-drivers/xf86-input-summa/Makefile
View file

@ -14,4 +14,6 @@ COMMENT= X.Org summa input driver
XORG_CAT= driver
IGNORE= Unmaintained upstream. Notify ${MAINTAINER} if you have this device.
.include <bsd.port.mk>

2
x11-drivers/xf86-input-tek4957/Makefile
View file

@ -15,4 +15,6 @@ COMMENT= X.Org tek4957 input driver
XORG_CAT= driver
MAN4= tek4957.4x
IGNORE= Unmaintained upstream. Notify ${MAINTAINER} if you have this device.
.include <bsd.port.mk>

3
x11-drivers/xf86-input-void/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= xf86-input-void
PORTVERSION= 1.1.1
PORTREVISION= 2
PORTVERSION= 1.2.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

6
x11-drivers/xf86-input-void/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/driver/xf86-input-void-1.1.1.tar.bz2) = 862c230f5f6e0c545f232b4c0fa9537a
SHA256 (xorg/driver/xf86-input-void-1.1.1.tar.bz2) = dde062d6267a3fd9d51b0daee88fd84fceea52a6019de51dece46e92012dbc4f
SIZE (xorg/driver/xf86-input-void-1.1.1.tar.bz2) = 219328
MD5 (xorg/driver/xf86-input-void-1.2.0.tar.bz2) = c81fbd9368abbe1488b423ddef477e88
SHA256 (xorg/driver/xf86-input-void-1.2.0.tar.bz2) = b01706192b00a777640f2be0a0635bbded70c2ef38863d268372d27d2b53e2a5
SIZE (xorg/driver/xf86-input-void-1.2.0.tar.bz2) = 235491

2
x11-drivers/xf86-video-dummy/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-dummy
PORTVERSION= 0.3.0
PORTVERSION= 0.3.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

6
x11-drivers/xf86-video-dummy/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/driver/xf86-video-dummy-0.3.0.tar.bz2) = 3d96297556846bee02a74166ffb5d052
SHA256 (xorg/driver/xf86-video-dummy-0.3.0.tar.bz2) = 5a4bbde0b7f0334bb63b159e5ef6e164be3699e3424734c2bd9823f20a30a278
SIZE (xorg/driver/xf86-video-dummy-0.3.0.tar.bz2) = 239002
MD5 (xorg/driver/xf86-video-dummy-0.3.1.tar.bz2) = e7920f4820d3450e9e5cb454fc620895
SHA256 (xorg/driver/xf86-video-dummy-0.3.1.tar.bz2) = bcd0111f8cba45125613f45ec67b9425ac6d39194c4d2c896c631efc51e93ba0
SIZE (xorg/driver/xf86-video-dummy-0.3.1.tar.bz2) = 233757

2
x11-drivers/xf86-video-intel/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-intel
PORTVERSION= 2.5.1
PORTVERSION= 2.6.3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

6
x11-drivers/xf86-video-intel/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = 62e96948860b7a8507963300f56d0d16
SHA256 (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = c203b728f1203d6d52b2963cdc6bfd87fb83eb12ab786c8122ea26c7984ac313
SIZE (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = 716182
MD5 (xorg/driver/xf86-video-intel-2.6.3.tar.bz2) = 440c014bbd3072b5d379fe1bdb861918
SHA256 (xorg/driver/xf86-video-intel-2.6.3.tar.bz2) = b35a142aeba034ad06b8d9b477c243f82ce9f82ad65a0ee4408630f228e90258
SIZE (xorg/driver/xf86-video-intel-2.6.3.tar.bz2) = 790275

2
x11-drivers/xf86-video-intel29/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-intel
PORTVERSION= 2.5.1
PORTVERSION= 2.6.3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

6
x11-drivers/xf86-video-intel29/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = 62e96948860b7a8507963300f56d0d16
SHA256 (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = c203b728f1203d6d52b2963cdc6bfd87fb83eb12ab786c8122ea26c7984ac313
SIZE (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = 716182
MD5 (xorg/driver/xf86-video-intel-2.6.3.tar.bz2) = 440c014bbd3072b5d379fe1bdb861918
SHA256 (xorg/driver/xf86-video-intel-2.6.3.tar.bz2) = b35a142aeba034ad06b8d9b477c243f82ce9f82ad65a0ee4408630f228e90258
SIZE (xorg/driver/xf86-video-intel-2.6.3.tar.bz2) = 790275

4
x11-drivers/xf86-video-mga/Makefile
View file

@ -6,8 +6,8 @@
#
PORTNAME= xf86-video-mga
PORTVERSION= 1.9.100
PORTEPOCH= 1
PORTVERSION= 1.4.9
PORTEPOCH= 2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

6
x11-drivers/xf86-video-mga/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/driver/xf86-video-mga-1.9.100.tar.bz2) = 3e80cfb84b62866d2f94774ecbf3e46c
SHA256 (xorg/driver/xf86-video-mga-1.9.100.tar.bz2) = e8efee8d5269eb29f9bd499db3d47a6a4d3c320d4b0a24874cdf7b598ad77a5c
SIZE (xorg/driver/xf86-video-mga-1.9.100.tar.bz2) = 369119
MD5 (xorg/driver/xf86-video-mga-1.4.9.tar.bz2) = 11066b84b949cd04300ec819c9c51532
SHA256 (xorg/driver/xf86-video-mga-1.4.9.tar.bz2) = d57dd2323052f064092167a232fb7576f46e5d62e98bc9cc6a7f270cc8d0fdc0
SIZE (xorg/driver/xf86-video-mga-1.4.9.tar.bz2) = 419781

2
x11-drivers/xf86-video-rendition/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-rendition
PORTVERSION= 4.2.0
PORTVERSION= 4.2.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

6
x11-drivers/xf86-video-rendition/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/driver/xf86-video-rendition-4.2.0.tar.bz2) = 7c03de3804d4c4f6ff59f74050d24b2b
SHA256 (xorg/driver/xf86-video-rendition-4.2.0.tar.bz2) = b57b62f707d87534a799170e31b33311449cfd7019a56e6b4fa85a4c7faaae15
SIZE (xorg/driver/xf86-video-rendition-4.2.0.tar.bz2) = 299330
MD5 (xorg/driver/xf86-video-rendition-4.2.1.tar.bz2) = c6b49b99586cc0955295cb1ca93fcac7
SHA256 (xorg/driver/xf86-video-rendition-4.2.1.tar.bz2) = 54209ec16c8f032b38cee88752783a7869139b2b30a537f8305d60404f40b0bb
SIZE (xorg/driver/xf86-video-rendition-4.2.1.tar.bz2) = 313792

2
x11-drivers/xf86-video-voodoo/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= xf86-video-voodoo
PORTVERSION= 1.2.0
PORTVERSION= 1.2.1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

6
x11-drivers/xf86-video-voodoo/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/driver/xf86-video-voodoo-1.2.0.tar.bz2) = 7c681d9b57f5e1f798263fc1a9d99245
SHA256 (xorg/driver/xf86-video-voodoo-1.2.0.tar.bz2) = b79ba6d5d4300570c00f8be37c536f47f2d78c18845f70f525da2a29e47c4b8c
SIZE (xorg/driver/xf86-video-voodoo-1.2.0.tar.bz2) = 256472
MD5 (xorg/driver/xf86-video-voodoo-1.2.1.tar.bz2) = ed4ce3a5406ca7958865d39558259726
SHA256 (xorg/driver/xf86-video-voodoo-1.2.1.tar.bz2) = a2ea804932ea47dd3d9e4b6ea4475b768305e5041dc1899393004ece558b3cda
SIZE (xorg/driver/xf86-video-voodoo-1.2.1.tar.bz2) = 258827

16
x11-servers/xephyr/Makefile
View file

@ -6,8 +6,8 @@
#
PORTNAME= xephyr
PORTVERSION= 1.5.3
PORTREVISION= 1
PORTVERSION= 1.6.0
#PORTREVISION= 1
CATEGORIES= x11-servers
MAINTAINER= x11@FreeBSD.org
@ -23,11 +23,12 @@ USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \
xf86bigfontproto scrnsaverproto bigreqsproto \
resourceproto fontsproto videoproto \
compositeproto trapproto recordproto \
xineramaproto evieproto xkbfile xfont \
xineramaproto xinerama evieproto xkbfile xfont \
xau xdmcp xext fontenc xv pixman
USE_OPENSSL= yes
CONFIGURE_ARGS= --enable-kdrive --enable-xephyr --disable-dmx --disable-xvfb \
--disable-xorg --disable-xnest --disable-xprint \
--disable-xorg --disable-xnest \
--localstatedir=/var --without-dtrace
PLIST_FILES= bin/Xephyr
@ -36,6 +37,13 @@ OPTIONS= HAL "Compile with HAL config support" on
.include <bsd.port.pre.mk>
.if defined(WITH_OPENSSL_BASE)
# The reason why I use this is cause openssl from base doesn't install a .pc file
# and configure will fail trying to find it. Setting both of those variables to
# a *non-empty* value by-passes the pkg-config check.
CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
.endif
.if !defined(WITHOUT_HAL)
LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
CONFIGURE_ARGS+= --enable-config-hal=yes

6
x11-servers/xephyr/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8
SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625
MD5 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = aafe73f5807ce8bb534727ecb72467c7
SHA256 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 81a9a02b621e8a3e0bae1ad1b5dd6706a3fdcdbe766d75e1670ab5b3f0d32812
SIZE (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 4655422

16
x11-servers/xorg-dmx/Makefile
View file

@ -6,9 +6,9 @@
#
PORTNAME= xorg-dmx
PORTVERSION= 1.5.3
PORTVERSION= 1.6.0
PORTEPOCH= 1
PORTREVISION= 1
#PORTREVISION= 1
CATEGORIES= x11-servers
MAINTAINER= x11@FreeBSD.org
@ -26,11 +26,12 @@ USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \
xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
resourceproto fontsproto xf86dgaproto videoproto \
compositeproto trapproto recordproto resourceproto \
xineramaproto evieproto xkbfile xfont fontenc xkbui \
xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
xau dmx xtst xres pixman xtrans
CONFIGURE_ARGS= --disable-xprint --disable-xvfb --disable-xorg --disable-xnest \
USE_OPENSSL= yes
CONFIGURE_ARGS= --disable-xvfb --disable-xorg --disable-xnest \
--enable-dmx --localstatedir=/var --without-dtrace
MAN1= Xdmx.1 dmxtodmx.1 vdltodmx.1 xdmxconfig.1
@ -42,6 +43,13 @@ OPTIONS= HAL "Compile with HAL config support" on
.include <bsd.port.pre.mk>
.if defined(WITH_OPENSSL_BASE)
# The reason why I use this is cause openssl from base doesn't install a .pc file
# and configure will fail trying to find it. Setting both of those variables to
# a *non-empty* value by-passes the pkg-config check.
CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
.endif
.if !defined(WITHOUT_HAL)
LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
CONFIGURE_ARGS+= --enable-config-hal=yes

6
x11-servers/xorg-dmx/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8
SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625
MD5 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = aafe73f5807ce8bb534727ecb72467c7
SHA256 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 81a9a02b621e8a3e0bae1ad1b5dd6706a3fdcdbe766d75e1670ab5b3f0d32812
SIZE (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 4655422

20
x11-servers/xorg-nestserver/Makefile
View file

@ -6,9 +6,9 @@
#
PORTNAME= xorg-nestserver
PORTVERSION= 1.5.3
PORTVERSION= 1.6.0
PORTEPOCH= 1
PORTREVISION= 1
#PORTREVISION= 1
CATEGORIES= x11-servers
MAINTAINER= x11@FreeBSD.org
@ -26,10 +26,11 @@ USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \
xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
dri2proto resourceproto fontsproto xf86dgaproto videoproto \
compositeproto trapproto recordproto resourceproto \
xineramaproto evieproto xkbfile xfont fontenc xkbui \
xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
CONFIGURE_ARGS= --disable-dmx --disable-xvfb --disable-xorg --disable-xprint \
USE_OPENSSL= yes
CONFIGURE_ARGS= --disable-dmx --disable-xvfb --disable-xorg \
--localstatedir=/var --without-dtrace
PLIST_FILES= bin/Xnest
@ -39,4 +40,13 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${PREFIX}/bin/
${INSTALL_MAN} ${WRKSRC}/hw/xnest/Xnest.1 ${PREFIX}/man/man1/
.include <bsd.port.mk>
.include <bsd.port.pre.mk>
.if defined(WITH_OPENSSL_BASE)
# The reason why I use this is cause openssl from base doesn't install a .pc file
# and configure will fail trying to find it. Setting both of those variables to
# a *non-empty* value by-passes the pkg-config check.
CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
.endif
.include <bsd.port.post.mk>

6
x11-servers/xorg-nestserver/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8
SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625
MD5 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = aafe73f5807ce8bb534727ecb72467c7
SHA256 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 81a9a02b621e8a3e0bae1ad1b5dd6706a3fdcdbe766d75e1670ab5b3f0d32812
SIZE (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 4655422

13
x11-servers/xorg-server/Makefile
View file

@ -6,8 +6,8 @@
#
PORTNAME= xorg-server
PORTVERSION= 1.5.3
PORTREVISION= 8
PORTVERSION= 1.6.0
#PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-servers
MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/
@ -31,19 +31,18 @@ USE_XORG= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
resourceproto fontsproto inputproto xf86dgaproto \
videoproto compositeproto trapproto recordproto xineramaproto \
evieproto xfont fontenc xkbui pixman pciaccess
xinerama evieproto xfont fontenc xkbui pixman pciaccess
USE_OPENSSL= yes
USE_PERL5_BUILD=yes
CONFIGURE_ARGS= --disable-dmx --disable-xvfb --disable-xnest --disable-xprint \
CONFIGURE_ARGS= --disable-dmx --disable-xvfb --disable-xnest \
--localstatedir=/var --without-dtrace --disable-xephyr \
--enable-record=yes --enable-xtrap=yes
--enable-record=yes
MAN1= Xorg.1 \
Xserver.1 \
cvt.1 \
gtf.1 \
xorgconfig.1
gtf.1
MAN4= exa.4 \
fbdevhw.4
MAN5= xorg.conf.5

6
x11-servers/xorg-server/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8
SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625
MD5 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = aafe73f5807ce8bb534727ecb72467c7
SHA256 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 81a9a02b621e8a3e0bae1ad1b5dd6706a3fdcdbe766d75e1670ab5b3f0d32812
SIZE (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 4655422

90
x11-servers/xorg-server/files/patch-Xserver-Xext-sync.c
View file

@ -1,90 +0,0 @@
--- Xext/sync.c.orig 2008-11-05 10:52:17.000000000 -0600
+++ Xext/sync.c 2009-03-08 17:04:38.000000000 -0500
@@ -2533,7 +2533,7 @@
* IDLETIME implementation
*/
-static pointer IdleTimeCounter;
+static SyncCounter *IdleTimeCounter;
static XSyncValue *pIdleTimeValueLess;
static XSyncValue *pIdleTimeValueGreater;
@@ -2545,38 +2545,69 @@
}
static void
-IdleTimeBlockHandler (pointer env,
- struct timeval **wt,
- pointer LastSelectMask)
+IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer LastSelectMask)
{
- XSyncValue idle;
+ XSyncValue idle, old_idle;
+ SyncTriggerList *list = IdleTimeCounter->pTriglist;
+ SyncTrigger *trig;
if (!pIdleTimeValueLess && !pIdleTimeValueGreater)
return;
+ old_idle = IdleTimeCounter->value;
IdleTimeQueryValue (NULL, &idle);
+ IdleTimeCounter->value = idle; /* push, so CheckTrigger works */
if (pIdleTimeValueLess &&
XSyncValueLessOrEqual (idle, *pIdleTimeValueLess))
{
- AdjustWaitForDelay (wt, 0);
+ /*
+ * We've been idle for less than the threshold value, and someone
+ * wants to know about that, but now we need to know whether they
+ * want level or edge trigger. Check the trigger list against the
+ * current idle time, and if any succeed, bomb out of select()
+ * immediately so we can reschedule.
+ */
+
+ for (list = IdleTimeCounter->pTriglist; list; list = list->next) {
+ trig = list->pTrigger;
+ if (trig->CheckTrigger(trig, old_idle)) {
+ AdjustWaitForDelay(wt, 0);
+ break;
+ }
+ }
}
else if (pIdleTimeValueGreater)
{
- unsigned long timeout = 0;
+ /*
+ * There's a threshold in the positive direction. If we've been
+ * idle less than it, schedule a wakeup for sometime in the future.
+ * If we've been idle more than it, and someone wants to know about
+ * that level-triggered, schedule an immediate wakeup.
+ */
+ unsigned long timeout = -1;
- if (XSyncValueLessThan (idle, *pIdleTimeValueGreater))
- {
+ if (XSyncValueLessThan (idle, *pIdleTimeValueGreater)) {
XSyncValue value;
Bool overflow;
XSyncValueSubtract (&value, *pIdleTimeValueGreater,
idle, &overflow);
- timeout = XSyncValueLow32 (value);
+ timeout = min(timeout, XSyncValueLow32 (value));
+ } else {
+ for (list = IdleTimeCounter->pTriglist; list; list = list->next) {
+ trig = list->pTrigger;
+ if (trig->CheckTrigger(trig, old_idle)) {
+ timeout = min(timeout, 0);
+ break;
+ }
+ }
}
AdjustWaitForDelay (wt, timeout);
}
+
+ IdleTimeCounter->value = old_idle; /* pop */
}
static void

14
x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c
View file

@ -1,14 +0,0 @@
Index: programs/Xserver/Xext/xvmc.c
diff -u -p programs/Xserver/Xext/xvmc.c.orig programs/Xserver/Xext/xvmc.c
--- Xext/xvmc.c.orig Sun Jul 3 17:53:36 2005
+++ Xext/xvmc.c Thu Jan 26 14:22:20 2006
@@ -24,8 +24,8 @@
#ifdef HAS_XVMCSHM
#ifndef Lynx
-#include <sys/ipc.h>
#include <sys/types.h>
+#include <sys/ipc.h>
#include <sys/shm.h>
#else
#include <ipc.h>

10
x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-compiler.h
View file

@ -1,11 +1,11 @@
--- hw/xfree86/common/compiler.h.orig 2009-03-02 12:21:23.000000000 -0600
+++ hw/xfree86/common/compiler.h 2009-03-02 12:21:29.000000000 -0600
@@ -498,7 +498,7 @@
--- hw/xfree86/common/compiler.h.orig 2009-02-25 13:12:11.000000000 -0600
+++ hw/xfree86/common/compiler.h 2009-03-21 02:08:22.000000000 -0500
@@ -465,7 +465,7 @@
extern unsigned int inw(unsigned long port);
extern unsigned int inl(unsigned long port);
-# elif defined(linux) && (defined(__amd64__) || defined(__x86_64__))
+# elif defined(linux) || defined(__FreeBSD__) && (defined(__amd64__) || defined(__x86_64__))
-# elif defined(linux) && defined(__amd64__)
+# elif defined(linux) || defined(__FreeBSD__) && defined(__amd64__)
# include <inttypes.h>

243
x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-bsd_mouse.c
View file

@ -1,243 +0,0 @@
--- hw/xfree86/os-support/bsd/bsd_mouse.c.orig 2008-11-05 11:52:17.000000000 -0500
+++ hw/xfree86/os-support/bsd/bsd_mouse.c 2009-02-04 12:54:48.000000000 -0500
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1999-2003 by The XFree86 Project, Inc.
*
@@ -76,11 +75,13 @@
#define DEFAULT_MOUSE_DEV "/dev/mouse"
#define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse"
#define DEFAULT_PS2_DEV "/dev/psm0"
+#define DEFAULT_USB_DEV "/dev/ums0"
static const char *mouseDevs[] = {
DEFAULT_MOUSE_DEV,
DEFAULT_SYSMOUSE_DEV,
DEFAULT_PS2_DEV,
+ DEFAULT_USB_DEV,
NULL
};
#elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
@@ -101,7 +102,11 @@
#if defined(__NetBSD__)
return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
+ return MSE_SERIAL | MSE_BUS | MSE_PS2 |
+#ifdef XPS2_SUPPORT
+ MSE_XPS2 |
+#endif
+ MSE_AUTO | MSE_MISC;
#else
return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
#endif
@@ -180,10 +185,31 @@
{ MOUSE_PROTO_THINK, "ThinkingMouse" },
{ MOUSE_PROTO_SYSMOUSE, "SysMouse" }
};
-
+
+#ifdef XPS2_SUPPORT
+static struct {
+ int dmodel;
+ char *name;
+} ps2proto[] = {
+ { MOUSE_MODEL_NETSCROLL, "NetScrollPS/2" },
+ { MOUSE_MODEL_NET, "NetMousePS/2" },
+ { MOUSE_MODEL_GLIDEPOINT, "GlidePointPS/2" },
+ { MOUSE_MODEL_THINK, "ThinkingMousePS/2" },
+ { MOUSE_MODEL_INTELLI, "IMPS/2" },
+ { MOUSE_MODEL_MOUSEMANPLUS, "MouseManPlusPS/2" },
+ { MOUSE_MODEL_EXPLORER, "ExplorerPS/2" },
+ { MOUSE_MODEL_4D, "IMPS/2" },
+ { MOUSE_MODEL_4DPLUS, "IMPS/2" },
+};
+#endif
+
static const char *
SetupAuto(InputInfoPtr pInfo, int *protoPara)
{
+#ifdef XPS2_SUPPORT
+ char *dev;
+#endif
+ const char *proto;
int i;
mousehw_t hw;
mousemode_t mode;
@@ -191,10 +217,16 @@
if (pInfo->fd == -1)
return NULL;
+#ifdef XPS2_SUPPORT
/* set the driver operation level, if applicable */
+ dev = xf86FindOptionValue(pInfo->options, "Device");
+ if (dev != NULL && !strncmp(dev, DEFAULT_PS2_DEV, 8))
+ i = 2;
+ else
+#endif
i = 1;
ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
-
+
/* interrogate the driver and get some intelligence on the device. */
hw.iftype = MOUSE_IF_UNKNOWN;
hw.model = MOUSE_MODEL_GENERIC;
@@ -210,9 +242,18 @@
protoPara[0] = mode.syncmask[0];
protoPara[1] = mode.syncmask[1];
}
+ proto = devproto[i].name;
+#ifdef XPS2_SUPPORT
+ if (mode.protocol == MOUSE_PROTO_PS2)
+ for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
+ if (hw.model == ps2proto[i].dmodel) {
+ proto = ps2proto[i].name;
+ break;
+ }
+#endif
xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
- pInfo->name, devproto[i].name);
- return devproto[i].name;
+ pInfo->name, proto);
+ return proto;
}
}
}
@@ -235,41 +276,41 @@
(protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
/*
* As the FreeBSD sysmouse driver defaults to protocol level 0
- * everytime it is opened we enforce protocol level 1 again at
+ * everytime it is closed we enforce protocol level 1 again at
* this point.
*/
mode.level = 1;
} else
- mode.level = -1;
-#else
- mode.level = -1;
#endif
+ mode.level = -1;
ioctl(pInfo->fd, MOUSE_SETMODE, &mode);
}
#endif
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-
-#define MOUSED_PID_FILE "/var/run/moused.pid"
-
/*
* Try to check if moused is running. DEFAULT_SYSMOUSE_DEV is useless without
- * it. There doesn't seem to be a better way of checking.
+ * it. Also, try to check if the device is used by moused. If it is opened
+ * by moused, we do not want to use it directly. There doesn't seem to be
+ * a better way of checking.
*/
static Bool
-MousedRunning(void)
+MousedRunning(const char *dev)
{
+ char cmd[128];
FILE *f = NULL;
- unsigned int pid;
+ unsigned int i;
- if ((f = fopen(MOUSED_PID_FILE, "r")) != NULL) {
- if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
- if (kill(pid, 0) == 0) {
- fclose(f);
- return TRUE;
- }
+ if (dev)
+ sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
+ else
+ sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
+ if ((f = popen(cmd, "r")) != NULL) {
+ if (fscanf(f, "%u", &i) == 1 && i > 0) {
+ pclose(f);
+ return TRUE;
}
- fclose(f);
+ pclose(f);
}
return FALSE;
}
@@ -277,17 +318,17 @@
static const char *
FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
{
- int fd = -1;
+ int ret = -1;
const char **pdev, *dev = NULL;
Bool devMouse = FALSE;
struct stat devMouseStat;
struct stat sb;
for (pdev = mouseDevs; *pdev; pdev++) {
- SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
- if (fd == -1) {
+ SYSCALL (ret = stat(*pdev, &sb));
+ if (ret == -1) {
#ifdef DEBUG
- ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
+ ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
#endif
} else {
/*
@@ -296,28 +337,32 @@
* the test for whether /dev/sysmouse is usable can be made.
*/
if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
- if (fstat(fd, &devMouseStat) == 0)
- devMouse = TRUE;
- close(fd);
+ memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
+ devMouse = TRUE;
continue;
} else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
/* Check if /dev/mouse is the same as /dev/sysmouse. */
- if (devMouse && fstat(fd, &sb) == 0 &&
- devMouseStat.st_dev == sb.st_dev &&
+ if (devMouse && devMouseStat.st_dev == sb.st_dev &&
devMouseStat.st_ino == sb.st_ino) {
/* If the same, use /dev/sysmouse. */
devMouse = FALSE;
}
- close(fd);
- if (MousedRunning())
+ if (MousedRunning(NULL))
break;
- else {
-#ifdef DEBUG
- ErrorF("moused isn't running\n");
-#endif
- }
} else {
- close(fd);
+ /* Check if /dev/mouse is the same as this device. */
+ if (devMouse && devMouseStat.st_dev == sb.st_dev &&
+ devMouseStat.st_ino == sb.st_ino) {
+ /* If the same, use this device. */
+ devMouse = FALSE;
+ }
+ if (MousedRunning(*pdev))
+ continue;
+ /* ums(4) does not support anything but SysMouse protocol. */
+ if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
+ xf86NameCmp(protocol, "auto") != 0 &&
+ xf86NameCmp(protocol, "sysmouse") != 0)
+ continue;
break;
}
}
@@ -775,7 +820,9 @@
p->CheckProtocol = CheckProtocol;
#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
p->SetupAuto = SetupAuto;
+#ifndef XPS2_SUPPORT
p->SetPS2Res = SetSysMouseRes;
+#endif
p->SetBMRes = SetSysMouseRes;
p->SetMiscRes = SetSysMouseRes;
#endif

12
x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-xf86_OSlib.h
View file

@ -1,12 +0,0 @@
--- hw/xfree86/os-support/xf86_OSlib.h.orig 2007-08-23 15:04:53.000000000 -0400
+++ hw/xfree86/os-support/xf86_OSlib.h 2008-04-08 16:20:04.000000000 -0400
@@ -495,6 +495,9 @@
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
# if defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013)
# include <sys/mouse.h>
+# if (__FreeBSD_kernel_version >= 700106)
+# define XPS2_SUPPORT
+# endif
# else
# undef MOUSE_GETINFO
# include <machine/mouse.h>

32
x11-servers/xorg-server/files/patch-bsdResource.c
View file

@ -1,32 +0,0 @@
--- hw/xfree86/os-support/bsd/bsdResource.c.orig 2008-07-19 12:47:13.000000000 +0100
+++ hw/xfree86/os-support/bsd/bsdResource.c 2008-07-19 12:52:03.000000000 +0100
@@ -19,7 +19,7 @@
#ifdef INCLUDE_XF86_NO_DOMAIN
-#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || defined(__x86_64__)
+#if defined(__alpha__) || defined(__amd64__) || defined(__x86_64__)
resPtr
xf86AccResFromOS(resPtr ret)
@@ -60,7 +60,7 @@
return ret;
}
-#elif defined(__powerpc__)
+#elif defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__)
resPtr
xf86AccResFromOS(resPtr ret)
@@ -77,7 +77,11 @@
ret = xf86AddResToList(ret, &range, -1);
RANGE(range, 0x00000000, 0x00000000, ResExcIoBlock);
ret = xf86AddResToList(ret, &range, -1);
+#if defined(__sparc__) || defined(__sparc64__)
+ RANGE(range, 0x00ffffff, 0x00ffffff, ResExcIoBlock);
+#else
RANGE(range, 0x0000ffff, 0x0000ffff, ResExcIoBlock);
+#endif
ret = xf86AddResToList(ret, &range, -1);
return ret;

143
x11-servers/xorg-server/files/patch-config-hal.c
View file

@ -1,143 +0,0 @@
--- config/hal.c.orig 2008-11-14 16:27:05.000000000 -0500
+++ config/hal.c 2009-02-08 01:17:28.000000000 -0500
@@ -467,11 +467,10 @@
info->system_bus = NULL;
}
-static void
-connect_hook(DBusConnection *connection, void *data)
+static BOOL
+connect_and_register(DBusConnection *connection, struct config_hal_info *info)
{
DBusError error;
- struct config_hal_info *info = data;
char **devices;
int num_devices, i;
@@ -479,8 +478,10 @@
dbus_error_init(&error);
- if (!info->hal_ctx)
- info->hal_ctx = libhal_ctx_new();
+ if (info->hal_ctx)
+ return TRUE; /* already registered, pretend we did something */
+
+ info->hal_ctx = libhal_ctx_new();
if (!info->hal_ctx) {
LogMessage(X_ERROR, "config/hal: couldn't create HAL context\n");
goto out_err;
@@ -512,7 +513,7 @@
dbus_error_free(&error);
- return;
+ return TRUE;
out_ctx2:
if (!libhal_ctx_shutdown(info->hal_ctx, &error))
@@ -526,6 +527,104 @@
info->hal_ctx = NULL;
info->system_bus = NULL;
+ return FALSE;
+}
+
+
+/**
+ * Handle NewOwnerChanged signals to deal with HAL startup at X server runtime.
+ *
+ * NewOwnerChanged is send once when HAL shuts down, and once again when it
+ * comes back up. Message has three arguments, first is the name
+ * (org.freedesktop.Hal), the second one is the old owner, third one is new
+ * owner.
+ */
+static DBusHandlerResult
+ownerchanged_handler(DBusConnection *connection, DBusMessage *message, void *data)
+{
+ int ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+ if (dbus_message_is_signal(message,
+ "org.freedesktop.DBus",
+ "NameOwnerChanged")) {
+ DBusError error;
+ char *name, *old_owner, *new_owner;
+
+ dbus_error_init(&error);
+ dbus_message_get_args(message, &error,
+ DBUS_TYPE_STRING, &name,
+ DBUS_TYPE_STRING, &old_owner,
+ DBUS_TYPE_STRING, &new_owner,
+ DBUS_TYPE_INVALID);
+
+ if (dbus_error_is_set(&error)) {
+ ErrorF("[config/hal] failed to get NameOwnerChanged args: %s (%s)\n",
+ error.name, error.message);
+ } else if (name && strcmp(name, "org.freedesktop.Hal") == 0) {
+
+ if (!old_owner || !strlen(old_owner)) {
+ DebugF("[config/hal] HAL startup detected.\n");
+ if (connect_and_register(connection, (struct config_hal_info*)data))
+ dbus_connection_unregister_object_path(connection,
+ "/org/freedesktop/DBus");
+ else
+ ErrorF("[config/hal] Failed to connect to HAL bus.\n");
+ }
+
+ ret = DBUS_HANDLER_RESULT_HANDLED;
+ }
+ dbus_error_free(&error);
+ }
+
+ return ret;
+}
+
+/**
+ * Register a handler for the NameOwnerChanged signal.
+ */
+static BOOL
+listen_for_startup(DBusConnection *connection, void *data)
+{
+ DBusObjectPathVTable vtable = { .message_function = ownerchanged_handler, };
+ DBusError error;
+ const char MATCH_RULE[] = "sender='org.freedesktop.DBus',"
+ "interface='org.freedesktop.DBus',"
+ "type='signal',"
+ "path='/org/freedesktop/DBus',"
+ "member='NameOwnerChanged'";
+ int rc = FALSE;
+
+ dbus_error_init(&error);
+ dbus_bus_add_match(connection, MATCH_RULE, &error);
+ if (!dbus_error_is_set(&error)) {
+ if (dbus_connection_register_object_path(connection,
+ "/org/freedesktop/DBus",
+ &vtable,
+ data))
+ rc = TRUE;
+ else
+ ErrorF("[config/hal] cannot register object path.\n");
+ } else {
+ ErrorF("[config/hal] couldn't add match rule: %s (%s)\n", error.name,
+ error.message);
+ ErrorF("[config/hal] cannot detect a HAL startup.\n");
+ }
+
+ dbus_error_free(&error);
+
+ return rc;
+}
+
+static void
+connect_hook(DBusConnection *connection, void *data)
+{
+ struct config_hal_info *info = data;
+
+ if (listen_for_startup(connection, data) &&
+ connect_and_register(connection, info))
+ dbus_connection_unregister_object_path(connection,
+ "/org/freedesktop/DBus");
+
return;
}

20
x11-servers/xorg-server/files/patch-configure Normal file
View file

@ -0,0 +1,20 @@
--- configure.orig 2009-04-02 20:48:06.000000000 -0500
+++ configure 2009-04-02 20:52:17.000000000 -0500
@@ -30559,7 +30559,7 @@
esac
-if test "x$DRI2" == xyes; then
+if test "x$DRI2" = xyes; then
DRI2_TRUE=
DRI2_FALSE='#'
else
@@ -30741,7 +30741,7 @@
fi
-if test "x$DRI2_AIGLX" == xyes; then
+if test "x$DRI2_AIGLX" = xyes; then
DRI2_AIGLX_TRUE=
DRI2_AIGLX_FALSE='#'
else

55
x11-servers/xorg-server/pkg-plist
View file

@ -2,32 +2,14 @@ bin/X
bin/Xorg
bin/cvt
bin/gtf
%%PPC_NA%%bin/inb
%%PPC_NA%%bin/inl
%%PPC_NA%%bin/inw
%%PPC_NA%%bin/ioport
%%PPC_NA%%bin/outb
%%PPC_NA%%bin/outl
%%PPC_NA%%bin/outw
bin/xorgconfig
include/xorg/BT.h
include/xorg/IBM.h
include/xorg/TI.h
include/xorg/XIstubs.h
include/xorg/afb.h
include/xorg/assyntax.h
include/xorg/atKeynames.h
include/xorg/bstore.h
include/xorg/bstorestr.h
include/xorg/bt829.h
include/xorg/cfb.h
include/xorg/cfb16.h
include/xorg/cfb32.h
include/xorg/cfb8_16.h
include/xorg/cfb8_32.h
include/xorg/cfbmap.h
include/xorg/cfbmskbits.h
include/xorg/cfbunmap.h
include/xorg/closestr.h
include/xorg/closure.h
include/xorg/colormap.h
@ -47,6 +29,7 @@ include/xorg/dixfontstr.h
include/xorg/dixgrabs.h
include/xorg/dixstruct.h
include/xorg/dri.h
include/xorg/dri2.h
include/xorg/dristruct.h
include/xorg/edid.h
include/xorg/exa.h
@ -57,21 +40,19 @@ include/xorg/extnsionst.h
include/xorg/fb.h
include/xorg/fbdevhw.h
include/xorg/fboverlay.h
include/xorg/fbpseudocolor.h
include/xorg/fbrop.h
include/xorg/fi1236.h
include/xorg/fourcc.h
include/xorg/gc.h
include/xorg/gcstruct.h
include/xorg/geext.h
include/xorg/geint.h
include/xorg/globals.h
include/xorg/glyphstr.h
include/xorg/hotplug.h
include/xorg/i2c_def.h
include/xorg/input.h
include/xorg/inputstr.h
include/xorg/mfb.h
include/xorg/mfbmap.h
include/xorg/mfbunmap.h
include/xorg/mi.h
include/xorg/mibank.h
include/xorg/mibstore.h
@ -100,6 +81,7 @@ include/xorg/pixmapstr.h
include/xorg/privates.h
include/xorg/property.h
include/xorg/propertyst.h
include/xorg/ptrveloc.h
include/xorg/randrstr.h
include/xorg/region.h
include/xorg/regionstr.h
@ -107,6 +89,7 @@ include/xorg/registry.h
include/xorg/renderedge.h
include/xorg/resource.h
include/xorg/rgb.h
include/xorg/rrtransform.h
include/xorg/sarea.h
include/xorg/screenint.h
include/xorg/scrnintstr.h
@ -114,6 +97,7 @@ include/xorg/selection.h
include/xorg/servermd.h
include/xorg/shadow.h
include/xorg/shadowfb.h
include/xorg/shmint.h
include/xorg/site.h
include/xorg/swaprep.h
include/xorg/swapreq.h
@ -132,15 +116,12 @@ include/xorg/xaa.h
include/xorg/xaaWrapper.h
include/xorg/xaalocal.h
include/xorg/xaarop.h
include/xorg/xf1bpp.h
include/xorg/xf4bpp.h
include/xorg/xf86.h
include/xorg/xf86Crtc.h
include/xorg/xf86Cursor.h
include/xorg/xf86DDC.h
include/xorg/xf86Modes.h
include/xorg/xf86Module.h
include/xorg/xf86OSmouse.h
include/xorg/xf86Opt.h
include/xorg/xf86Optrec.h
include/xorg/xf86Parser.h
@ -154,7 +135,6 @@ include/xorg/xf86RamDac.h
include/xorg/xf86Rename.h
include/xorg/xf86Resources.h
%%SPARC64%%include/xorg/xf86Sbus.h
include/xorg/xf86Version.h
include/xorg/xf86Xinput.h
include/xorg/xf86_OSlib.h
include/xorg/xf86_OSproc.h
@ -169,42 +149,33 @@ include/xorg/xf86xvmc.h
include/xorg/xf86xvpriv.h
include/xorg/xisb.h
include/xorg/xkbfile.h
include/xorg/xkbrules.h
include/xorg/xkbsrv.h
include/xorg/xkbstr.h
include/xorg/xorg-server.h
include/xorg/xorgVersion.h
include/xorg/xserver-properties.h
include/xorg/xvdix.h
include/xorg/xvmcext.h
lib/X11/Cards
lib/X11/Options
lib/xorg/modules/extensions/libdbe.la
lib/xorg/modules/extensions/libdbe.so
lib/xorg/modules/extensions/libdri.la
lib/xorg/modules/extensions/libdri.so
lib/xorg/modules/extensions/libdri2.la
lib/xorg/modules/extensions/libdri2.so
lib/xorg/modules/extensions/libextmod.la
lib/xorg/modules/extensions/libextmod.so
lib/xorg/modules/extensions/libglx.la
lib/xorg/modules/extensions/libglx.so
lib/xorg/modules/extensions/librecord.la
lib/xorg/modules/extensions/librecord.so
lib/xorg/modules/extensions/libxtrap.la
lib/xorg/modules/extensions/libxtrap.so
lib/xorg/modules/fonts/libfreetype.la
lib/xorg/modules/fonts/libfreetype.so
%%ALPHA_NA%%lib/xorg/modules/libafb.la
%%ALPHA_NA%%lib/xorg/modules/libafb.so
lib/xorg/modules/libcfb.la
lib/xorg/modules/libcfb.so
lib/xorg/modules/libcfb32.la
lib/xorg/modules/libcfb32.so
lib/xorg/modules/libexa.la
lib/xorg/modules/libexa.so
lib/xorg/modules/libfb.la
lib/xorg/modules/libfb.so
lib/xorg/modules/libint10.la
lib/xorg/modules/libint10.so
lib/xorg/modules/libmfb.la
lib/xorg/modules/libmfb.so
lib/xorg/modules/libshadow.la
lib/xorg/modules/libshadow.so
lib/xorg/modules/libshadowfb.la
@ -217,14 +188,8 @@ lib/xorg/modules/libwfb.la
lib/xorg/modules/libwfb.so
lib/xorg/modules/libxaa.la
lib/xorg/modules/libxaa.so
lib/xorg/modules/libxf1bpp.la
lib/xorg/modules/libxf1bpp.so
lib/xorg/modules/libxf4bpp.la
lib/xorg/modules/libxf4bpp.so
lib/xorg/modules/libxf8_16bpp.la
lib/xorg/modules/libxf8_16bpp.so
lib/xorg/modules/libxf8_32bpp.la
lib/xorg/modules/libxf8_32bpp.so
lib/xorg/modules/linux/libfbdevhw.la
lib/xorg/modules/linux/libfbdevhw.so
lib/xorg/modules/multimedia/bt829_drv.la

22
x11-servers/xorg-vfbserver/Makefile
View file

@ -6,9 +6,9 @@
#
PORTNAME= xorg-vfbserver
PORTVERSION= 1.5.3
PORTVERSION= 1.6.0
PORTEPOCH= 1
PORTREVISION= 1
#PORTREVISION= 1
CATEGORIES= x11-servers
MAINTAINER= x11@FreeBSD.org
@ -26,10 +26,11 @@ USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \
xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
dri2proto resourceproto fontsproto xf86dgaproto videoproto \
compositeproto trapproto recordproto resourceproto \
xineramaproto evieproto xkbfile xfont fontenc xkbui xxf86misc \
xxf86vm xaw7 xmu xpm xext pixman xtrans
xineramaproto xinerama evieproto xkbfile xfont fontenc \
xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
CONFIGURE_ARGS= --disable-dmx --disable-xnest --disable-xorg --disable-xprint \
USE_OPENSSL= yes
CONFIGURE_ARGS= --disable-dmx --disable-xnest --disable-xorg \
--localstatedir=/var --without-dtrace
PLIST_FILES= bin/Xvfb
@ -38,4 +39,13 @@ MAN1= Xvfb.1
do-install:
cd ${WRKSRC}/hw/vfb; ${MAKE} install
.include <bsd.port.mk>
.include <bsd.port.pre.mk>
.if defined(WITH_OPENSSL_BASE)
# The reason why I use this is cause openssl from base doesn't install a .pc file
# and configure will fail trying to find it. Setting both of those variables to
# a *non-empty* value by-passes the pkg-config check.
CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
.endif
.include <bsd.port.post.mk>

6
x11-servers/xorg-vfbserver/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8
SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625
MD5 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = aafe73f5807ce8bb534727ecb72467c7
SHA256 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 81a9a02b621e8a3e0bae1ad1b5dd6706a3fdcdbe766d75e1670ab5b3f0d32812
SIZE (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 4655422

2
x11/libXrandr/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= libXrandr
PORTVERSION= 1.2.3
PORTVERSION= 1.3.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org

6
x11/libXrandr/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/lib/libXrandr-1.2.3.tar.bz2) = 5cd67cc02a50c9644ba0a1846ea3b08e
SHA256 (xorg/lib/libXrandr-1.2.3.tar.bz2) = f8edfe26b8c4c3677a3a949f81a8b09a5fad62972020bfd230401e11cc0ed267
SIZE (xorg/lib/libXrandr-1.2.3.tar.bz2) = 251814
MD5 (xorg/lib/libXrandr-1.3.0.tar.bz2) = 68eb59c3b7524db6ffd78746ee893d1d
SHA256 (xorg/lib/libXrandr-1.3.0.tar.bz2) = 5961ce0f77c5173a8208b3ed669ac01719f2bf4a10517ffa6c33a5e064802e78
SIZE (xorg/lib/libXrandr-1.3.0.tar.bz2) = 262270

2
x11/randrproto/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= randrproto
PORTVERSION= 1.2.1
PORTVERSION= 1.3.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org

6
x11/randrproto/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/proto/randrproto-1.2.1.tar.bz2) = e2e45564f8ce22e00e1360e79c8ccdeb
SHA256 (xorg/proto/randrproto-1.2.1.tar.bz2) = 102fd42f8f2562450f4e45c28bfb0390c2d30ffa6a805eead15d67018930f654
SIZE (xorg/proto/randrproto-1.2.1.tar.bz2) = 54962
MD5 (xorg/proto/randrproto-1.3.0.tar.bz2) = a49416013fff33c853efb32f1926551e
SHA256 (xorg/proto/randrproto-1.3.0.tar.bz2) = cfeb1429465e3c24debde1bf53ec35ef738fde5e80d2eed14f33e315e747bb8d
SIZE (xorg/proto/randrproto-1.3.0.tar.bz2) = 74817

5
x11/xrandr/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= xrandr
PORTVERSION= 1.2.3
PORTVERSION= 1.3.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@ -15,7 +15,8 @@ COMMENT= Primitive command line interface to the RandR extension
XORG_CAT= app
USE_XORG= xrandr xrender x11
PLIST_FILES= bin/xrandr
PLIST_FILES= bin/xrandr \
bin/xkeystone
MAN1= xrandr.1

6
x11/xrandr/distinfo
View file

@ -1,3 +1,3 @@
MD5 (xorg/app/xrandr-1.2.3.tar.bz2) = 41a9d0cc073fa6165a31fbf9e85f68a6
SHA256 (xorg/app/xrandr-1.2.3.tar.bz2) = ab06b77f3a2b8866279e096f9d2702ac644681424eb0aec39e4eb7199f152207
SIZE (xorg/app/xrandr-1.2.3.tar.bz2) = 111121
MD5 (xorg/app/xrandr-1.3.0.tar.bz2) = 616612a15711a4422e71be6acc42ca3c
SHA256 (xorg/app/xrandr-1.3.0.tar.bz2) = 24c93868edd34519df76c736e20b39653a31eb2609bea61e538e45dc340556f0
SIZE (xorg/app/xrandr-1.3.0.tar.bz2) = 128126