kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

This is xorg-server 1.3.0.0, patched to support Mesa 6.5.3. It also

Browse source 
includes the following fixes:

--Disable damage notification on move for manually redirected windows
--Disable back-filling of windows created with bg=none
--Untested fix for problems with offscreen pixmaps using XAA

Enjoy!
This commit is contained in:
Blair Sadewitz 2007-05-02 01:27:28 +00:00 committed by Thomas Klausner
parent 4aa4a2fd06
commit 813b93836e
37 changed files with 1225 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modular-xorg-server-mesa653/DESCR Normal file
View file

@ -0,0 +1,2 @@
The X.org X11 Server from the modularized source tree of
X.org X11.

117
modular-xorg-server-mesa653/Makefile Normal file
View file

@ -0,0 +1,117 @@
# $NetBSD: Makefile,v 1.1 2007/05/02 01:27:28 bsadewitz Exp $
DISTNAME= xorg-server-1.3.0.0
PKGNAME= modular-${DISTNAME}
CATEGORIES= x11
MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/
EXTRACT_SUFX= .tar.bz2
SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS}
PKG_DESTDIR_SUPPORT= user-destdir
MAINTAINER= blair.sadewitz@gmail.com
COMMENT= Xorg X11 Server from modular X.org X11
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
PKGCONFIG_OVERRIDE+= xorg-server.pc.in
USE_TOOLS+= pkg-config
USE_TOOLS+= gmake
USE_TOOLS+= perl
USE_TOOLS+= automake
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
CONFIGURE_ARGS+= --enable-dri
CONFIGURE_ARGS+= --disable-xorgcfg
PKG_SUPPORTED_OPTIONS= dri
PKG_OPTIONS_VAR= PKG_OPTIONS.xorg-server
PKG_OPTIONS_LEGACY_OPTS=glx:dri
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdri)
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DISTFILES+= MesaLib-6.5.3.tar.bz2
SITES.MesaLib-6.5.3.tar.bz2= ${MASTER_SITE_SOURCEFORGE:=mesa3d/}
MESA_SRC= ${WRKDIR}/Mesa-6.5.3
CONFIGURE_ARGS+= --enable-glx
CONFIGURE_ARGS+= --with-mesa-source=${MESA_SRC}
CONFIGURE_ARGS+= --with-dri-driver-path=${PREFIX}/lib/xorg/modules/dri
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "sparc64" || \
${MACHINE_ARCH} == "alpha"
GLX_DEFINES+= -D__GLX_ALIGN64
.endif
CONFIGURE_ENV+= GLX_DEFINES=${GLX_DEFINES:M*:Q}
# glcore.h and dri_interface.h shipped with *proto are older than
# those in Mesa-6.5.2. Either patch them or trick the build into using
# the newer ones.
#BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.8nb1
#BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.3nb1
post-extract:
${LN} -s ${MESA_SRC:Q}/include/GL ${WRKSRC:Q}/GL/glx/GL
PLIST_SUBST+= GLX=""
.else
CONFIGURE_ARGS+= --disable-glx
PLIST_SUBST+= GLX="@comment "
.endif
BUILD_DEFS+= VARBASE
# -wip
#DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
DEPENDS+= xkbdata-[0-9]*:../../x11/xkbdata
BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0
BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3
DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros
pre-configure:
cd ${WRKSRC} && autoreconf -v --install
.include "../../devel/zlib/buildlink3.mk"
.include "../../fonts/libfontenc/buildlink3.mk"
.if empty(PKG_OPTIONS:Mdri)
# for GLX we already have the Mesa source
.include "../../graphics/MesaLib/buildlink3.mk"
.endif
.include "../../x11/bigreqsproto/buildlink3.mk"
.include "../../x11/compositeproto/buildlink3.mk"
.include "../../x11/damageproto/buildlink3.mk"
.include "../../x11/evieext/buildlink3.mk"
.include "../../x11/fixesproto/buildlink3.mk"
.include "../../x11/fontsproto/buildlink3.mk"
.include "../../x11/glproto/buildlink3.mk"
.include "../../x11/inputproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXau/buildlink3.mk"
.include "../../x11/libXaw/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXdamage/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
.include "../../x11/libXfont/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXxf86misc/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
.include "../../x11/libdrm/buildlink3.mk"
.include "../../x11/liblbxutil/buildlink3.mk"
.include "../../x11/libxkbfile/buildlink3.mk"
.include "../../x11/libxkbui/buildlink3.mk"
.include "../../x11/randrproto/buildlink3.mk"
.include "../../x11/recordproto/buildlink3.mk"
.include "../../x11/renderproto/buildlink3.mk"
.include "../../x11/resourceproto/buildlink3.mk"
.include "../../x11/scrnsaverproto/buildlink3.mk"
.include "../../x11/trapproto/buildlink3.mk"
.include "../../x11/videoproto/buildlink3.mk"
.include "../../x11/xcmiscproto/buildlink3.mk"
.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/xf86bigfontproto/buildlink3.mk"
.include "../../x11/xf86dgaproto/buildlink3.mk"
.include "../../x11/xf86driproto/buildlink3.mk"
.include "../../x11/xf86miscproto/buildlink3.mk"
.include "../../x11/xf86vidmodeproto/buildlink3.mk"
.include "../../x11/xineramaproto/buildlink3.mk"
.include "../../x11/xproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

241
modular-xorg-server-mesa653/PLIST Normal file
View file

