sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resurrect dri-devel with a snapshot of today's DRI CVS. It contains only the

Browse source 
OpenGL drivers, like the graphics/dri port, rather than also providing the
XFree86 server, 2d drivers, and related modules.
This commit is contained in:
Eric Anholt 2003-11-12 04:27:31 +00:00
parent 174afe5c1b
commit 98be7ccb06
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=93786
11 changed files with 62 additions and 202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
graphics/dri-devel/Makefile
View file

@ -1,4 +1,4 @@
# Ports collection makefile for: dri development
# Ports collection makefile for: dri-devel
# Date created: Wed Aug 21 14:47:34 PDT 2002
# Whom: Eric Anholt <anholt@FreeBSD.org>
#
@ -6,84 +6,44 @@
#
PORTNAME= dri
PORTVERSION= 20021008
PORTREVISION= 1
CATEGORIES= graphics x11-servers
PORTVERSION= 4.3.99.12.20031111
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= anholt/dri-devel
PKGNAMESUFFIX= -devel
DISTNAME= dri-20020826
PATCH_SITES= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= anholt/dri-devel
PATCHFILES= dri-20020826-${PORTVERSION}.diff.bz2
DISTNAME= ${PORTNAME}-20031111
MAINTAINER= anholt@FreeBSD.org
COMMENT= Unstable DRI (3d HW OpenGL acceleration) drivers for some chipsets
RUN_DEPENDS= XFree86:${PORTSDIR}/x11-servers/XFree86-4-Server
COMMENT= OpenGL hardware acceleration drivers snapshot for XFree86
WRKSRC= ${WRKDIR}/xc
IGNORE= outdated, use updated XFree86 4.3.0 ports
BUILD_WRKSRC= ${WRKSRC}/lib/GL
USE_BZIP2= yes
USE_X_PREFIX= yes
MAKE_ENV= FBSDCFLAGS="${CFLAGS}" FBSDCC="${CC}" FBSDCXX="${CXX}"
INSTALLS_SHLIB= yes
USE_REINPLACE= yes
DRILIST= i810/i810_dri.so i830/i830_dri.so \
r128/r128_dri.so radeon/radeon_dri.so r200/r200_dri.so \
gamma/gamma_dri.so mga/mga_dri.so tdfx/tdfx_dri.so
DDXLIST= ati/r128_drv.o ati/radeon_drv.o \
i810/i810_drv.o \
mga/mga_drv.o tdfx/tdfx_drv.o
XMAKEFILE_TARGETS= VerifyOS version.def Makefiles includes depend
pre-fetch::
@${ECHO_MSG} "********************************************************"
@${ECHO_MSG} "This port installs unstable, development-class drivers."
@${ECHO_MSG} "It comes from snapshots of DRI CVS (http://dri.sf.net)"
@${ECHO_MSG} "If you just want 3d, that is included with XFree86."
@${ECHO_MSG} "********************************************************"
post-patch:
@${REINPLACE_CMD} -e 's/DRI trunk/DRI trunk: dri-devel-${PORTVERSION}/g' \
${WRKSRC}/config/cf/host.def
DRILIST= gamma/gamma_dri.so i810/i810_dri.so i830/i830_dri.so \
mga/mga_dri.so r128/r128_dri.so r200/r200_dri.so \
radeon/radeon_dri.so sis/sis_dri.so tdfx/tdfx_dri.so
do-configure:
@${RM} -f ${WRKSRC}/config/cf/version.def
@${ECHO} "" > ${WRKSRC}/config/cf/version.def
@${RM} -f ${WRKSRC}/config/cf/date.def
@${TOUCH} ${WRKSRC}/config/cf/version.def
@${TOUCH} ${WRKSRC}/config/cf/date.def
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} Makefile.boot
.for target in ${XMAKEFILE_TARGETS}
.for target in VerifyOS version.def Makefiles includes depend
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} -f xmakefile ${target}
.endfor
pre-build:
cd ${WRKSRC}/config && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
do-install:
${INSTALL_DATA} ${WRKSRC}/lib/GL/GL/libGL.so.1.2 ${PREFIX}/lib/libGL.so.1
${INSTALL_DATA} ${WRKSRC}/lib/GLU/libGLU.so.1.3 ${PREFIX}/lib/libGLU.so.1
${INSTALL_DATA} ${WRKSRC}/lib/GL/mesa/src/OSmesa/libOSMesa.so.4.0 \
${PREFIX}/lib/libOSMesa.so.4
.for i in ${DRILIST}
${INSTALL_DATA} ${WRKSRC}/lib/GL/mesa/src/drv/${i} \
${PREFIX}/lib/modules/dri
.endfor
.for i in ${DDXLIST}
${INSTALL_DATA} ${WRKSRC}/programs/Xserver/hw/xfree86/drivers/${i} \
${PREFIX}/lib/modules/drivers
.endfor
${INSTALL_DATA} ${WRKSRC}/programs/Xserver/hw/xfree86/os-support/bsd/drm/libdrm.a \
${PREFIX}/lib/modules/freebsd/
${INSTALL_DATA} ${WRKSRC}/programs/Xserver/hw/xfree86/xaa/libxaa.a \
${PREFIX}/lib/modules/extensions/
${INSTALL_DATA} ${WRKSRC}/programs/Xserver/GL/dri/libdri.a \
${PREFIX}/lib/modules/extensions/
${INSTALL_DATA} ${WRKSRC}/programs/Xserver/GL/libglx.a \
${PREFIX}/lib/modules/extensions/
${INSTALL_DATA} ${WRKSRC}/programs/Xserver/GL/mesa/GLcore/libGLcore.a \
${PREFIX}/lib/modules/extensions/
${INSTALL_PROGRAM} ${WRKSRC}/programs/Xserver/XFree86 ${PREFIX}/bin
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>

