mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00
Code Issues Releases Activity

Update to always compile DRI on i386 machines, including 3dfx support.

Browse Source 
/sys no longer needs to be accessible, nor does Glide support (unlike with
4.1.0).  Bump PORTREVISION to denote update.

PR:		36181
Submitted by:	Eric Anholt <eanholt@gladstone.uoregon.edu>
This commit is contained in:
Will Andrews 2002-04-02 02:03:31 +00:00
parent 5d446a33fa
commit ab86baa5a0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=57165
9 changed files with 55 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
x11-servers/XFree86-4-Server-snap/Makefile
View File

@ -7,9 +7,7 @@
PORTNAME= Server
PORTVERSION= 4.2.0
.if defined(WITH_MATROX_GXX_DRIVER)
PORTREVISION= 1
.endif
PORTREVISION= 2
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE} \
ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
@ -34,7 +32,7 @@ SCRIPTS_ENV= OSVERSION=${OSVERSION} \
HasPam=${HasPam} \
ExtendedInputDevices=${ExtendedInputDevices} \
BuildXF86DRI=${BuildXF86DRI} \
BuildXF86DRM=${BuildXF86DRM} \
HasGlide3=${HasGlide3} \
HaveMatroxHal=${HaveMatroxHal}
MAKE_ENV= MAN_INSTALL_TARGET=FreeBSDPortsInstall.man WORLDOPTS=
MAKE_ARGS= WORLDOPTS=
@ -88,23 +86,24 @@ HasXdmAuth?= YES
HasSecureRPC?= DEFAULT
HasPam?= DEFAULT
ExtendedInputDevices?= DEFAULT
.if ${ARCH} == i386 && (exists(/sys) || exists(/usr/src/sys))
.if ${ARCH} == i386
BuildXF86DRI= YES
BuildXF86DRM= YES
PLIST_SUB+= DRI=""
PLIST_SUB+= DRI_KMOD=""
MASTER_SITES+= http://gladstone.uoregon.edu/~eanholt/dri/:glide
DISTFILES+= freebsd-glide3headers.tar.gz:glide
HasGlide3= YES
post-extract:
@(cd ${WRKSRC}/lib/GL/mesa/src/drv/tdfx/ ; \
tar xfpz ${DISTDIR}/${DIST_SUBDIR}/freebsd-glide3headers.tar.gz)
.else
pre-fetch::
.if ${ARCH} == i386
@${ECHO_MSG} "DRI would not build: kernel source required in /sys."
.else
@${ECHO_MSG} "DRI only built on i386"
.endif # i386
BuildXF86DRI= NO
BuildXF86DRM= NO
HasGlide3= NO
PLIST_SUB+= DRI="@comment "
PLIST_SUB+= DRI_KMOD="@comment "
.endif # have /sys
.endif # i386
# Some things are not applicable if this machine is an alpha
.if ${ARCH} == alpha
@ -197,16 +196,8 @@ PLIST_SUB+= MATROX="@comment "
do-configure:
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
.if ${BuildXF86DRM} == "YES"
pre-install:
${MKDIR} ${PREFIX}/lib/X11/kernel
.endif
post-build:
@${RM} -f ${PKGMESSAGE}
.if ${BuildXF86DRM} == "YES"
@${CAT} ${.CURDIR}/pkg-message-drm > ${PKGMESSAGE}
.endif
@${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE}
post-install::

1
x11-servers/XFree86-4-Server-snap/distinfo
View File

@ -1,3 +1,4 @@
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d
MD5 (xc/Wraphelp.c) = IGNORE
MD5 (xc/freebsd-glide3headers.tar.gz) = 2bb614c909898a17c05e43e60cfb8e3b

9
x11-servers/XFree86-4-Server-snap/pkg-plist
View File

