Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 418201 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-5 / +9 lines)
Line  Link Here
0
-- dev-games/ogre/ogre-1.7.4-r1.ebuild
0
++ dev-games/ogre/ogre-1.8.0.ebuild
Lines 13-20 Link Here
13
13
14
LICENSE="MIT"
14
LICENSE="MIT"
15
SLOT="0"
15
SLOT="0"
16
KEYWORDS="amd64 ~x86"
16
KEYWORDS="~amd64 ~x86"
17
IUSE="+boost cg doc double-precision examples +freeimage ois +opengl poco profile tbb test threads tools +zip"
17
IUSE="+boost cg doc double-precision examples +freeimage gles2 ois +opengl poco profile tbb test threads tools +zip"
18
REQUIRED_USE="threads? ( || ( boost poco tbb ) )"
18
REQUIRED_USE="threads? ( || ( boost poco tbb ) )"
19
RESTRICT="test" #139905
19
RESTRICT="test" #139905
20
20
Lines 28-39 Link Here
28
	boost? ( dev-libs/boost )
28
	boost? ( dev-libs/boost )
29
	cg? ( media-gfx/nvidia-cg-toolkit )
29
	cg? ( media-gfx/nvidia-cg-toolkit )
30
	freeimage? ( media-libs/freeimage )
30
	freeimage? ( media-libs/freeimage )
31
	gles2? ( || ( <media-libs/mesa-8.0.0[gles] >=media-libs/mesa-8.0.0[gles2] ) )
31
	ois? ( dev-games/ois )
32
	ois? ( dev-games/ois )
32
	threads? (
33
	threads? (
33
		poco? ( dev-libs/poco )
34
		poco? ( dev-libs/poco )
34
		tbb? ( dev-cpp/tbb )
35
		tbb? ( dev-cpp/tbb )
35
	)
36
	)
36
	zip? ( sys-libs/zlib dev-libs/zziplib )"
37
	zip? ( sys-libs/zlib dev-libs/zziplib )"
38
# gles1 currently broken wrt bug #418201
37
DEPEND="${RDEPEND}
39
DEPEND="${RDEPEND}
38
	x11-proto/xf86vidmodeproto
40
	x11-proto/xf86vidmodeproto
39
	virtual/pkgconfig
41
	virtual/pkgconfig
Lines 43-50 Link Here
43
S=${WORKDIR}/${PN}_src_v${MY_PV}
45
S=${WORKDIR}/${PN}_src_v${MY_PV}
44
46
45
src_prepare() {
47
src_prepare() {
46
	epatch "${FILESDIR}"/${P}-gcc46.patch
48
	epatch "${FILESDIR}"/${PN}-1.7.4-threading.patch
47
	epatch "${FILESDIR}"/${P}-threading.patch
49
	epatch "${FILESDIR}"/${P}-flags.patch
48
	sed -i \
50
	sed -i \
49
		-e "s:share/OGRE/docs:share/doc/${PF}:" \
51
		-e "s:share/OGRE/docs:share/doc/${PF}:" \
50
		Docs/CMakeLists.txt || die
52
		Docs/CMakeLists.txt || die
Lines 64-69 Link Here
64
		$(cmake-utils_use examples OGRE_INSTALL_SAMPLES)
66
		$(cmake-utils_use examples OGRE_INSTALL_SAMPLES)
65
		$(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE)
67
		$(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE)
66
		$(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL)
68
		$(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL)
69
		-DOGRE_BUILD_RENDERSYSTEM_GLES=OFF
70
		$(cmake-utils_use gles2 OGRE_BUILD_RENDERSYSTEM_GLES2)
67
		$(cmake-utils_use profile OGRE_PROFILING)
71
		$(cmake-utils_use profile OGRE_PROFILING)
68
		$(cmake-utils_use test OGRE_BUILD_TESTS)
72
		$(cmake-utils_use test OGRE_BUILD_TESTS)
69
		$(usex threads "-DOGRE_CONFIG_THREADS=2" "-DOGRE_CONFIG_THREADS=0")
73
		$(usex threads "-DOGRE_CONFIG_THREADS=2" "-DOGRE_CONFIG_THREADS=0")

Return to bug 418201