Attachment 66026 Details for Bug 97711 – driconf.diff

[patch] driconf.diff

driconf.diff (text/x-patch), 7.70 KB, created by Martin Wilke on 2006-05-26 10:04:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Wilke

Created: 2006-05-26 10:04:31 UTC

Size: 7.70 KB

patch

obsolete

>diff -ruN /usr/ports/graphics/driconf/Makefile ports/graphics/dri/Makefile
>--- /usr/ports/graphics/driconf/Makefile	Mon May  8 15:43:17 2006
>+++ ports/graphics/dri/Makefile	Sat Jan 21 19:55:03 2006
>@@ -1,30 +1,75 @@
>-# New ports collection makefile for:    driconf
>-# Date created:         		1 Apr, 2005
>-# Whom:                 anholt@FreeBSD.org
>+# New ports collection makefile for:    dri
>+# Date created:		8 Nov 2003
>+# Whom:			anholt@FreeBSD.org
> #
>-# $FreeBSD: ports/graphics/driconf/Makefile,v 1.4 2006/05/07 23:45:56 edwin Exp $
>+# $FreeBSD: ports/graphics/dri/Makefile,v 1.15 2006/01/21 18:55:03 lesi Exp $
> #
> 
>-PORTNAME=	driconf
>-PORTVERSION=	0.2.6
>-PORTREVISION=	1
>+PORTNAME=	dri
>+PORTVERSION=	6.4.1
>+PORTEPOCH=	2
> CATEGORIES=	graphics
>-MASTER_SITES=	http://dri.freedesktop.org/~fxkuehl/driconf/
>+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>+MASTER_SITE_SUBDIR=mesa3d
>+DISTNAME=	MesaLib-${PORTVERSION}
> 
> MAINTAINER=	anholt@FreeBSD.org
>-COMMENT=	Configuration program for DRI drivers
>+COMMENT=	OpenGL hardware acceleration drivers for the DRI
> 
>-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
>+LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
>+BUILD_DEPENDS=	makedepend:${X_IMAKE_PORT}
> 
>-USE_PYTHON=	yes
>-NO_BUILD=	yes
>+CONFLICTS=	xfree86-dri-* dri-6.2.2005*
> 
>-pre-patch:
>-	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \
>-		-e 's|/usr/local|${PREFIX}|'
>+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}
> 
>-do-install:
>-	@(cd ${WRKSRC} && ${PYTHON_CMD} setup.py install)
>+ONLY_FOR_ARCHS=	i386 alpha amd64
>+
>+DRIMODDIR=	${PREFIX}/lib/modules/dri
>+
>+.include <bsd.port.pre.mk>
> 
>-.include <bsd.port.mk>
>+.if ${X_WINDOW_SYSTEM:L} != xorg
>+IGNORE=	requires libGL from X.Org.
>+.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/unichrome_dri.so ${DRIMODDIR}
>+	${INSTALL_PROGRAM} ${WRKSRC}/lib/tdfx_dri.so ${DRIMODDIR}
>+.elif ${ARCH} == amd64
>+	${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR}
>+.endif
>+	${INSTALL_PROGRAM} ${WRKSRC}/lib/mach64_dri.so ${DRIMODDIR}
>+	${INSTALL_PROGRAM} ${WRKSRC}/lib/mga_dri.so ${DRIMODDIR}
>+	${INSTALL_PROGRAM} ${WRKSRC}/lib/r128_dri.so ${DRIMODDIR}
>+	${INSTALL_PROGRAM} ${WRKSRC}/lib/r200_dri.so ${DRIMODDIR}
>+	${INSTALL_PROGRAM} ${WRKSRC}/lib/r300_dri.so ${DRIMODDIR}
>+	${INSTALL_PROGRAM} ${WRKSRC}/lib/radeon_dri.so ${DRIMODDIR}
>+	${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>
>diff -ruN /usr/ports/graphics/driconf/distinfo ports/graphics/dri/distinfo
>--- /usr/ports/graphics/driconf/distinfo	Sun Jan 22 13:34:47 2006
>+++ ports/graphics/dri/distinfo	Sat Jan 21 19:55:03 2006
>@@ -1,3 +1,3 @@
>-MD5 (driconf-0.2.6.tar.gz) = 92058855dbf48442d3e3b86f153b40cb
>-SHA256 (driconf-0.2.6.tar.gz) = e7f25a8b04f5b2042197b5410fe086048db4fd504ef21085a754a700da375a1f
>-SIZE (driconf-0.2.6.tar.gz) = 80749
>+MD5 (MesaLib-6.4.1.tar.bz2) = ea148c828ec6f645526451db1b8556f1
>+SHA256 (MesaLib-6.4.1.tar.bz2) = 2c1c8784cccab416a52ef9512e3539a0063b88dcc9b0abbcf1a407f9808758cf
>+SIZE (MesaLib-6.4.1.tar.bz2) = 2913887
>diff -ruN /usr/ports/graphics/driconf/files/patch-freebsd-dri ports/graphics/dri/files/patch-freebsd-dri
>--- /usr/ports/graphics/driconf/files/patch-freebsd-dri	Thu Jan  1 01:00:00 1970
>+++ ports/graphics/dri/files/patch-freebsd-dri	Sat Jan 21 19:55:03 2006
>@@ -0,0 +1,47 @@
>+--- 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
>diff -ruN /usr/ports/graphics/driconf/pkg-descr ports/graphics/dri/pkg-descr
>--- /usr/ports/graphics/driconf/pkg-descr	Wed Jun 15 07:42:03 2005
>+++ ports/graphics/dri/pkg-descr	Wed Jun 15 04:16:36 2005
>@@ -1,6 +1,8 @@
>-driconf is an application for configuring DRI drivers at a system or user level,
>-with choices applicable to all or to specific applications.  Options are
>-advertised to driconf by the DRI drivers.
>+This package contains the current stable release of the client drivers for the
>+DRI.  With an X Server configured for the DRI they allow direct rendering of
>+hardware-accelerated OpenGL.
> 
>-WWW: http://dri.freedesktop.org/wiki/DriConf
>--- Eric Anholt <anholt@FreeBSD.org>
>+WWW: http://dri.sourceforge.net/
>+
>+- Eric Anholt
>+anholt@FreeBSD.org
>diff -ruN /usr/ports/graphics/driconf/pkg-plist ports/graphics/dri/pkg-plist
>--- /usr/ports/graphics/driconf/pkg-plist	Thu Jun 16 22:12:42 2005
>+++ ports/graphics/dri/pkg-plist	Sun Jan 22 03:14:46 2006
>@@ -1,12 +1,15 @@
>-bin/driconf
>-%%PYTHON_SITELIBDIR%%/dri.py
>-%%PYTHON_SITELIBDIR%%/dri.pyc
>-%%PYTHON_SITELIBDIR%%/driconf.py
>-%%PYTHON_SITELIBDIR%%/driconf.pyc
>-share/locale/de/LC_MESSAGES/driconf.mo
>-share/locale/es/LC_MESSAGES/driconf.mo
>-%%DATADIR%%/card.png
>-%%DATADIR%%/screen.png
>-%%DATADIR%%/screencard.png
>-%%DATADIR%%/drilogo.jpg
>-@dirrm %%DATADIR%%
>+%%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
>+@dirrm lib/modules/dri
>+@dirrmtry lib/modules

Actions: View | Diff

Attachments on bug 97711: 66025 | 66026 | 66027