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

Collapse All | Expand All

(-)jasper-2.0.12.ebuild.old (-6 / +5 lines)
Lines 27-41 Link Here
27
RDEPEND="
27
RDEPEND="
28
	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
28
	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
29
	opengl? (
29
	opengl? (
30
		>=virtual/opengl-7.0-r1:0[${MULTILIB_USEDEP}]
30
		>=virtual/opengl-7.0-r1:0
31
		>=media-libs/freeglut-2.8.1:0[${MULTILIB_USEDEP}]
31
		>=media-libs/freeglut-2.8.1:0
32
		virtual/glu[${MULTILIB_USEDEP}]
33
		x11-libs/libXi[${MULTILIB_USEDEP}]
34
		x11-libs/libXmu[${MULTILIB_USEDEP}]
35
	)"
32
	)"
36
DEPEND="${RDEPEND}
33
DEPEND="${RDEPEND}
37
	doc? ( app-doc/doxygen )"
34
	doc? ( app-doc/doxygen )"
38
35
36
PATCHES=( "${FILESDIR}"/jasper-opengl-cleanup.patch )
37
39
multilib_src_configure() {
38
multilib_src_configure() {
40
	local mycmakeargs=(
39
	local mycmakeargs=(
41
		-DALLOW_IN_SOURCE_BUILD=OFF
40
		-DALLOW_IN_SOURCE_BUILD=OFF
Lines 54-60 Link Here
54
53
55
		# OpenGL
54
		# OpenGL
56
		-DJAS_ENABLE_OPENGL=$(usex opengl)
55
		-DJAS_ENABLE_OPENGL=$(usex opengl)
57
		-DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=$(usex !opengl)
56
		-DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=$(multilib_native_usex !opengl)
58
57
59
		# Doxygen
58
		# Doxygen
60
		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
59
		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)

Return to bug 601068