[Midnightbsd-cvs] mports: graphics/dri: Upgraded to 7.0.1

ctriv at midnightbsd.org ctriv at midnightbsd.org
Tue Oct 2 21:27:19 EDT 2007 

Log Message:
-----------
Upgraded to 7.0.1

Modified Files:
--------------
    mports/graphics/dri:
        Makefile (r1.3 -> r1.4)
        distinfo (r1.1.1.1 -> r1.2)
        pkg-plist (r1.1.1.1 -> r1.2)

Added Files:
-----------
    mports/graphics/dri/files:
        patch-bin__mklib (r1.1)

Removed Files:
-------------
    mports/graphics/dri/files:
        patch-freebsd-dri
        patch-intel_context_c
        patch-intel_context_h
        patch-intel_screen_c

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/graphics/dri/pkg-plist,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lgraphics/dri/pkg-plist -Lgraphics/dri/pkg-plist -u -r1.1.1.1 -r1.2
--- graphics/dri/pkg-plist
+++ graphics/dri/pkg-plist
@@ -1,15 +1,14 @@
-%%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
-lib/modules/dri/r128_dri.so
-lib/modules/dri/r200_dri.so
-lib/modules/dri/r300_dri.so
-lib/modules/dri/radeon_dri.so
-lib/modules/dri/savage_dri.so
-lib/modules/dri/sis_dri.so
-%%I386%%lib/modules/dri/tdfx_dri.so
-%%I386%%lib/modules/dri/unichrome_dri.so
- at dirrm lib/modules/dri
- at dirrmtry lib/modules
+%%I386%%lib/dri/i810_dri.so
+%%I386_AMD64%%lib/dri/i915_dri.so
+%%I386%%lib/dri/i965_dri.so
+lib/dri/mach64_dri.so
+lib/dri/mga_dri.so
+lib/dri/r128_dri.so
+lib/dri/r200_dri.so
+lib/dri/r300_dri.so
+lib/dri/radeon_dri.so
+lib/dri/savage_dri.so
+lib/dri/sis_dri.so
+%%I386%%lib/dri/tdfx_dri.so
+%%I386%%lib/dri/unichrome_dri.so
+ at dirrm lib/dri
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/dri/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lgraphics/dri/Makefile -Lgraphics/dri/Makefile -u -r1.3 -r1.4
--- graphics/dri/Makefile
+++ graphics/dri/Makefile
@@ -2,51 +2,42 @@
 # Date created:		8 Nov 2003
 # Whom:			anholt at FreeBSD.org
 #
-# $MidnightBSD$
-# $FreeBSD: ports/graphics/dri/Makefile,v 1.17 2006/09/01 04:17:44 anholt Exp $
+# $FreeBSD: ports/graphics/dri/Makefile,v 1.24 2007/08/29 10:33:10 flz Exp $
 #
 
 PORTNAME=	dri
-PORTVERSION=	6.4.1
+PORTVERSION=	${MESAVERSION}
 PORTEPOCH=	2
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=mesa3d
-DISTNAME=	MesaLib-${PORTVERSION}
 
-MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	OpenGL hardware acceleration drivers for the DRI
 
-LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-BUILD_DEPENDS=	makedepend:${X_IMAKE_PORT}
+LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm \
+		expat.6:${PORTSDIR}/textproc/expat2
+BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 
 CONFLICTS=	xfree86-dri-* dri-6.2.2005* dri-6.5.2006*
 
-WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}
-USE_X_PREFIX=	yes
-USE_BZIP2=	yes
-USE_GMAKE=	yes
 MAKE_ENV+=	FBSDCC="${CC}" FBSDCXX="${CXX}" \
 		FBSDCFLAGS="${CFLAGS}" FBSDCXXFLAGS="${CXXFLAGS}" \
 		PTHREAD_LIBS=${PTHREAD_LIBS}
 USE_GCC=	3.4+
 
-ONLY_FOR_ARCHS=	i386 alpha amd64
+USE_XORG=	x11
 
-DRIMODDIR=	${PREFIX}/lib/modules/dri
+DRIMODDIR=	${PREFIX}/lib/dri
+SRCDIR=		mesa
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=	requires libGL from X.Org.
+.if !defined(ARCH)
+ARCH!=	uname -p
 .endif
 
 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/i965_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/unichrome_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/tdfx_dri.so ${DRIMODDIR}
 .elif ${ARCH} == amd64
@@ -61,17 +52,6 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/savage_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/sis_dri.so ${DRIMODDIR}
 
