From 6c25c3d9b9cf506e7c7dffe8354ce372ad1f7ef6 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Mon, 17 May 2010 19:37:19 +0000 Subject: [PATCH] Add cross-compile fixes. Thx solar. (force due to not updated cvs tree) Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 RepoMan-Options: --force --- media-libs/mesa/ChangeLog | 5 ++++- media-libs/mesa/Manifest | 14 ++++++++++++-- media-libs/mesa/mesa-7.8.1.ebuild | 18 ++++++++++++++++-- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index 103123a86303..4b3da1fd1084 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/mesa # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.270 2010/05/12 18:21:43 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.271 2010/05/17 19:37:19 scarabeus Exp $ + + 17 May 2010; Tomáš Chvátal mesa-7.8.1.ebuild: + Add cross-compile fixes. Thx solar. 12 May 2010; Brent Baude mesa-7.7.1.ebuild: Marking mesa-7.7.1 ppc64 stable for bug 308521 diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 4d663c39bb0d..7c534b3268e5 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 0001-st-xorg-Adopt-to-new-dirty-clip-rect-type.patch 1135 RMD160 55c85bcf2ae92c9039f4394c07271863d5fb8c69 SHA1 4c29e61a096bcda471dc4ceb68712f937c1f08f8 SHA256 0c494b66f452d38e0012a5604da50e74779cd0e10c3e7408d797cd1f1ab0fc62 AUX lib/libGL.la 729 RMD160 b89950051dfa9d02824eb0b15858855016f92dcc SHA1 32c0aabf00f1590aa7aeca75955b80a04c6c7f15 SHA256 f5e62da033bfb72a56d6290d6030df4d5f687acea456a8f31a765c0c4f532606 AUX lib/libGLU.la 743 RMD160 34e3adc8e0422a5477a9eaa0fee141e577afeee4 SHA1 c131df3a61b7f193e8a8cea3feeb1f9ff0f1ea7d SHA256 0a8efb7cd557598607ede88af6442574a6999689ddbb7f0f3cbaf53734bfa284 @@ -6,6 +9,13 @@ DIST MesaLib-7.7.1.tar.bz2 4990250 RMD160 2f0dcc017aa97c364538a9fd29d5cdb247ab78 DIST MesaLib-7.8.1.tar.bz2 5137426 RMD160 b7b989342dc80a2a12456c17882e652db7bd86cd SHA1 1c15c62f845ef9b648366aa804410f68f7f79172 SHA256 b0b46e5abfd75db44501e308125fa92bcf1c91d91e97a043a3b1764cfa0907fa EBUILD mesa-7.5.2.ebuild 7691 RMD160 483cf8426096b4836b2829c623a108f4008bd8ed SHA1 786e3df77391a76ba2c3ddb39e05a71477ae8a1c SHA256 96b2d79b0f9a1f3bd3f4060c2de82aa0060bd37f5e0955b374ae2b63fc7e0134 EBUILD mesa-7.7.1.ebuild 5947 RMD160 8203c1a7b91f296a4fc140cb4467408fef3ee1c3 SHA1 cd6c1ab44b368ec045ea8d598e9b2022bd04cbcf SHA256 88d1fe991839cbebee2f5790d7ea940b892e4af5a7eabd79bbdfb2f89a7a6e55 -EBUILD mesa-7.8.1.ebuild 5947 RMD160 fdd30482cc0fb78207e2315bcb8ad5f37defc2c5 SHA1 0b81205ba900677c19214d973f8d3385d3294fa8 SHA256 65729844a860658f544f10f8f3cf5e8b084c56ac2b6633ee818d5ea596ccf857 -MISC ChangeLog 47310 RMD160 0c93b859024d2c6e15c4fa32f4e4196eb7190baa SHA1 813bf2f4983731fee5077f37c3d166a290be052a SHA256 373ef05e96d6864e4c6dc57991f8cbd7fd596077c793ae25aeaa63271ed15a31 +EBUILD mesa-7.8.1.ebuild 6530 RMD160 ef4e893f133a301743e51140f382f210035994db SHA1 62617f2baea72617380f5e12b9f821c94a5517cb SHA256 01bb7e1d393d18b0b454a646b82a128733d09b6c81a0c40c2367d931506dc7ae +MISC ChangeLog 47426 RMD160 1aca8a4bdc2358f22a51595f5d8759065d260c38 SHA1 54e3c01c968e808d5f16808e8212a25a22dac372 SHA256 6835613b0028b21b73272f09cfaaa05056b8f5964ab0e2d491a3f33bec2c115e MISC metadata.xml 344 RMD160 2a7cf045329a3141e5ae1396b497ca0e98a1888b SHA1 b730806d6fa2db3bada9e66dd6b93b9e40d6dfea SHA256 849997a7912f4428382a3bdc6b6b6bdb2928048a274fa865b3c89cd3e89e6dde +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkvxmvwACgkQHB6c3gNBRYcuMACgwDyagWFjIrDmJkJ/p6V8+1Wq +Ww0AmgJX/TVFAqDtxh/RUH9P0Nxj7f2l +=GHmz +-----END PGP SIGNATURE----- diff --git a/media-libs/mesa/mesa-7.8.1.ebuild b/media-libs/mesa/mesa-7.8.1.ebuild index f501e7a8017a..86cdc820988d 100644 --- a/media-libs/mesa/mesa-7.8.1.ebuild +++ b/media-libs/mesa/mesa-7.8.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.8.1.ebuild,v 1.1 2010/04/06 08:43:11 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.8.1.ebuild,v 1.2 2010/05/17 19:37:19 scarabeus Exp $ EAPI=3 @@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then EXPERIMENTAL="true" fi -inherit autotools multilib flag-o-matic ${GIT_ECLASS} portability +inherit autotools multilib flag-o-matic toolchain-funcs ${GIT_ECLASS} portability OPENGL_DIR="xorg-x11" @@ -104,6 +104,14 @@ src_prepare() { [[ ${CHOST} == *-freebsd6.* ]] && \ sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac + # In order for mesa to complete it's build process we need to use a tool + # that it compiles. When we cross compile this clearly does not work + # so we require mesa to be built on the host system first. -solar + if tc-is-cross-compiler; then + sed -i -e "s#^GLSL_CL = .*\$#GLSL_CL = glsl-compile#g" \ + "${S}"/src/mesa/shader/slang/library/Makefile || die + fi + eautoreconf } @@ -169,6 +177,12 @@ src_configure() { src_install() { emake DESTDIR="${D}" install || die "Installation failed" + # Save the glsl-compiler for later use + if ! tc-is-cross-compiler; then + dodir /usr/bin/ + cp "${S}"/src/glsl/apps/compile "${D}"/usr/bin/glsl-compile \ + || die "failed to copy the glsl compiler." + fi # Remove redundant headers # GLUT thing rm -f "${D}"/usr/include/GL/glut*.h || die "Removing glut include failed." -- 2.26.2