From owner-freebsd-x11@FreeBSD.ORG Sun Dec 26 18:33:00 2004 Return-Path: Delivered-To: freebsd-x11@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 14A5416A4CE; Sun, 26 Dec 2004 18:33:00 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1EDD43D2F; Sun, 26 Dec 2004 18:32:59 +0000 (GMT) (envelope-from thierry@FreeBSD.org) Received: from freefall.freebsd.org (thierry@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id iBQIWxLD086479; Sun, 26 Dec 2004 18:32:59 GMT (envelope-from thierry@freefall.freebsd.org) Received: (from thierry@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id iBQIWxXl086475; Sun, 26 Dec 2004 18:32:59 GMT (envelope-from thierry) Date: Sun, 26 Dec 2004 18:32:59 GMT From: Thierry Thomas Message-Id: <200412261832.iBQIWxXl086475@freefall.freebsd.org> To: yasu@utahime.org, thierry@FreeBSD.org, freebsd-x11@FreeBSD.org Subject: Re: ports/75473: graphics/dri: port is broken after update to 6.2_1 X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Dec 2004 18:33:00 -0000 Synopsis: graphics/dri: port is broken after update to 6.2_1 State-Changed-From-To: open->analyzed State-Changed-By: thierry State-Changed-When: Sun Dec 26 18:30:52 GMT 2004 State-Changed-Why: Could you please test the following patch? It works for me... --- dri.diff begins here --- diff -urN graphics/dri.orig/Makefile graphics/dri/Makefile --- graphics/dri.orig/Makefile Sun Dec 26 17:28:19 2004 +++ graphics/dri/Makefile Sun Dec 26 18:53:29 2004 @@ -26,7 +26,7 @@ USE_X_PREFIX= yes USE_BZIP2= yes USE_GMAKE= yes -MAKE_ENV+= FBSDCC="${CC}" FBSDCXX="${CXX}" \ +MAKE_ENV+= FBSDCC="${CC}" FBSDCXX="${CXX}" PTHREAD_LIBS=${PTHREAD_LIBS} \ FBSDCFLAGS="${CFLAGS}" FBSDCXXFLAGS="${CXXFLAGS}" ONLY_FOR_ARCHS= i386 alpha amd64 diff -urN graphics/dri.orig/files/patch-freebsd-dri graphics/dri/files/patch-freebsd-dri --- graphics/dri.orig/files/patch-freebsd-dri Fri Dec 24 10:05:40 2004 +++ graphics/dri/files/patch-freebsd-dri Sun Dec 26 19:09:08 2004 @@ -1,5 +1,5 @@ ---- configs/freebsd-dri.orig Tue Nov 23 22:59:05 2004 -+++ configs/freebsd-dri Fri Dec 24 00:29:13 2004 +--- ./configs/freebsd-dri.orig Wed Nov 24 07:59:05 2004 ++++ ./configs/freebsd-dri Sun Dec 26 19:08:40 2004 @@ -6,19 +6,22 @@ CONFIG_NAME = freebsd-dri @@ -25,8 +25,8 @@ # Library/program dependencies -DRI_LIB_DEPS = -lm -lpthread -lexpat -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -pthread -+DRI_LIB_DEPS = -L$(LOCALBASE)/lib -lm -lpthread -lexpat -+GL_LIB_DEPS = -L$(X11BASE) -lX11 -lXext -lm -pthread ++DRI_LIB_DEPS = -L$(LOCALBASE)/lib -lm $(PTHREAD_LIBS) -lexpat ++GL_LIB_DEPS = -L$(X11BASE) -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 diff -urN graphics/dri.orig/files/patch-src::mesa::drivers::dri::x11::Makefile graphics/dri/files/patch-src::mesa::drivers::dri::x11::Makefile --- graphics/dri.orig/files/patch-src::mesa::drivers::dri::x11::Makefile Thu Jan 1 01:00:00 1970 +++ graphics/dri/files/patch-src::mesa::drivers::dri::x11::Makefile Sun Dec 26 19:11:46 2004 @@ -0,0 +1,11 @@ +--- ./src/mesa/drivers/dri/x11/Makefile.orig Sat Jun 26 00:51:39 2004 ++++ ./src/mesa/drivers/dri/x11/Makefile Sun Dec 26 19:10:59 2004 +@@ -42,7 +42,7 @@ + MESA_MODULES = $(TOP)/src/mesa/mesa.a + + # Libraries that the driver shared lib depends on +-LIB_DEPS = -lm -lpthread -lc ++LIB_DEPS = -lm $(PTHREAD_LIBS) -lc + # LIB_DEPS = -lGL -lm -lpthread -lc + + --- dri.diff ends here --- http://www.freebsd.org/cgi/query-pr.cgi?pr=75473