-.if ${ARCH} == i386
-PLIST_SUB+=	I386=""
-PLIST_SUB+=	I386_AMD64=""
-ALL_TARGET=	freebsd-dri-x86
-.elif ${ARCH} == amd64
-PLIST_SUB+=	I386="@comment "
-PLIST_SUB+=	I386_AMD64=""
-ALL_TARGET=	freebsd-dri
-.else
-PLIST_SUB+=	I386="@comment "
-PLIST_SUB+=	I386_AMD64="@comment "
-ALL_TARGET=	freebsd-dri
-.endif
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+
+.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/graphics/dri/distinfo,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lgraphics/dri/distinfo -Lgraphics/dri/distinfo -u -r1.1.1.1 -r1.2
--- graphics/dri/distinfo
+++ graphics/dri/distinfo
@@ -1,3 +1,3 @@
-MD5 (MesaLib-6.4.1.tar.bz2) = ea148c828ec6f645526451db1b8556f1
-SHA256 (MesaLib-6.4.1.tar.bz2) = 2c1c8784cccab416a52ef9512e3539a0063b88dcc9b0abbcf1a407f9808758cf
-SIZE (MesaLib-6.4.1.tar.bz2) = 2913887
+MD5 (MesaLib-7.0.1.tar.bz2) = c056abd763e899114bf745c9eedbf9ad
+SHA256 (MesaLib-7.0.1.tar.bz2) = 5190ffac157882d9129d31f262339512f4a45dcf95ccdad213760a7d54d82de7
+SIZE (MesaLib-7.0.1.tar.bz2) = 3343538
--- graphics/dri/files/patch-intel_screen_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/mesa/drivers/dri/i915/intel_screen.c.orig	Sun Apr  8 02:27:32 2007
-+++ src/mesa/drivers/dri/i915/intel_screen.c	Sun Apr  8 02:27:46 2007
-@@ -340,6 +340,7 @@
-    case PCI_CHIP_I915_G:
-    case PCI_CHIP_I915_GM:
-    case PCI_CHIP_I945_G:
-+   case PCI_CHIP_I945_GM:
-       return i915CreateContext( mesaVis, driContextPriv, 
- 			       sharedContextPrivate );
-  
--- graphics/dri/files/patch-intel_context_h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/mesa/drivers/dri/i915/intel_context.h.orig	Sun Apr  8 02:26:46 2007
-+++ src/mesa/drivers/dri/i915/intel_context.h	Sun Apr  8 02:27:01 2007
-@@ -413,6 +413,7 @@
- #define PCI_CHIP_I915_G			0x2582
- #define PCI_CHIP_I915_GM		0x2592
- #define PCI_CHIP_I945_G			0x2772
-+#define PCI_CHIP_I945_GM		0x27A2
- 
- 
- /* ================================================================
--- graphics/dri/files/patch-intel_context_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mesa/drivers/dri/i915/intel_context.c.orig	Sun Apr  8 02:26:09 2007
-+++ src/mesa/drivers/dri/i915/intel_context.c	Sun Apr  8 02:26:32 2007
-@@ -118,6 +118,8 @@
- 	 chipset = "Intel(R) 915GM"; break;
-       case PCI_CHIP_I945_G:
- 	 chipset = "Intel(R) 945G"; break;
-+      case PCI_CHIP_I945_GM:
-+	 chipset = "Intel(R) 945GM"; break;
-       default:
- 	 chipset = "Unknown Intel Chipset"; break;
-       }
--- graphics/dri/files/patch-freebsd-dri
+++ /dev/null
@@ -1,47 +0,0 @@
---- configs/freebsd-dri.orig	Tue Oct 25 01:11:57 2005
-+++ configs/freebsd-dri	Fri Dec 30 00:58:57 2005
-@@ -6,32 +6,32 @@
- 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
-+EXPAT_INCLUDES = -I${LOCALBASE}/include
-+X11_INCLUDES = -I${X11BASE}/include -I${X11BASE}/include/X11/extensions
- DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
- 	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS
--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
- LIBDRM_LIB = `pkg-config --libs libdrm` -ldrm
--DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
--GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread $(LIBDRM_LIB)
-+DRI_LIB_DEPS = -L${LOCALBASE}/lib -lm ${PTHREAD_LIBS} -lexpat $(LIBDRM_LIB)
-+GL_LIB_DEPS = -L${X11BASE}/lib -lX11 -lXext -lm ${PTHREAD_LIBS} $(LIBDRM_LIB)
- 
--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 = glx/x11 mesa glu glut/glx glw
-+SRC_DIRS = mesa
- DRIVER_DIRS = dri
- PROGRAM_DIRS = 
- WINDOW_SYSTEM=dri
--- /dev/null
+++ graphics/dri/files/patch-bin__mklib
@@ -0,0 +1,11 @@
+--- ./bin/mklib.orig	Mon Oct  1 03:11:55 2007
++++ ./bin/mklib	Mon Oct  1 03:12:02 2007
+@@ -356,7 +356,7 @@
+ 	fi
+ 	;;
+ 
+-    'FreeBSD')
++    'FreeBSD' | 'MidnightBSD')
+ 	# we assume gcc
+ 
+ 	if [ "x$LINK" = "x" ] ; then

More information about the Midnightbsd-cvs mailing list