| 1 |
mr_bones_ 12/05/30 17:51:38 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: ogre-1.7.4-r1.ebuild |
| 5 |
Log: |
| 6 |
fix threading support with patch from hasufell (bug #418269) |
| 7 |
|
| 8 |
(Portage version: 2.1.10.49/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.76 dev-games/ogre/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/ChangeLog?rev=1.76&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/ChangeLog?rev=1.76&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/ChangeLog?r1=1.75&r2=1.76 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v |
| 20 |
retrieving revision 1.75 |
| 21 |
retrieving revision 1.76 |
| 22 |
diff -u -r1.75 -r1.76 |
| 23 |
--- ChangeLog 26 May 2012 15:31:19 -0000 1.75 |
| 24 |
+++ ChangeLog 30 May 2012 17:51:38 -0000 1.76 |
| 25 |
@@ -1,6 +1,11 @@ |
| 26 |
# ChangeLog for dev-games/ogre |
| 27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.75 2012/05/26 15:31:19 ago Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.76 2012/05/30 17:51:38 mr_bones_ Exp $ |
| 30 |
+ |
| 31 |
+*ogre-1.7.4-r1 (30 May 2012) |
| 32 |
+ |
| 33 |
+ 30 May 2012; Michael Sterrett <mr_bones_@g.o> +ogre-1.7.4-r1.ebuild: |
| 34 |
+ fix threading support with patch from hasufell (bug #418269) |
| 35 |
|
| 36 |
26 May 2012; Agostino Sarubbo <ago@g.o> ogre-1.7.4.ebuild: |
| 37 |
Stable for amd64, wrt bug #412675 |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 dev-games/ogre/ogre-1.7.4-r1.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/ogre-1.7.4-r1.ebuild?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/ogre-1.7.4-r1.ebuild?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: ogre-1.7.4-r1.ebuild |
| 47 |
=================================================================== |
| 48 |
# Copyright 1999-2012 Gentoo Foundation |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.7.4-r1.ebuild,v 1.1 2012/05/30 17:51:38 mr_bones_ Exp $ |
| 51 |
|
| 52 |
EAPI="4" |
| 53 |
|
| 54 |
inherit eutils cmake-utils |
| 55 |
|
| 56 |
MY_PV=${PV//./-} |
| 57 |
DESCRIPTION="Object-oriented Graphics Rendering Engine" |
| 58 |
HOMEPAGE="http://www.ogre3d.org/" |
| 59 |
SRC_URI="mirror://sourceforge/${PN}/${PN}_src_v${MY_PV}.tar.bz2" |
| 60 |
|
| 61 |
LICENSE="MIT" |
| 62 |
SLOT="0" |
| 63 |
KEYWORDS="~amd64 ~x86" |
| 64 |
IUSE="+boost cg doc double-precision examples +freeimage ois +opengl poco profile tbb test threads tools +zip" |
| 65 |
REQUIRED_USE="threads? ( || ( boost poco tbb ) )" |
| 66 |
RESTRICT="test" #139905 |
| 67 |
|
| 68 |
RDEPEND="media-libs/freetype:2 |
| 69 |
virtual/opengl |
| 70 |
virtual/glu |
| 71 |
x11-libs/libX11 |
| 72 |
x11-libs/libXaw |
| 73 |
x11-libs/libXrandr |
| 74 |
x11-libs/libXt |
| 75 |
boost? ( dev-libs/boost ) |
| 76 |
cg? ( media-gfx/nvidia-cg-toolkit ) |
| 77 |
freeimage? ( media-libs/freeimage ) |
| 78 |
ois? ( dev-games/ois ) |
| 79 |
threads? ( |
| 80 |
poco? ( dev-libs/poco ) |
| 81 |
tbb? ( dev-cpp/tbb ) |
| 82 |
) |
| 83 |
zip? ( sys-libs/zlib dev-libs/zziplib )" |
| 84 |
DEPEND="${RDEPEND} |
| 85 |
x11-proto/xf86vidmodeproto |
| 86 |
virtual/pkgconfig |
| 87 |
doc? ( app-doc/doxygen ) |
| 88 |
test? ( dev-util/cppunit )" |
| 89 |
|
| 90 |
S=${WORKDIR}/${PN}_src_v${MY_PV} |
| 91 |
|
| 92 |
src_prepare() { |
| 93 |
epatch "${FILESDIR}"/${P}-gcc46.patch |
| 94 |
epatch "${FILESDIR}"/${P}-threading.patch |
| 95 |
sed -i \ |
| 96 |
-e "s:share/OGRE/docs:share/doc/${PF}:" \ |
| 97 |
Docs/CMakeLists.txt || die |
| 98 |
# Stupid build system hardcodes release names |
| 99 |
sed -i \ |
| 100 |
-e '/CONFIGURATIONS/s:CONFIGURATIONS.*::' \ |
| 101 |
CMake/Utils/OgreConfigTargets.cmake || die |
| 102 |
} |
| 103 |
|
| 104 |
src_configure() { |
| 105 |
local mycmakeargs=( |
| 106 |
-DOGRE_FULL_RPATH=NO |
| 107 |
$(cmake-utils_use boost OGRE_USE_BOOST) |
| 108 |
$(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG) |
| 109 |
$(cmake-utils_use doc OGRE_INSTALL_DOCS) |
| 110 |
$(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE) |
| 111 |
$(cmake-utils_use examples OGRE_INSTALL_SAMPLES) |
| 112 |
$(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE) |
| 113 |
$(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL) |
| 114 |
$(cmake-utils_use profile OGRE_PROFILING) |
| 115 |
$(cmake-utils_use test OGRE_BUILD_TESTS) |
| 116 |
$(usex threads "-DOGRE_CONFIG_THREADS=2" "-DOGRE_CONFIG_THREADS=0") |
| 117 |
$(cmake-utils_use tools OGRE_BUILD_TOOLS) |
| 118 |
$(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP) |
| 119 |
) |
| 120 |
|
| 121 |
if use threads ; then |
| 122 |
local f |
| 123 |
for f in boost poco tbb ; do |
| 124 |
use ${f} || continue |
| 125 |
mycmakeargs+=( -DOGRE_CONFIG_THREAD_PROVIDER=${f} ) |
| 126 |
break |
| 127 |
done |
| 128 |
fi |
| 129 |
|
| 130 |
cmake-utils_src_configure |
| 131 |
} |
Archives