diff options
| author | Will Andrews <will@FreeBSD.org> | 2002-03-16 23:40:19 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2002-03-16 23:40:19 +0000 |
| commit | 92becb4baf7713b343d948a652f39579b35fcb52 (patch) | |
| tree | e95fd7d2f39f40888e10b2d3afdb76e7196d0055 /x11/XFree86-4-libraries/files/patch-DRI | |
| parent | XFree86 4.2.0 Stage 1: bsd.port.mk (diff) | |
XFree86 4.2.0 Stage 2: XFree86-4-* miniport upgrades
[1] Upgrade to 4.2.0.
[2] Allow Wraphelp.c to be fetched by default, set HasXdmAuth=YES
by default.
Submitted by: [1] sf, taguchi@tohoku.iij.ad.jp
Approved by: [2] core
Notes
Notes:
svn path=/head/; revision=56229
Diffstat (limited to 'x11/XFree86-4-libraries/files/patch-DRI')
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-DRI | 62 |
1 files changed, 36 insertions, 26 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-DRI b/x11/XFree86-4-libraries/files/patch-DRI index 6b51e4dd1f2d..5d18c6e1ac24 100644 --- a/x11/XFree86-4-libraries/files/patch-DRI +++ b/x11/XFree86-4-libraries/files/patch-DRI @@ -1,40 +1,50 @@ ---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/Makefile.orig Wed Apr 11 11:15:17 2001 -+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/Makefile Wed Apr 11 11:18:01 2001 -@@ -6,6 +6,7 @@ - agpsupport.c ctxbitmap.c - SRCS += device_if.h bus_if.h pci_if.h - CFLAGS += ${DEBUG_FLAGS} -I.. -+KMODDIR = ${X11BASE}/lib/X11/kernel +--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/Makefile.orig Thu Dec 13 09:24:52 2001 ++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/Makefile Sat Jan 19 21:35:22 2002 +@@ -5,6 +5,7 @@ + SRCS= tdfx_drv.c + SRCS+= device_if.h bus_if.h pci_if.h opt_drm_linux.h + CFLAGS+= ${DEBUG_FLAGS} -I. -I.. ++KMODDIR = ${X11BASE}/lib/X11/kernel @: ln -sf /sys @ ---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/Makefile.orig Wed Apr 11 11:20:15 2001 -+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/Makefile Wed Apr 11 11:20:31 2001 +--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/Makefile.orig Thu Dec 13 09:24:49 2001 ++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/Makefile Sat Jan 19 21:37:05 2002 @@ -5,6 +5,7 @@ - SRCS += device_if.h bus_if.h pci_if.h - CFLAGS += ${DEBUG_FLAGS} -I.. - KMODDEPS = drm -+KMODDIR = ${X11BASE}/lib/X11/kernel + SRCS = gamma_drv.c gamma_dma.c + SRCS += device_if.h bus_if.h pci_if.h opt_drm_linux.h + CFLAGS += ${DEBUG_FLAGS} -I. -I.. ++KMODDIR= ${X11BASE}/lib/X11/kernel @: ln -sf /sys @ ---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/Makefile.orig Wed Apr 11 11:17:21 2001 -+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/Makefile Wed Apr 11 11:20:01 2001 +--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/Makefile.orig Thu Dec 13 09:24:49 2001 ++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/Makefile Sat Jan 19 21:36:20 2002 @@ -5,6 +5,7 @@ - SRCS += device_if.h bus_if.h pci_if.h - CFLAGS += ${DEBUG_FLAGS} -I.. - KMODDEPS = drm -+KMODDIR = ${X11BASE}/lib/X11/kernel + SRCS= mga_drv.c mga_state.c mga_warp.c mga_dma.c + SRCS+= device_if.h bus_if.h pci_if.h opt_drm_linux.h + CFLAGS+= ${DEBUG_FLAGS} -I. -I.. ++KMODDIR= ${X11BASE}/lib/X11/kernel @: ln -sf /sys @ ---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/Makefile.orig Wed Apr 11 11:20:10 2001 -+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/Makefile Wed Apr 11 11:20:22 2001 -@@ -6,6 +6,7 @@ - CFLAGS += ${DEBUG_FLAGS} -I.. - KERN = /usr/src/sys - KMODDEPS = drm -+KMODDIR = ${X11BASE}/lib/X11/kernel +--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128/Makefile.orig Thu Dec 13 09:24:50 2001 ++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128/Makefile Mon Jan 21 10:17:46 2002 +@@ -5,6 +5,7 @@ + SRCS = r128_cce.c r128_drv.c r128_state.c + SRCS += device_if.h bus_if.h pci_if.h opt_drm_linux.h + CFLAGS += ${DEBUG_FLAGS} -I. -I.. ++KMODDIR= ${X11BASE}/lib/X11/kernel + + @: + ln -sf /sys @ +--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon/Makefile.orig Thu Dec 13 09:24:51 2001 ++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon/Makefile Mon Jan 21 10:17:21 2002 +@@ -5,6 +5,7 @@ + SRCS = radeon_cp.c radeon_drv.c radeon_state.c + SRCS += device_if.h bus_if.h pci_if.h opt_drm_linux.h + CFLAGS += ${DEBUG_FLAGS} -I. -I.. ++KMODDIR= ${X11BASE}/lib/X11/kernel @: ln -sf /sys @ |