Gentoo Archives: gentoo-commits

From: "Chi-Thanh Christopher Nguyen (chithanh)" <chithanh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers: ChangeLog ati-drivers-11.11.ebuild
Date: Mon, 21 Nov 2011 15:45:58
Message-Id: 20111121154539.50E522004B@flycatcher.gentoo.org
1 chithanh 11/11/21 15:45:39
2
3 Modified: ChangeLog ati-drivers-11.11.ebuild
4 Log:
5 Fix installation of OpenCL on x86, bug #391249.
6
7 (Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.263 x11-drivers/ati-drivers/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.263&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.263&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?r1=1.262&r2=1.263
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v
19 retrieving revision 1.262
20 retrieving revision 1.263
21 diff -u -r1.262 -r1.263
22 --- ChangeLog 20 Nov 2011 02:01:26 -0000 1.262
23 +++ ChangeLog 21 Nov 2011 15:45:39 -0000 1.263
24 @@ -1,6 +1,10 @@
25 # ChangeLog for x11-drivers/ati-drivers
26 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.262 2011/11/20 02:01:26 chithanh Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.263 2011/11/21 15:45:39 chithanh Exp $
29 +
30 + 21 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
31 + ati-drivers-11.11.ebuild:
32 + Fix installation of OpenCL on x86, bug #391249.
33
34 *ati-drivers-11.11 (20 Nov 2011)
35
36
37
38
39 1.2 x11-drivers/ati-drivers/ati-drivers-11.11.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild?rev=1.2&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild?rev=1.2&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild?r1=1.1&r2=1.2
44
45 Index: ati-drivers-11.11.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild,v
48 retrieving revision 1.1
49 retrieving revision 1.2
50 diff -u -r1.1 -r1.2
51 --- ati-drivers-11.11.ebuild 20 Nov 2011 02:01:26 -0000 1.1
52 +++ ati-drivers-11.11.ebuild 21 Nov 2011 15:45:39 -0000 1.2
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2011 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild,v 1.1 2011/11/20 02:01:26 chithanh Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-11.11.ebuild,v 1.2 2011/11/21 15:45:39 chithanh Exp $
58
59 EAPI=4
60
61 @@ -33,7 +33,10 @@
62 x11-libs/libXinerama
63 x11-libs/libXrandr
64 x11-libs/libXrender
65 - multilib? ( app-emulation/emul-linux-x86-opengl )
66 + multilib? (
67 + app-emulation/emul-linux-x86-opengl
68 + app-emulation/emul-linux-x86-xlibs
69 + )
70 qt4? (
71 x11-libs/libICE
72 x11-libs/libSM
73 @@ -46,7 +49,6 @@
74 "
75
76 DEPEND="${RDEPEND}
77 - app-portage/portage-utils
78 x11-proto/inputproto
79 x11-proto/xf86miscproto
80 x11-proto/xf86vidmodeproto
81 @@ -264,9 +266,7 @@
82 elog "r600 chipset and newer."
83 elog "This represent the ATI Radeon HD series at this moment."
84 elog
85 - elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
86 - elog "as replacement is highly recommended. Rather than staying with"
87 - elog "old versions of this driver."
88 + elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
89 elog "For migration informations please reffer to:"
90 elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
91 einfo
92 @@ -439,7 +439,11 @@
93 # OpenCL
94 if use opencl ; then
95 insinto /etc/OpenCL/vendors/
96 - doins "${ARCH_DIR}"/etc/OpenCL/vendors/amdocl64.icd || die "doins failed"
97 + if [[ "${ABI}" == "amd64" ]] ; then
98 + doins "${ARCH_DIR}"/etc/OpenCL/vendors/amdocl64.icd || die "doins failed"
99 + else
100 + doins "${ARCH_DIR}"/etc/OpenCL/vendors/amdocl32.icd || die "doins failed"
101 + fi
102 fi
103
104 # include.
105 @@ -569,6 +573,9 @@
106 elog "Fully rebooting the system after an ${PN} update is recommended"
107 elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
108 elog "might not work"
109 + elog
110 + elog "Some cards need acpid running to handle events"
111 + elog "Please add it to boot runlevel with rc-update add acpid boot"
112
113 use modules && linux-mod_pkg_postinst
114 "${ROOT}"/usr/bin/eselect opengl set --use-old ati