From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-319557-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1Psg94-0007Pm-Dq
for garchives@archives.gentoo.org; Thu, 24 Feb 2011 18:42:34 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DE1C11C0D7;
Thu, 24 Feb 2011 18:42:27 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 8B0F51C0E9
for <gentoo-commits@lists.gentoo.org>; Thu, 24 Feb 2011 18:42:27 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 07E6A1B40C0
for <gentoo-commits@lists.gentoo.org>; Thu, 24 Feb 2011 18:42:27 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 659018006A
for <gentoo-commits@lists.gentoo.org>; Thu, 24 Feb 2011 18:42:26 +0000 (UTC)
From: "Dane Smith" <c1pher@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Dane Smith" <c1pher@gentoo.org>
Message-ID: <f85cf8dc27aa830c06681f9a9f4f77bb802eee1c.c1pher@gentoo>
Subject: [gentoo-commits] dev/c1pher:master commit in: profiles/, licenses/, dev-util/ati-stream-sdk/
X-VCS-Repository: dev/c1pher
X-VCS-Files: dev-util/ati-stream-sdk/Manifest dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild licenses/AMD-OCL profiles/package.mask
X-VCS-Directories: profiles/ licenses/ dev-util/ati-stream-sdk/
X-VCS-Committer: c1pher
X-VCS-Committer-Name: Dane Smith
X-VCS-Revision: f85cf8dc27aa830c06681f9a9f4f77bb802eee1c
Date: Thu, 24 Feb 2011 18:42:26 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: bdd43e9e748ccd777ffe0f99af463323
commit: f85cf8dc27aa830c06681f9a9f4f77bb802eee1c
Author: Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 18:37:36 2011 +0000
Commit: Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 18:37:36 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/c1pher.git;a=3D=
commit;h=3Df85cf8dc
Working version of the ati-stream-sdk for testing.
---
dev-util/ati-stream-sdk/Manifest | 2 +-
.../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild | 35 +++--
licenses/AMD-OCL | 157 ++++++++++++++=
++++++
profiles/package.mask | 1 -
4 files changed, 183 insertions(+), 12 deletions(-)
diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/M=
anifest
index fa28365..43928c3 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,5 +1,5 @@
AUX Makefile 2297 RMD160 cb547b9644ae1f1e013f5627fca57d1b47173cde SHA1 8=
c7308662ab9ba793c285d5fe6a14b8262875c59 SHA256 17fddeaea2c5d94ed0ee01bf43=
17a9f20f141ea68a92f78ae4c8b7a36fc6c9bd
DIST ati-stream-sdk-v2.3-lnx32.tgz 49912168 RMD160 07c045de3118531472672=
e9ef7b3763cb32f7d68 SHA1 972bdbe6942e52411a2f041720348e857f17c388 SHA256 =
07fd15a51a678c4378767f61466daf9da21d0bab6088a97a70136dd8c976aca6
DIST ati-stream-sdk-v2.3-lnx64.tgz 78659015 RMD160 57af36f62e590ae54cb9d=
43b880735979b77466c SHA1 43c94e5126563fe3fa4cb92fb6dd20f12864a86d SHA256 =
f92537d1fc306af0bff1441af4669bf2fa668654b12d9fb53a3a872dc8826cad
-EBUILD ati-stream-sdk-2.3-r1.ebuild 1785 RMD160 a49779dcf7c9cc2c759edd25=
2a8de82fb2b4731a SHA1 78f96f8730fb3da67dc6939a646567bf82174217 SHA256 b1f=
1607754f6ca3cb4784242dd260a9e8a6738d08fc7923dbf02ecdd9ee576aa
+EBUILD ati-stream-sdk-2.3-r1.ebuild 2283 RMD160 895b4b104aff70c3bdfcb9ce=
e4bbb460d65c9538 SHA1 3861f98499025bd4d74bbddd0f862e634911f47b SHA256 30f=
925eba989538ac81801bf734670b03da0100f7cd271767259161c0c4a989a
MISC metadata.xml 301 RMD160 1ef0179dbe53f24768e976ab60f6ae0e8ca9e672 SH=
A1 fba668cb8711ac2bcc6b7bfc113a1a513c69b0be SHA256 55f555e646e9d04c8975a7=
36b9a5b3f1d8ea110446c18e988a3b884d0dca33b7
diff --git a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild b/dev-u=
til/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
index 4a993c0..c6e51d7 100644
--- a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
+++ b/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
@@ -13,26 +13,28 @@ SRC_URI=3D" \
amd64? ( http://download2-developer.amd.com/amd/Stream20GA/${MY_P}-lnx6=
4.tgz ) \
x86? ( http://download2-developer.amd.com/amd/Stream20GA/${MY_P}-lnx32.=
tgz )"
=20
-LICENSE=3D"AMD GPL-1 as-is"
+LICENSE=3D"AMD-OCL"
SLOT=3D"0"
KEYWORDS=3D""
IUSE=3D"examples doc multilib"
RESTRICT=3D"strip fetch"
RDEPEND=3D"media-libs/freeglut
+ examples? ( media-libs/glew )
x11-drivers/ati-drivers
- examples? ( media-libs/glew )"
+ !dev-util/nvidia-cuda-sdk
+ !dev-util/nvidia-cuda-toolkit"
=20
QA_EXECSTACK=3D"opt/${PN}/lib*/libatiocl??.so"
=20
S=3D"${WORKDIR}/${MY_P}"
=20
-pkg_nofetch() {
+pkg_nofetch(){
ewarn "Proprietary software. Download at"
ewarn "http://developer.amd.com/gpu/AMDAPPSDK/downloads/Pages/default.a=
spx"
ewarn "and move it to distfiles"
}
=20
-src_unpack() {
+src_unpack(){
default_src_unpack
=20
mv ${MY_P}-lnx* ${MY_P} || die
@@ -46,15 +48,19 @@ src_prepare(){
fi
}
=20
-src_compile() { true; }
+src_compile(){ true; }
=20
-src_install() {
+src_install(){
local DEST=3D/opt/${PN}
=20
rm include/GL/{glext.h,glut.h} || die
=20
if use amd64; then
emake DESTDIR=3D"${D}" ARCH=3D"amd64" install || die "Install failed";
+ if use multilib; then
+ emake DESTDIR=3D"${D}" ARCH=3D"x86" install-lib \
+ || die "Multilib install failed"
+ fi
else
emake DESTDIR=3D"${D}" ARCH=3D"x86" install || die "Install failed";
fi
@@ -62,10 +68,9 @@ src_install() {
cat > "${T}/99${PN}" << EOF
PATH=3D${DEST}/bin
ROOTPATH=3D${DEST}/bin
-LDPATH=3D${DEST}/$(get_libdir)
-LD_LIBRARY_PATH=3D${DEST}/$(get_libdir)
+LDPATH=3D${DEST}/lib
EOF
- doenvd "${T}/99${PN}"
+ doenvd "${T}/99${PN}" || die
=20
if use examples; then
insinto ${DEST}/examples
@@ -75,6 +80,16 @@ EOF
fi
=20
if use doc; then
- dodoc docs/opencl/*
+ dodoc docs/opencl/* || die
fi
}
+
+pkg_postinst(){
+ elog "If you want to be able to compile without passing"
+ elog "-I /opt/ati-stream-sdk/include to gcc, please set"
+ elog "C_INCLUDE_PATH and CPLUS_INCLUDE_PATH to that directory"
+ elog
+ elog "Also, if you do not want to pass -L /opt/ati-stream-sdk/lib/x86(_=
64)"
+ elog "to gcc for every use of -lOpenCL, add that directory to"
+ elog "LD_LIBRARY_PATH."
+}
diff --git a/licenses/AMD-OCL b/licenses/AMD-OCL
new file mode 100644
index 0000000..5d2015b
--- /dev/null
+++ b/licenses/AMD-OCL
@@ -0,0 +1,157 @@
+Do not load this Software until you have
+carefully read and agreed to the following terms and conditions. This i=
s a
+legal agreement ("Agreement") between you (either an individual or an en=
tity)
+(you or "Licensee") and Advanced Micro Devices, Inc. ("AMD"). If License=
e
+does not agree to the terms of this Agreement, do not install or use thi=
s
+Software or any portion thereof. By loading or using this software that=
may
+include associated media, printed Software, and online or electronic
+documentation or any portion thereof that is made available to install
+("Software"), Licensee agrees to all of the terms of this Agreement.
+
+1. License. The software accompanying this License (hereinafter "Softwa=
re"),
+regardless of the form in which it is distributed, is licensed to you by
+Advanced Micro Devices, Inc. You own the medium on which the Software i=
s
+recorded, but Advanced Micro Devices, Inc. and, if applicable, its Licen=
sors
+(referred to collectively as "AMD") retain title to the Software and
+related documentation. You may:
+a) make a copy of the Software in machine-readable form for backup purpo=
ses.
+You must reproduce on such copy AMD's copyright notice and any other
+proprietary legends that were on the original copy of the Software;
+b) transfer all your license rights in the Software to a third party
+provided you must also transfer a copy of this License, the backup copy =
of
+the Software and the related documentation and provided the other party =
reads
+and agrees to accept the terms and conditions of this License. Upon suc=
h
+transfer your license is then terminated; and
+c) make and distribute copies of the Software within your organization,
+provided that you agree to include all copyright legends and other legal
+notices that may appear in the Software, as well as this Software Licens=
e
+Agreement in its entirety, in each copy of the Software that is made or
+distributed.
+
+2. Restrictions. The Software contains copyrighted and patented materi=
al,
+trade secrets and other proprietary material. In order to protect them,=
and
+except as permitted by applicable legislation, you may not:
+a) decompile, reverse engineer, disassemble or otherwise reduce the Soft=
ware
+to a human-perceivable form;
+b) modify, network, rent, lend, loan, distribute or create derivative wo=
rks
+based upon the Software in whole or in part; or
+c) electronically transmit the Software from one computer to another or =
over
+a network or otherwise transfer the Software except as permitted by this
+License.
+
+3 OWNERSHIP AND COPYRIGHT OF SOFTWARE: The Software is owned by AMD and =
is
+protected by United States and foreign intellectual property laws (e.g. =
patent
+and copyright laws) and international treaty provisions. Licensee will =
not
+remove the copyright notice from the Software. Licensee agrees to preve=
nt
+any unauthorized copying of the Software. All title and copyrights in a=
nd
+to the Software, all copies thereof (in whole or in part, and in any for=
m),
+and all rights therein shall remain vested in AMD. Except as expressly
+provided herein, AMD does not grant any express or implied right to Lice=
nsee
+under AMD patents, copyrights, trademarks, or trade secret information. =
All
+rights in and to the Software not expressly granted to Licensee in this
+Agreement are reserved to AMD.
+
+4. SUPPORT: Under this Agreement, AMD is under no obligation to assist=
in
+the use of this Software, to provide support to licensees of the Softwar=
e, or
+to provide maintenance, correction, modification, enhancement, or upgrad=
es to
+the Software. AMD may provide such support, maintenance, correction,
+modification, enhancement or upgrades in a media determined by AMD and A=
MD
+shall have no obligation to notify Licensee thereof. Additionally, such
+support, maintenance, correction, modification, enhancement, or upgrades=
shall
+be considered part of the Software, and shall be subject to this Agreeme=
nt.
+
+5. Termination. This License is effective until terminated. You may
+terminate this License at any time by destroying the Software, related
+documentation and all copies thereof. This License will terminate
+immediately without notice from AMD if you fail to comply with any provi=
sion
+of this License. Upon termination you must destroy the Software, relate=
d
+documentation and all copies thereof.
+
+6. Government End Users. If you are acquiring the Software on behalf of=
any
+unit or agency of the United States Government, the following provisions
+apply. The Government agrees the Software and documentation were develo=
ped
+at private expense and are provided with "RESTRICTED RIGHTS". Use,
+duplication, or disclosure by the Government is subject to restrictions =
as
+set forth in DFARS 227.7202-1(a) and 227.7202-3(a) (1995), DFARS
+252.227-7013(c)(1)(ii) (Oct 1988), FAR 12.212(a)(1995), FAR 52.227-19, (=
June
+1987) or FAR 52.227-14(ALT III) (June 1987),as amended from time to time=
.=20
+In the event that this License, or any part thereof, is deemed inconsist=
ent
+with the minimum rights identified in the Restricted Rights provisions, =
the
+minimum rights shall prevail.
+
+7. EXPORT ASSURANCES: Licensee agrees and certifies that neither the
+Software, nor any direct product thereof will be exported, directly or
+indirectly, into any country prohibited by the United States Export
+Administration Act and the regulations thereunder without the required
+authorization from the United States government nor will it be used for =
any
+purpose prohibited by the same.
+
+8. No Other License. No rights or licenses are granted by AMD under th=
is
+License, expressly or by implication, with respect to any proprietary
+information or patent, copyright, trade secret or other intellectual pro=
perty
+right owned or controlled by AMD, except as expressly provided in this
+License.
+
+9. Additional Licenses. DISTRIBUTION OR USE OF THE SOFTWARE WITH AN
+OPERATING SYSTEM MAY REQUIRE ADDITIONAL LICENSES FROM THE OPERATING SYST=
EM
+VENDOR.=20
+
+10. Disclaimer of Warranty on Software. You expressly acknowledge and =
agree
+that use of the Software is at your sole risk. The Software and related
+documentation are provided "AS IS" and without warranty of any kind and =
AMD
+EXPRESSLY DISCLAIMS ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING, BUT =
NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE. AMD DOES NOT WARRANT THAT THE FUNCTIONS CONTAINED I=
N THE
+SOFTWARE WILL MEET YOUR REQUIREMENTS, OR THAT THE OPERATION OF THE SOFTW=
ARE
+WILL BE UNINTERRUPTED OR ERROR-FREE, OR THAT DEFECTS IN THE SOFTWARE WIL=
L BE
+CORRECTED. THE ENTIRE RISK AS TO THE RESULTS AND PERFORMANCE OF THE
+SOFTWARE IS ASSUMED BY YOU. FURTHERMORE, AMD DOES NOT WARRANT OR MAKE A=
NY
+REPRESENTATIONS REGARDING THE USE OR THE RESULTS OF THE USE OF THE SOFTW=
ARE
+OR RELATED DOCUMENTATION IN TERMS OF THEIR CORRECTNESS, ACCURACY,
+RELIABILITY, CURRENTNESS, OR OTHERWISE. NO ORAL OR WRITTEN INFORMATION O=
R
+ADVICE GIVEN BY AMD OR AMD'S AUTHORIZED REPRESENTATIVE SHALL CREATE A
+WARRANTY OR IN ANY WAY INCREASE THE SCOPE OF THIS WARRANTY. SHOULD THE
+SOFTWARE PROVE DEFECTIVE, YOU (AND NOT AMD OR AMD'S AUTHORIZED
+REPRESENTATIVE) ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAI=
R
+OR CORRECTION. THE SOFTWARE IS NOT INTENDED FOR USE IN MEDICAL, LIFE SA=
VING
+OR LIFE SUSTAINING APPLICATIONS. SOME JURISDICTIONS DO NOT ALLOW THE
+EXCLUSION OF IMPLIED WARRANTIES, SO THE ABOVE EXCLUSION MAY NOT APPLY TO=
YOU.=20
+
+11. Limitation of Liability. UNDER NO CIRCUMSTANCES INCLUDING NEGLIGENC=
E,
+SHALL AMD, OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR AGENTS, BE LIABLE TO=
YOU
+FOR ANY INCIDENTAL, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES (INCLUDIN=
G
+DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUS=
INESS
+INFORMATION, AND THE LIKE) ARISING OUT OF THE USE, MISUSE OR INABILITY T=
O USE
+THE SOFTWARE OR RELATED DOCUMENTATION, BREACH OR DEFAULT, INCLUDING THOS=
E
+ARISING FROM INFRINGEMENT OR ALLEGED INFRINGEMENT OF ANY PATENT, TRADEMA=
RK,
+COPYRIGHT OR OTHER INTELLECTUAL PROPERTY RIGHT, BY AMD, EVEN IF AMD OR A=
MD'S
+AUTHORIZED REPRESENTATIVE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OR EXCLUSION OF
+LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THE ABOVE LIMITATI=
ON OR
+EXCLUSION MAY NOT APPLY TO YOU. AMD will not be liable for 1) loss of, =
or
+damage to, your records or data or 2) any damages claimed by you based o=
n any
+third party claim. In no event shall AMD's total liability to you for =
all
+damages, losses, and causes of action (whether in contract, tort (includ=
ing
+negligence) or otherwise) exceed the amount paid by you for the Software=
.
+
+12. Controlling Law and Severability. This License shall be governed b=
y and
+construed under the laws of the state of California without reference to=
its
+conflict of law principles. In the event of any conflicts between forei=
gn
+law, rules, and regulations, and United States law, rules, and regulatio=
ns,
+United States rules and regulations shall prevail and govern. The Unite=
d
+Nations Convention on Contracts for the International Sale of Goods shal=
l not
+apply to this License. If for any reason a court of competent jurisdict=
ion
+finds any provision of this License or portion thereof, to be unenforcea=
ble,
+that provision of the License shall be enforced to the maximum extent
+permissible so as to effect the intent of the parties, and the remainder=
of
+this License shall continue in full force and effect.
+
+13. Complete Agreement. This License constitutes the entire agreement
+between the parties with respect to the use of the Software and the rela=
ted
+documentation, and supersedes all prior or contemporaneous understanding=
s or
+agreements, written or oral, regarding such subject matter. No amendmen=
t to
+or modification of this License will be binding unless in writing and si=
gned
+by a duly authorized representative of AMD.
+
+This software may be used for any purpose but may not be re-sold in orig=
inal
+or modified form.=20
diff --git a/profiles/package.mask b/profiles/package.mask
index 8bc6804..dc7e99b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,3 +1,2 @@
>=3Ddev-libs/botan-1.9
-dev-util/ati-stream-sdk
sys-kernel/c1pher-sources