From owner-freebsd-x11@FreeBSD.ORG Wed Jun 27 20:18:02 2007 Return-Path: X-Original-To: freebsd-x11@FreeBSD.org Delivered-To: freebsd-x11@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 719B816A469; Wed, 27 Jun 2007 20:18:02 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from anuket.mj.niksun.com (gwnew.niksun.com [65.115.46.162]) by mx1.freebsd.org (Postfix) with ESMTP id 2C4DE13C457; Wed, 27 Jun 2007 20:18:02 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from niksun.com (anuket [10.70.0.5]) by anuket.mj.niksun.com (8.13.6/8.13.6) with ESMTP id l5RKI1QY017254; Wed, 27 Jun 2007 16:18:01 -0400 (EDT) (envelope-from jkim@FreeBSD.org) From: Jung-uk Kim To: freebsd-x11@FreeBSD.org Date: Wed, 27 Jun 2007 16:17:52 -0400 User-Agent: KMail/1.6.2 References: <200706271605.21263.jkim@FreeBSD.org> In-Reply-To: <200706271605.21263.jkim@FreeBSD.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: Multipart/Mixed; boundary="Boundary-00=_2XsgGL+U9dohWMQ" Message-Id: <200706271617.58021.jkim@FreeBSD.org> X-Virus-Scanned: ClamAV 0.90.2/3542/Wed Jun 27 12:55:00 2007 on anuket.mj.niksun.com X-Virus-Status: Clean Cc: anholt@FreeBSD.org Subject: Re: Mesa 7.0 update? X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 20:18:02 -0000 --Boundary-00=_2XsgGL+U9dohWMQ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Wednesday 27 June 2007 04:05 pm, Jung-uk Kim wrote: > Mesa 7.0 is just released: > > http://www.mesa3d.org/relnotes-7.0.html > > Attached patch is updated ports (+ plus little fixes) for all that > I know of. Is there any objection for committing this? Did I miss > anything? Bah, the attachment is mysteriously disappeared. Retrying... Sorry for the annoyance. Jung-uk Kim --Boundary-00=_2XsgGL+U9dohWMQ Content-Type: text/plain; charset="iso-8859-1"; name="mesa7.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="mesa7.diff" --- ports/graphics/dri/Makefile 2007-05-21 10:59:09.000000000 -0400 +++ ports/graphics/dri/Makefile 2007-06-27 15:55:54.000000000 -0400 @@ -6,9 +6,7 @@ # PORTNAME= dri -PORTVERSION= 6.5.3 -PORTREVISION= 1 -PORTEPOCH= 2 +PORTVERSION= 7.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=mesa3d @@ -73,8 +71,11 @@ -e 's|/usr/X11R6|$$(X11BASE)|g' \ -e 's|-lpthread|$$(PTHREAD_LIBS)|g' \ -e 's|^\(SRC_DIRS =\).*|\1 mesa|' \ - -e 's|-DHAVE_POSIX_MEMALIGN||' \ ${WRKSRC}/configs/freebsd-dri +.if ${OSVERSION} < 700013 + @${REINPLACE_CMD} -e 's|-DHAVE_POSIX_MEMALIGN||' \ + ${WRKSRC}/configs/freebsd-dri +.endif .if ${ARCH} == i386 PLIST_SUB+= I386="" @@ -83,7 +84,7 @@ .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 " --- ports/graphics/dri/distinfo 2007-05-19 16:08:52.000000000 -0400 +++ ports/graphics/dri/distinfo 2007-06-27 14:45:43.000000000 -0400 @@ -1,3 +1,3 @@ -MD5 (MesaLib-6.5.3.tar.bz2) = 46359457147c469745f24b5074a186f0 -SHA256 (MesaLib-6.5.3.tar.bz2) = f8b09b40b59d6951dcd9889d19a67d1995c5f558bafa1e978f4b0e88035a96b3 -SIZE (MesaLib-6.5.3.tar.bz2) = 3351899 +MD5 (MesaLib-7.0.tar.bz2) = 50c371455fa7532c04aa0a970f9bc51f +SHA256 (MesaLib-7.0.tar.bz2) = dc4dcd24712c4bdafc430f281e7200b9b7d9a6de1995223275def1d1bf012c08 +SIZE (MesaLib-7.0.tar.bz2) = 3366124 --- ports/graphics/libGL/Makefile 2007-06-22 14:21:20.000000000 -0400 +++ ports/graphics/libGL/Makefile 2007-06-27 15:02:33.000000000 -0400 @@ -6,8 +6,7 @@ # PORTNAME?= libGL -PORTVERSION?= 6.5.3 -PORTREVISION= 3 +PORTVERSION?= 7.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/ @@ -65,7 +64,7 @@ .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 " --- ports/graphics/libGL/distinfo 2007-05-19 16:09:43.000000000 -0400 +++ ports/graphics/libGL/distinfo 2007-06-27 15:02:46.000000000 -0400 @@ -1,3 +1,3 @@ -MD5 (MesaLib-6.5.3.tar.bz2) = 46359457147c469745f24b5074a186f0 -SHA256 (MesaLib-6.5.3.tar.bz2) = f8b09b40b59d6951dcd9889d19a67d1995c5f558bafa1e978f4b0e88035a96b3 -SIZE (MesaLib-6.5.3.tar.bz2) = 3351899 +MD5 (MesaLib-7.0.tar.bz2) = 50c371455fa7532c04aa0a970f9bc51f +SHA256 (MesaLib-7.0.tar.bz2) = dc4dcd24712c4bdafc430f281e7200b9b7d9a6de1995223275def1d1bf012c08 +SIZE (MesaLib-7.0.tar.bz2) = 3366124 --- ports/graphics/libGLU/Makefile 2007-05-19 16:09:44.000000000 -0400 +++ ports/graphics/libGLU/Makefile 2007-06-27 15:07:05.000000000 -0400 @@ -6,7 +6,7 @@ # PORTNAME= libGLU -PORTVERSION= 6.5.3 +PORTVERSION= 7.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mesa3d --- ports/graphics/libGLU/distinfo 2007-05-19 16:09:44.000000000 -0400 +++ ports/graphics/libGLU/distinfo 2007-06-27 15:07:13.000000000 -0400 @@ -1,3 +1,3 @@ -MD5 (MesaLib-6.5.3.tar.bz2) = 46359457147c469745f24b5074a186f0 -SHA256 (MesaLib-6.5.3.tar.bz2) = f8b09b40b59d6951dcd9889d19a67d1995c5f558bafa1e978f4b0e88035a96b3 -SIZE (MesaLib-6.5.3.tar.bz2) = 3351899 +MD5 (MesaLib-7.0.tar.bz2) = 50c371455fa7532c04aa0a970f9bc51f +SHA256 (MesaLib-7.0.tar.bz2) = dc4dcd24712c4bdafc430f281e7200b9b7d9a6de1995223275def1d1bf012c08 +SIZE (MesaLib-7.0.tar.bz2) = 3366124 --- ports/graphics/libglut/Makefile 2007-05-19 16:09:49.000000000 -0400 +++ ports/graphics/libglut/Makefile 2007-06-27 15:17:07.000000000 -0400 @@ -6,8 +6,7 @@ # PORTNAME= libglut -PORTVERSION= 6.5.2 -PORTREVISION= 1 +PORTVERSION= 7.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mesa3d --- ports/graphics/libglut/distinfo 2007-05-19 16:09:49.000000000 -0400 +++ ports/graphics/libglut/distinfo 2007-06-27 15:17:16.000000000 -0400 @@ -1,3 +1,3 @@ -MD5 (MesaGLUT-6.5.2.tar.bz2) = e84edbb11c69c8e408dfadd2ed08e95b -SHA256 (MesaGLUT-6.5.2.tar.bz2) = 32bc1bfbdeb381de058c007a91a744017a859a692979277ac01505f17d23cf62 -SIZE (MesaGLUT-6.5.2.tar.bz2) = 313048 +MD5 (MesaGLUT-7.0.tar.bz2) = 4af28296e02772ef1de00e4e79bf3d12 +SHA256 (MesaGLUT-7.0.tar.bz2) = cf16ed504739344cbc34de926e2026baa7f4675194d9c032fcb839bf68a3ed9e +SIZE (MesaGLUT-7.0.tar.bz2) = 312866 --- ports/graphics/libglut/files/Makefile 2006-01-12 07:54:04.000000000 -0500 +++ ports/graphics/libglut/files/Makefile 2007-06-27 15:18:14.000000000 -0400 @@ -7,7 +7,7 @@ CFLAGS+= -I../../../include -I${X11BASE}/include LDFLAGS+= -L${X11BASE}/lib -lGLU -lX11 -lXext -lGL -lXmu -lXi LIBDIR= ${PREFIX}/lib -NOPROFILE?= yes +NO_PROFILE?= yes beforeinstall: ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ --- ports/graphics/mesa-demos/Makefile 2007-05-25 14:53:40.000000000 -0400 +++ ports/graphics/mesa-demos/Makefile 2007-06-27 15:38:09.000000000 -0400 @@ -6,8 +6,7 @@ # PORTNAME= demos -PORTVERSION= 6.5.3 -PORTREVISION= 2 +PORTVERSION= 7.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mesa3d/ @@ -69,7 +68,7 @@ -e 's|geartrain.dat|${DATADIR}/data/geartrain.dat|g' \ -e 's|terrain.dat|${DATADIR}/data/terrain.dat|g' \ -e 's|isosurf.dat|${DATADIR}/data/isosurf.dat|g' \ - ${WRKSRC}/progs/demos/*.c + ${WRKSRC}/progs/demos/*.c ${WRKSRC}/progs/xdemos/*.c do-install: @for prog in ${DEMO_PROGS}; do \ --- ports/graphics/mesa-demos/distinfo 2007-04-30 20:29:36.000000000 -0400 +++ ports/graphics/mesa-demos/distinfo 2007-06-27 15:22:26.000000000 -0400 @@ -1,6 +1,6 @@ -MD5 (MesaDemos-6.5.3.tar.bz2) = 8af91773ab2653fe537499676b05f2e8 -SHA256 (MesaDemos-6.5.3.tar.bz2) = 186169c1875367a76a5e45a269ba3f35dcba7f699cbc7bfc009b308bce7d5e79 -SIZE (MesaDemos-6.5.3.tar.bz2) = 1339115 -MD5 (MesaLib-6.5.3.tar.bz2) = 46359457147c469745f24b5074a186f0 -SHA256 (MesaLib-6.5.3.tar.bz2) = f8b09b40b59d6951dcd9889d19a67d1995c5f558bafa1e978f4b0e88035a96b3 -SIZE (MesaLib-6.5.3.tar.bz2) = 3351899 +MD5 (MesaDemos-7.0.tar.bz2) = fada2bc1f29da513e015fda1e3abd0c0 +SHA256 (MesaDemos-7.0.tar.bz2) = d674154aad2cde9c1fd5bf6931196f5ff13832efc69313bd8931efcde3df8db7 +SIZE (MesaDemos-7.0.tar.bz2) = 1334310 +MD5 (MesaLib-7.0.tar.bz2) = 50c371455fa7532c04aa0a970f9bc51f +SHA256 (MesaLib-7.0.tar.bz2) = dc4dcd24712c4bdafc430f281e7200b9b7d9a6de1995223275def1d1bf012c08 +SIZE (MesaLib-7.0.tar.bz2) = 3366124 --- ports/graphics/mesa-demos/files/patch-progs-xdemos-glthreads.c 1969-12-31 19:00:00.000000000 -0500 +++ ports/graphics/mesa-demos/files/patch-progs-xdemos-glthreads.c 2007-05-29 14:08:09.000000000 -0400 @@ -0,0 +1,11 @@ +--- progs/xdemos/glthreads.c.orig Fri May 18 20:28:57 2007 ++++ progs/xdemos/glthreads.c Fri May 18 20:32:37 2007 +@@ -505,7 +505,7 @@ + for (i = 0; i < numThreads; i++) { + pthread_create(&WinThreads[i].Thread, NULL, thread_function, + (void*) &WinThreads[i]); +- printf("glthreads: Created thread %u\n", (unsigned int) WinThreads[i].Thread); ++ printf("glthreads: Created thread %lu\n", (unsigned long) WinThreads[i].Thread); + } + + if (MultiDisplays) --Boundary-00=_2XsgGL+U9dohWMQ--