Gentoo Archives: gentoo-commits

From: "Kacper Kowalik (xarthisius)" <xarthisius@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers: ati-drivers-12.1-r1.ebuild ChangeLog
Date: Sat, 04 Feb 2012 12:32:46
Message-Id: 20120204123236.B91E32004B@flycatcher.gentoo.org
1 xarthisius 12/02/04 12:32:36
2
3 Modified: ati-drivers-12.1-r1.ebuild ChangeLog
4 Log:
5 Drop opencl use flag and install OpenCL unconditionally
6
7 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 x11-drivers/ati-drivers/ati-drivers-12.1-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.1-r1.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.1-r1.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.1-r1.ebuild?r1=1.1&r2=1.2
15
16 Index: ati-drivers-12.1-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.1-r1.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- ati-drivers-12.1-r1.ebuild 4 Feb 2012 11:15:36 -0000 1.1
23 +++ ati-drivers-12.1-r1.ebuild 4 Feb 2012 12:32:36 -0000 1.2
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2012 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.1-r1.ebuild,v 1.1 2012/02/04 11:15:36 xarthisius Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.1-r1.ebuild,v 1.2 2012/02/04 12:32:36 xarthisius Exp $
29
30 EAPI=4
31
32 @@ -17,7 +17,7 @@
33 SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
34 FOLDER_PREFIX=""
35 fi
36 -IUSE="debug +modules multilib opencl pax_kernel qt4"
37 +IUSE="debug +modules multilib pax_kernel qt4"
38
39 LICENSE="AMD GPL-2 QPL-1.0 as-is"
40 KEYWORDS="~amd64 ~x86"
41 @@ -428,7 +428,7 @@
42 into /opt
43 dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
44 use qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui
45 - use opencl && dobin "${ARCH_DIR}"/usr/bin/clinfo
46 + dobin "${ARCH_DIR}"/usr/bin/clinfo
47 # We cleaned out the compilable stuff in src_unpack
48 dobin "${ARCH_DIR}"/usr/X11R6/bin/*
49
50 @@ -534,23 +534,19 @@
51 doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
52
53 # AMD Cal and OpenCL libraries
54 - if use opencl ; then
55 - exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
56 - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
57 - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
58 - dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
59 - fi
60 + exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
61 + doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
62 + doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
63 + dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
64 exeinto /usr/$(get_libdir)
65 doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
66
67 # OpenCL vendor files
68 - if use opencl ; then
69 - insinto /etc/OpenCL/vendors/
70 - cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
71 - /usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
72 - EOF
73 - doins "${T}"/amdocl${oclsuffix}.icd
74 - fi
75 + insinto /etc/OpenCL/vendors/
76 + cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
77 + /usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
78 + EOF
79 + doins "${T}"/amdocl${oclsuffix}.icd
80
81 local envname="${T}"/04ati-dri-path
82 if [[ -n ${ABI} ]]; then
83
84
85
86 1.272 x11-drivers/ati-drivers/ChangeLog
87
88 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.272&view=markup
89 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.272&content-type=text/plain
90 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?r1=1.271&r2=1.272
91
92 Index: ChangeLog
93 ===================================================================
94 RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v
95 retrieving revision 1.271
96 retrieving revision 1.272
97 diff -u -r1.271 -r1.272
98 --- ChangeLog 4 Feb 2012 11:15:36 -0000 1.271
99 +++ ChangeLog 4 Feb 2012 12:32:36 -0000 1.272
100 @@ -1,6 +1,10 @@
101 # ChangeLog for x11-drivers/ati-drivers
102 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
103 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.271 2012/02/04 11:15:36 xarthisius Exp $
104 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.272 2012/02/04 12:32:36 xarthisius Exp $
105 +
106 + 04 Feb 2012; Kacper Kowalik <xarthisius@g.o>
107 + ati-drivers-12.1-r1.ebuild:
108 + Drop opencl use flag and install OpenCL unconditionally
109
110 *ati-drivers-12.1-r1 (04 Feb 2012)