mirror of
https://git.freebsd.org/ports.git
synced 2025-07-17 09:19:15 -04:00
Update dri-devel to a 2006-06-24 snapshot.
Replace the annoying always-conflicting patch to freebsd-dri with a big REINPLACE_CMD.
This commit is contained in:
Eric Anholt
parent
18c4b9813b
commit
fbdf13efe6
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=166301
6 changed files with 22 additions and 103 deletions
|
|
@ -6,18 +6,14 @@
|
|||
#
|
||||
|
||||
PORTNAME= dri
|
||||
PORTVERSION= 6.2.20050719
|
||||
PORTVERSION= 6.5.20060624
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= ${MASTER_SITE_LOCAL} \
|
||||
http://people.freebsd.org/~anholt/dri/
|
||||
MASTER_SITE_SUBDIR= anholt
|
||||
DISTFILES= Mesa-20050719.tar.bz2 \
|
||||
drm-20050719.tar.bz2 \
|
||||
r300-20050719.tar.bz2
|
||||
|
||||
PATCH_SITES= http://people.freebsd.org/~anholt/dri/
|
||||
PATCHFILES= patch-r300_drm.bz2
|
||||
DISTFILES= Mesa-20060624.tar.bz2 \
|
||||
drm-20060624.tar.bz2
|
||||
|
||||
MAINTAINER= anholt@FreeBSD.org
|
||||
COMMENT= DRI OpenGL drivers snapshot
|
||||
|
|
@ -28,7 +24,7 @@ EXTRA_DISTFILES= \
|
|||
Mesa-20050719.tar.bz2 \
|
||||
drm-20050719.tar.bz2
|
||||
|
||||
CONFLICTS= xfree86-dri-[0-9]* dri-6.2_*
|
||||
CONFLICTS= xfree86-dri-[0-9]* dri-6.2_* dri-6.4_*
|
||||
|
||||
WRKSRC= ${WRKDIR}/Mesa
|
||||
USE_X_PREFIX= yes
|
||||
|
|
@ -49,20 +45,25 @@ DRIMODDIR= ${PREFIX}/lib/modules/dri
|
|||
USE_GCC= 3.4
|
||||
.endif
|
||||
|
||||
post-extract:
|
||||
(cd ${WRKSRC}/src/mesa/drivers/dri && \
|
||||
${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
|
||||
${DISTDIR}/r300-20050719.tar.bz2 ${EXTRACT_AFTER_ARGS} )
|
||||
|
||||
.if ${X_WINDOW_SYSTEM:L} != xorg
|
||||
IGNORE= requires libGL from X.Org.
|
||||
.endif
|
||||
|
||||
pre-patch:
|
||||
${REINPLACE_CMD} \
|
||||
-e 's|/usr/X11R6|${X11BASE}|g' \
|
||||
-e 's|/usr/local|${LOCALBASE}|g' \
|
||||
-e 's|gcc|${CC}|g' \
|
||||
-e 's|g++|${CXX}|g' \
|
||||
-e 's|CFLAGS = |CFLAGS = ${CFLAGS}|g' \
|
||||
-e 's|OPT_FLAGS = .*|OPT_FLAGS = ${CFLAGS}|g' \
|
||||
-e 's|-pthread|${PTHREAD_LIBS}|g' \
|
||||
${WRKSRC}/configs/freebsd-dri
|
||||
|
||||
do-install:
|
||||
${MKDIR} ${DRIMODDIR}
|
||||
.if ${ARCH} == i386
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/lib/i810_dri.so ${DRIMODDIR}
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/lib/i830_dri.so ${DRIMODDIR}
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR}
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/lib/unichrome_dri.so ${DRIMODDIR}
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/lib/tdfx_dri.so ${DRIMODDIR}
|
||||
|
|
@ -85,7 +86,7 @@ ALL_TARGET= freebsd-dri-x86
|
|||
.elif ${ARCH} == amd64
|
||||
PLIST_SUB+= I386="@comment "
|
||||
PLIST_SUB+= I386_AMD64=""
|
||||
ALL_TARGET= freebsd-dri
|
||||
ALL_TARGET= freebsd-dri-amd64
|
||||
.else
|
||||
PLIST_SUB+= I386="@comment "
|
||||
PLIST_SUB+= I386_AMD64="@comment "
|
||||
|
|
|
|||
|
|
@ -1,12 +1,6 @@
|
|||
MD5 (Mesa-20050719.tar.bz2) = a1d544f745acd30ba3165ef35fe94873
|
||||
SHA256 (Mesa-20050719.tar.bz2) = 5fef715fed1f16feb8f976e1cbde54cad623458148edc3f778bd2cac9bb361e3
|
||||
SIZE (Mesa-20050719.tar.bz2) = 4803354
|
||||
MD5 (drm-20050719.tar.bz2) = 41e97f1d4e72bccb94652489e2a17481
|
||||
SHA256 (drm-20050719.tar.bz2) = b56ddbecb50a4eec60d648d63ac94014d5a9e98d086d2b2675b0196e36dbb312
|
||||
SIZE (drm-20050719.tar.bz2) = 574577
|
||||
MD5 (r300-20050719.tar.bz2) = c0efa93184cc6a24d5c12d0d542429be
|
||||
SHA256 (r300-20050719.tar.bz2) = 736ae3c8f91099f26090bb0437feebf40b48ace2b8a6749e6110e1ef0b2a52a9
|
||||
SIZE (r300-20050719.tar.bz2) = 183141
|
||||
MD5 (patch-r300_drm.bz2) = f119e27184c3171c8ac4994ffd6b4cfe
|
||||
SHA256 (patch-r300_drm.bz2) = 168e6dfa3aed3f384767118a12e61399a19cebf4edc9e34d2a439049682d317f
|
||||
SIZE (patch-r300_drm.bz2) = 15578
|
||||
MD5 (Mesa-20060624.tar.bz2) = 62ba462919ef64d5f1c54cffe9a5c110
|
||||
SHA256 (Mesa-20060624.tar.bz2) = bbeb1c1528922994468b1b9e6135e4f45a4cffb9ffbace2a289382dd3911701b
|
||||
SIZE (Mesa-20060624.tar.bz2) = 5576542
|
||||
MD5 (drm-20060624.tar.bz2) = a7cc254ee5705892fa23771b72724934
|
||||
SHA256 (drm-20060624.tar.bz2) = 7736d46889a9cc7e169c657983d8c791b70438917302d272247c06276c306bb4
|
||||
SIZE (drm-20060624.tar.bz2) = 580419
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
--- configs/freebsd-dri.orig Sat May 28 13:17:06 2005
|
||||
+++ configs/freebsd-dri Wed Jul 20 00:17:01 2005
|
||||
@@ -6,30 +6,30 @@
|
||||
CONFIG_NAME = freebsd-dri
|
||||
|
||||
# Compiler and flags
|
||||
-CC = gcc
|
||||
-CXX = g++
|
||||
+CC = $(FBSDCC)
|
||||
+CXX = $(FBSDCXX)
|
||||
WARN_FLAGS = -Wall
|
||||
-OPT_FLAGS = -O
|
||||
+OPT_FLAGS = $(FBSDCFLAGS)
|
||||
|
||||
-EXPAT_INCLUDES = -I/usr/local/include
|
||||
-X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
|
||||
+EXPAT_INCLUDES = -I${LOCALBASE}/include
|
||||
+X11_INCLUDES = -I${X11BASE}/include -I${X11BASE}/include/X11/extensions
|
||||
DEFINES = -DDRI_NEW_INTERFACE_ONLY
|
||||
-CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC \
|
||||
- -ffast-math $(X11_INCLUDES)
|
||||
+CFLAGS = $(FBSDCFLAGS) $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef \
|
||||
+ -fPIC -ffast-math $(X11_INCLUDES)
|
||||
CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
|
||||
|
||||
ASM_SOURCES =
|
||||
|
||||
# Library/program dependencies
|
||||
-DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat
|
||||
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
|
||||
+DRI_LIB_DEPS = -L${LOCALBASE}/lib -lm ${PTHREAD_LIBS} -lexpat
|
||||
+GL_LIB_DEPS = -L${X11BASE}/lib -lX11 -lXext -lm ${PTHREAD_LIBS}
|
||||
|
||||
-GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
|
||||
-GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
|
||||
+GLUT_LIB_DEPS = -L$(LIB_DIR) -L${X11BASE}/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
|
||||
+GLW_LIB_DEPS = -L$(LIB_DIR) -L${X11BASE}/lib -lGL -lXt -lXm -lX11
|
||||
|
||||
|
||||
# Directories
|
||||
-SRC_DIRS = mesa glu glut/glx glw glx/x11
|
||||
+SRC_DIRS = mesa
|
||||
DRIVER_DIRS = dri
|
||||
PROGRAM_DIRS =
|
||||
WINDOW_SYSTEM=dri
|
||||
@@ -38,6 +38,6 @@
|
||||
|
||||
# ffb and gamma are missing because they have not been converted to use the new
|
||||
# interface.
|
||||
-DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon tdfx \
|
||||
+DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 r300 radeon tdfx \
|
||||
unichrome savage sis
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- include/GL/glext.h.orig Wed Jul 20 00:37:30 2005
|
||||
+++ include/GL/glext.h Wed Jul 20 00:37:39 2005
|
||||
@@ -4192,7 +4192,7 @@
|
||||
#ifndef GL_EXT_texture3D
|
||||
#define GL_EXT_texture3D 1
|
||||
#ifdef GL_GLEXT_PROTOTYPES
|
||||
-GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
|
||||
+GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
|
||||
GLAPI void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
|
||||
#endif /* GL_GLEXT_PROTOTYPES */
|
||||
typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- src/mesa/drivers/dri/r300/r300_context.c.orig Wed Jul 20 01:01:19 2005
|
||||
+++ src/mesa/drivers/dri/r300/r300_context.c Wed Jul 20 01:01:23 2005
|
||||
@@ -66,7 +66,7 @@
|
||||
int future_hw_tcl_on=0;
|
||||
int hw_tcl_on=0;
|
||||
|
||||
-#if 1
|
||||
+#if 0
|
||||
#define need_GL_ARB_multisample
|
||||
#define need_GL_ARB_texture_compression
|
||||
#define need_GL_EXT_blend_minmax
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
%%I386%%lib/modules/dri/i810_dri.so
|
||||
%%I386%%lib/modules/dri/i830_dri.so
|
||||
%%I386_AMD64%%lib/modules/dri/i915_dri.so
|
||||
lib/modules/dri/mach64_dri.so
|
||||
lib/modules/dri/mga_dri.so
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue