diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2010-04-01 21:48:37 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2010-04-01 21:48:37 +0000 |
| commit | 85f11f3c30d9fbe4c3a2752b01a40e707f075b0a (patch) | |
| tree | 7029c6162ec5d6ca758f256a183b2e122bfdade1 /dev-util/nvidia-cuda-toolkit/files | |
| parent | Bug #312687: We actually need to consider the automake from the real root, no... (diff) | |
| download | gentoo-2-85f11f3c30d9fbe4c3a2752b01a40e707f075b0a.tar.gz gentoo-2-85f11f3c30d9fbe4c3a2752b01a40e707f075b0a.tar.bz2 gentoo-2-85f11f3c30d9fbe4c3a2752b01a40e707f075b0a.zip | |
Add an enum fix for gcc pedantic mode (bug #311657), fix a typo in src_install.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/nvidia-cuda-toolkit/files')
| -rw-r--r-- | dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.0-enum_fix.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.0-enum_fix.patch b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.0-enum_fix.patch new file mode 100644 index 000000000000..ce11b492f086 --- /dev/null +++ b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.0-enum_fix.patch @@ -0,0 +1,54 @@ +diff -Naur cuda.orig/include/cudaGL.h cuda/include/cudaGL.h +--- cuda.orig/include/cudaGL.h 2010-03-21 13:19:57.000000000 +0100 ++++ cuda/include/cudaGL.h 2010-03-21 13:46:29.000000000 +0100 +@@ -59,7 +59,7 @@ + typedef enum CUGLmap_flags_enum { + CU_GL_MAP_RESOURCE_FLAGS_NONE = 0x00, + CU_GL_MAP_RESOURCE_FLAGS_READ_ONLY = 0x01, +- CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02, ++ CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02 + } CUGLmap_flags; + + CUresult CUDAAPI cuGLInit(void); +diff -Naur cuda.orig/include/cuda_gl_interop.h cuda/include/cuda_gl_interop.h +--- cuda.orig/include/cuda_gl_interop.h 2010-03-21 13:19:57.000000000 +0100 ++++ cuda/include/cuda_gl_interop.h 2010-03-21 13:28:07.000000000 +0100 +@@ -82,7 +82,7 @@ + { + cudaGLMapFlagsNone = 0, ///< Default; Assume resource can be read/written + cudaGLMapFlagsReadOnly = 1, ///< CUDA kernels will not write to this resource +- cudaGLMapFlagsWriteDiscard = 2, ///< CUDA kernels will only write to and will not read from this resource ++ cudaGLMapFlagsWriteDiscard = 2 ///< CUDA kernels will only write to and will not read from this resource + }; + + extern __host__ cudaError_t CUDARTAPI cudaGLRegisterBufferObject(GLuint bufObj); +diff -Naur cuda.orig/include/driver_types.h cuda/include/driver_types.h +--- cuda.orig/include/driver_types.h 2010-03-21 13:19:57.000000000 +0100 ++++ cuda/include/driver_types.h 2010-03-21 13:26:09.000000000 +0100 +@@ -244,7 +244,7 @@ + /*DEVICE_BUILTIN*/ + enum cudaGraphicsRegisterFlags + { +- cudaGraphicsRegisterFlagsNone = 0, ///< Default ++ cudaGraphicsRegisterFlagsNone = 0 ///< Default + }; + + /** +@@ -255,7 +255,7 @@ + { + cudaGraphicsMapFlagsNone = 0, ///< Default; Assume resource can be read/written + cudaGraphicsMapFlagsReadOnly = 1, ///< CUDA will not write to this resource +- cudaGraphicsMapFlagsWriteDiscard = 2, ///< CUDA will only write to and will not read from this resource ++ cudaGraphicsMapFlagsWriteDiscard = 2 ///< CUDA will only write to and will not read from this resource + }; + + /** +@@ -268,7 +268,7 @@ + cudaGraphicsCubeFacePositiveY = 0x02, ///< Positive Y face of cubemap + cudaGraphicsCubeFaceNegativeY = 0x03, ///< Negative Y face of cubemap + cudaGraphicsCubeFacePositiveZ = 0x04, ///< Positive Z face of cubemap +- cudaGraphicsCubeFaceNegativeZ = 0x05, ///< Negative Z face of cubemap ++ cudaGraphicsCubeFaceNegativeZ = 0x05 ///< Negative Z face of cubemap + }; + + /** |