Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-games/ogre
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2013-01-09 17:26:23 +0000
committerJulian Ospald <hasufell@gentoo.org>2013-01-09 17:26:23 +0000
commit44ab567f103b9fc2103e7e46989a2b7fa309bf58 (patch)
treee1b8fa3ba008a1becdb46fad38b65cfd570e5e25 /dev-games/ogre
parentapp-text/dos2unix: Cleaned old (diff)
downloadhistorical-44ab567f103b9fc2103e7e46989a2b7fa309bf58.tar.gz
historical-44ab567f103b9fc2103e7e46989a2b7fa309bf58.tar.bz2
historical-44ab567f103b9fc2103e7e46989a2b7fa309bf58.zip
fix build with USE=gles2 wrt #435560
Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64 Manifest-Sign-Key: 0xE73C35B3
Diffstat (limited to 'dev-games/ogre')
-rw-r--r--dev-games/ogre/ChangeLog8
-rw-r--r--dev-games/ogre/Manifest19
-rw-r--r--dev-games/ogre/files/ogre-1.8.1-gles2.patch22
-rw-r--r--dev-games/ogre/ogre-1.8.1.ebuild7
4 files changed, 49 insertions, 7 deletions
diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index c6128c950a59..9b707c31f7fe 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-games/ogre
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.91 2012/12/14 12:53:39 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.92 2013/01/09 17:26:13 hasufell Exp $
+
+ 09 Jan 2013; Julian Ospald <hasufell@gentoo.org> ogre-1.8.1.ebuild,
+ +files/ogre-1.8.1-gles2.patch:
+ fix build with USE=gles2 wrt #435560
14 Dec 2012; Agostino Sarubbo <ago@gentoo.org> ogre-1.8.1.ebuild:
Stable for x86, wrt bug #447160
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index da7bc3b7ca6e..7966e9125861 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,10 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX ogre-1.8.0-flags.patch 791 SHA256 ee88c072c45e4ccefe956c8bbfacba4c7ddcac3328b74c04159c37c3f6c53378 SHA512 b2c15e79e265b8b1c8386f1ab264f19542fb4e30e4e53455b4b64ae53e69fbb863a91a6f2347e09c5e39a4b53f2a5e61189b1e417e896c3f37d8d22dbd2652ed WHIRLPOOL f309a1f9f06121fb8a5e2072278143eaad8731c4ad57bd09817e6d884254ed3aa99f485cb7ebf6e348cbf4113a682d94111d26177ae9d50184bd27205c5dc8d9
AUX ogre-1.8.0-threading.patch 2060 SHA256 5404ac5abd128fbe0d6a54344d82cdc1587ef12932c7f152454ef5e60cec0212 SHA512 0da8baa8369154d9e31bbaacf88a7249839bc53bf576c437e54d26221bac10f6113f65d92cea814ccaaa1bcf49e575a700911741dd5c03bef9aec87d66943248 WHIRLPOOL 8abe68d9393d36a0226a46c005547dc296e3bba7f8aca95a123833f3f7e2cd6998e479765175e932f7a5a2901f71def51aa094c936dc6b2da37b5359dc635b7a
AUX ogre-1.8.1-flags.patch 791 SHA256 ee88c072c45e4ccefe956c8bbfacba4c7ddcac3328b74c04159c37c3f6c53378 SHA512 b2c15e79e265b8b1c8386f1ab264f19542fb4e30e4e53455b4b64ae53e69fbb863a91a6f2347e09c5e39a4b53f2a5e61189b1e417e896c3f37d8d22dbd2652ed WHIRLPOOL f309a1f9f06121fb8a5e2072278143eaad8731c4ad57bd09817e6d884254ed3aa99f485cb7ebf6e348cbf4113a682d94111d26177ae9d50184bd27205c5dc8d9
+AUX ogre-1.8.1-gles2.patch 898 SHA256 7f097e7c8319352ed2c1db7979cbe38d303093881173351145b52f51092934ce SHA512 da163643260be3293f9aae667d1b937dff343c38820fc01caa4e90e253c741c263f42408669063a5bb49139f3406da618532f4dc414e2844bb03699bf4bb7617 WHIRLPOOL 5845a040d2e85dacc2abcab6e8ceb776f58589c710d0836afddfe5c94b1e7a57690c2c1506ea6053b8b74c21894d873f6952aac922ff48c15d81dbf61087bf2e
AUX ogre-1.8.1-threading.patch 2060 SHA256 5404ac5abd128fbe0d6a54344d82cdc1587ef12932c7f152454ef5e60cec0212 SHA512 0da8baa8369154d9e31bbaacf88a7249839bc53bf576c437e54d26221bac10f6113f65d92cea814ccaaa1bcf49e575a700911741dd5c03bef9aec87d66943248 WHIRLPOOL 8abe68d9393d36a0226a46c005547dc296e3bba7f8aca95a123833f3f7e2cd6998e479765175e932f7a5a2901f71def51aa094c936dc6b2da37b5359dc635b7a
DIST ogre_src_v1-8-0.tar.bz2 88682669 SHA256 2f59de73b0717c5d2084285f2594a045a9240a8a53e5b38203419c4e715c8ba6 SHA512 fd382a6c6da90c5f7e99531ddc784375e83e0b7eacaa2da3e749fb837ca85673415ebc788a3898d0d4026e2e0b0208ae32f1972ad229d1d07e0d9fb89e5295cd WHIRLPOOL cb750c4f7eb92559467d234d926b56f79994f6652ab83340e05a7b89dbc3bf2528ec6885fc2e811560db788c65f62c32c0e140c71d32905270e7cb877be15fe2
DIST ogre_src_v1-8-1.tar.bz2 88619968 SHA256 da908ac934265d25e378d336d648327afe569a758ef262029acd357d506f6aab SHA512 0bbce593e5a9ebf51e3cb53661f6447d99ae28a53365d7f518c6d408216690527ef7552385160cff8d5c3ef15d3ab5c2520ef2c1f51fda5541d5d4dca4663ae2 WHIRLPOOL 7325effb6421710ff0e21ab0e29443404fed151cc2aeaf481c597fd098278bb6223b9e2115abbd175f305e909491766c2d7b871b028d5b46f8028269b25c161d
EBUILD ogre-1.8.0.ebuild 2531 SHA256 35461dae6a7e96231ee4b9fd14d94703be68b813b049fc958dcfddc3d32165da SHA512 3b6dc2bc4da220dbd212e0a9037f358345415110cdadf7231a5cfef8686de20078886a0136caca7a4eb0398b6654978afc52d4e32ac487f79ef8d6aa5ebd6fe2 WHIRLPOOL b89e45bb2586508400461c7fd635045045f4112e264de72027d15bf1a27a6f2e078585c774fae11505c0f20932e91a9dbced4a4aee125e1f2648460484e3eeaa
-EBUILD ogre-1.8.1.ebuild 2680 SHA256 cae7f6b7cfcbec0a3316fdd0a7265bd83ff15e152d2578c5fc6cd3108bba13b2 SHA512 f09b446e535333b3efe296519c7ad6c61df25ae0b2c05e74ac7baf1530b0c51ed3d0a27015c2e1b473a41e59a73e94afe1ca468be371947dab18009ec633321a WHIRLPOOL 78d4c9c7a99aed496f3fb601aeef459378620eeffdfe182ebba900fa3a14a78547fadd1f0508c08e60f28d06e574878e6074f435f233963dfb5e712cbae2b8c9
-MISC ChangeLog 13035 SHA256 536a50cf8ffc2c80d32d1b9c36d4265924a714b7059ad45ba852068005f66e4c SHA512 fec90688deb443ec80bc270e18b34e23ea49e43b48d07c2e4424e9a0708dc03a327811b9156b7d0f428d9f5ef11382c749ce435c9edde536f4d53335779612a5 WHIRLPOOL 98ce23db5dff3559cee3453e7a0f9649dcbbe6a9f419a9ad83dec8b5a9dd7906fa90eb6fa394701ad29df12a744cef4ad93e7abae7c6b5c29bb97ae37101a25c
+EBUILD ogre-1.8.1.ebuild 2720 SHA256 4471284330eb1f1951c07fc3c48300300c3d04dd59dcdd4e06ce74ab658ddbc9 SHA512 66b693b72a19f3305e5b57e113d6c722fbf4e09736310306ae4326e1c77efd4945d0af208b2cab366c3c6d04504a1889cc23d944525920cb5e057b658c8a1291 WHIRLPOOL 00404193542b03e5e77d8ddc2a3e90c73ce30f6ac409b9a4ab1226b35c92a8779eb5d8cfaccf3d81f67565f0718855f968c1797ddfcfe2be22b427d62546a4b3
+MISC ChangeLog 13183 SHA256 dbea658a6cdfb08634385dcb82909e0fc587ce0dc9d925ee453056971a057771 SHA512 90dce454016cecd7b300ff7b9f10e2ea103594e97d78e7b79d01927e03409db8dfc002fe769c68f585042dd72d15574919e6fedfafcd2e83db9881b64f756a97 WHIRLPOOL eb598c496b47355e39d00134efce60f7a02a440f3c4b4031b0e7ac8dfbddae863d847e7d01d7c24e4806c64ccacc6e7cd36c4ccb3baeb47039a1e6a413078612
MISC metadata.xml 4897 SHA256 45a214db2ff7ecfbc7c9d4949cba75af450a8cf1c65ab44a57d6cc74d3ae4be6 SHA512 7cf77c7422fec1116e163f8035aa8a8aaedfafaee05ee1d315f667e902169066eadf5f5fa8960e1fd4b311a029212fb9766b7e6b343ad250c3e0390d360fc323 WHIRLPOOL 13507b98e0eadb961effc15eab2859933944873fb51439761211a76fd40947129ce1e6a69035727b1c66d6e981818eb357ef116af4f18522a21faed7fbaadb1e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ7ag+AAoJEFpvPKfnPDWzJ/oH/RhRxCTOXXvQqylCYpMOcsD1
+y+sUY5W7+3bXeqLFbjowAYWOZvdicLHUnsdBzGVoLPSI68iTfGlGn9tspVPGsHtr
+sNbBb3SGrAKNdgXPqECFOrI29edJV7fYFGe59bqCGyIsQbGeTxQNVIcqBX4+rGyH
+X18Hp3zoqOQxa1nzmsMmcggIk8LnbbR8nt1QN6K66ID8+eggsCPcMZgZXgRX9lgt
+h2l14hA8oA+dfjB0jpOgAQWxVQkW6EjtOfko+fhZf8JeUdh/bcOdfdYUgDnaQpg6
+P/P/LQYCQKHaDHV+WQzbGfbHFnrj7XjyUy6t8Ijio+1xYoAloq0Z7B0QafiO8Zs=
+=+mNW
+-----END PGP SIGNATURE-----
diff --git a/dev-games/ogre/files/ogre-1.8.1-gles2.patch b/dev-games/ogre/files/ogre-1.8.1-gles2.patch
new file mode 100644
index 000000000000..6c9a3f33b2a5
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.8.1-gles2.patch
@@ -0,0 +1,22 @@
+https://bitbucket.org/sinbad/ogre/commits/6e2e797877491fa9bea169e063a9663834977d8e
+
+--- RenderSystems/GLES2/src/GLSLES/src/OgreGLSLESProgramPipeline.cpp
++++ RenderSystems/GLES2/src/GLSLES/src/OgreGLSLESProgramPipeline.cpp
+@@ -138,7 +138,7 @@
+ GLint binaryLength = 0;
+
+ #if GL_OES_get_program_binary
+- glGetProgramiv(mGLHandle, GL_PROGRAM_BINARY_LENGTH_OES, &binaryLength);
++ glGetProgramiv(mGLProgramHandle, GL_PROGRAM_BINARY_LENGTH_OES, &binaryLength);
+ GL_CHECK_ERROR;
+ #endif
+
+@@ -148,7 +148,7 @@
+
+ #if GL_OES_get_program_binary
+ // Get binary
+- glGetProgramBinaryOES(mGLHandle, binaryLength, NULL, (GLenum *)newMicrocode->getPtr(), newMicrocode->getPtr() + sizeof(GLenum));
++ glGetProgramBinaryOES(mGLProgramHandle, binaryLength, NULL, (GLenum *)newMicrocode->getPtr(), newMicrocode->getPtr() + sizeof(GLenum));
+ GL_CHECK_ERROR;
+ #endif
+
diff --git a/dev-games/ogre/ogre-1.8.1.ebuild b/dev-games/ogre/ogre-1.8.1.ebuild
index 55ba0955f38a..1818f3e54772 100644
--- a/dev-games/ogre/ogre-1.8.1.ebuild
+++ b/dev-games/ogre/ogre-1.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.8.1.ebuild,v 1.4 2012/12/14 12:53:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.8.1.ebuild,v 1.5 2013/01/09 17:26:13 hasufell Exp $
EAPI=4
inherit eutils cmake-utils
@@ -45,7 +45,8 @@ S=${WORKDIR}/${PN}_src_v${MY_PV}
src_prepare() {
epatch \
"${FILESDIR}"/${P}-threading.patch \
- "${FILESDIR}"/${P}-flags.patch
+ "${FILESDIR}"/${P}-flags.patch \
+ "${FILESDIR}"/${P}-gles2.patch
sed -i \
-e "s:share/OGRE/docs:share/doc/${PF}:" \
Docs/CMakeLists.txt || die