@ -47,12 +47,6 @@ lib/X11/etc/Xinstall.sh
lib/X11/etc/sun.termcap
lib/X11/etc/sun.terminfo
lib/X11/etc/xmodmap.std
%%DRI_KMOD%%lib/X11/kernel/gamma.ko
%%DRI_KMOD%%lib/X11/kernel/mga.ko
%%DRI_KMOD%%lib/X11/kernel/r128.ko
%%DRI_KMOD%%lib/X11/kernel/radeon.ko
%%DRI_KMOD%%lib/X11/kernel/tdfx.ko
%%DRI_KMOD%%@dirrm lib/X11/kernel
lib/X11/xserver/SecurityPolicy
lib/modules/codeconv/libARABIC.a
lib/modules/codeconv/libARMSCII8.a
@ -88,9 +82,10 @@ lib/modules/codeconv/libVISCII.a
%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so
%%I386:%%%%DRI%%lib/modules/dri/i830_dri.so
%%DRI%%lib/modules/dri/mga_dri.so
%%DRI%%lib/modules/dri/radeon_dri.so
%%I386:%%%%DRI%%lib/modules/dri/radeon_dri.so
%%I386:%%%%DRI%%lib/modules/dri/r128_dri.so
%%I386:%%%%DRI%%lib/modules/dri/sis_dri.so
%%DRI%%lib/modules/dri/tdfx_dri.so
%%I386:%%lib/modules/drivers/apm_drv.o
%%I386:%%lib/modules/drivers/ark_drv.o
%%I386:%%lib/modules/drivers/ati_drv.o

4
x11-servers/XFree86-4-Server-snap/scripts/configure vendored
View File

@ -46,7 +46,9 @@ configure () {
echo "#define XInputDrivers mouse" >> $LOCALDEF
fi
echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF
echo "#define BuildXF86DRM ${BuildXF86DRM}" >> $LOCALDEF
echo "#define BuildXF86DRM NO" >> $LOCALDEF
echo "#define HasGlide3 ${HasGlide3}" >> $LOCALDEF
echo "#define Glide3IncDir glide3" >> $LOCALDEF
# Matrox driver support
echo "#define HaveMatroxHal $HaveMatroxHal" >> $LOCALDEF

35
x11-servers/XFree86-4-Server/Makefile
View File

@ -7,9 +7,7 @@
PORTNAME= Server
PORTVERSION= 4.2.0
.if defined(WITH_MATROX_GXX_DRIVER)
PORTREVISION= 1
.endif
PORTREVISION= 2
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE} \
ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
@ -34,7 +32,7 @@ SCRIPTS_ENV= OSVERSION=${OSVERSION} \
HasPam=${HasPam} \
ExtendedInputDevices=${ExtendedInputDevices} \
BuildXF86DRI=${BuildXF86DRI} \
BuildXF86DRM=${BuildXF86DRM} \
HasGlide3=${HasGlide3} \
HaveMatroxHal=${HaveMatroxHal}
MAKE_ENV= MAN_INSTALL_TARGET=FreeBSDPortsInstall.man WORLDOPTS=
MAKE_ARGS= WORLDOPTS=
@ -88,23 +86,24 @@ HasXdmAuth?= YES
HasSecureRPC?= DEFAULT
HasPam?= DEFAULT
ExtendedInputDevices?= DEFAULT
.if ${ARCH} == i386 && (exists(/sys) || exists(/usr/src/sys))
.if ${ARCH} == i386
BuildXF86DRI= YES
BuildXF86DRM= YES
PLIST_SUB+= DRI=""
PLIST_SUB+= DRI_KMOD=""
MASTER_SITES+= http://gladstone.uoregon.edu/~eanholt/dri/:glide
DISTFILES+= freebsd-glide3headers.tar.gz:glide
HasGlide3= YES
post-extract:
@(cd ${WRKSRC}/lib/GL/mesa/src/drv/tdfx/ ; \
tar xfpz ${DISTDIR}/${DIST_SUBDIR}/freebsd-glide3headers.tar.gz)
.else
pre-fetch::
.if ${ARCH} == i386
@${ECHO_MSG} "DRI would not build: kernel source required in /sys."
.else
@${ECHO_MSG} "DRI only built on i386"
.endif # i386
BuildXF86DRI= NO
BuildXF86DRM= NO
HasGlide3= NO
PLIST_SUB+= DRI="@comment "
PLIST_SUB+= DRI_KMOD="@comment "
.endif # have /sys
.endif # i386
# Some things are not applicable if this machine is an alpha
.if ${ARCH} == alpha
@ -197,16 +196,8 @@ PLIST_SUB+= MATROX="@comment "
do-configure:
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
.if ${BuildXF86DRM} == "YES"
pre-install:
${MKDIR} ${PREFIX}/lib/X11/kernel
.endif
post-build:
@${RM} -f ${PKGMESSAGE}
.if ${BuildXF86DRM} == "YES"
@${CAT} ${.CURDIR}/pkg-message-drm > ${PKGMESSAGE}
.endif
@${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE}
post-install::

