1 |
darkside 11/01/27 16:44:03 |
2 |
|
3 |
Modified: ChangeLog mesa-7.10.ebuild |
4 |
Log: |
5 |
Push Gentoo Prefix changes from x11 overlay, as approved |
6 |
|
7 |
(Portage version: 2.1.9.35/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.308 media-libs/mesa/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.308&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.308&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/ChangeLog?r1=1.307&r2=1.308 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v |
19 |
retrieving revision 1.307 |
20 |
retrieving revision 1.308 |
21 |
diff -u -r1.307 -r1.308 |
22 |
--- ChangeLog 12 Jan 2011 00:14:54 -0000 1.307 |
23 |
+++ ChangeLog 27 Jan 2011 16:44:03 -0000 1.308 |
24 |
@@ -1,6 +1,9 @@ |
25 |
# ChangeLog for media-libs/mesa |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.307 2011/01/12 00:14:54 chithanh Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.308 2011/01/27 16:44:03 darkside Exp $ |
29 |
+ |
30 |
+ 27 Jan 2011; Jeremy Olexa <darkside@g.o> mesa-7.10.ebuild: |
31 |
+ Push Gentoo Prefix changes from x11 overlay, as approved |
32 |
|
33 |
*mesa-7.10 (12 Jan 2011) |
34 |
|
35 |
|
36 |
|
37 |
|
38 |
1.2 media-libs/mesa/mesa-7.10.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-7.10.ebuild?rev=1.2&view=markup |
41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-7.10.ebuild?rev=1.2&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-7.10.ebuild?r1=1.1&r2=1.2 |
43 |
|
44 |
Index: mesa-7.10.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10.ebuild,v |
47 |
retrieving revision 1.1 |
48 |
retrieving revision 1.2 |
49 |
diff -u -r1.1 -r1.2 |
50 |
--- mesa-7.10.ebuild 12 Jan 2011 00:14:54 -0000 1.1 |
51 |
+++ mesa-7.10.ebuild 27 Jan 2011 16:44:03 -0000 1.2 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2011 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10.ebuild,v 1.1 2011/01/12 00:14:54 chithanh Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10.ebuild,v 1.2 2011/01/27 16:44:03 darkside Exp $ |
57 |
|
58 |
EAPI=3 |
59 |
|
60 |
@@ -35,7 +35,7 @@ |
61 |
|
62 |
LICENSE="LGPL-2 kilgard" |
63 |
SLOT="0" |
64 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
65 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
66 |
|
67 |
INTEL_CARDS="intel" |
68 |
RADEON_CARDS="radeon" |
69 |
@@ -140,6 +140,11 @@ |
70 |
-e "s/-DHAVE_POSIX_MEMALIGN//" \ |
71 |
configure.ac || die |
72 |
fi |
73 |
+ # Solaris needs some recent POSIX stuff in our case |
74 |
+ if [[ ${CHOST} == *-solaris* ]] ; then |
75 |
+ sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die |
76 |
+ sed -i -e 's/uint/unsigned int/g' src/egl/drivers/glx/egl_glx.c || die |
77 |
+ fi |
78 |
|
79 |
# In order for mesa to complete it's build process we need to use a tool |
80 |
# that it compiles. When we cross compile this clearly does not work |
81 |
@@ -238,9 +243,9 @@ |
82 |
fi |
83 |
# Remove redundant headers |
84 |
# GLUT thing |
85 |
- rm -f "${D}"/usr/include/GL/glut*.h || die "Removing glut include failed." |
86 |
+ rm -f "${ED}"/usr/include/GL/glut*.h || die "Removing glut include failed." |
87 |
# Glew includes |
88 |
- rm -f "${D}"/usr/include/GL/{glew,glxew,wglew}.h \ |
89 |
+ rm -f "${ED}"/usr/include/GL/{glew,glxew,wglew}.h \ |
90 |
|| die "Removing glew includes failed." |
91 |
|
92 |
# Install config file for eselect mesa |
93 |
@@ -252,15 +257,15 @@ |
94 |
ebegin "Moving libGL and friends for dynamic switching" |
95 |
dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include} |
96 |
local x |
97 |
- for x in "${D}"/usr/$(get_libdir)/libGL.{la,a,so*}; do |
98 |
+ for x in "${ED}"/usr/$(get_libdir)/libGL.{la,a,so*}; do |
99 |
if [ -f ${x} -o -L ${x} ]; then |
100 |
- mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \ |
101 |
+ mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \ |
102 |
|| die "Failed to move ${x}" |
103 |
fi |
104 |
done |
105 |
- for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do |
106 |
+ for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do |
107 |
if [ -f ${x} -o -L ${x} ]; then |
108 |
- mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \ |
109 |
+ mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \ |
110 |
|| die "Failed to move ${x}" |
111 |
fi |
112 |
done |
113 |
@@ -272,7 +277,7 @@ |
114 |
dodir /usr/$(get_libdir)/mesa |
115 |
for x in ${gallium_drivers[@]}; do |
116 |
if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then |
117 |
- mv -f "${D}/usr/$(get_libdir)/dri/${x}" "${D}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \ |
118 |
+ mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \ |
119 |
|| die "Failed to move ${x}" |
120 |
insinto "/usr/$(get_libdir)/dri/" |
121 |
if [ -f "${S}/$(get_libdir)/${x}" ]; then |
122 |
@@ -281,13 +286,13 @@ |
123 |
fi |
124 |
fi |
125 |
done |
126 |
- for x in "${D}"/usr/$(get_libdir)/dri/*.so; do |
127 |
+ for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do |
128 |
if [ -f ${x} -o -L ${x} ]; then |
129 |
mv -f "${x}" "${x/dri/mesa}" \ |
130 |
|| die "Failed to move ${x}" |
131 |
fi |
132 |
done |
133 |
- pushd "${D}"/usr/$(get_libdir)/dri || die "pushd failed" |
134 |
+ pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed" |
135 |
ln -s ../mesa/*.so . || die "Creating symlink failed" |
136 |
# remove symlinks to drivers known to eselect |
137 |
for x in ${gallium_drivers[@]}; do |