Wed Apr 30 07:00:14 2008 UTC ()
Mesa


(bjs)
diff -r1.58 -r1.59 pkgsrc/graphics/MesaLib/Makefile
diff -r1.50 -r1.51 pkgsrc/graphics/MesaLib/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/MesaLib/patches/patch-ao
cvs diff -r1.58 -r1.59 pkgsrc/graphics/MesaLib/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/Makefile 2008/04/25 20:11:11 1.58
+++ pkgsrc/graphics/MesaLib/Makefile 2008/04/30 07:00:14 1.59
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1# $NetBSD: Makefile,v 1.58 2008/04/25 20:11:11 bjs Exp $ 1# $NetBSD: Makefile,v 1.59 2008/04/30 07:00:14 bjs Exp $
2 2
3PKGNAME= MesaLib-${MESA_PKGVERSION} 3PKGNAME= MesaLib-${MESA_PKGVERSION}
4PKGREVISION= 1 
5COMMENT= Graphics library similar to SGI's OpenGL 4COMMENT= Graphics library similar to SGI's OpenGL
6 5
7MESA_HEADERS= gl.h gl_mangle.h glext.h glx.h glxext.h \ 6MESA_HEADERS= gl.h gl_mangle.h glext.h glx.h glxext.h \
8 glx_mangle.h osmesa.h xmesa.h xmesa_x.h \ 7 glx_mangle.h osmesa.h xmesa.h xmesa_x.h \
9 xmesa_xf86.h 8 xmesa_xf86.h
10 9
11PKG_DESTDIR_SUPPORT= user-destdir 10PKG_DESTDIR_SUPPORT= user-destdir
12 11
 12INORE_CCACHE= yes
 13
13BUILD_DEFS+= MESA_HZ MESA_EXECMEM_HEAPSIZE 14BUILD_DEFS+= MESA_HZ MESA_EXECMEM_HEAPSIZE
14 15
15.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
16 17
17CFLAGS.NetBSD+= -D_NETBSD_SOURCE 18CFLAGS.NetBSD+= -D_NETBSD_SOURCE
18 19
19.if (${MACHINE_ARCH} == "x86_64" || \ 20.if (${MACHINE_ARCH} == "x86_64" || \
20 ${MACHINE_ARCH} == "sparc64" || \ 21 ${MACHINE_ARCH} == "sparc64" || \
21 ${MACHINE_ARCH} == "alpha") 22 ${MACHINE_ARCH} == "alpha")
22CFLAGS+= -D__GLX_ALIGN64 23CFLAGS+= -D__GLX_ALIGN64
23.endif 24.endif
24 25
25.if !empty(MACHINE_ARCH:Mi386) 26.if !empty(MACHINE_ARCH:Mi386)
@@ -33,28 +34,35 @@ CFLAGS+= -D__GLX_ALIGN64 @@ -33,28 +34,35 @@ CFLAGS+= -D__GLX_ALIGN64
33### 34###
34### XXX We need a reliable check for these functions. 35### XXX We need a reliable check for these functions.
35### 36###
36#/* NetBSD uses IEEE double precision. */ 37#/* NetBSD uses IEEE double precision. */
37CFLAGS.NetBSD+= -DDEFAULT_X86_FPU=0x127f 38CFLAGS.NetBSD+= -DDEFAULT_X86_FPU=0x127f
38### 39###
39### 40###
40#/* FreeBSD leaves some exceptions unmasked as well. */ 41#/* FreeBSD leaves some exceptions unmasked as well. */
41### 42###
42CFLAGS.FreeBSD+= -DDEFAULT_x86_FPU=0x1272 43CFLAGS.FreeBSD+= -DDEFAULT_x86_FPU=0x1272
43.endif 44.endif
44 45
45CFLAGS.FreeBSD+= -DUSE_NATIVE_LIBM_FUNCS 46CFLAGS.FreeBSD+= -DUSE_NATIVE_LIBM_FUNCS
 47CFLAGS.FreeBSD+= -DUSE_SSE_SYSCTL_DETECTION
 48
