dfports/x11-servers/xorg-server 6.7.0_5 -> 6.8.1
Hiroki Sato
hrs at allbsd.org
Tue Dec 28 01:25:14 PST 2004
Hi,
Here is a patch to update dfports/x11-servers/xorg-server
from 6.7.0_5 to 6.8.1.
Index: Makefile
===================================================================
RCS file: /cvs/dfports/x11-servers/xorg-server/Makefile,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 Makefile
--- Makefile 16 Aug 2004 12:30:29 -0000 1.1
+++ Makefile 28 Dec 2004 04:55:12 -0000
@@ -6,14 +6,13 @@
# $DragonFly: dfports/x11-servers/xorg-server/Makefile,v 1.1 2004/08/16 12:30:29 joerg Exp $
#
-PORTNAME= server
-PORTVERSION= 6.7.0
-PORTREVISION= 5
+PORTNAME= xorg-server
+PORTVERSION= 6.8.1
CATEGORIES= x11-servers
-MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/
-PKGNAMEPREFIX= xorg-
-DISTFILES= X11R6.7.0-src1.tar.gz \
- X11R6.7.0-src3.tar.gz
+MASTER_SITES= ${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR= X11R6.8.1/tars
+DISTFILES= X11R${PORTVERSION}-src1.tar.gz \
+ X11R${PORTVERSION}-src3.tar.gz
MAINTAINER= x11 at xxxxxxxxxxx
COMMENT= X.Org X server and related programs
@@ -41,20 +40,30 @@
xorgcfg.1 \
xorgconfig.1
MAN4= citron.4 \
+ dmc.4 \
dynapro.4 \
elographics.4 \
fbdevhw.4 \
+ fpit.4 \
+ glint.4 \
+ js_x.4 \
kbd.4 \
keyboard.4 \
+ mga.4 \
microtouch.4 \
mouse.4 \
mutouch.4 \
- nv.4 \
+ palmax.4 \
+ penmount.4 \
r128.4 \
radeon.4 \
+ tdfx.4 \
+ tek4957.4 \
+ vga.4 \
void.4 \
wacom.4
-MAN5= xorg.conf.5
+MAN5= getconfig.5 \
+ xorg.conf.5
XBUILD_DIRS= lib/font programs/Xserver
XINCLUDE_DIRS= lib/xtrans
@@ -68,6 +77,13 @@
IGNORE= is part of X.Org. For switching to X.Org, read UPDATING entry 20040723
.endif
+.if ${ARCH} == alpha
+PLIST_SUB+= ALPHA_NA="@comment "
+.else
+PLIST_SUB+= ALPHA_NA=""
+MAN4+= vesa.4
+.endif
+
.if ${ARCH} == ia64
PLIST_SUB+= IA64_NA="@comment "
.else
@@ -77,39 +93,48 @@
.if ${ARCH} == sparc64
PLIST_SUB+= SPARC64=""
PLIST_SUB+= SPARC64_NA="@comment "
-MAN4+= sunffb.4
+MAN4+= sunbw2.4 \
+ suncg14.4 \
+ suncg3.4 \
+ suncg6.4 \
+ sunffb.4 \
+ sunleo.4 \
+ suntcx.4
.else
PLIST_SUB+= SPARC64="@comment "
PLIST_SUB+= SPARC64_NA=""
-MAN4+= glint.4 \
- mga.4 \
+MAN4+= cirrus.4 \
+ nv.4 \
rendition.4 \
s3virge.4 \
savage.4 \
- siliconmotion.4 \
- sis.4 \
- tdfx.4 \
- vga.4
+ siliconmotion.4
.endif
.if ${ARCH} == i386
PLIST_SUB+= I386=""
MAN1+= scanpci.1
+MAN4+= i740.4 \
+ i810.4 \
+ nsc.4 \
+ via.4 \
+ vmware.4
+.else
+PLIST_SUB+= I386="@comment "
+.endif
+
+.if ${ARCH} == amd64 || ${ARCH} == i386
+PLIST_SUB+= AMD64_I386=""
MAN4+= apm.4 \
chips.4 \
- cirrus.4 \
cyrix.4 \
i128.4 \
- i740.4 \
- i810.4 \
neomagic.4 \
- nsc.4 \
+ sis.4 \
trident.4 \
- tseng.4 \
- vesa.4 \
- vmware.4
+ tseng.4
.else
-PLIST_SUB+= I386="@comment "
+PLIST_SUB+= AMD64_I386="@comment "
.endif
.if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
Index: Makefile.inc
===================================================================
RCS file: /cvs/dfports/x11-servers/xorg-server/Makefile.inc,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.2 Makefile.inc
--- Makefile.inc 17 Aug 2004 15:53:10 -0000 1.2
+++ Makefile.inc 28 Dec 2004 06:08:56 -0000
@@ -16,6 +16,7 @@
WRKSRC?= ${WRKDIR}/xc
USE_X_PREFIX?= no
PREFIX?= ${X11BASE}
+MTREE_FILE= /etc/mtree/BSD.x11-4.dist
USE_IMAKE= YES
.if defined(XMAN_DIRS)
@@ -37,9 +38,6 @@
CF_PATCHES= ${SERVER_PORTDIR}/files/patch-DragonFly.cf \
${SERVER_PORTDIR}/files/patch-FreeBSD.cf \
${SERVER_PORTDIR}/files/patch-Imake.cf \
- ${SERVER_PORTDIR}/files/patch-config-cf-Imakefile \
- ${SERVER_PORTDIR}/files/patch-imake-imakemdep.h \
- ${SERVER_PORTDIR}/files/patch-imake.c \
${SERVER_PORTDIR}/files/patch-Imake.rules \
${SERVER_PORTDIR}/files/patch-Imake.tmpl \
${SERVER_PORTDIR}/files/patch-Library.tmpl \
@@ -47,16 +45,13 @@
${SERVER_PORTDIR}/files/patch-X11.tmpl
SERVER_PATCHES= ${SERVER_PORTDIR}/files/patch-Xserver-Imakefile \
- ${SERVER_PORTDIR}/files/patch-bus-Imakefile \
- ${SERVER_PORTDIR}/files/patch-fb-renderfixes.diff \
- ${SERVER_PORTDIR}/files/patch-kernel-Imakefile \
- ${SERVER_PORTDIR}/files/patch-loadmod.c \
+ ${SERVER_PORTDIR}/files/patch-alpha_video.c \
${SERVER_PORTDIR}/files/patch-man-Imakefile \
${SERVER_PORTDIR}/files/patch-os-Imakefile \
${SERVER_PORTDIR}/files/patch-savage-pci-id \
${SERVER_PORTDIR}/files/patch-xf86sym.c \
- ${SERVER_PORTDIR}/files/patch-xkbout.c
-LIBRARY_PATCHES= ${SERVER_PORTDIR}/files/patch-Xtranssock.c
+ ${SERVER_PORTDIR}/files/patch-xkbout.c \
+ ${SERVER_PORTDIR}/files/patch-xorgconfig.c
.if !target(do-configure)
do-configure:
@@ -94,6 +89,5 @@
@for dir in ${XMAN_DIRS}; do \
cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install.man; \
done
- @${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html
.endif
Index: distinfo
===================================================================
RCS file: /cvs/dfports/x11-servers/xorg-server/distinfo,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 distinfo
--- distinfo 16 Aug 2004 12:30:29 -0000 1.1
+++ distinfo 28 Dec 2004 04:56:22 -0000
@@ -1,8 +1,4 @@
-MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
-SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
-MD5 (xorg/X11R6.7.0-src2.tar.gz) = 6ef4e8f7647a28f080c10ea1bcf01f79
-SIZE (xorg/X11R6.7.0-src2.tar.gz) = 5739983
-MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669
-SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793
-MD5 (xorg/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
-SIZE (xorg/Wraphelp2.gz) = 3376
+MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
+SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
+MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3
+SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808
Index: pkg-plist
===================================================================
RCS file: /cvs/dfports/x11-servers/xorg-server/pkg-plist,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 pkg-plist
--- pkg-plist 16 Aug 2004 12:30:29 -0000 1.1
+++ pkg-plist 28 Dec 2004 04:55:51 -0000
@@ -17,34 +17,58 @@
%%I386%%bin/scanpci
bin/xorgcfg
bin/xorgconfig
+include/X11/bitmaps/card.xbm
+include/X11/bitmaps/down.xbm
+include/X11/bitmaps/keyboard.xbm
+include/X11/bitmaps/left.xbm
+include/X11/bitmaps/monitor.xbm
+include/X11/bitmaps/mouse.xbm
+include/X11/bitmaps/narrower.xbm
+include/X11/bitmaps/right.xbm
+include/X11/bitmaps/shorter.xbm
+include/X11/bitmaps/taller.xbm
+include/X11/bitmaps/up.xbm
+include/X11/bitmaps/wider.xbm
+include/X11/pixmaps/card.xpm
+include/X11/pixmaps/computer.xpm
+include/X11/pixmaps/keyboard.xpm
+include/X11/pixmaps/monitor.xpm
+include/X11/pixmaps/mouse.xpm
+lib/X11/Cards
lib/X11/Options
-lib/X11/XF86Config.98
-lib/X11/XF86Config.eg
+lib/X11/app-defaults/XOrgCfg
lib/X11/doc/BUILD
lib/X11/doc/BugReport
lib/X11/doc/DESIGN
lib/X11/doc/Install
lib/X11/doc/LICENSE
+lib/X11/doc/OS2.Notes
lib/X11/doc/README
lib/X11/doc/README.DECtga
-%%I386%%lib/X11/doc/README.I128
-%%I386%%lib/X11/doc/README.SiS
+lib/X11/doc/README.Darwin
+lib/X11/doc/README.I128
+lib/X11/doc/README.LynxOS
+lib/X11/doc/README.NetBSD
+lib/X11/doc/README.OpenBSD
+lib/X11/doc/README.SCO
+lib/X11/doc/README.SiS
+lib/X11/doc/README.Solaris
lib/X11/doc/README.XKB-Config
lib/X11/doc/README.XKB-Enhancing
-%%I386%%lib/X11/doc/README.apm
+lib/X11/doc/README.apm
lib/X11/doc/README.ati
-%%I386%%lib/X11/doc/README.chips
-%%I386%%lib/X11/doc/README.cyrix
+lib/X11/doc/README.chips
+lib/X11/doc/README.cyrix
lib/X11/doc/README.dps
lib/X11/doc/README.fonts
-%%I386%%lib/X11/doc/README.i740
-%%I386%%lib/X11/doc/README.i810
+lib/X11/doc/README.i740
+lib/X11/doc/README.i810
lib/X11/doc/README.mouse
-%%I386%%lib/X11/doc/README.newport
+lib/X11/doc/README.newport
lib/X11/doc/README.r128
lib/X11/doc/README.rapidaccess
-%%SPARC64_NA%%%%IA64_NA%%lib/X11/doc/README.rendition
-%%SPARC64_NA%%%%IA64_NA%%lib/X11/doc/README.s3virge
+lib/X11/doc/README.rendition
+lib/X11/doc/README.s3virge
lib/X11/doc/RELNOTES
lib/X11/doc/Versions
lib/X11/doc/VideoBoard98
@@ -53,72 +77,46 @@
lib/X11/getconfig/cfg.sample
lib/X11/getconfig/xorg.cfg
lib/X11/xserver/SecurityPolicy
-lib/modules/codeconv/libARABIC.a
-lib/modules/codeconv/libARMSCII8.a
-lib/modules/codeconv/libBIG5.a
-lib/modules/codeconv/libBIG5HKSCS.a
-lib/modules/codeconv/libDOSENCODING.a
-lib/modules/codeconv/libGB18030.a
-lib/modules/codeconv/libGB2312.a
-lib/modules/codeconv/libGBK.a
-lib/modules/codeconv/libGEORGIAN.a
-lib/modules/codeconv/libISO8859_1.a
-lib/modules/codeconv/libISO8859_10.a
-lib/modules/codeconv/libISO8859_11.a
-lib/modules/codeconv/libISO8859_13.a
-lib/modules/codeconv/libISO8859_14.a
-lib/modules/codeconv/libISO8859_15.a
-lib/modules/codeconv/libISO8859_2.a
-lib/modules/codeconv/libISO8859_3.a
-lib/modules/codeconv/libISO8859_4.a
-lib/modules/codeconv/libISO8859_5.a
-lib/modules/codeconv/libISO8859_6.a
-lib/modules/codeconv/libISO8859_7.a
-lib/modules/codeconv/libISO8859_8.a
-lib/modules/codeconv/libISO8859_9.a
-lib/modules/codeconv/libJISX0201.a
-lib/modules/codeconv/libJISX0208.a
-lib/modules/codeconv/libJISX0212.a
-lib/modules/codeconv/libKOI8.a
-lib/modules/codeconv/libKSC5601.a
-lib/modules/codeconv/libKSCJOHAB.a
-lib/modules/codeconv/libMULEENCODING.a
-lib/modules/codeconv/libTCVN.a
-lib/modules/codeconv/libVISCII.a
-%%I386%%lib/modules/drivers/apm_drv.o
-%%I386%%lib/modules/drivers/ark_drv.o
+%%AMD64_I386%%lib/modules/drivers/apm_drv.o
+%%AMD64_I386%%lib/modules/drivers/ark_drv.o
lib/modules/drivers/ati_drv.o
lib/modules/drivers/atimisc_drv.o
-%%I386%%lib/modules/drivers/chips_drv.o
-%%I386%%lib/modules/drivers/cirrus_alpine.o
-%%I386%%lib/modules/drivers/cirrus_drv.o
-%%I386%%lib/modules/drivers/cirrus_laguna.o
-%%I386%%lib/modules/drivers/cyrix_drv.o
-lib/modules/drivers/dummy_drv.o
-%%SPARC64_NA%%lib/modules/drivers/glint_drv.o
-%%I386%%lib/modules/drivers/i128_drv.o
+%%AMD64_I386%%lib/modules/drivers/chips_drv.o
+%%SPARC64_NA%%lib/modules/drivers/cirrus_alpine.o
+%%SPARC64_NA%%lib/modules/drivers/cirrus_drv.o
+%%SPARC64_NA%%lib/modules/drivers/cirrus_laguna.o
+%%AMD64_I386%%lib/modules/drivers/cyrix_drv.o
+%%AMD64_I386%%lib/modules/drivers/dummy_drv.o
+lib/modules/drivers/glint_drv.o
+%%AMD64_I386%%lib/modules/drivers/i128_drv.o
%%I386%%lib/modules/drivers/i740_drv.o
%%I386%%lib/modules/drivers/i810_drv.o
-%%SPARC64_NA%%lib/modules/drivers/mga_drv.o
-%%I386%%lib/modules/drivers/neomagic_drv.o
+lib/modules/drivers/mga_drv.o
+%%AMD64_I386%%lib/modules/drivers/neomagic_drv.o
%%I386%%lib/modules/drivers/nsc_drv.o
-lib/modules/drivers/nv_drv.o
+%%SPARC64_NA%%lib/modules/drivers/nv_drv.o
lib/modules/drivers/r128_drv.o
lib/modules/drivers/radeon_drv.o
%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.o
-lib/modules/drivers/riva128.o
+%%SPARC64_NA%%lib/modules/drivers/riva128.o
%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.o
%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.o
%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.o
%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/siliconmotion_drv.o
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/sis_drv.o
+%%AMD64_I386%%lib/modules/drivers/sis_drv.o
+%%SPARC64%%lib/modules/drivers/sunbw2_drv.o
+%%SPARC64%%lib/modules/drivers/suncg14_drv.o
+%%SPARC64%%lib/modules/drivers/suncg3_drv.o
+%%SPARC64%%lib/modules/drivers/suncg6_drv.o
%%SPARC64%%lib/modules/drivers/sunffb_drv.o
-%%SPARC64_NA%%lib/modules/drivers/tdfx_drv.o
+%%SPARC64%%lib/modules/drivers/sunleo_drv.o
+%%SPARC64%%lib/modules/drivers/suntcx_drv.o
+lib/modules/drivers/tdfx_drv.o
%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o
-%%I386%%lib/modules/drivers/trident_drv.o
-%%I386%%lib/modules/drivers/tseng_drv.o
-%%I386%%lib/modules/drivers/vesa_drv.o
-%%SPARC64_NA%%lib/modules/drivers/vga_drv.o
+%%AMD64_I386%%lib/modules/drivers/trident_drv.o
+%%AMD64_I386%%lib/modules/drivers/tseng_drv.o
+%%ALPHA_NA%%lib/modules/drivers/vesa_drv.o
+lib/modules/drivers/vga_drv.o
%%I386%%lib/modules/drivers/via_drv.o
%%I386%%lib/modules/drivers/vmware_drv.o
lib/modules/extensions/libGLcore.a
@@ -130,9 +128,7 @@
lib/modules/extensions/libxtrap.a
lib/modules/fonts/libbitmap.a
lib/modules/fonts/libfreetype.so
-lib/modules/fonts/libspeedo.a
lib/modules/fonts/libtype1.a
-lib/modules/fonts/libxtt.a
lib/modules/freebsd/libdrm.a
lib/modules/input/acecad_drv.o
lib/modules/input/calcomp_drv.o
@@ -145,6 +141,7 @@
lib/modules/input/hyperpen_drv.o
lib/modules/input/js_x_drv.o
lib/modules/input/kbd_drv.o
+lib/modules/input/keyboard_drv.o
lib/modules/input/magellan_drv.o
lib/modules/input/microtouch_drv.o
lib/modules/input/mouse_drv.o
@@ -156,11 +153,13 @@
lib/modules/input/tek4957_drv.o
lib/modules/input/void_drv.o
lib/modules/input/wacom_drv.o
-%%I386%%lib/modules/libafb.a
+%%ALPHA_NA%%lib/modules/libafb.a
lib/modules/libcfb.a
lib/modules/libcfb16.a
lib/modules/libcfb24.a
lib/modules/libcfb32.a
+lib/modules/libcw.a
+lib/modules/libdamage.a
lib/modules/libddc.a
lib/modules/libfb.a
lib/modules/libi2c.a
@@ -181,5 +180,7 @@
lib/modules/libxf4bpp.a
lib/modules/libxf8_16bpp.a
lib/modules/libxf8_32bpp.a
+%%SPARC64%%lib/modules/libxf8_32wid.a
%%SPARC64_NA%%lib/modules/v10002d.uc
%%SPARC64_NA%%lib/modules/v20002d.uc
+ at dirrm lib/X11/getconfig
Index: files/patch-DragonFly.cf
===================================================================
RCS file: /cvs/dfports/x11-servers/xorg-server/files/patch-DragonFly.cf,v
retrieving revision 1.4
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.4 patch-DragonFly.cf
--- files/patch-DragonFly.cf 20 Dec 2004 09:05:55 -0000 1.4
+++ files/patch-DragonFly.cf 28 Dec 2004 06:16:09 -0000
@@ -74,8 +74,8 @@
+# define BuildThreadStubLibrary YES
+# define NeedUIThrStubs YES
+# define ThreadsLibraries -pthread
-+# define SharedX11Reqs $(LDPRELIB) -lXThrStub
-+# define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) -lXThrStub
++# define SharedX11Reqs $(LDPRELIB)
++# define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
+#endif
+
+#define AvoidNullMakeCommand YES
Index: files/patch-FreeBSD.cf
===================================================================
RCS file: /cvs/dfports/x11-servers/xorg-server/files/patch-FreeBSD.cf,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 patch-FreeBSD.cf
--- files/patch-FreeBSD.cf 16 Aug 2004 12:30:29 -0000 1.1
+++ files/patch-FreeBSD.cf 28 Dec 2004 04:51:34 -0000
@@ -1,54 +1,44 @@
---- config/cf/FreeBSD.cf.orig Fri Apr 2 13:47:10 2004
-+++ config/cf/FreeBSD.cf Fri May 7 17:32:47 2004
-@@ -109,7 +109,7 @@
- # endif
- # define HasPosixThreads YES
- # define ThreadedX YES
--# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE
-+# define SystemMTDefines FreeBSDPTHREAD_CFLAGS
- /*
- * FreeBSD has tread-safe api but no getpwnam_r yet.
- */
-@@ -119,9 +119,8 @@
- # else
- # define MTSafeAPIDefines -DXUSE_MTSAFE_API
+--- config/cf/FreeBSD.cf.orig Sat Aug 14 17:03:36 2004
++++ config/cf/FreeBSD.cf Sat Sep 11 15:18:01 2004
+@@ -78,6 +78,7 @@
+ #define HasIssetugid YES
+ #define HasPoll YES
+ #endif
++#define BuildHtmlManPages NO
+
+ #if OSMajorVersion >= 4
+ #define HasGetIfAddrs YES
+@@ -117,14 +118,8 @@
+ # if (OSRelVersion < 500043)
+ # define NeedUIThrStubs YES
# endif
--# if HasLibPthread
+-# if (OSRelVersion >= 502102)
-# define ThreadsLibraries -lpthread
+-# elif (OSRelVersion >= 500016)
+-# define ThreadsLibraries -lc_r
-# else
+-# define ThreadsLibraries -pthread
+-# endif
+-# define SystemMTDefines -D_THREAD_SAFE
+# define ThreadsLibraries FreeBSDPTHREAD_LIBS
-+# if !HasLibPthread
- # if OSRelVersion >= 500043
- # define BuildThreadStubLibrary NO
- # define NeedUIThrStubs NO
-@@ -130,10 +129,7 @@
- # define NeedUIThrStubs YES
- # endif
- # if (OSRelVersion >= 500016)
--# define ThreadsLibraries -lc_r
- # define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc
--# else
--# define ThreadsLibraries -pthread
- # endif
- # define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB)
- # define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
-@@ -192,11 +188,11 @@
- * ld: warning: libXThrStub.so.6, needed by libX11.so, not found
- */
- #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
--# define CcCmd $(CLIENTENVSETUP) cc
--# define CplusplusCmd $(CLIENTENVSETUP) c++
-+# define CcCmd $(CLIENTENVSETUP) FreeBSDCC
-+# define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX
- #else
--# define CcCmd cc
--# define CplusplusCmd c++
-+# define CcCmd FreeBSDCC
-+# define CplusplusCmd FreeBSDCXX
++# define SystemMTDefines FreeBSDPTHREAD_CFLAGS
+ #endif
+
+ /* This fixes linking C programs against libGLU on FreeBSD 3.x */
+@@ -173,10 +168,10 @@
#endif
+ #ifndef CcCmd
+-#define CcCmd cc
++#define CcCmd FreeBSDCC
+ #endif
+ #ifndef CplusplusCmd
+-#define CplusplusCmd c++
++#define CplusplusCmd FreeBSDCXX
+ #endif
#define CppCmd /usr/bin/cpp
-@@ -359,7 +355,7 @@
+ #define PreProcessCmd CppCmd
+@@ -338,7 +333,7 @@
#ifndef LibraryRpathLoadFlags
# if UseRpath
# if UseElfFormat
@@ -57,7 +47,7 @@
# else
# define LibraryRpathLoadFlags -R $(USRLIBDIRPATH)
# endif
-@@ -452,18 +450,8 @@
+@@ -463,18 +458,8 @@
#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
#endif
Index: files/patch-Library.tmpl
===================================================================
RCS file: /cvs/dfports/x11-servers/xorg-server/files/patch-Library.tmpl,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 patch-Library.tmpl
--- files/patch-Library.tmpl 16 Aug 2004 12:30:29 -0000 1.1
+++ files/patch-Library.tmpl 28 Dec 2004 04:51:34 -0000
@@ -1,21 +1,21 @@
---- config/cf/Library.tmpl.orig Mon Aug 27 10:40:55 2001
-+++ config/cf/Library.tmpl Wed Oct 16 21:53:13 2002
-@@ -300,6 +300,10 @@
+--- config/cf/Library.tmpl.orig Mon May 24 12:06:57 2004
++++ config/cf/Library.tmpl Fri Sep 10 21:46:00 2004
+@@ -389,7 +389,7 @@
*/
#ifndef MakeStringsDependency
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+#define MakeStringsDependency @@\
-+MAKESTRS = makestrs
-+#else
- # define MakeStringsDependency @@\
+-# ifndef UseInstalled
++# if !defined(UseInstalled) && !defined(UseInstalledPrograms)
+ # define MakeStringsDependency @@\
MAKESTRS = $(CONFIGSRC)/util/makestrs @@\
NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\
-@@ -308,6 +312,7 @@
- cd $(CONFIGSRC)/util && $(MAKE) HostProgramTargetName(makestrs) @@\
+@@ -399,7 +399,8 @@
@@\
includes:: HostProgramTargetName($(MAKESTRS))
-+#endif
+ # else
+-# define MakeStringsDependency /**/
++# define MakeStringsDependency @@\
++MAKESTRS = makestrs
+ # endif
#endif
- #ifndef ToolkitMakeStrings
Index: files/patch-X11.tmpl
===================================================================
RCS file: /cvs/dfports/x11-servers/xorg-server/files/patch-X11.tmpl,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 patch-X11.tmpl
--- files/patch-X11.tmpl 16 Aug 2004 12:30:29 -0000 1.1
+++ files/patch-X11.tmpl 28 Dec 2004 04:51:34 -0000
@@ -1,6 +1,6 @@
---- config/cf/X11.tmpl.orig Fri Apr 2 13:47:10 2004
-+++ config/cf/X11.tmpl Sun May 30 12:46:35 2004
-@@ -576,7 +576,7 @@
+--- config/cf/X11.tmpl.orig Fri Sep 3 09:18:18 2004
++++ config/cf/X11.tmpl Fri Sep 10 20:29:12 2004
+@@ -616,7 +616,7 @@
#define BuildXft1Library BuildRenderLibrary
#endif
#ifndef UseFontconfig
@@ -9,27 +9,21 @@
#endif
#ifndef BuildFontconfigLibrary
#define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig)
-@@ -1543,7 +1543,14 @@
+@@ -1606,7 +1606,7 @@
#endif
#ifndef PsWrap
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+#define PsWrap pswrap
-+#define PsWrapDependency /**/
-+#else
- #define PsWrap $(PSWRAPSRC)/pswrap
-+#define PsWrapDependency HostProgramTargetName($(PSWRAP))
-+#endif
-+ PSWRAP = PsWrap
- #endif
-
- #ifndef ResourceConfigurationManagement
-@@ -1615,7 +1622,7 @@
+-# ifndef UseInstalled
++# if !defined(UseInstalled) && !defined(UseInstalledPrograms)
+ # define PsWrap $(PSWRAPSRC)/pswrap
+ # else
+ # define PsWrap pswrap
+@@ -1683,7 +1683,7 @@
INSTAPPFLAGS = $(INSTDATFLAGS) /* XXX - this should go away - XXX */
-#if UseInstalledX11
+#if UseInstalledX11 || UseInstalledClients
- RGB = $(BINDIR)/rgb
- FONTC = $(BINDIR)/bdftopcf
- MKFONTSCALE = $(BINDIR)/mkfontscale
+ RGB = $(XBINDIR)/rgb
+ FONTC = $(XBINDIR)/bdftopcf
+ MKFONTSCALE = $(XBINDIR)/mkfontscale
Index: files/patch-alpha_video.c
===================================================================
RCS file: files/patch-alpha_video.c
diff -N files/patch-alpha_video.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-alpha_video.c 28 Dec 2004 04:51:34 -0000
@@ -0,0 +1,11 @@
+--- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig Wed Sep 1 21:05:09 2004
++++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c Wed Sep 1 21:06:52 2004
+@@ -487,7 +487,7 @@
+ writeSparse32(int Value, pointer Base, register unsigned long Offset);
+
+ #ifdef __FreeBSD__
+-extern int sysarch(int, char *);
++extern int sysarch(int, void *);
+ #endif
+
+ struct parms {
Index: files/patch-bus-Imakefile
===================================================================
RCS file: files/patch-bus-Imakefile
diff -N files/patch-bus-Imakefile
--- files/patch-bus-Imakefile 16 Aug 2004 12:30:29 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-Index: programs/Xserver/hw/xfree86/os-support/bus/Imakefile
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile,v
-retrieving revision 1.2
-diff -u -r1.2 Imakefile
---- programs/Xserver/hw/xfree86/os-support/bus/Imakefile 23 Apr 2004 19:54:08 -0000 1.2
-+++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile 11 May 2004 07:58:43 -0000
-@@ -80,8 +80,8 @@
- PCIDRVRSRC = ix86Pci.c linuxPci.c
- PCIDRVROBJ = ix86Pci.o linuxPci.o
-
--#elif defined(FreeBSDArchitecture) && defined(AlphaArchitecture)
--
-+#elif defined(FreeBSDArchitecture) && \
-+ (defined(AlphaArchitecture) || defined(AMD64Architecture))
-
- XCOMM generic FreeBSD PCI driver (using /dev/pci)
-
Index: files/patch-drm.h
===================================================================
RCS file: files/patch-drm.h
diff -N files/patch-drm.h
--- files/patch-drm.h 16 Aug 2004 12:30:29 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/drm.h Mon Apr 5 23:28:41 2004
-+++ programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/drm.h Mon Apr 5 23:32:53 2004
-@@ -46,8 +46,8 @@
- #define DRM_IOC_WRITE _IOC_WRITE
- #define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE
- #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
--#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
--#if defined(__FreeBSD__) && defined(IN_MODULE)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-+#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(IN_MODULE)
- /* Prevent name collision when including sys/ioccom.h */
- #undef ioctl
- #include <sys/ioccom.h>
Index: files/patch-fb-renderfixes.diff
===================================================================
RCS file: files/patch-fb-renderfixes.diff
diff -N files/patch-fb-renderfixes.diff
--- files/patch-fb-renderfixes.diff 16 Aug 2004 12:30:29 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,320 +0,0 @@
-Index: programs/Xserver/fb/fbcompose.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbcompose.c,v
-retrieving revision 1.2
-diff -u -r1.2 fbcompose.c
---- programs/Xserver/fb/fbcompose.c 23 Apr 2004 19:05:14 -0000 1.2
-+++ programs/Xserver/fb/fbcompose.c 11 May 2004 22:58:12 -0000
-@@ -191,15 +191,15 @@
- a = (*msk->fetcha) (msk);
- if (!a)
- return 0;
--
-- x = (*src->fetcha) (src);
-- if (a == 0xffffffff)
-- return x;
--
-- m = FbInC(x,0,a,t);
-- n = FbInC(x,8,a,t);
-- o = FbInC(x,16,a,t);
-- p = FbInC(x,24,a,t);
-+
-+ x = (*src->fetch) (src) >> 24;
-+ if (x == 0xff)
-+ return a;
-+
-+ m = FbInU(a,0,x,t);
-+ n = FbInU(a,8,x,t);
-+ o = FbInU(a,16,x,t);
-+ p = FbInU(a,24,x,t);
- return m|n|o|p;
- }
-
-@@ -608,7 +608,7 @@
- cs = fbCombineMaskC (src, msk);
- d = (*dst->fetch) (dst);
- s = cs.value;
-- ad = cs.alpha;
-+ ad = ~cs.alpha;
- as = d >> 24;
- m = FbGen(s,d,0,as,FbGet8(ad,0),t,u,v);
- n = FbGen(s,d,8,as,FbGet8(ad,8),t,u,v);
-@@ -698,10 +698,10 @@
- s = cs.value;
- ad = ~cs.alpha;
- as = ~d >> 24;
-- m = FbGen(s,d,0,as,ad,t,u,v);
-- n = FbGen(s,d,8,as,ad,t,u,v);
-- o = FbGen(s,d,16,as,ad,t,u,v);
-- p = FbGen(s,d,24,as,ad,t,u,v);
-+ m = FbGen(s,d,0,as,FbGet8(ad,0),t,u,v);
-+ n = FbGen(s,d,8,as,FbGet8(ad,8),t,u,v);
-+ o = FbGen(s,d,16,as,FbGet8(ad,16),t,u,v);
-+ p = FbGen(s,d,24,as,FbGet8(ad,24),t,u,v);
- (*dst->store) (dst, m|n|o|p);
- }
-
-@@ -763,10 +763,9 @@
- FbCompositeOperand *dst)
- {
- CARD32 s = fbCombineMaskU (src, msk), d;
--#if 0
- CARD16 sa, da;
- CARD16 ad, as;
-- CARD16 t;
-+ CARD16 t, u, v;
- CARD32 m,n,o,p;
-
- d = (*dst->fetch) (dst);
-@@ -789,16 +788,6 @@
- p = FbGen(s,d,24,as,ad,t,u,v);
- }
- (*dst->store) (dst, m|n|o|p);
--#else
-- if ((s >> 24) == 0xff)
-- (*dst->store) (dst, s);
-- else
-- {
-- d = (*dst->fetch) (dst);
-- if ((s >> 24) > (d >> 24))
-- (*dst->store) (dst, s);
-- }
--#endif
- }
-
- void
-@@ -831,7 +820,7 @@
- else
- n = FbGen (s, d, 8, (da << 8) / sg, 0xff, t, u, v);
-
-- if (sr < da)
-+ if (sr <= da)
- o = FbAdd(s,d,16,t);
- else
- o = FbGen (s, d, 16, (da << 8) / sr, 0xff, t, u, v);
-@@ -972,8 +961,8 @@
- FbCompSrc cs;
- CARD32 s, d;
- CARD32 m,n,o,p;
-- CARD32 Fa;
-- CARD16 Fb, t, u, v;
-+ CARD32 Fa, Fb;
-+ CARD16 t, u, v;
- CARD32 sa;
- CARD8 da;
-
-@@ -996,10 +985,10 @@
- Fa = m|n|o|p;
- break;
- case CombineAIn:
-- m = fbCombineDisjointOutPart ((CARD8) (sa >> 0), da);
-- n = fbCombineDisjointOutPart ((CARD8) (sa >> 8), da) << 8;
-- o = fbCombineDisjointOutPart ((CARD8) (sa >> 16), da) << 16;
-- p = fbCombineDisjointOutPart ((CARD8) (sa >> 24), da) << 24;
-+ m = fbCombineDisjointInPart ((CARD8) (sa >> 0), da);
-+ n = fbCombineDisjointInPart ((CARD8) (sa >> 8), da) << 8;
-+ o = fbCombineDisjointInPart ((CARD8) (sa >> 16), da) << 16;
-+ p = fbCombineDisjointInPart ((CARD8) (sa >> 24), da) << 24;
- Fa = m|n|o|p;
- break;
- case CombineA:
-@@ -1012,19 +1001,27 @@
- Fb = 0;
- break;
- case CombineBOut:
-- Fb = fbCombineDisjointOutPart (da, sa);
-+ m = fbCombineDisjointOutPart (da, (CARD8) (sa >> 0));
-+ n = fbCombineDisjointOutPart (da, (CARD8) (sa >> 8)) << 8;
-+ o = fbCombineDisjointOutPart (da, (CARD8) (sa >> 16)) << 16;
-+ p = fbCombineDisjointOutPart (da, (CARD8) (sa >> 24)) << 24;
-+ Fb = m|n|o|p;
- break;
- case CombineBIn:
-- Fb = fbCombineDisjointInPart (da, sa);
-+ m = fbCombineDisjointInPart (da, (CARD8) (sa >> 0));
-+ n = fbCombineDisjointInPart (da, (CARD8) (sa >> 8)) << 8;
-+ o = fbCombineDisjointInPart (da, (CARD8) (sa >> 16)) << 16;
-+ p = fbCombineDisjointInPart (da, (CARD8) (sa >> 24)) << 24;
-+ Fb = m|n|o|p;
- break;
- case CombineB:
-- Fb = 0xff;
-+ Fb = 0xffffffff;
- break;
- }
-- m = FbGen (s,d,0,FbGet8(Fa,0),Fb,t,u,v);
-- n = FbGen (s,d,8,FbGet8(Fa,8),Fb,t,u,v);
-- o = FbGen (s,d,16,FbGet8(Fa,16),Fb,t,u,v);
-- p = FbGen (s,d,24,FbGet8(Fa,24),Fb,t,u,v);
-+ m = FbGen (s,d,0,FbGet8(Fa,0),FbGet8(Fb,0),t,u,v);
-+ n = FbGen (s,d,8,FbGet8(Fa,8),FbGet8(Fb,8),t,u,v);
-+ o = FbGen (s,d,16,FbGet8(Fa,16),FbGet8(Fb,16),t,u,v);
-+ p = FbGen (s,d,24,FbGet8(Fa,24),FbGet8(Fb,24),t,u,v);
- s = m|n|o|p;
- (*dst->store) (dst, s);
- }
-@@ -1065,21 +1062,6 @@
- fbCombineDisjointGeneralC (src, msk, dst, CombineAOver);
- }
-
--void
--fbCombineDisjointOverReverseU (FbCompositeOperand *src,
-- FbCompositeOperand *msk,
-- FbCompositeOperand *dst)
--{
-- fbCombineDisjointGeneralU (src, msk, dst, CombineBOver);
--}
--
--void
--fbCombineDisjointOverReverseC (FbCompositeOperand *src,
-- FbCompositeOperand *msk,
-- FbCompositeOperand *dst)
--{
-- fbCombineDisjointGeneralC (src, msk, dst, CombineBOver);
--}
-
- void
- fbCombineDisjointInU (FbCompositeOperand *src,
-@@ -1281,8 +1263,8 @@
- FbCompSrc cs;
- CARD32 s, d;
- CARD32 m,n,o,p;
-- CARD32 Fa;
-- CARD16 Fb, t, u, v;
-+ CARD32 Fa, Fb;
-+ CARD16 t, u, v;
- CARD32 sa;
- CARD8 da;
-
-@@ -1305,10 +1287,10 @@
- Fa = m|n|o|p;
- break;
- case CombineAIn:
-- m = fbCombineConjointOutPart ((CARD8) (sa >> 0), da);
-- n = fbCombineConjointOutPart ((CARD8) (sa >> 8), da) << 8;
-- o = fbCombineConjointOutPart ((CARD8) (sa >> 16), da) << 16;
-- p = fbCombineConjointOutPart ((CARD8) (sa >> 24), da) << 24;
-+ m = fbCombineConjointInPart ((CARD8) (sa >> 0), da);
-+ n = fbCombineConjointInPart ((CARD8) (sa >> 8), da) << 8;
-+ o = fbCombineConjointInPart ((CARD8) (sa >> 16), da) << 16;
-+ p = fbCombineConjointInPart ((CARD8) (sa >> 24), da) << 24;
- Fa = m|n|o|p;
- break;
- case CombineA:
-@@ -1321,19 +1303,27 @@
- Fb = 0;
- break;
- case CombineBOut:
-- Fb = fbCombineConjointOutPart (da, sa);
-+ m = fbCombineConjointOutPart (da, (CARD8) (sa >> 0));
-+ n = fbCombineConjointOutPart (da, (CARD8) (sa >> 8)) << 8;
-+ o = fbCombineConjointOutPart (da, (CARD8) (sa >> 16)) << 16;
-+ p = fbCombineConjointOutPart (da, (CARD8) (sa >> 24)) << 24;
-+ Fb = m|n|o|p;
- break;
- case CombineBIn:
-- Fb = fbCombineConjointInPart (da, sa);
-+ m = fbCombineConjointInPart (da, (CARD8) (sa >> 0));
-+ n = fbCombineConjointInPart (da, (CARD8) (sa >> 8)) << 8;
-+ o = fbCombineConjointInPart (da, (CARD8) (sa >> 16)) << 16;
-+ p = fbCombineConjointInPart (da, (CARD8) (sa >> 24)) << 24;
-+ Fb = m|n|o|p;
- break;
- case CombineB:
-- Fb = 0xff;
-+ Fb = 0xffffffff;
- break;
- }
-- m = FbGen (s,d,0,FbGet8(Fa,0),Fb,t,u,v);
-- n = FbGen (s,d,8,FbGet8(Fa,8),Fb,t,u,v);
-- o = FbGen (s,d,16,FbGet8(Fa,16),Fb,t,u,v);
-- p = FbGen (s,d,24,FbGet8(Fa,24),Fb,t,u,v);
-+ m = FbGen (s,d,0,FbGet8(Fa,0),FbGet8(Fb,0),t,u,v);
-+ n = FbGen (s,d,8,FbGet8(Fa,8),FbGet8(Fb,8),t,u,v);
-+ o = FbGen (s,d,16,FbGet8(Fa,16),FbGet8(Fb,16),t,u,v);
-+ p = FbGen (s,d,24,FbGet8(Fa,24),FbGet8(Fb,24),t,u,v);
- s = m|n|o|p;
- (*dst->store) (dst, s);
- }
-@@ -1519,14 +1509,14 @@
- fbCombineAtopReverseU,
- fbCombineXorU,
- fbCombineAddU,
-- fbCombineDisjointOverU, /* Saturate */
-+ fbCombineSaturateU,
- 0,
- 0,
- fbCombineClear,
- fbCombineSrcU,
- fbCombineDst,
- fbCombineDisjointOverU,
-- fbCombineDisjointOverReverseU,
-+ fbCombineSaturateU, /* DisjointOverReverse */
- fbCombineDisjointInU,
- fbCombineDisjointInReverseU,
- fbCombineDisjointOutU,
-@@ -1566,14 +1556,14 @@
- fbCombineAtopReverseC,
- fbCombineXorC,
- fbCombineAddC,
-- fbCombineDisjointOverC, /* Saturate */
-+ fbCombineSaturateC,
- 0,
- 0,
- fbCombineClear, /* 0x10 */
- fbCombineSrcC,
- fbCombineDst,
- fbCombineDisjointOverC,
-- fbCombineDisjointOverReverseC,
-+ fbCombineSaturateC, /* DisjointOverReverse */
- fbCombineDisjointInC,
- fbCombineDisjointInReverseC,
- fbCombineDisjointOutC,
-Index: programs/Xserver/fb/fbpict.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbpict.c,v
-retrieving revision 1.2
-diff -u -r1.2 fbpict.c
---- programs/Xserver/fb/fbpict.c 23 Apr 2004 19:05:14 -0000 1.2
-+++ programs/Xserver/fb/fbpict.c 12 May 2004 00:45:56 -0000
-@@ -1001,7 +1001,6 @@
- {
- switch (pSrc->format) {
- case PICT_a8r8g8b8:
-- case PICT_x8r8g8b8:
- switch (pDst->format) {
- case PICT_a8r8g8b8:
- case PICT_x8r8g8b8:
-@@ -1016,7 +1015,6 @@
- }
- break;
- case PICT_a8b8g8r8:
-- case PICT_x8b8g8r8:
- switch (pDst->format) {
- case PICT_a8b8g8r8:
- case PICT_x8b8g8r8:
-Index: programs/Xserver/fb/fbpict.h
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbpict.h,v
-retrieving revision 1.2
-diff -u -r1.2 fbpict.h
---- programs/Xserver/fb/fbpict.h 23 Apr 2004 19:05:14 -0000 1.2
-+++ programs/Xserver/fb/fbpict.h 11 May 2004 18:46:20 -0000
-@@ -333,15 +333,8 @@
- FbCompositeOperand *msk,
- FbCompositeOperand *dst);
-
--void
--fbCombineDisjointOverReverseU (FbCompositeOperand *src,
-- FbCompositeOperand *msk,
-- FbCompositeOperand *dst);
--
--void
--fbCombineDisjointOverReverseC (FbCompositeOperand *src,
-- FbCompositeOperand *msk,
-- FbCompositeOperand *dst);
-+#define fbCombineDisjointOverReverseU fbCombineSaturateU
-+#define fbCombineDisjointOverReverseC fbCombineSaturateC
-
- void
- fbCombineDisjointInU (FbCompositeOperand *src,
Index: files/patch-kernel-Imakefile
===================================================================
RCS file: files/patch-kernel-Imakefile
diff -N files/patch-kernel-Imakefile
--- files/patch-kernel-Imakefile 16 Aug 2004 12:30:29 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile.orig Sun May 9 21:27:57 2004
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile Sun May 9 21:28:16 2004
-@@ -20,6 +20,7 @@
- @echo 'Use "make -f Makefile.bsd" to manually build the modules'
- #endif
-
-+#if 0
- SRCS_DRM = \
- drm.h \
- drmP.h \
-@@ -130,6 +131,7 @@
- InstallNamedNonExec(radeon/Makefile,Makefile,$(DRMSRCDIR)/radeon)
- InstallNamedNonExec(sis/Makefile,Makefile,$(DRMSRCDIR)/sis)
- InstallNamedNonExec(tdfx/Makefile,Makefile,$(DRMSRCDIR)/tdfx)
-+#endif /* 0 */
-
- LinkSourceFile(drm.h,$(XF86OSSRC)/shared/drm/kernel)
- LinkSourceFile(drm_sarea.h,$(XF86OSSRC)/shared/drm/kernel)
Index: files/patch-linux.cf
===================================================================
RCS file: files/patch-linux.cf
diff -N files/patch-linux.cf
--- files/patch-linux.cf 16 Aug 2004 12:30:29 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- config/cf/linux.cf.orig Fri May 7 15:51:10 2004
-+++ config/cf/linux.cf Fri May 7 15:51:17 2004
-@@ -747,7 +747,7 @@
- #endif
-
- #ifndef XF86OSCardDrivers
--# define XF86OSCardDrivers v4l
-+# define XF86OSCardDrivers fbdev v4l
- #endif
-
- #ifndef OSXInputDrivers
Index: files/patch-loadmod.c
===================================================================
RCS file: files/patch-loadmod.c
diff -N files/patch-loadmod.c
--- files/patch-loadmod.c 16 Aug 2004 12:30:29 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- programs/Xserver/hw/xfree86/loader/loadmod.c.orig Fri May 7 18:46:10 2004
-+++ programs/Xserver/hw/xfree86/loader/loadmod.c Fri May 7 18:46:12 2004
-@@ -62,7 +62,6 @@
- #include "xf86Xinput.h"
- #endif
- #include "loader.h"
--#include "xf86Optrec.h"
-
- #include <sys/types.h>
- #include <regex.h>
Index: files/patch-xf86Events.c
===================================================================
RCS file: files/patch-xf86Events.c
diff -N files/patch-xf86Events.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-xf86Events.c 28 Dec 2004 04:51:34 -0000
@@ -0,0 +1,76 @@
+--- programs/Xserver/hw/xfree86/common/xf86Events.c.orig Sun Sep 26 04:17:42 2004
++++ programs/Xserver/hw/xfree86/common/xf86Events.c Sun Sep 26 04:17:25 2004
+@@ -448,7 +448,7 @@
+ #if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT)
+ static Bool first_time = TRUE;
+ #endif
+-#if defined(__sparc__) && defined(__linux__)
++#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
+ static int kbdSun = -1;
+ #endif
+ /* Disable any keyboard processing while in suspend */
+@@ -464,7 +464,7 @@
+ }
+ #endif
+
+-#if defined (__sparc__) && defined(__linux__)
++#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
+ if (kbdSun == -1) {
+ if ((xf86Info.xkbmodel && !strcmp(xf86Info.xkbmodel, "sun"))
+ || (xf86Info.xkbrules && !strcmp(xf86Info.xkbrules, "sun")))
+@@ -474,7 +474,7 @@
+ }
+ if (kbdSun)
+ goto special;
+-#endif /* __sparc__ && __linux__ */
++#endif /* __sparc__ && (__linux__ || __FreeBSD__) */
+
+ #ifdef __linux__
+ if (xf86Info.kbdCustomKeycodes) {
+@@ -525,6 +525,7 @@
+ } else
+ #endif /* i386 && SVR4 */
+ {
++ if (!xf86IsPc98()) {
+ switch (scanCode) {
+ case 0x59: scanCode = KEY_0x59; break;
+ case 0x5a: scanCode = KEY_0x5A; break;
+@@ -555,6 +556,7 @@
+ case 0x75: scanCode = KEY_0x75; break;
+ case 0x76: scanCode = KEY_0x76; break;
+ }
++ } /* end if (!xf86IsPc98()) */
+ }
+ }
+
+@@ -636,10 +638,12 @@
+ * they need to get the same key code as the base key on the same
+ * physical keyboard key.
+ */
++ if (!xf86IsPc98()) {
+ if (scanCode == KEY_SysReqest)
+ scanCode = KEY_Print;
+ else if (scanCode == KEY_Break)
+ scanCode = KEY_Pause;
++ }
+ #endif
+
+ /*
+@@ -676,7 +680,7 @@
+ }
+ }
+ #endif
+-#if defined (__sparc__) && defined(__linux__)
++#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
+ special:
+ if (kbdSun) {
+ switch (scanCode) {
+@@ -710,7 +714,7 @@
+ */
+ scanCode--;
+ }
+-#endif /* defined (__sparc__) && defined(__linux__) */
++#endif /* __sparc__ && (__linux__ || __FreeBSD__) */
+
+ #ifdef XKB
+ if ((xf86Info.ddxSpecialKeys == SKWhenNeeded &&
Index: files/patch-xf86cfg-Imakefile
===================================================================
RCS file: files/patch-xf86cfg-Imakefile
diff -N files/patch-xf86cfg-Imakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-xf86cfg-Imakefile 28 Dec 2004 04:51:34 -0000
@@ -0,0 +1,11 @@
+--- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig Sat Sep 11 15:11:04 2004
++++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile Sat Sep 11 15:11:07 2004
+@@ -25,6 +25,8 @@
+ SNPRINTFOBJS = snprintf.o
+ #endif
+
++XAWLIB = -lXaw
++
+ SRCS =\
+ accessx.c\
+ card-cfg.c\
Index: files/patch-xorg.cf
===================================================================
RCS file: files/patch-xorg.cf
diff -N files/patch-xorg.cf
--- files/patch-xorg.cf 16 Aug 2004 12:30:29 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- config/cf/xorg.cf.orig Sun May 9 21:05:27 2004
-+++ config/cf/xorg.cf Sun May 9 21:05:28 2004
-@@ -388,7 +388,7 @@
- GlideDriver i128 NscDriver \
- ati i810 AgpGartDrivers DevelDrivers ark \
- cyrix siliconmotion via \
-- fbdev vesa vga \
-+ vesa vga \
- dummy XF86OSCardDrivers XF86ExtraCardDrivers
- # endif
-
Index: files/patch-xorgconfig.c
===================================================================
RCS file: files/patch-xorgconfig.c
diff -N files/patch-xorgconfig.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-xorgconfig.c 28 Dec 2004 04:51:34 -0000
@@ -0,0 +1,12 @@
+--- programs/Xserver/hw/xfree86/xf86config/xorgconfig.c.orig Mon Nov 8 22:18:58 2004
++++ programs/Xserver/hw/xfree86/xf86config/xorgconfig.c Mon Nov 8 22:19:22 2004
+@@ -854,8 +854,7 @@
+ "which is the rate at which scanlines are displayed.\n"
+ "\n"
+ "The valid range for horizontal sync and vertical sync should be documented\n"
+-"in the manual of your monitor. If in doubt, check the monitor database\n"
+-TREEROOTDOC "/Monitors to see if your monitor is there.\n"
++"in the manual of your monitor.\n"
+ "\n";
+
+ static char *hsyncintro_text =
Index: scripts/configure
===================================================================
RCS file: /cvs/dfports/x11-servers/xorg-server/scripts/configure,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 configure
--- scripts/configure 16 Aug 2004 12:30:29 -0000 1.1
+++ scripts/configure 28 Dec 2004 04:56:03 -0000
@@ -14,6 +14,8 @@
echo "#define ForceNormalLib NO" >> $LOCALDEF
echo "#define XTrueTypeInstallCConvHeaders NO" >> $LOCALDEF
echo "#define BuildServer YES" >> $LOCALDEF
+echo "#define BuildXprint NO" >> $LOCALDEF
+echo "#define BuildLibraries NO" >> $LOCALDEF
echo "#define LibInstallBuild YES" >> $LOCALDEF
echo "#define ModInstall YES" >> $LOCALDEF
echo "#define XF86Server NO" >> $LOCALDEF
Attachment:
pgp00017.pgp
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pgp00017.pgp
Type: application/octet-stream
Size: 187 bytes
Desc: "Description: PGP signature"
URL: <http://lists.dragonflybsd.org/pipermail/submit/attachments/20041228/55abd963/attachment-0014.obj>
More information about the Submit
mailing list