Gentoo Archives: gentoo-commits

From: "Michael Januszewski (spock)" <spock@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/nvidia-cuda-toolkit/files: nvidia-cuda-toolkit-3.0-enum_fix.patch
Date: Thu, 01 Apr 2010 21:48:41
Message-Id: E1NxSFh-0005F0-DM@stork.gentoo.org
1 spock 10/04/01 21:48:37
2
3 Added: nvidia-cuda-toolkit-3.0-enum_fix.patch
4 Log:
5 Add an enum fix for gcc pedantic mode (bug #311657), fix a typo in src_install.
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.0-enum_fix.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.0-enum_fix.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.0-enum_fix.patch?rev=1.1&content-type=text/plain
13
14 Index: nvidia-cuda-toolkit-3.0-enum_fix.patch
15 ===================================================================
16 diff -Naur cuda.orig/include/cudaGL.h cuda/include/cudaGL.h
17 --- cuda.orig/include/cudaGL.h 2010-03-21 13:19:57.000000000 +0100
18 +++ cuda/include/cudaGL.h 2010-03-21 13:46:29.000000000 +0100
19 @@ -59,7 +59,7 @@
20 typedef enum CUGLmap_flags_enum {
21 CU_GL_MAP_RESOURCE_FLAGS_NONE = 0x00,
22 CU_GL_MAP_RESOURCE_FLAGS_READ_ONLY = 0x01,
23 - CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02,
24 + CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02
25 } CUGLmap_flags;
26
27 CUresult CUDAAPI cuGLInit(void);
28 diff -Naur cuda.orig/include/cuda_gl_interop.h cuda/include/cuda_gl_interop.h
29 --- cuda.orig/include/cuda_gl_interop.h 2010-03-21 13:19:57.000000000 +0100
30 +++ cuda/include/cuda_gl_interop.h 2010-03-21 13:28:07.000000000 +0100
31 @@ -82,7 +82,7 @@
32 {
33 cudaGLMapFlagsNone = 0, ///< Default; Assume resource can be read/written
34 cudaGLMapFlagsReadOnly = 1, ///< CUDA kernels will not write to this resource
35 - cudaGLMapFlagsWriteDiscard = 2, ///< CUDA kernels will only write to and will not read from this resource
36 + cudaGLMapFlagsWriteDiscard = 2 ///< CUDA kernels will only write to and will not read from this resource
37 };
38
39 extern __host__ cudaError_t CUDARTAPI cudaGLRegisterBufferObject(GLuint bufObj);
40 diff -Naur cuda.orig/include/driver_types.h cuda/include/driver_types.h
41 --- cuda.orig/include/driver_types.h 2010-03-21 13:19:57.000000000 +0100
42 +++ cuda/include/driver_types.h 2010-03-21 13:26:09.000000000 +0100
43 @@ -244,7 +244,7 @@
44 /*DEVICE_BUILTIN*/
45 enum cudaGraphicsRegisterFlags
46 {
47 - cudaGraphicsRegisterFlagsNone = 0, ///< Default
48 + cudaGraphicsRegisterFlagsNone = 0 ///< Default
49 };
50
51 /**
52 @@ -255,7 +255,7 @@
53 {
54 cudaGraphicsMapFlagsNone = 0, ///< Default; Assume resource can be read/written
55 cudaGraphicsMapFlagsReadOnly = 1, ///< CUDA will not write to this resource
56 - cudaGraphicsMapFlagsWriteDiscard = 2, ///< CUDA will only write to and will not read from this resource
57 + cudaGraphicsMapFlagsWriteDiscard = 2 ///< CUDA will only write to and will not read from this resource
58 };
59
60 /**
61 @@ -268,7 +268,7 @@
62 cudaGraphicsCubeFacePositiveY = 0x02, ///< Positive Y face of cubemap
63 cudaGraphicsCubeFaceNegativeY = 0x03, ///< Negative Y face of cubemap
64 cudaGraphicsCubeFacePositiveZ = 0x04, ///< Positive Z face of cubemap
65 - cudaGraphicsCubeFaceNegativeZ = 0x05, ///< Negative Z face of cubemap
66 + cudaGraphicsCubeFaceNegativeZ = 0x05 ///< Negative Z face of cubemap
67 };
68
69 /**