diff options
| author | bjs <bjs> | 2008-10-26 21:03:40 +0000 |
|---|---|---|
| committer | bjs <bjs> | 2008-10-26 21:03:40 +0000 |
| commit | 2cf4205a94c9f1a963d6327ec1a6ecd368f7f10d (patch) | |
| tree | e3ef6c5f9c1b3e0e627559601e75abb90e1aa6e3 | |
| parent | cd26a8a9af225272a824fc82dff9689d674a1492 (diff) | |
| download | pkgsrc-2cf4205a94c9f1a963d6327ec1a6ecd368f7f10d.tar.gz | |
Add the following patch from upstream as a new distribution
patch and bump MesaLib's PKGREVISION. While here, make a few
small changes to appease pkglint.
commit 2b8d8989fb6f9c36baf166fc715182a1407ebadb
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Sun Sep 28 20:31:46 2008 -0700
Use 3Dnow! x86-64 routines only on processors that support 3Dnow!
Added an x86-64 CPUID function and use it to detect 3Dnow!
[...]
This fixes long standing bug #8724.
| -rw-r--r-- | graphics/Mesa/Makefile.version | 4 | ||||
| -rw-r--r-- | graphics/MesaLib/Makefile | 4 | ||||
| -rw-r--r-- | graphics/MesaLib/distinfo | 5 | ||||
| -rw-r--r-- | graphics/MesaLib/glx-config.mk | 4 | ||||
| -rw-r--r-- | graphics/MesaLib/options.mk | 6 |
5 files changed, 13 insertions, 10 deletions
diff --git a/graphics/Mesa/Makefile.version b/graphics/Mesa/Makefile.version index c40b45b7afe..29c998840ea 100644 --- a/graphics/Mesa/Makefile.version +++ b/graphics/Mesa/Makefile.version @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.version,v 1.2 2008/10/21 06:25:26 bjs Exp $ +# $NetBSD: Makefile.version,v 1.3 2008/10/26 21:03:40 bjs Exp $ # # When changing this version, please run "make distinfo" in the following # package directories: @@ -14,7 +14,7 @@ MESA_SITES= ${MASTER_SITE_SOURCEFORGE:=mesa3d/} MESA_VERSION= 7.0.4 MESA_PKGVERSION= ${MESA_VERSION}${MESA_PATCHLEVEL} -MESA_PATCHFILES= 001 +MESA_PATCHFILES= 001 002 MESA_PATCHLEVEL= .1 PATCHFILES= ${MESA_PATCHFILES:@.p.@Mesa-${MESA_VERSION}-${.p.}@} diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 3e160d891c6..87e16106639 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.74 2008/10/21 06:25:26 bjs Exp $ +# $NetBSD: Makefile,v 1.75 2008/10/26 21:03:40 bjs Exp $ PKGNAME= MesaLib-${MESA_PKGVERSION} COMMENT= Graphics library similar to SGI's OpenGL -PKGREVISION= 3 +PKGREVISION= 4 MESA_HEADERS= gl.h gl_mangle.h glext.h glx.h glxext.h \ glx_mangle.h osmesa.h xmesa.h xmesa_x.h \ diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index 91c0625e209..f4425701294 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -1,8 +1,11 @@ -$NetBSD: distinfo,v 1.60 2008/10/21 06:25:26 bjs Exp $ +$NetBSD: distinfo,v 1.61 2008/10/26 21:03:40 bjs Exp $ SHA1 (Mesa-7.0.4.1/Mesa-7.0.4-001) = a49b9094272abb2484447fb35c9adf3fe391a4bb RMD160 (Mesa-7.0.4.1/Mesa-7.0.4-001) = 1992bb054742924f1f39a19ab35e621f53e6fbf2 Size (Mesa-7.0.4.1/Mesa-7.0.4-001) = 38003 bytes +SHA1 (Mesa-7.0.4.1/Mesa-7.0.4-002) = 1f7fe7b19a9ec6cc036021df8c9016fc1f1cb234 +RMD160 (Mesa-7.0.4.1/Mesa-7.0.4-002) = 5e11808b59ea3e8c4459c671c9236b18a95d8fba +Size (Mesa-7.0.4.1/Mesa-7.0.4-002) = 4379 bytes SHA1 (Mesa-7.0.4.1/MesaDemos-7.0.4.tar.bz2) = 1adb2010d6d3103bd57c08f228e2bbed38178e14 RMD160 (Mesa-7.0.4.1/MesaDemos-7.0.4.tar.bz2) = 3e5b414bf1a40603367fcd0ba321b6e2caf84626 Size (Mesa-7.0.4.1/MesaDemos-7.0.4.tar.bz2) = 1341624 bytes diff --git a/graphics/MesaLib/glx-config.mk b/graphics/MesaLib/glx-config.mk index edcaa3f97c6..85b0d47e312 100644 --- a/graphics/MesaLib/glx-config.mk +++ b/graphics/MesaLib/glx-config.mk @@ -1,4 +1,4 @@ -# $NetBSD: glx-config.mk,v 1.2 2008/10/21 06:46:46 bjs Exp $ +# $NetBSD: glx-config.mk,v 1.3 2008/10/26 21:03:40 bjs Exp $ # # used by x11/modular-xorg-server/options.mk @@ -16,7 +16,7 @@ CFLAGS.NetBSD+= -D_NETBSD_SOURCE CFLAGS.NetBSD+= ${ATOMIC_OPS_CHECK}HAVE_NETBSD_ATOMIC_OPS . if ${OPSYS} == "NetBSD" && !target(netbsd-atomic-ops-check) -. PHONY: netbsd-atomic-opts-check +.PHONY: netbsd-atomic-opts-check netbsd-atomic-ops-check: ATOMIC_OPS_CHECK!=\ if ( ${NM} /usr/lib/libc.so | ${GREP} -q atomic_cas_uint ); then \ diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk index e7cbc16218a..432fc5df9b2 100644 --- a/graphics/MesaLib/options.mk +++ b/graphics/MesaLib/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.12 2008/07/29 13:56:15 tnn Exp $ +# $NetBSD: options.mk,v 1.13 2008/10/26 21:03:40 bjs Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib PKG_SUPPORTED_OPTIONS= @@ -46,11 +46,11 @@ BUILD_TARGET_SUFFIX= # empty .if !empty(PKG_OPTIONS:Mdri) BUILD_TARGET= pkgsrc-dri${BUILD_TARGET_SUFFIX} -PLIST.dri= # empty +PLIST.dri= yes . include "../../graphics/MesaLib/dri.mk" .else BUILD_TARGET= pkgsrc -PLIST.nodri= # empty +PLIST.nodri= yes ### ### XXX building libOSMesa breaks with -j, and GNU make has no .WAIT ### |