46CFLAGS.Linux+= -DUSE_NATIVE_LIBM_FUNCS 49CFLAGS.Linux+= -DUSE_NATIVE_LIBM_FUNCS
 50
47CFLAGS.NetBSD+= -DUSE_NATIVE_LIBM_FUNCS 51CFLAGS.NetBSD+= -DUSE_NATIVE_LIBM_FUNCS
 52CFLAGS.NetBSD+= -DUSE_SSE_SYSCTL_DETECTION
 53
 54CFLAGS.DragonFly+= -DUSE_NATIVE_LIBM_FUNCS
 55CFLAGS.DragonFly+= -DUSE_SSE_SYSCTL_DETECTION
48 56
49PLIST_VARS= dri nodri 57PLIST_VARS= dri nodri
50 58
51.include "../../graphics/Mesa/Makefile.lib" 59.include "../../graphics/Mesa/Makefile.lib"
52.include "options.mk" 60.include "options.mk"
53.include "../../mk/pthread.buildlink3.mk" 61.include "../../mk/pthread.buildlink3.mk"
54 62
55.if !empty(MACHINE_PLATFORM:MNetBSD-[12].*) 63.if !empty(MACHINE_PLATFORM:MNetBSD-[12].*)
56. include "../../devel/pthread-stublib/buildlink3.mk" 64. include "../../devel/pthread-stublib/buildlink3.mk"
57PTHREAD_STUBLIB= "-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpthstub" 65PTHREAD_STUBLIB= "-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpthstub"
58.else 66.else
59PTHREAD_STUBLIB= # provided by libc 67PTHREAD_STUBLIB= # provided by libc
60.endif 68.endif
cvs diff -r1.50 -r1.51 pkgsrc/graphics/MesaLib/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/distinfo 2008/04/25 15:39:54 1.50
+++ pkgsrc/graphics/MesaLib/distinfo 2008/04/30 07:00:14 1.51
@@ -1,31 +1,37 @@ @@ -1,31 +1,37 @@
1$NetBSD: distinfo,v 1.50 2008/04/25 15:39:54 tnn Exp $ 1$NetBSD: distinfo,v 1.51 2008/04/30 07:00:14 bjs Exp $
2 2
 3SHA1 (Mesa-7.0.3/Mesa-7.0.3-001) = 32725fd4632d51495253b06786b3f0e743d11dbd
 4RMD160 (Mesa-7.0.3/Mesa-7.0.3-001) = 92b1e1d3eb3932a419c6d1fb9e7b96ef5c32fd1a
 5Size (Mesa-7.0.3/Mesa-7.0.3-001) = 12578 bytes
 6SHA1 (Mesa-7.0.3/Mesa-7.0.3-002) = 9fcdeb76d4cf44f0aeadff48bf7c48335773a2c0
 7RMD160 (Mesa-7.0.3/Mesa-7.0.3-002) = 63b568f9c3f0e09cf53de064aee3350b4f96ee2d
 8Size (Mesa-7.0.3/Mesa-7.0.3-002) = 639 bytes