@ -0,0 +1,241 @@
@comment $NetBSD: PLIST,v 1.1 2007/05/02 01:27:28 bsadewitz Exp $
bin/X
bin/Xnest
bin/Xorg
bin/Xvfb
bin/cvt
bin/gtf
bin/inb
bin/inl
bin/inw
bin/ioport
bin/outb
bin/outl
bin/outw
bin/pcitweak
bin/scanpci
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
include/xorg/colormapst.h
include/xorg/compiler.h
include/xorg/cursor.h
include/xorg/cursorstr.h
include/xorg/damage.h
include/xorg/damagestr.h
include/xorg/dbestruct.h
include/xorg/dgaproc.h
include/xorg/dix.h
include/xorg/dixevents.h
include/xorg/dixfont.h
include/xorg/dixfontstr.h
include/xorg/dixgrabs.h
include/xorg/dixstruct.h
include/xorg/dri.h
include/xorg/dristruct.h
include/xorg/edid.h
include/xorg/exa.h
include/xorg/exevents.h
include/xorg/extension.h
include/xorg/extinit.h
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/globals.h
include/xorg/glyphstr.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
include/xorg/micmap.h
include/xorg/micoord.h
include/xorg/mifillarc.h
include/xorg/mifpoly.h
include/xorg/migc.h
include/xorg/miline.h
include/xorg/mipict.h
include/xorg/mipointer.h
include/xorg/mipointrst.h
include/xorg/misc.h
include/xorg/miscstruct.h
include/xorg/mispans.h
include/xorg/mistruct.h
include/xorg/miwideline.h
include/xorg/mizerarc.h
include/xorg/msp3430.h
include/xorg/opaque.h
include/xorg/os.h
include/xorg/picture.h
include/xorg/picturestr.h
include/xorg/pixmap.h
include/xorg/pixmapstr.h
include/xorg/property.h
include/xorg/propertyst.h
include/xorg/randrstr.h
include/xorg/region.h
include/xorg/regionstr.h
include/xorg/renderedge.h
include/xorg/resource.h
include/xorg/rgb.h
include/xorg/sarea.h
include/xorg/screenint.h
include/xorg/scrnintstr.h
include/xorg/selection.h
include/xorg/servermd.h
include/xorg/shadow.h
include/xorg/shadowfb.h
include/xorg/site.h
include/xorg/swaprep.h
include/xorg/swapreq.h
include/xorg/tda8425.h
include/xorg/tda9850.h
include/xorg/tda9885.h
include/xorg/uda1380.h
include/xorg/validate.h
include/xorg/vbe.h
include/xorg/vbeModes.h
include/xorg/vdif.h
include/xorg/vgaHW.h
include/xorg/window.h
include/xorg/windowstr.h
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/xf86Keymap.h
include/xorg/xf86Modes.h
include/xorg/xf86Module.h
include/xorg/xf86OSKbd.h
include/xorg/xf86OSmouse.h
include/xorg/xf86Opt.h
include/xorg/xf86Optrec.h
include/xorg/xf86Parser.h
include/xorg/xf86Pci.h
include/xorg/xf86PciInfo.h
include/xorg/xf86Priv.h
include/xorg/xf86Privstr.h
include/xorg/xf86RAC.h
include/xorg/xf86RamDac.h
include/xorg/xf86RandR12.h
include/xorg/xf86Rename.h
include/xorg/xf86Resources.h
include/xorg/xf86Version.h
include/xorg/xf86Xinput.h
include/xorg/xf86_OSlib.h
include/xorg/xf86_OSproc.h
include/xorg/xf86_ansic.h
include/xorg/xf86_libc.h
include/xorg/xf86cmap.h
include/xorg/xf86fbman.h
include/xorg/xf86i2c.h
include/xorg/xf86int10.h
include/xorg/xf86sbusBus.h
include/xorg/xf86str.h
include/xorg/xf86xv.h
include/xorg/xf86xvmc.h
include/xorg/xf86xvpriv.h
include/xorg/xisb.h
include/xorg/xorg-server.h
include/xorg/xorgVersion.h
include/xorg/xvdix.h
include/xorg/xvmcext.h
lib/X11/Cards
lib/X11/Options
lib/pkgconfig/xorg-server.pc
lib/xorg/modules/extensions/libGLcore.la
lib/xorg/modules/extensions/libdbe.la
lib/xorg/modules/extensions/libdri.la
lib/xorg/modules/extensions/libextmod.la
lib/xorg/modules/extensions/libglx.la
lib/xorg/modules/extensions/librecord.la
lib/xorg/modules/extensions/libxtrap.la
lib/xorg/modules/fonts/libfreetype.la
lib/xorg/modules/fonts/libtype1.la
lib/xorg/modules/libafb.la
lib/xorg/modules/libcfb.la
lib/xorg/modules/libcfb32.la
lib/xorg/modules/libexa.la
lib/xorg/modules/libfb.la
lib/xorg/modules/libint10.la
lib/xorg/modules/libmfb.la
lib/xorg/modules/libpcidata.la
lib/xorg/modules/libscanpci.la
lib/xorg/modules/libshadow.la
lib/xorg/modules/libshadowfb.la
lib/xorg/modules/libvbe.la
lib/xorg/modules/libvgahw.la
lib/xorg/modules/libxaa.la
lib/xorg/modules/libxf1bpp.la
lib/xorg/modules/libxf4bpp.la
lib/xorg/modules/libxf8_16bpp.la
lib/xorg/modules/libxf8_32bpp.la
lib/xorg/modules/linux/libfbdevhw.la
lib/xorg/modules/multimedia/bt829_drv.la
lib/xorg/modules/multimedia/fi1236_drv.la
lib/xorg/modules/multimedia/msp3430_drv.la
lib/xorg/modules/multimedia/tda8425_drv.la
lib/xorg/modules/multimedia/tda9850_drv.la
lib/xorg/modules/multimedia/tda9885_drv.la
lib/xorg/modules/multimedia/uda1380_drv.la
lib/xserver/SecurityPolicy
man/man1/Xnest.1
man/man1/Xorg.1
man/man1/Xserver.1
man/man1/Xvfb.1
man/man1/cvt.1
man/man1/gtf.1
man/man1/pcitweak.1
man/man1/scanpci.1
man/man1/xorgconfig.1
man/man4/exa.4
man/man4/fbdevhw.4
man/man5/xorg.conf.5
share/X11/xkb/compiled/README.compiled
share/aclocal/xorg-server.m4
@dirrm share/X11/xkb/compiled
@dirrm lib/xserver
@dirrm lib/xorg/modules/multimedia
@dirrm lib/xorg/modules/linux
@dirrm lib/xorg/modules/fonts
@dirrm lib/xorg/modules/extensions
@comment @dirrm lib/xorg/modules
@comment @dirrm lib/xorg
@comment @dirrm lib/X11
@comment @dirrm include/xorg