3
graphics/dri-devel/distinfo
View file

@ -1,2 +1 @@
MD5 (dri-20020826.tar.bz2) = 2a598aeb7833e0840ab7046978feac2b
MD5 (dri-20020826-20021008.diff.bz2) = 092791e8e40129850ae6daa277975d17
MD5 (dri-20031111.tar.bz2) = 416419347b33a8cfeb890076254ec554

33
graphics/dri-devel/files/patch-FreeBSD.cf
View file

@ -1,37 +1,14 @@
--- config/cf/FreeBSD.cf.orig Mon Aug 26 19:58:16 2002
+++ config/cf/FreeBSD.cf Sun Nov 24 10:25:09 2002
@@ -89,10 +89,18 @@
# if HasLibPthread
# define ThreadsLibraries -lpthread
# else
-# define BuildThreadStubLibrary YES
-# define NeedUIThrStubs YES
-# define ThreadsCompileFlags -pthread
-# define ThreadsLibraries -pthread
+# if OSRelVersion >= 500043
+# define BuildThreadStubLibrary YES
+# define NeedUIThrStubs YES
+# else
+# define BuildThreadStubLibrary YES
+# define NeedUIThrStubs YES
+# endif
+# if (OSRelVersion >= 500016)
+# define ThreadsLibraries -lc_r
+# else
+# define ThreadsLibraries -pthread
+# endif
# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB)
# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
# endif
@@ -144,6 +152,7 @@
--- config/cf/FreeBSD.cf.orig Thu Oct 9 02:55:57 2003
+++ config/cf/FreeBSD.cf Tue Nov 11 17:41:44 2003
@@ -166,6 +166,7 @@
*
* ld: warning: libXThrStub.so.6, needed by libX11.so, not found
*/
+/*
#if BuildThreadStubLibrary && !UseInstalled
#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
# define CcCmd $(CLIENTENVSETUP) cc
# define CplusplusCmd $(CLIENTENVSETUP) c++
@@ -151,6 +160,9 @@
@@ -173,6 +174,9 @@
# define CcCmd cc
# define CplusplusCmd c++
#endif

11
graphics/dri-devel/files/patch-GL-Imakefile Normal file
View file

@ -0,0 +1,11 @@
--- lib/GL/Imakefile.orig Tue Nov 11 18:00:25 2003
+++ lib/GL/Imakefile Tue Nov 11 18:00:26 2003
@@ -110,7 +110,7 @@
#if BuildXF86DRI && GlxUseBuiltInDRIDriver
SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS)
#else
-SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS)
+SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(DRIVERDIRS)
#endif
MakeSubdirs($(SUBDIRS))

37
graphics/dri-devel/files/patch-bsdLib.rules
View file

@ -1,37 +0,0 @@
--- config/cf/bsdLib.rules.orig Wed Jul 10 17:25:29 2002
+++ config/cf/bsdLib.rules Wed Jul 10 17:25:32 2002
@@ -306,6 +306,34 @@
#endif /* SharedDepLibraryTarget */
+/*
+ * SharedDepCplusplusLibraryTarget - generate rules to create a shared library.
+ */
+#ifndef SharedDepCplusplusLibraryTarget
+#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\
+AllTarget(Concat(lib,libname.so.rev)) @@\
+ @@\
+Concat(lib,libname.so.rev): deplist @@\
+ $(RM) $@~ @@\
+ @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
+ (cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
+ $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
+ LinkBuildSonameLibrary($$SONAME) @@\
+ $(RM) $@ @@\
+ $(MV) $@~ $@ @@\
+ $(RM) Concat(lib,libname.so) @@\
+ $(LN) $@ Concat(lib,libname.so) @@\
+ LinkBuildLibrary($@) @@\
+ LinkBuildLibrary(Concat(lib,libname.so)) @@\
+ @@\
+clean:: @@\
+ @SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`; \ @@\
+ set -x; $(RM) $$SONAME @@\
+ $(RM) Concat(lib,libname.so) @@\
+ $(RM) Concat(lib,libname.so.rev)
+
+#endif /* SharedDepLibraryTarget */
+
#ifndef SharedDepModuleTarget
#define SharedDepModuleTarget(name,deps,solist) @@\
AllTarget(name) @@\

17
graphics/dri-devel/files/patch-drm_os_freebsd.h
View file

@ -1,17 +0,0 @@
Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_freebsd.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_freebsd.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_freebsd.h 29 Sep 2002 23:21:55 -0000 1.9
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm_os_freebsd.h 14 Oct 2002 23:35:24 -0000 1.10
@@ -142,7 +142,7 @@
#define DRM_HZ hz
#define DRM_WAIT_ON( ret, queue, timeout, condition ) \
-while (condition) { \
+while (!condition) { \
ret = tsleep( &(queue), PZERO | PCATCH, "drmwtq", (timeout) ); \
if ( ret ) \
return ret; \

32
graphics/dri-devel/files/patch-host.def
View file

@ -1,9 +1,10 @@
--- config/cf/host.def.orig Fri Aug 30 15:05:13 2002
+++ config/cf/host.def Fri Aug 30 15:12:10 2002
@@ -4,16 +4,10 @@
--- config/cf/host.def.orig Wed Oct 22 16:15:12 2003
+++ config/cf/host.def Tue Nov 11 17:48:48 2003
@@ -8,18 +8,10 @@
/* Don't use any special flags by default, but leave this here commented out
* so people see how to if they want
*/
#define XFree86CustomVersion "DRI trunk"
-/*
-#define DefaultGcc2AxpOpt -O2 -mcpu=ev6
-#define DefaultGcc2PpcOpt -O2 -mcpu=750
-#define DefaultGcc2i386Opt -O2
@ -14,19 +15,30 @@
-#else
-# define LibraryCDebugFlags -O2
-#endif
-*/
+#define DefaultGcc2AxpOpt ${FBSDCFLAGS}
+#define DefaultGcc2PpcOpt ${FBSDCFLAGS}
+#define DefaultGcc2i386Opt ${FBSDCFLAGS}
+#define LibraryCDebugFlags ${FBSDCFLAGS}
#define BuildXFree86ConfigTools YES
@@ -32,7 +26,7 @@
#define BuildXFree86ConfigTools YES
@@ -43,15 +35,17 @@
#if defined(FreeBSDArchitecture) && defined(HasGcc3) && HasGcc3
#define NoSystemWarn -Wno-system-headers
+#define AliasingArg -fno-strict-aliasing
#else
#define NoSystemWarn
+#define AliasingArg
#endif
#define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \
-Wmissing-prototypes -Wmissing-declarations \
-Wnested-externs
-#define DefaultCCOptions -ansi GccWarningOptions -pipe -g
+#define DefaultCCOptions -g
-Wredundant-decls -Wnested-externs -Wundef \
NoSystemWarn
-#define DefaultCCOptions -ansi -pedantic GccWarningOptions -pipe -g
+#define DefaultCCOptions AliasingArg GccWarningOptions
#define NormalLibGlx NO

10
graphics/dri-devel/files/patch-mga_driver.c
View file

@ -1,10 +0,0 @@
--- programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c.orig Thu Sep 19 00:12:42 2002
+++ programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c Thu Sep 19 00:13:56 2002
@@ -2745,6 +2745,7 @@
case PCI_CHIP_MGAG200:
case PCI_CHIP_MGAG200_PCI:
case PCI_CHIP_MGAG400:
+ case PCI_CHIP_MGAG550:
if(pMga->SecondCrtc == FALSE && pMga->HWCursor == TRUE) {
outMGAdac(MGA1064_CURSOR_BASE_ADR_LOW,
pMga->FbCursorOffset >> 10);

7
graphics/dri-devel/pkg-descr
View file

@ -1,8 +1,3 @@
dri-devel installs unstable DRI drivers from a CVS snapshot,
replacing parts of your existing XFree86-4 install.
Current major updates include r200 (8500) support, Transform and
Lighting for radeons, and pageflipping support for radeons. Requires
updated DRM to use. See pkg-message for information.
dri-devel installs DRI OpenGL hardware acceleration drivers from a CVS snapshot.
WWW: http://people.freebsd.org/~anholt/dri/

20
graphics/dri-devel/pkg-message
View file

@ -1,20 +0,0 @@
***********************************************************************
You have installed dri-devel, unstable DRI drivers. If you just wanted
hardware 3d support, XFree86 comes with support for most people and
you should reinstall XFree86-4-Server. Use this at your own risk.
***********************************************************************
For R200 (8500) support you will require an updated DRM. Radeon 1
users will need an updated DRM if they want TCL (Transform & Lighting)
support.
To do this, remove drm-kmod if you have it, and remove the DRM from
your kernel if you have it. You need /sys to point to the source
for your kernel. Then from this port's directory:
$ make configure
$ cd work/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel
$ make -f Makefile.bsd depend all install
This installs to your kernel's module directory, so you will have
to redo this after each kernel install.

18
graphics/dri-devel/pkg-plist
View file

@ -1,19 +1,9 @@
bin/XFree86
lib/libGL.so.1
lib/libGLU.so.1
lib/libOSMesa.so.4
lib/modules/dri/gamma_dri.so
lib/modules/dri/i810_dri.so
lib/modules/dri/i830_dri.so
lib/modules/dri/mga_dri.so
lib/modules/dri/r128_dri.so
lib/modules/dri/r200_dri.so
lib/modules/dri/radeon_dri.so
lib/modules/drivers/i810_drv.o
lib/modules/drivers/mga_drv.o
lib/modules/drivers/r128_drv.o
lib/modules/drivers/radeon_drv.o
lib/modules/drivers/tdfx_drv.o
lib/modules/extensions/libGLcore.a
lib/modules/extensions/libdri.a
lib/modules/extensions/libglx.a
lib/modules/extensions/libxaa.a
lib/modules/freebsd/libdrm.a
lib/modules/dri/sis_dri.so
lib/modules/dri/tdfx_dri.so