1
x11-servers/XFree86-4-Server/distinfo
View File

@ -1,3 +1,4 @@
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d
MD5 (xc/Wraphelp.c) = IGNORE
MD5 (xc/freebsd-glide3headers.tar.gz) = 2bb614c909898a17c05e43e60cfb8e3b

9
x11-servers/XFree86-4-Server/pkg-plist
View File

@ -47,12 +47,6 @@ lib/X11/etc/Xinstall.sh
lib/X11/etc/sun.termcap
lib/X11/etc/sun.terminfo
lib/X11/etc/xmodmap.std
%%DRI_KMOD%%lib/X11/kernel/gamma.ko
%%DRI_KMOD%%lib/X11/kernel/mga.ko
%%DRI_KMOD%%lib/X11/kernel/r128.ko
%%DRI_KMOD%%lib/X11/kernel/radeon.ko
%%DRI_KMOD%%lib/X11/kernel/tdfx.ko
%%DRI_KMOD%%@dirrm lib/X11/kernel
lib/X11/xserver/SecurityPolicy
lib/modules/codeconv/libARABIC.a
lib/modules/codeconv/libARMSCII8.a
@ -88,9 +82,10 @@ lib/modules/codeconv/libVISCII.a
%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so
%%I386:%%%%DRI%%lib/modules/dri/i830_dri.so
%%DRI%%lib/modules/dri/mga_dri.so
%%DRI%%lib/modules/dri/radeon_dri.so
%%I386:%%%%DRI%%lib/modules/dri/radeon_dri.so
%%I386:%%%%DRI%%lib/modules/dri/r128_dri.so
%%I386:%%%%DRI%%lib/modules/dri/sis_dri.so
%%DRI%%lib/modules/dri/tdfx_dri.so
%%I386:%%lib/modules/drivers/apm_drv.o
%%I386:%%lib/modules/drivers/ark_drv.o
%%I386:%%lib/modules/drivers/ati_drv.o

4
x11-servers/XFree86-4-Server/scripts/configure vendored
View File

@ -46,7 +46,9 @@ configure () {
echo "#define XInputDrivers mouse" >> $LOCALDEF
fi
echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF
echo "#define BuildXF86DRM ${BuildXF86DRM}" >> $LOCALDEF
echo "#define BuildXF86DRM NO" >> $LOCALDEF
echo "#define HasGlide3 ${HasGlide3}" >> $LOCALDEF
echo "#define Glide3IncDir glide3" >> $LOCALDEF
# Matrox driver support
echo "#define HaveMatroxHal $HaveMatroxHal" >> $LOCALDEF

17
x11/XFree86-4-libraries/files/patch-drmclean Normal file
View File

@ -0,0 +1,17 @@
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile.orig Tue Mar 19 17:35:44 2002
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile Tue Mar 19 17:35:50 2002
@@ -11,10 +11,11 @@
install::
$(MAKE) -f Makefile.bsd install
+
+clean::
+ $(MAKE) -f Makefile.bsd clean
+
#else
all::
@echo 'Use "make -f Makefile.bsd" to manually build the modules'
#endif
-
-clean::
- $(MAKE) -f Makefile.bsd clean