From f38d341616b51de8b2727bcbc3f5dff4c75b6056 Mon Sep 17 00:00:00 2001 From: Michael Januszewski Date: Sat, 3 Jul 2010 22:54:10 +0000 Subject: [PATCH] Version bump (bug #325831). Thanks to Clemens Rabe for the updated ebuild. Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- dev-util/nvidia-cuda-sdk/Manifest | 12 +- dev-util/nvidia-cuda-toolkit/ChangeLog | 9 +- dev-util/nvidia-cuda-toolkit/Manifest | 12 +- .../nvidia-cuda-toolkit-3.1-enum_fix.patch | 24 +++ .../nvidia-cuda-toolkit-3.1.ebuild | 148 ++++++++++++++++++ 5 files changed, 195 insertions(+), 10 deletions(-) create mode 100644 dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.1-enum_fix.patch create mode 100644 dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.1.ebuild diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest index 2ce650ce1c7b..588ce8e13725 100644 --- a/dev-util/nvidia-cuda-sdk/Manifest +++ b/dev-util/nvidia-cuda-sdk/Manifest @@ -9,6 +9,7 @@ DIST cudasdk_2.2_linux.run 55951278 RMD160 68c05b95b2a1f9230b9a076f1d9cf150d877d DIST cudasdk_2.3_linux.run 66005555 RMD160 e6995f190663ec5826f986420f2c02920a484444 SHA1 6411d962d251cede1fac0eb6eaee001e00c053f4 SHA256 26ec80755b124a8484c93a6481a3c19f4fa7fdae96b087fd889346981c463873 DIST gpucomputingsdk_3.0-beta1_linux.run 108531376 RMD160 f474240b59f3f14924b12134e7c3a75754ade330 SHA1 27a77b8304198814f5ea3c4a158108e3e5d0b0cc SHA256 43b1ffe2a069f5e509efcd476d47a2595bad0db8a6967d91375e706445b9b016 DIST gpucomputingsdk_3.0_linux.run 100306703 RMD160 5850ac6e4c80d5b8f01dfb1f4b34500bc3264650 SHA1 5e1e32a8d27249ea1a427256eaffee7c1f885d21 SHA256 7a3afdd52023cfa49bc67182729ce498cc85fa370dcd4bd33c299fb75945ec5e +DIST gpucomputingsdk_3.1_linux.run 222010279 RMD160 5ae82967b821dfaa8a0b90fbbf2a20c4fd8ef892 SHA1 8b78733e909e52b4e14bdfd8be986bb420268320 SHA256 57d71cf889df7bbbc8b18ba5e74b2dd9e5a64951867c007d63577c2e07afd7ce EBUILD nvidia-cuda-sdk-2.02.0807.1535.ebuild 1681 RMD160 a5f2b051c5ebf2b9d87df734e8ad2eea22f77d9d SHA1 9cda10985b669195bb0e04ca1dab4152b7f5476c SHA256 502a34cbed280a8e37c1299d296832461e533ebe052cf5f379153f9c2cc445e6 EBUILD nvidia-cuda-sdk-2.1.1215.2015.ebuild 1769 RMD160 83432d9aa10b827d453db6d9c134305a302636f7 SHA1 8eedf3ffdafdd85d1e8ed731cb611089fa3074f2 SHA256 9c944000245302a8033b82388d5e289d70a535a51f47fb9fe7e5c4b60f82ea35 EBUILD nvidia-cuda-sdk-2.2-r1.ebuild 1871 RMD160 9140bf49b2813a9f3c2a5a9710e8136cda5596d0 SHA1 cce9e070e541cc4b8db61932a838d1b8a5687fb3 SHA256 05120cc8d9f6d3e28d33d4803db69aa3270b0efe653624d651f3d6b47d6c23ed @@ -16,12 +17,13 @@ EBUILD nvidia-cuda-sdk-2.2.ebuild 1662 RMD160 a5093207a54e4686be5cee0419e3849ed9 EBUILD nvidia-cuda-sdk-2.3.ebuild 1948 RMD160 45d7899e1cb42d15c360a71320dd1510336b3959 SHA1 b73f2c72ba7a862e73b7115d2c272882b7c5f578 SHA256 7be6125b5162c740d4d6e085265ce5465fde0fe603fa48f61840dc447c978055 EBUILD nvidia-cuda-sdk-3.0.ebuild 1927 RMD160 8ec6581e85689c296dd6a56c3289579490369494 SHA1 ff6a031457d3a552a5df056cc768f50840435f16 SHA256 a01339da33c8f9977c611ffc2cb7b6145a885f13b27e7c669a7d4dd69ccfdff0 EBUILD nvidia-cuda-sdk-3.0_beta1.ebuild 1933 RMD160 f9e898d4b786b5e11bf0cc438472200b81de40ff SHA1 cb6da93ec36a23b8d6dc4b8995bb25cf6ee2cf14 SHA256 f5e40f453cfcb2a81f65f79ad7fac7abf19ce431e62c5eabff43d6490e0f9bbe -MISC ChangeLog 4121 RMD160 6707a446e47cc091794495b56afdbe7d884429d3 SHA1 7d236cfc27738af0434155812edc472aa4305461 SHA256 d11459a7379388afe454fd7e8262116bee4fcfb632f6f0eb9c9c029cb2611ecb +EBUILD nvidia-cuda-sdk-3.1.ebuild 1589 RMD160 6e3939ac46a4be479f357a508541d75619feb2cc SHA1 a0d285e167b0ca712301d17b8f7209bb1f5730d1 SHA256 60205e74004088a3be01a8158de147d748ab42910af142d7f0c02efcb3556fc5 +MISC ChangeLog 4320 RMD160 79e383cbc2a53d6184da477b7e85ac7aada52536 SHA1 28973434ed00ed00c6b6320c1463bfa3feceaece SHA256 8c453bab85a29b1ea1921fe1df6ce75c9b3a0b141bf147d1dc8508a412d64e48 MISC metadata.xml 533 RMD160 e687824960583f9189283c95ad2630ba4bc34e12 SHA1 d0aa73f3b64351649b72867df05cb2a6785539fc SHA256 f41f0deb837dab23cf452542fb338fca84cec8665c78a08eaeaa7919b61e673f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkumJEIACgkQchej4aZK9/fqTQCfRMWLrjVFgpDvjiQuoG0YuOhf -6nAAnjZ03rwoVBOKROgbTbFkgGyS/3hU -=SD+e +iEYEARECAAYFAkwvwDQACgkQchej4aZK9/cQfgCfc/HbOxSAl+0qGOBXv7ma4RwJ +DiIAnikpXEwTr3YNmJApAnAHXEg8MEZs +=D1p0 -----END PGP SIGNATURE----- diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog index bfd09382cf1f..05844cfe611d 100644 --- a/dev-util/nvidia-cuda-toolkit/ChangeLog +++ b/dev-util/nvidia-cuda-toolkit/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/nvidia-cuda-toolkit # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.27 2010/06/24 11:02:37 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.28 2010/07/03 22:54:09 spock Exp $ + +*nvidia-cuda-toolkit-3.1 (03 Jul 2010) + + 03 Jul 2010; Michał Januszewski + +nvidia-cuda-toolkit-3.1.ebuild, + +files/nvidia-cuda-toolkit-3.1-enum_fix.patch: + Version bump (bug #325831). Thanks to Clemens Rabe for the updated ebuild. 24 Jun 2010; Michał Januszewski nvidia-cuda-toolkit-3.0.ebuild: diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest index 66559652e278..c495fd625dfe 100644 --- a/dev-util/nvidia-cuda-toolkit/Manifest +++ b/dev-util/nvidia-cuda-toolkit/Manifest @@ -3,6 +3,7 @@ Hash: SHA1 AUX nvidia-cuda-toolkit-2.2-enum_fix.patch 1901 RMD160 74aadb45017c94404d6379a0f94b62db38d74656 SHA1 5b79051ddb2701c80331b64d376e6c106c38def6 SHA256 a1917977a94f0439ca3e28be0eb41b9e5c0ca9c03f3a22dc91d6bfdca253b258 AUX nvidia-cuda-toolkit-3.0-enum_fix.patch 2460 RMD160 df4fa802d2f5b9bdb53bf321145894eba2669ce3 SHA1 daf02f05256674d17c43eccadf12859cf05f10e0 SHA256 7256247bd4def308b263a547b4c0f342c687f11cea17fad527859452417a4cc6 +AUX nvidia-cuda-toolkit-3.1-enum_fix.patch 1193 RMD160 a62d6db592ee632e6806e925aa3d40ebd77cb108 SHA1 24ae3a875f4fb0292eece89ea960274e10add603 SHA256 31849dd2c4774983ae7c8008063de6318e4a1065a977e33f4f7c265ccdea62a7 DIST cudagdb_2.2_linux_32_rhel5.3.run 1181310 RMD160 44c69588df4dde25b93fb9115adccbf2a00a5371 SHA1 8628be1a53251237ec31639e9acd6d95831ea33e SHA256 72ab11691bf8feb5d5dbdab440467aaa61fae3a7ddcf5002dfb3ae75b58eaf3c DIST cudagdb_2.2_linux_64_rhel5.3.run 1336512 RMD160 71492aef7db31dafc8b95d6c073d123ca59b15b4 SHA1 254f9b78808a357077bfba199827aa85ec622453 SHA256 c86ad34018a128e1e2abf3d818c3e01bce3cfe8e53c88b221a45ff5cc877cf7c DIST cudatoolkit_2.2_linux_32_rhel4.7.run 28263025 RMD160 d51c9d4f6d804defde689be002383bce690ee8a6 SHA1 b86d8d1ae6bd2bf50060c5d852ba262cb31f86be SHA256 7a1860d352b9405c3e300e2e1881796e14dee6aef87b368524f67e3ba3502991 @@ -13,16 +14,19 @@ DIST cudatoolkit_3.0-beta1_linux_32_rhel5.3.run 68368026 RMD160 22d623f02c04807e DIST cudatoolkit_3.0-beta1_linux_64_rhel5.3.run 61151391 RMD160 9227825b6fa9b94eafec456115dbccf6f575550f SHA1 508cc4fec3c11ba70588e4172da87bed19952c64 SHA256 4eff6124b762e22f09b98510e5e3f106e957a87e54710af6d4974c3dbfa0914f DIST cudatoolkit_3.0_linux_32_rhel5.3.run 81057579 RMD160 1fb15e3248ae6679922eceed73b276164966eef2 SHA1 605fc2a1e0417dc949a44cb34b9acae978ff3e33 SHA256 9a454cc5e697f62e1dde125b7c252e02ca888bd17218e204033f3e6def337fbe DIST cudatoolkit_3.0_linux_64_rhel5.3.run 105580281 RMD160 33ee9a7c3dc2230e1e5d27d85df5e9e64910e54c SHA1 10afb1bd3891f09b4f19817dfe124ed6456cbb5d SHA256 55a030f9b768f6da99256f89544fcb9a9ae58d2ccf68c9974b544eb9ce16ecde +DIST cudatoolkit_3.1_linux_32_ubuntu9.10.run 66247466 RMD160 ee6c509a33142686c93a599aa461a9002668900d SHA1 814af7902b80cea14315a0cde91c74528cf82328 SHA256 a47dfa1c2d7d320436e27df0871f86311788e4befc0a3fc6373919e231583953 +DIST cudatoolkit_3.1_linux_64_ubuntu9.10.run 77819853 RMD160 c07af6804da2f565b23458ee1f033bedd36c502b SHA1 fc44332458ec52b194a556c9d1f72b2752938f56 SHA256 06cebc47f2d2df8ff1ce5696493b606040657030838a165823a8b3145a7c6620 EBUILD nvidia-cuda-toolkit-2.2-r3.ebuild 3008 RMD160 f821f04dd3d5469a0ec8006f8c8e51e91ff058eb SHA1 d5ae73dcc93afefa468d2e90541a6e71a24601a8 SHA256 822932868afc62902aa12655fb378e4a7d6eed9ebbbb6f6ea73a4d9975ea5baf EBUILD nvidia-cuda-toolkit-2.3.ebuild 2941 RMD160 a0c2b69579699fde1512c520848833535a53d0a0 SHA1 02839e6288fe6aa7f7a524e79a15ee4871dba0e9 SHA256 abb4b390a6b8947b5f1da41c65d2c446a1b03bfb1bfd102e01c288b6d0781241 EBUILD nvidia-cuda-toolkit-3.0.ebuild 3421 RMD160 fdacd92c92304f78142d770e491de854d8815027 SHA1 4e55939f46db30a35d395ab4d68c4eb157f423a8 SHA256 2f550d1e30adc06bbe00df456006377450c527cab557b9405e658c56513d6771 EBUILD nvidia-cuda-toolkit-3.0_beta1.ebuild 3003 RMD160 38dedf40fe7266c62fec3b24af3cb87d0e5f357b SHA1 bbc31963f0b1fd651b51c11b63d1961995d64fe6 SHA256 1b6255c77aa2fa022987906b8e72b442257e898b3e57e889095efc3da742a210 -MISC ChangeLog 4958 RMD160 b376fe0f9f4177a2f7334d80b99d4001388ac404 SHA1 8cee3317e5e91968af31dba1d7d1f337f4add08c SHA256 8ccddffca39fc24683fdbf99f55d92eaddf862f56c1c6cbb4668905dfa01d5bc +EBUILD nvidia-cuda-toolkit-3.1.ebuild 3254 RMD160 0fc076e89f5e1466d69ad9418d8e11f1c3521817 SHA1 6213992fe62a0559494dc642081f52fb2e3d0125 SHA256 960c85024120892402bdd81cdafb9e9fe5c202fff8bbf7f67af5b9d154dd3b8f +MISC ChangeLog 5214 RMD160 2f880005f7fabe3302af18014075736c7683731e SHA1 80c3a60f0cdb980d098d649cf23bf0a8d2225b69 SHA256 bfb4a8021a75210ebf0aba4158fd3c372fd5b10d911b0efd3b3869de62f76ba9 MISC metadata.xml 484 RMD160 a8b809639cfc4ab4e1133dfc97d37052752741c5 SHA1 4638605669859be01b2c2dc2a0192c7f765176cc SHA256 c5395eacda061252ecad00d6172b91dcc5100b2bec944712f90a6adb122b69f0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkwjO1sACgkQchej4aZK9/cR0gCghXj7E61MFXamPdheAB+X20rY -iIgAnjcMCawPmDsCNclpfWs851/WFA3D -=zHIy +iEYEARECAAYFAkwvv6AACgkQchej4aZK9/ePdACfcAaA4DNC6Ln+qg7CVNvYOAMY +JX0AniaYhwuQYFOtLD7RJALr+raC6/rH +=MK1v -----END PGP SIGNATURE----- diff --git a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.1-enum_fix.patch b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.1-enum_fix.patch new file mode 100644 index 000000000000..698d2c7b56e0 --- /dev/null +++ b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.1-enum_fix.patch @@ -0,0 +1,24 @@ +diff -Naur include.orig/cudaGL.h include/cudaGL.h +--- include.orig/cudaGL.h 2010-04-28 09:31:16.000000000 +0200 ++++ include/cudaGL.h 2010-05-21 00:04:47.000000000 +0200 +@@ -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 include.orig/cuda_gl_interop.h include/cuda_gl_interop.h +--- include.orig/cuda_gl_interop.h 2010-04-28 09:30:46.000000000 +0200 ++++ include/cuda_gl_interop.h 2010-05-21 00:05:08.000000000 +0200 +@@ -83,7 +83,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 --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.1.ebuild new file mode 100644 index 000000000000..83accd86d920 --- /dev/null +++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.1.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.1.ebuild,v 1.1 2010/07/03 22:54:09 spock Exp $ + +EAPI=2 + +inherit eutils multilib + +DESCRIPTION="NVIDIA CUDA Toolkit" +HOMEPAGE="http://developer.nvidia.com/cuda" + +CUDA_V=${PV//_/-} +DIR_V=${CUDA_V//./_} +DIR_V=${DIR_V//beta/Beta} + +BASE_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}/toolkit" +SRC_URI="amd64? ( ${BASE_URI}/cudatoolkit_${CUDA_V}_linux_64_ubuntu9.10.run ) + x86? ( ${BASE_URI}/cudatoolkit_${CUDA_V}_linux_32_ubuntu9.10.run )" + +LICENSE="NVIDIA" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debugger doc profiler" + +DEPEND="!dev-util/nvidia-cuda-profiler" +RDEPEND="${DEPEND} + >=sys-devel/binutils-2.20 + >=sys-devel/gcc-4.0 + profiler? ( x86? ( + x11-libs/qt-gui + x11-libs/qt-core + x11-libs/qt-assistant + x11-libs/qt-sql[sqlite] ) + >=media-libs/libpng-1.2.43-r2 + ) + debugger? ( >=sys-libs/libtermcap-compat-2.0.8-r2 )" +RESTRICT="strip binchecks" + +S="${WORKDIR}" + +src_unpack() { + for f in ${A} ; do + if [ "${f//*.run/}" == "" ]; then + unpack_makeself ${f} + fi + done +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-enum_fix.patch +} + +src_install() { + local DEST=/opt/cuda + + into ${DEST} + dobin bin/* + dolib $(get_libdir)/* + + if ! use debugger; then + rm -f "${D}/${DEST}/bin/cuda-gdb" + fi + + chmod a-x "${D}/${DEST}/bin/nvcc.profile" + + # doman does not respect DESTTREE + insinto ${DEST}/man/man1 + doins man/man1/* + insinto ${DEST}/man/man3 + doins man/man3/* + prepman ${DEST} + + insinto ${DEST}/include + doins -r include/* + + insinto ${DEST}/src + doins src/* + + if use doc ; then + insinto ${DEST}/doc + doins -r doc/* + fi + + cat > "${T}/env" << EOF +PATH=${DEST}/bin +ROOTPATH=${DEST}/bin +LDPATH=${DEST}/$(get_libdir) +MANPATH=${DEST}/man +EOF + newenvd "${T}/env" 99cuda + + if use profiler; then + local target="computeprof" + + into ${DEST}/${target} + dobin ${target}/bin/${target} + + cat > "${T}/env" << EOF +PATH=${DEST}/${target}/bin +ROOTPATH=${DEST}/${target}/bin +EOF + if use x86 ; then + dosym /usr/bin/assistant ${DEST}/${target}/bin + + insinto ${DEST}/${target}/bin + doins ${target}/bin/cudaapitrace.so + else + dobin ${target}/bin/assistant + insinto ${DEST}/${target}/bin + doins ${target}/bin/*.so* + insinto ${DEST}/${target}/bin/sqldrivers + doins ${target}/bin/sqldrivers/* + + cat >> "${T}/env" << EOF +LDPATH=${DEST}/${target}/bin +EOF + fi + + newenvd "${T}/env" 99${target} + + if use doc; then + insinto ${DEST}/${target} + doins ${target}/*.txt + insinto ${DEST}/${target}/doc + doins ${target}/doc/* + insinto ${DEST}/${target}/projects + doins ${target}/projects/* + fi + + make_desktop_entry /opt/cuda/computeprof/bin/computeprof "NVIDIA Compute Visual Profiler" + fi + + export CONF_LIBDIR_OVERRIDE="lib" + # HACK: temporary workaround until CONF_LIBDIR_OVERRIDE is respected. + export LIBDIR_amd64="lib" + + into ${DEST}/open64 + dobin open64/bin/* + libopts -m0755 + dolib open64/lib/* +} + +pkg_postinst() { + elog "If you want to natively run the code generated by this version of the" + elog "CUDA toolkit, you will need >=x11-drivers/nvidia-drivers-256.22." + elog "" + elog "Run '. /etc/profile' before using the CUDA toolkit. " +} -- 2.26.2