3SHA1 (Mesa-7.0.3/MesaDemos-7.0.3.tar.bz2) = c8dfef08f3b3f7abc70d99e16a35b0bbc1af4f8a 9SHA1 (Mesa-7.0.3/MesaDemos-7.0.3.tar.bz2) = c8dfef08f3b3f7abc70d99e16a35b0bbc1af4f8a
4RMD160 (Mesa-7.0.3/MesaDemos-7.0.3.tar.bz2) = 22917fbab3987e1d60d46321e1a77d5cbdd3800c 10RMD160 (Mesa-7.0.3/MesaDemos-7.0.3.tar.bz2) = 22917fbab3987e1d60d46321e1a77d5cbdd3800c
5Size (Mesa-7.0.3/MesaDemos-7.0.3.tar.bz2) = 1342158 bytes 11Size (Mesa-7.0.3/MesaDemos-7.0.3.tar.bz2) = 1342158 bytes
6SHA1 (Mesa-7.0.3/MesaGLUT-7.0.3.tar.bz2) = ce263120bfa258d6cf791c21d506ea215e806b5f 12SHA1 (Mesa-7.0.3/MesaGLUT-7.0.3.tar.bz2) = ce263120bfa258d6cf791c21d506ea215e806b5f
7RMD160 (Mesa-7.0.3/MesaGLUT-7.0.3.tar.bz2) = 9cf615868d540d3121b1219b0395f5f268e407cd 13RMD160 (Mesa-7.0.3/MesaGLUT-7.0.3.tar.bz2) = 9cf615868d540d3121b1219b0395f5f268e407cd
8Size (Mesa-7.0.3/MesaGLUT-7.0.3.tar.bz2) = 329421 bytes 14Size (Mesa-7.0.3/MesaGLUT-7.0.3.tar.bz2) = 329421 bytes
9SHA1 (Mesa-7.0.3/MesaLib-7.0.3.tar.bz2) = 49b92094a25f189b411f393174ee666e73dddf36 15SHA1 (Mesa-7.0.3/MesaLib-7.0.3.tar.bz2) = 49b92094a25f189b411f393174ee666e73dddf36
10RMD160 (Mesa-7.0.3/MesaLib-7.0.3.tar.bz2) = 1672be9d235f19c779c42ea4f443995b1844c836 16RMD160 (Mesa-7.0.3/MesaLib-7.0.3.tar.bz2) = 1672be9d235f19c779c42ea4f443995b1844c836
11Size (Mesa-7.0.3/MesaLib-7.0.3.tar.bz2) = 3389327 bytes 17Size (Mesa-7.0.3/MesaLib-7.0.3.tar.bz2) = 3389327 bytes
12SHA1 (patch-aa) = 6db543357cfe41fe1ab1fc16d823ff61d3e8646b 18SHA1 (patch-aa) = 6db543357cfe41fe1ab1fc16d823ff61d3e8646b
13SHA1 (patch-ab) = ab6c3eb50f2e8091aeca30f92f55e02661c099e9 19SHA1 (patch-ab) = ab6c3eb50f2e8091aeca30f92f55e02661c099e9
14SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468 20SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468
15SHA1 (patch-ad) = ab71ff80c6d0af6bed9e6810bb38fd83e8bdc3be 21SHA1 (patch-ad) = ab71ff80c6d0af6bed9e6810bb38fd83e8bdc3be
16SHA1 (patch-ae) = e1c37a279cf3fc78d7eb43e392abbb40d3419a5f 22SHA1 (patch-ae) = e1c37a279cf3fc78d7eb43e392abbb40d3419a5f
17SHA1 (patch-af) = da03d949c3105bc548b4c6c762e8a787a995aa94 23SHA1 (patch-af) = da03d949c3105bc548b4c6c762e8a787a995aa94
18SHA1 (patch-ag) = 9010c8c90a43a37bbc5766957e25536ac67e55b5 24SHA1 (patch-ag) = 9010c8c90a43a37bbc5766957e25536ac67e55b5
19SHA1 (patch-ah) = 3e60a700697f200fb2819f9270a37ad4a5cfa695 25SHA1 (patch-ah) = 3e60a700697f200fb2819f9270a37ad4a5cfa695
20SHA1 (patch-ai) = 171a27e6e4a5ed92c6c2355283179e2091031a79 26SHA1 (patch-ai) = 171a27e6e4a5ed92c6c2355283179e2091031a79
21SHA1 (patch-aj) = 3749b279b500b1a93e45985ae956e8a70d854d9c 27SHA1 (patch-aj) = 3749b279b500b1a93e45985ae956e8a70d854d9c
22SHA1 (patch-ak) = 74a1ffa426de7720a771c1d94aecb7bde17fd26c 28SHA1 (patch-ak) = 74a1ffa426de7720a771c1d94aecb7bde17fd26c
23SHA1 (patch-al) = b734af278352de120b704025ff2e9ac127e5ec7f 29SHA1 (patch-al) = b734af278352de120b704025ff2e9ac127e5ec7f
24SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef 30SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef
25SHA1 (patch-an) = a6960dcf6c184fa0692c0f679ebb59e004e0f499 31SHA1 (patch-an) = a6960dcf6c184fa0692c0f679ebb59e004e0f499
26SHA1 (patch-ao) = d5086862fb820c2f79966a41712ce056fdc25f44 32SHA1 (patch-ao) = 3b1f615bcf0ea14814f8e7763ba6fc9411078667
27SHA1 (patch-ap) = 20237356cd866c2ebe573124bba7be66fb335754 33SHA1 (patch-ap) = 20237356cd866c2ebe573124bba7be66fb335754
28SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5 34SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5
29SHA1 (patch-at) = 4b3d95a116734ad8951816e042b497f638c4cf6b 35SHA1 (patch-at) = 4b3d95a116734ad8951816e042b497f638c4cf6b
30SHA1 (patch-au) = 6ce0d6236e5fb9f53db3bcb388b328ab0e132907 36SHA1 (patch-au) = 6ce0d6236e5fb9f53db3bcb388b328ab0e132907
31SHA1 (patch-cb) = 0eac61e6656c8a8d6452504dd06ed6969ddbeba2 37SHA1 (patch-cb) = 0eac61e6656c8a8d6452504dd06ed6969ddbeba2
cvs diff -r1.1 -r1.2 pkgsrc/graphics/MesaLib/patches/Attic/patch-ao (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/patches/Attic/patch-ao 2008/04/24 07:40:24 1.1
+++ pkgsrc/graphics/MesaLib/patches/Attic/patch-ao 2008/04/30 07:00:14 1.2
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-ao,v 1.1 2008/04/24 07:40:24 bjs Exp $ 1$NetBSD: patch-ao,v 1.2 2008/04/30 07:00:14 bjs Exp $
2 2
3--- src/mesa/x86/common_x86.c.orig 2007-07-12 16:49:55.000000000 -0400 3--- src/mesa/x86/common_x86.c.orig 2008-04-29 15:29:20.000000000 -0400
4+++ src/mesa/x86/common_x86.c 4+++ src/mesa/x86/common_x86.c
5@@ -38,7 +38,7 @@ 5@@ -38,7 +38,7 @@
6 #if defined(USE_SSE_ASM) && defined(__linux__) 6 #if defined(USE_SSE_ASM) && defined(__linux__)
7 #include <linux/version.h> 7 #include <linux/version.h>
8 #endif 8 #endif
9-#if defined(USE_SSE_ASM) && defined(__FreeBSD__) 9-#if defined(USE_SSE_ASM) && (defined(__FreeBSD__) || defined(__DragonFly__))
10+#if defined(USE_SSE_ASM) && (defined(__FreeBSD__) || defined(__NetBSD__)) 10+#if defined(USE_SSE_ASM) && defined(USE_SSE_SYSCTL_DETECTION)
11 #include <sys/types.h> 11 #include <sys/types.h>
12 #include <sys/sysctl.h> 12 #include <sys/sysctl.h>
13 #endif 13 #endif
14@@ -113,6 +113,14 @@ static void check_os_sse_support( void ) 14@@ -113,6 +113,14 @@ static void check_os_sse_support( void )
15 if (ret || !enabled) 15 if (ret || !enabled)
16 _mesa_x86_cpu_features &= ~(X86_FEATURE_XMM); 16 _mesa_x86_cpu_features &= ~(X86_FEATURE_XMM);
17 } 17 }
18+#elif defined (__NetBSD__) 18+#elif defined (__NetBSD__)
19+ { 19+ {
20+ int ret, enabled; 20+ int ret, enabled;
21+ size_t len = sizeof(enabled); 21+ size_t len = sizeof(enabled);
22+ ret = sysctlbyname("machdep.sse", &enabled, &len, (void *)NULL, 0); 22+ ret = sysctlbyname("machdep.sse", &enabled, &len, (void *)NULL, 0);
23+ if (ret || !enabled) 23+ if (ret || !enabled)