29
modular-xorg-server-mesa653/buildlink3.mk Normal file
View file

@ -0,0 +1,29 @@
# $NetBSD: buildlink3.mk,v 1.1 2007/05/02 01:27:28 bsadewitz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MODULAR_XORG_SERVER_BUILDLINK3_MK:= ${MODULAR_XORG_SERVER_BUILDLINK3_MK}+
.if ${BUILDLINK_DEPTH} == "+"
BUILDLINK_DEPENDS+= modular-xorg-server
.endif
BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmodular-xorg-server}
BUILDLINK_PACKAGES+= modular-xorg-server
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}modular-xorg-server
.if ${MODULAR_XORG_SERVER_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.3.0
BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../wip/modular-xorg-server-mesa653
.endif # MODULAR_XORG_SERVER_BUILDLINK3_MK
.include "../../x11/compositeproto/buildlink3.mk"
.include "../../x11/fontsproto/buildlink3.mk"
.include "../../x11/inputproto/buildlink3.mk"
.include "../../x11/randrproto/buildlink3.mk"
.include "../../x11/renderproto/buildlink3.mk"
.include "../../x11/videoproto/buildlink3.mk"
.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/xf86driproto/buildlink3.mk"
.include "../../x11/xproto/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}

40
modular-xorg-server-mesa653/distinfo Normal file
View file

@ -0,0 +1,40 @@
$NetBSD: distinfo,v 1.1 2007/05/02 01:27:28 bsadewitz Exp $
SHA1 (MesaLib-6.5.3.tar.bz2) = 8ab86e54976752028fbffcc21a9e0d2ebefeeff4
RMD160 (MesaLib-6.5.3.tar.bz2) = becb4d9e9896b7086cd7c738a2ee0ebbae3bfe4e
Size (MesaLib-6.5.3.tar.bz2) = 3351899 bytes
SHA1 (xorg-server-1.3.0.0.tar.bz2) = 6f9645fe70da5b6a121f3e8fa6c2fc1e4307390c
RMD160 (xorg-server-1.3.0.0.tar.bz2) = 1a4fecd73aed0d5adabe84066c24ce69dc2c2dc1
Size (xorg-server-1.3.0.0.tar.bz2) = 5968263 bytes
SHA1 (patch-aa) = fd5002a17deea4fb08a7f4c681ed1b95a79f04fc
SHA1 (patch-ab) = 00da0d269f98909671d0b55b03a5575872855802
SHA1 (patch-ac) = e366aee80019e7252c08a71bb7490a6aa9c591c1
SHA1 (patch-ad) = 3ed72c43527c3c7a5e63872d1acd8776559038c6
SHA1 (patch-ae) = a6ea6151713dcae452ca10d83cd12d2991c10491
SHA1 (patch-af) = 387c7c6ec98adb942cb2b781ee5ae6a9ed27a1fd
SHA1 (patch-ag) = 03f90f05076efc06590dba5c10d1ef4aa99b0c6f
SHA1 (patch-ah) = feefc53249b115e81c93142067431963c5ba6108
SHA1 (patch-ai) = 313242073fe24be864f3aaaeb8f6d35bb18a5197
SHA1 (patch-aj) = 0470a1494ec6645eda171203604e8fbc9ec5fe26
SHA1 (patch-ak) = de068c4792769067ee16be319211ac7a80cc24e5
SHA1 (patch-al) = 5c886ed049acc596ab3e0fbbead175f942908020
SHA1 (patch-am) = f98e0e3c15ec042f490a16e55c7b44da79b7a932
SHA1 (patch-an) = c134b644afe98e1d909bc8356a19ad8c30d99dce
SHA1 (patch-ao) = 243b9667c2cde531cdb9b33727884e52847b755e
SHA1 (patch-ap) = 6021f0433940ffdbe849c5e4742323b0e6e6c217
SHA1 (patch-aq) = 757a9ac2ac4a41f8a5a798aeae5bbb6d8a373d61
SHA1 (patch-ar) = 9f7e9d17ee4c7babcba8fa945e91889ff0fb7c23
SHA1 (patch-as) = d1b031df1a04222edda340db75f5ec2d990b6970
SHA1 (patch-at) = 38e1474cc85c937ad31d8226e64b2a2df07daf8e
SHA1 (patch-au) = 72f295f432d426c6616e2b67d1b054e2fcaa47a9
SHA1 (patch-av) = 29ca6ae83573349cc0630d668909f2462f19d429
SHA1 (patch-aw) = 4371447cd3eb8b22f085a86ed338845cd1f113bf
SHA1 (patch-ax) = f4eb4d0242b8838ba57b57ff4106ff45669d1d6b
SHA1 (patch-ay) = 818519e975f364240de009c7bcc1673240f6bd17
SHA1 (patch-az) = e025fc80ed9d5519e64dc7f140d69c946b692f8a
SHA1 (patch-ba) = f7777d29fe400f6363e1fcddedaa8ce032acf7b6
SHA1 (patch-da) = 239f2dcda2813c91af65a97acb5c3dd27b9ff57b
SHA1 (patch-db) = a3614f29c79c72a4f2d93959dff5b3cd16cb3d2b
SHA1 (patch-dc) = 147d0591182a31157ca429b0d2533491381ed3de
SHA1 (patch-dd) = dadffd4c02a690fbafa697f8cb30ab954daaa3db
SHA1 (patch-de) = e2329da08020a020a99b7b7bdcc13a8fd7c40039

31
modular-xorg-server-mesa653/patches/patch-aa Normal file
View file

@ -0,0 +1,31 @@
$NetBSD: patch-aa,v 1.1 2007/05/02 01:27:28 bsadewitz Exp $
--- hw/xfree86/os-support/bsd/bsd_init.c.orig 2006-09-18 02:04:18.000000000 -0400
+++ hw/xfree86/os-support/bsd/bsd_init.c
@@ -160,7 +160,9 @@ xf86OpenConsole()
xf86ConsOpen_t *driver;
#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
int result;
+#ifdef __FreeBSD__
struct utsname uts;
+#endif
vtmode_t vtmode;
#endif
@@ -251,6 +253,7 @@ xf86OpenConsole()
#endif
/* otherwise fall through */
case PCVT:
+#if !(defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000))
/*
* First activate the #1 VT. This is a hack to allow a server
* to be started while another one is active. There should be
@@ -265,7 +268,7 @@ xf86OpenConsole()
}
sleep(1);
}
-
+#endif
acquire_vt:
/*
* now get the VT

54
modular-xorg-server-mesa653/patches/patch-ab Normal file
View file

@ -0,0 +1,54 @@
$NetBSD: patch-ab,v 1.1 2007/05/02 01:27:28 bsadewitz Exp $
--- configure.orig 2007-04-19 21:25:26.000000000 -0400
+++ configure
@@ -24767,6 +24767,10 @@ _ACEOF
#define USE_DEV_IO 1
_ACEOF
;;
+ *dragonfly*) cat >>confdefs.h <<\_ACEOF
+#define USE_DEV_IO 1
+_ACEOF
+ ;;
*netbsd*) cat >>confdefs.h <<\_ACEOF
#define USE_I386_IOPL 1
_ACEOF
@@ -24873,7 +24877,7 @@ fi
DRI=no
KDRIVE_HW=no
case $host_os in
- *freebsd*)
+ *freebsd* | *dragonfly*)
case $host_os in
kfreebsd*-gnu) ;;
*)
@@ -24912,6 +24916,11 @@ _ACEOF
cat >>confdefs.h <<\_ACEOF
+#define PCVT_SUPPORT 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
#define WSCONS_SUPPORT 1
_ACEOF
@@ -28182,7 +28191,7 @@ _ACEOF
fi
-VENDOR_RELEASE="((($VERSION_MAJOR) * 10000000) + (($VERSION_MINOR) * 100000) + (($VERSION_PATCH) * 1000) + $VERSION_SNAP)"
+VENDOR_RELEASE=`expr \( $VERSION_MAJOR \* 10000000 \) + \( $VERSION_MINOR \* 100000 \) + \( $VERSION_PATCH \* 1000 \) + $VERSION_SNAP`
if test $VERSION_SNAP = "0"; then
if test $VERSION_PATCH = "0"; then
@@ -30903,7 +30912,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
;;
- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
XORG_OS="freebsd"
XORG_OS_SUBDIR="bsd"
XORG_OS_KBD="BSD"

16
modular-xorg-server-mesa653/patches/patch-ac Normal file
View file

@ -0,0 +1,16 @@
$NetBSD: patch-ac,v 1.1 2007/05/02 01:27:28 bsadewitz Exp $
--- ../Mesa-6.5.3/src/glx/x11/glxext.c.orig 2007-04-09 13:21:13.000000000 -0400
+++ ../Mesa-6.5.3/src/glx/x11/glxext.c
@@ -672,8 +672,9 @@ filter_modes( __GLcontextModes ** server
if ( do_delete && (m->visualID != 0) ) {
do_delete = GL_FALSE;
- fprintf(stderr, "libGL warning: 3D driver claims to not support "
- "visual 0x%02x\n", m->visualID);
+ if (m->visualRating != GLX_NON_CONFORMANT_VISUAL_EXT || getenv("LIBGL_DEBUG"))
+ fprintf(stderr, "libGL warning: 3D driver claims to not support "
+ "visual 0x%02x\n", m->visualID);
}
if ( do_delete ) {

26
modular-xorg-server-mesa653/patches/patch-ad Normal file
View file

@ -0,0 +1,26 @@
$NetBSD: patch-ad,v 1.1 2007/05/02 01:27:28 bsadewitz Exp $
So mouse pointer does not get stuck on left side of screen.
--- hw/xfree86/common/xf86Xinput.c.orig 2006-11-16 13:01:24.000000000 -0500
+++ hw/xfree86/common/xf86Xinput.c
@@ -938,15 +938,10 @@ xf86PostMotionEvent(DeviceIntPtr device,
/* modeled from xf86Events.c */
if (device->ptrfeed->ctrl.threshold) {
if ((abs(dx) + abs(dy)) >= device->ptrfeed->ctrl.threshold) {
- local->dxremaind = ((float)dx * (float)(device->ptrfeed->ctrl.num)) /
- (float)(device->ptrfeed->ctrl.den) + local->dxremaind;
- valuator[0] = (int)local->dxremaind;
- local->dxremaind = local->dxremaind - (float)valuator[0];
-
- local->dyremaind = ((float)dy * (float)(device->ptrfeed->ctrl.num)) /
- (float)(device->ptrfeed->ctrl.den) + local->dyremaind;
- valuator[1] = (int)local->dyremaind;
- local->dyremaind = local->dyremaind - (float)valuator[1];
+ valuator[0] = (dx * device->ptrfeed->ctrl.num) /
+ device->ptrfeed->ctrl.den;
+ valuator[1] = (dy * device->ptrfeed->ctrl.num) /
+ device->ptrfeed->ctrl.den;
}
}
else if (dx || dy) {

24
modular-xorg-server-mesa653/patches/patch-ae Normal file
View file

@ -0,0 +1,24 @@
$NetBSD: patch-ae,v 1.1 2007/05/02 01:27:28 bsadewitz Exp $
--- GL/glx/glxdri.c.orig 2007-04-09 15:59:09.000000000 -0400
+++ GL/glx/glxdri.c
@@ -327,6 +327,19 @@ __glXDRIbindTexImage(__GLXcontext *baseC
int bpp;
GLenum target, format, type;
+ /* When the GLX_EXT_texture_from_pixmap is used, as it's
+ * implemented here, we want to pull pixmap out of video memory
+ * and into host memory. */
+ {
+ extern void XAAEvictPixmaps(void);
+ static int evictedPixmaps;
+
+ if (!evictedPixmaps) {
+ XAAEvictPixmaps();
+ evictedPixmaps = TRUE;
+ }
+ }
+
pixmap = (PixmapPtr) glxPixmap->pDraw;
if (!glxPixmap->pDamage) {
glxPixmap->pDamage = DamageCreate(NULL, NULL, DamageReportNone,

16
modular-xorg-server-mesa653/patches/patch-af Normal file
View file

@ -0,0 +1,16 @@
$NetBSD: patch-af,v 1.1 2007/05/02 01:27:28 bsadewitz Exp $
--- hw/xfree86/os-support/bsd/i386_video.c.orig 2006-09-18 02:04:18.000000000 -0400
+++ hw/xfree86/os-support/bsd/i386_video.c
@@ -50,6 +50,11 @@
#include <machine/mtrr.h>
#include <machine/sysarch.h>
#include <sys/queue.h>
+#ifdef __x86_64__
+#define i386_set_mtrr x86_64_set_mtrr
+#define i386_get_mtrr x86_64_get_mtrr
+#define i386_iopl x86_64_iopl
+#endif
#endif
#if defined(__OpenBSD__) && defined(__amd64__)

13
modular-xorg-server-mesa653/patches/patch-ag Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-ag,v 1.1 2007/05/02 01:27:28 bsadewitz Exp $
--- GL/glx/glxext.c.orig 2006-11-30 20:40:10.000000000 -0500
+++ GL/glx/glxext.c
@@ -275,7 +275,7 @@ static GLboolean errorOccured = GL_FALSE
/*
** The GL was will call this routine if an error occurs.
*/
-void __glXErrorCallBack(__GLinterface *gc, GLenum code)
+void __glXErrorCallBack(GLenum code)
{
errorOccured = GL_TRUE;
}

13
modular-xorg-server-mesa653/patches/patch-ah Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-ah,v 1.1 2007/05/02 01:27:28 bsadewitz Exp $
--- GL/glx/glxext.h.orig 2006-09-18 02:04:17.000000000 -0400
+++ GL/glx/glxext.h
@@ -66,7 +66,7 @@ typedef struct {
extern GLboolean __glXFreeContext(__GLXcontext *glxc);
extern void __glXFlushContextCache(void);
-extern void __glXErrorCallBack(__GLinterface *gc, GLenum code);
+extern void __glXErrorCallBack(GLenum code);
extern void __glXClearErrorOccured(void);
extern GLboolean __glXErrorOccured(void);
extern void __glXResetLargeCommandStatus(__GLXclientState*);

22
modular-xorg-server-mesa653/patches/patch-ai Normal file
View file

@ -0,0 +1,22 @@
$NetBSD: patch-ai,v 1.1 2007/05/02 01:27:28 bsadewitz Exp $
--- GL/mesa/Makefile.am.orig 2006-06-06 13:13:51.000000000 -0400
+++ GL/mesa/Makefile.am
@@ -1,15 +1,15 @@
-SUBDIRS = main math array_cache swrast swrast_setup tnl shader X glapi
+SUBDIRS = main math swrast swrast_setup tnl shader X glapi vbo
noinst_LTLIBRARIES = libGLcore.la
libGLcore_la_SOURCES = dummy.c
libGLcore_la_LIBADD = main/libmain.la \
math/libmath.la \
- array_cache/libac.la \
swrast/libswrast.la \
swrast_setup/libss.la \
tnl/libtnl.la \
shader/libshader.la \
shader/grammar/libgrammar.la \
shader/slang/libslang.la \
+ vbo/libvbo.la \
X/libX.la

34
modular-xorg-server-mesa653/patches/patch-aj Normal file
View file

@ -0,0 +1,34 @@
$NetBSD: patch-aj,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- GL/mesa/X/Makefile.am.orig 2006-09-18 02:04:17.000000000 -0400
+++ GL/mesa/X/Makefile.am
@@ -2,7 +2,6 @@ noinst_LTLIBRARIES = libX.la
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
@@ -21,18 +20,15 @@ INCLUDES = -I@MESA_SOURCE@/include \
AM_CFLAGS = \
$(DIX_CFLAGS) \
-DXFree86Server \
- @GLX_DEFINES@ \
- -DXFree86Server
+ @GLX_DEFINES@
-libX_la_SOURCES = xf86glx.c \
- xf86glx_util.c \
- xf86glx_util.h \
- xf86glxint.h
+libX_la_SOURCES = xf86glx.c
nodist_libX_la_SOURCES = \
xm_api.c \
xm_buffer.c \
xm_dd.c \
+ xm_image.c \
xm_line.c \
xm_span.c \
xm_tri.c \

12
modular-xorg-server-mesa653/patches/patch-ak Normal file
View file

@ -0,0 +1,12 @@
$NetBSD: patch-ak,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- GL/mesa/glapi/Makefile.am.orig 2006-09-18 02:04:17.000000000 -0400
+++ GL/mesa/glapi/Makefile.am
@@ -7,7 +7,6 @@ AM_CFLAGS = \
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \

28
modular-xorg-server-mesa653/patches/patch-al Normal file
View file

@ -0,0 +1,28 @@
$NetBSD: patch-al,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- GL/mesa/main/Makefile.am.orig 2006-11-17 12:47:26.000000000 -0500
+++ GL/mesa/main/Makefile.am
@@ -7,7 +7,6 @@ AM_CFLAGS = \
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
@@ -62,13 +61,14 @@ nodist_libmain_la_SOURCES = accum.c \
matrix.c \
mipmap.c \
mm.c \
- occlude.c \
pixel.c \
points.c \
polygon.c \
+ queryobj.c \
rastpos.c \
rbadaptors.c \
renderbuffer.c \
+ shaders.c \
state.c \
stencil.c \
texcompress.c \

12
modular-xorg-server-mesa653/patches/patch-am Normal file
View file

@ -0,0 +1,12 @@
$NetBSD: patch-am,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- GL/mesa/math/Makefile.am.orig 2006-09-18 02:04:17.000000000 -0400
+++ GL/mesa/math/Makefile.am
@@ -7,7 +7,6 @@ AM_CFLAGS = \
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \

30
modular-xorg-server-mesa653/patches/patch-an Normal file
View file

@ -0,0 +1,30 @@
$NetBSD: patch-an,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- GL/mesa/shader/Makefile.am.orig 2006-09-18 02:04:17.000000000 -0400
+++ GL/mesa/shader/Makefile.am
@@ -9,7 +9,6 @@ AM_CFLAGS = \
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
@@ -28,8 +27,13 @@ nodist_libshader_la_SOURCES = \
atifragshader.c \
nvfragparse.c \
nvprogram.c \
- nvvertexec.c \
- nvvertparse.c \
+ nvvertparse.c \
+ prog_debug.c \
+ prog_execute.c \
+ prog_instruction.c \
+ prog_parameter.c \
+ prog_print.c \
program.c \
- shaderobjects.c \
- shaderobjects_3dlabs.c
+ programopt.c \
+ prog_statevars.c \
+ shader_api.c

12
modular-xorg-server-mesa653/patches/patch-ao Normal file
View file

@ -0,0 +1,12 @@
$NetBSD: patch-ao,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- GL/mesa/shader/grammar/Makefile.am.orig 2006-09-18 02:04:17.000000000 -0400
+++ GL/mesa/shader/grammar/Makefile.am
@@ -7,7 +7,6 @@ AM_CFLAGS = \
INCLUDES = -I@MESA_SOURCE@/include \
-I../../X \
- -I../../array_cache \
-I../../glapi \
-I../../main \
-I../../math \

48
modular-xorg-server-mesa653/patches/patch-ap Normal file
View file

@ -0,0 +1,48 @@
$NetBSD: patch-ap,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- GL/mesa/shader/slang/Makefile.am.orig 2006-09-18 02:04:17.000000000 -0400
+++ GL/mesa/shader/slang/Makefile.am
@@ -8,7 +8,6 @@ AM_CFLAGS = \
INCLUDES = -I@MESA_SOURCE@/include \
-I../grammar \
-I../../X \
- -I../../array_cache \
-I../../glapi \
-I../../main \
-I../../math \
@@ -19,23 +18,24 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I../.. \
-I$(top_srcdir)/hw/xfree86/os-support
-nodist_libslang_la_SOURCES = slang_analyse.c \
- slang_assemble_assignment.c \
- slang_assemble.c \
- slang_assemble_conditional.c \
- slang_assemble_constructor.c \
- slang_assemble_typeinfo.c \
+nodist_libslang_la_SOURCES = slang_builtin.c \
+ slang_codegen.c \
slang_compile.c \
slang_compile_function.c \
slang_compile_operation.c \
slang_compile_struct.c \
slang_compile_variable.c \
- slang_execute.c \
- slang_execute_x86.c \
- slang_export.c \
- slang_library_texsample.c \
+ slang_emit.c \
+ slang_ir.c \
+ slang_label.c \
slang_library_noise.c \
slang_link.c \
+ slang_log.c \
+ slang_mem.c \
slang_preprocess.c \
+ slang_print.c \
+ slang_simplify.c \
slang_storage.c \
- slang_utility.c
+ slang_typeinfo.c \
+ slang_utility.c \
+ slang_vartable.c

33
modular-xorg-server-mesa653/patches/patch-aq Normal file
View file

@ -0,0 +1,33 @@
$NetBSD: patch-aq,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- GL/mesa/swrast/Makefile.am.orig 2006-09-18 02:04:17.000000000 -0400
+++ GL/mesa/swrast/Makefile.am
@@ -7,7 +7,6 @@ AM_CFLAGS = \
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
@@ -24,7 +23,6 @@ nodist_libswrast_la_SOURCES = s_aaline.c
s_aatriangle.c \
s_accum.c \
s_alpha.c \
- s_arbshader.c \
s_atifragshader.c \
s_bitmap.c \
s_blend.c \
@@ -36,11 +34,11 @@ nodist_libswrast_la_SOURCES = s_aaline.c
s_drawpix.c \
s_feedback.c \
s_fog.c \
+ s_fragprog.c \
s_imaging.c \
s_lines.c \
s_logic.c \
s_masking.c \
- s_nvfragprog.c \
s_points.c \
s_readpix.c \
s_span.c \

12
modular-xorg-server-mesa653/patches/patch-ar Normal file
View file

@ -0,0 +1,12 @@
$NetBSD: patch-ar,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- GL/mesa/swrast_setup/Makefile.am.orig 2006-09-18 02:04:17.000000000 -0400
+++ GL/mesa/swrast_setup/Makefile.am
@@ -7,7 +7,6 @@ AM_CFLAGS = \
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \

42
modular-xorg-server-mesa653/patches/patch-as Normal file
View file

@ -0,0 +1,42 @@
$NetBSD: patch-as,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- GL/mesa/tnl/Makefile.am.orig 2006-09-18 02:04:17.000000000 -0400
+++ GL/mesa/tnl/Makefile.am
@@ -7,7 +7,6 @@ AM_CFLAGS = \
INCLUDES = -I@MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
@@ -19,16 +18,9 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I.. \
-I$(top_srcdir)/hw/xfree86/os-support
-nodist_libtnl_la_SOURCES = t_array_api.c \
- t_array_import.c \
- t_context.c \
+nodist_libtnl_la_SOURCES = t_context.c \
+ t_draw.c \
t_pipeline.c \
- t_save_api.c \
- t_save_loopback.c \
- t_save_playback.c \
- t_vb_arbprogram.c \
- t_vb_arbprogram_sse.c \
- t_vb_arbshader.c \
t_vb_cull.c \
t_vb_fog.c \
t_vb_light.c \
@@ -42,9 +34,4 @@ nodist_libtnl_la_SOURCES = t_array_api.c
t_vertex.c \
t_vertex_generic.c \
t_vertex_sse.c \
- t_vp_build.c \
- t_vtx_api.c \
- t_vtx_eval.c \
- t_vtx_exec.c \
- t_vtx_generic.c \
- t_vtx_x86.c
+ t_vp_build.c

40
modular-xorg-server-mesa653/patches/patch-at Normal file
View file

@ -0,0 +1,40 @@
$NetBSD: patch-at,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- GL/mesa/vbo/Makefile.am.orig 2007-05-01 21:01:36.000000000 -0400
+++ GL/mesa/vbo/Makefile.am
@@ -0,0 +1,35 @@
+noinst_LTLIBRARIES = libvbo.la
+
+AM_CFLAGS = \
+ $(DIX_CFLAGS) \
+ -DXFree86Server \
+ @GLX_DEFINES@
+
+INCLUDES = -I@MESA_SOURCE@/include \
+ -I../X \
+ -I../glapi \
+ -I../main \
+ -I../math \
+ -I../shader \
+ -I../shader/slang \
+ -I../shader/slang \
+ -I../swrast \
+ -I../swrast_setup \
+ -I../tnl \
+ -I.. \
+ -I$(top_srcdir)/hw/xfree86/os-support
+
+nodist_libvbo_la_SOURCES = vbo_context.c \
+ vbo_exec_api.c \
+ vbo_exec_array.c \
+ vbo_exec.c \
+ vbo_exec_draw.c \
+ vbo_exec_eval.c \
+ vbo_rebase.c \
+ vbo_save_api.c \
+ vbo_save.c \
+ vbo_save_draw.c \
+ vbo_save_loopback.c \
+ vbo_split.c \
+ vbo_split_copy.c \
+ vbo_split_inplace.c

84
modular-xorg-server-mesa653/patches/patch-au Normal file
View file

@ -0,0 +1,84 @@
$NetBSD: patch-au,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- GL/symlink-mesa.sh.orig 2006-10-04 17:46:03.000000000 -0400
+++ GL/symlink-mesa.sh
@@ -85,15 +85,6 @@ symlink_mesa_math() {
done
}
-symlink_mesa_ac() {
- src_dir src/mesa/array_cache
- dst_dir mesa/array_cache
-
- for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
- action `basename $src`
- done
-}
-
symlink_mesa_swrast() {
src_dir src/mesa/swrast
dst_dir mesa/swrast
@@ -157,6 +148,15 @@ symlink_mesa_shader_slang_library() {
done
}
+symlink_mesa_vbo() {
+ src_dir src/mesa/vbo
+ dst_dir mesa/vbo
+
+ for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
+ action `basename $src`
+ done
+}
+
symlink_mesa_x() {
src_dir src/mesa/drivers/x11
dst_dir mesa/X
@@ -168,6 +168,8 @@ symlink_mesa_x() {
action xm_api.c
action xm_buffer.c
action xm_dd.c
+ action xm_image.c
+ action xm_image.h
action xm_line.c
action xm_span.c
action xm_tri.c
@@ -203,7 +205,6 @@ symlink_mesa_x8664() {
symlink_mesa() {
symlink_mesa_main
symlink_mesa_math
- symlink_mesa_ac
symlink_mesa_swrast
symlink_mesa_ss
symlink_mesa_tnl
@@ -215,6 +216,7 @@ symlink_mesa() {
symlink_mesa_glapi
symlink_mesa_ppc
symlink_mesa_sparc
+ symlink_mesa_vbo
symlink_mesa_x86
symlink_mesa_x8664
}
@@ -225,9 +227,6 @@ symlink_glx() {
dst_dir glx
action indirect_size.h
-
- src_dir src/mesa/drivers/dri/common
-
action glcontextmodes.c
action glcontextmodes.h
@@ -289,9 +288,9 @@ action() {
}
usage() {
- echo symlink.sh src-dir dst-dir
- echo src-dir: the xc directory of the monolithic source tree
- echo dst-dir: the modular source tree containing proto, app, lib, ...
+ echo symlink-mesa.sh src-dir dst-dir
+ echo src-dir: the Mesa source directory
+ echo dst-dir: the GL subdirectory of the Xserver modular tree
}
# Check commandline args

20
modular-xorg-server-mesa653/patches/patch-av Normal file
View file

@ -0,0 +1,20 @@
$NetBSD: patch-av,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- composite/compalloc.c.orig 2007-03-17 20:29:16.000000000 -0400
+++ composite/compalloc.c
@@ -478,6 +478,7 @@ compNewPixmap (WindowPtr pWin, int x, in
* Copy bits from the parent into the new pixmap so that it will
* have "reasonable" contents in case for background None areas.
*/
+#if 0
if (pGC)
{
XID val = IncludeInferiors;
@@ -492,6 +493,7 @@ compNewPixmap (WindowPtr pWin, int x, in
w, h, 0, 0);
FreeScratchGC (pGC);
}
+#endif
return pPixmap;
}

31
modular-xorg-server-mesa653/patches/patch-aw Normal file
View file

@ -0,0 +1,31 @@
$NetBSD: patch-aw,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- composite/compwindow.c.orig 2007-03-17 20:29:16.000000000 -0400
+++ composite/compwindow.c
@@ -571,12 +571,15 @@ compCopyWindow (WindowPtr pWin, DDXPoint
}
else
{
+ CompWindowPtr cw = GetCompWindow (pWin);
+
ptOldOrg.x -= dx;
ptOldOrg.y -= dy;
REGION_TRANSLATE (prgnSrc, prgnSrc,
pWin->drawable.x - ptOldOrg.x,
pWin->drawable.y - ptOldOrg.y);
- DamageDamageRegion (&pWin->drawable, prgnSrc);
+ if (pWin->redirectDraw && cw->update == CompositeRedirectAutomatic)
+ DamageDamageRegion (&pWin->drawable, prgnSrc);
}
cs->CopyWindow = pScreen->CopyWindow;
pScreen->CopyWindow = compCopyWindow;
@@ -655,7 +658,8 @@ compSetRedirectBorderClip (WindowPtr pWi
/*
* Report that as damaged so it will be redrawn
*/
- DamageDamageRegion (&pWin->drawable, &damage);
+ if (cw->update == CompositeRedirectAutomatic)
+ DamageDamageRegion (&pWin->drawable, &damage);
REGION_UNINIT (pScreen, &damage);
/*
* Save the new border clip region

12
modular-xorg-server-mesa653/patches/patch-ax Normal file
View file

@ -0,0 +1,12 @@
$NetBSD: patch-ax,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- configure.ac.orig 2007-04-19 21:23:40.000000000 -0400
+++ configure.ac
@@ -1697,6 +1697,7 @@ GL/mesa/shader/slang/Makefile
GL/mesa/swrast/Makefile
GL/mesa/swrast_setup/Makefile
GL/mesa/tnl/Makefile
+GL/mesa/vbo/Makefile
GL/mesa/X/Makefile
include/Makefile
afb/Makefile

13
modular-xorg-server-mesa653/patches/patch-ay Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-ay,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- hw/dmx/glxProxy/glxext.h.orig 2006-09-18 02:04:17.000000000 -0400
+++ hw/dmx/glxProxy/glxext.h
@@ -67,7 +67,7 @@ extern void __glXFreeGLXPixmap( __GLXpix
extern void __glXNoSuchRenderOpcode(GLbyte*);
extern int __glXNoSuchSingleOpcode(__GLXclientState*, GLbyte*);
-extern void __glXErrorCallBack(__GLinterface *gc, GLenum code);
+extern void __glXErrorCallBack(GLenum code);
extern void __glXClearErrorOccured(void);
extern GLboolean __glXErrorOccured(void);
extern void __glXResetLargeCommandStatus(__GLXclientState*);

18
modular-xorg-server-mesa653/patches/patch-az Normal file
View file

@ -0,0 +1,18 @@
$NetBSD: patch-az,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- hw/xfree86/common/xf86Helper.c.orig 2006-11-16 13:01:24.000000000 -0500
+++ hw/xfree86/common/xf86Helper.c
@@ -2394,6 +2394,13 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, con
&errmaj, &errmin);
if (!ret)
LoaderErrorMsg(pScrn->name, name, errmaj, errmin);
+
+ /* "drm" module has been merged into "dri" module, but some drivers
+ are still trying to load it explictely and fail if it doesn't exist :-( */
+ if (!ret && !strcmp(name,"drm")) {
+ ret = (pointer) -1;
+ }
+
return ret;
}

35
modular-xorg-server-mesa653/patches/patch-ba Normal file
View file

@ -0,0 +1,35 @@
$NetBSD: patch-ba,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- hw/xfree86/xaa/xaaInit.c.orig 2006-09-18 02:04:18.000000000 -0400
+++ hw/xfree86/xaa/xaaInit.c
@@ -97,6 +97,30 @@ XAADestroyInfoRec(XAAInfoRecPtr infoRec)
xfree(infoRec);
}
+void
+XAAEvictPixmaps(void)
+{
+ XAAScreenPtr pScreenPriv;
+ XAAInfoRecPtr infoRec;
+ ScreenPtr pScreen;
+ int i;
+
+ xf86MsgVerb(X_INFO, 3, "XAA: Evicting pixmaps\n");
+
+ for (i = 0; i < screenInfo.numScreens; i++) {
+ pScreen = screenInfo.screens[i];
+ infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+
+ pScreenPriv = pScreen->devPrivates[XAAScreenIndex].ptr;
+ infoRec = pScreenPriv->AccelInfoRec;
+
+ infoRec->offscreenDepths = 0;
+ infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
+
+ XAAMoveOutOffscreenPixmaps(pScreen);
+ XAAInvalidatePixmapCache(pScreen);
+ }
+}
Bool
XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)

13
modular-xorg-server-mesa653/patches/patch-da Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-da,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- Xext/shm.c.orig 2006-09-18 02:04:17.000000000 -0400
+++ Xext/shm.c
@@ -156,7 +156,7 @@ static ShmFuncs fbFuncs = {fbShmCreatePi
}
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__DragonFly__)
#include <sys/signal.h>
static Bool badSysCall = FALSE;

13
modular-xorg-server-mesa653/patches/patch-db Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-db,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- Xext/xf86bigfont.c.orig 2006-09-18 02:04:17.000000000 -0400
+++ Xext/xf86bigfont.c
@@ -104,7 +104,7 @@ static unsigned int pagesize;
static Bool badSysCall = FALSE;
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__DragonFly__)
#include <sys/signal.h>

13
modular-xorg-server-mesa653/patches/patch-dc Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-dc,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- hw/xfree86/loader/os.c.orig 2006-07-01 14:12:40.000000000 -0400
+++ hw/xfree86/loader/os.c
@@ -42,6 +42,8 @@
#define OSNAME "linux"
#elif defined(__FreeBSD__)
#define OSNAME "freebsd"
+#elif defined(__DragonFly__)
+#define OSNAME "dragonfly"
#elif defined(__NetBSD__)
#define OSNAME "netbsd"
#elif defined(__OpenBSD__)

13
modular-xorg-server-mesa653/patches/patch-dd Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-dd,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- hw/xfree86/os-support/bus/Pci.h.orig 2006-11-16 12:39:04.000000000 -0500
+++ hw/xfree86/os-support/bus/Pci.h
@@ -235,7 +235,7 @@
# if defined(linux)
# define ARCH_PCI_INIT axpPciInit
# define INCLUDE_XF86_MAP_PCI_MEM
-# elif defined(__FreeBSD__) || defined(__OpenBSD__)
+# elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
# define ARCH_PCI_INIT freebsdPciInit
# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN

13
modular-xorg-server-mesa653/patches/patch-de Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-de,v 1.1 2007/05/02 01:27:29 bsadewitz Exp $
--- hw/xfree86/os-support/bus/freebsdPci.c.orig 2006-09-18 02:04:18.000000000 -0400
+++ hw/xfree86/os-support/bus/freebsdPci.c
@@ -83,7 +83,7 @@ static pciBusInfo_t freebsdPci0 = {
/* bridge */ NULL
};
-#if !defined(__OpenBSD__) && !defined(__FreeBSD__)
+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__)
#if X_BYTE_ORDER == X_BIG_ENDIAN
#ifdef __sparc__
#ifndef ASI_PL