| 1 |
ssuominen 10/07/29 22:11:16 |
| 2 |
|
| 3 |
Modified: ChangeLog libprojectm-2.0.1-r1.ebuild |
| 4 |
Removed: libprojectm-2.0.1.ebuild |
| 5 |
Log: |
| 6 |
Check for OpenMP functionality with tc-has-openmp wrt #302741 by Paul Tobias. Use VIDEO_CARDS="nvidia" for media-gfx/nvidia-cg-toolkit wrt #296808 by "jms". |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.35 media-libs/libprojectm/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libprojectm/ChangeLog?rev=1.35&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libprojectm/ChangeLog?rev=1.35&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libprojectm/ChangeLog?r1=1.34&r2=1.35 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v |
| 19 |
retrieving revision 1.34 |
| 20 |
retrieving revision 1.35 |
| 21 |
diff -u -r1.34 -r1.35 |
| 22 |
--- ChangeLog 22 Dec 2009 13:22:35 -0000 1.34 |
| 23 |
+++ ChangeLog 29 Jul 2010 22:11:16 -0000 1.35 |
| 24 |
@@ -1,6 +1,12 @@ |
| 25 |
# ChangeLog for media-libs/libprojectm |
| 26 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.34 2009/12/22 13:22:35 aballier Exp $ |
| 28 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.35 2010/07/29 22:11:16 ssuominen Exp $ |
| 30 |
+ |
| 31 |
+ 29 Jul 2010; Samuli Suominen <ssuominen@g.o> |
| 32 |
+ libprojectm-2.0.1-r1.ebuild: |
| 33 |
+ Check for OpenMP functionality with tc-has-openmp wrt #302741 by Paul |
| 34 |
+ Tobias. Use VIDEO_CARDS="nvidia" for media-gfx/nvidia-cg-toolkit wrt |
| 35 |
+ #296808 by "jms". |
| 36 |
|
| 37 |
*libprojectm-2.0.1-r1 (22 Dec 2009) |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.2 media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild?rev=1.2&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild?rev=1.2&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild?r1=1.1&r2=1.2 |
| 47 |
|
| 48 |
Index: libprojectm-2.0.1-r1.ebuild |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild,v |
| 51 |
retrieving revision 1.1 |
| 52 |
retrieving revision 1.2 |
| 53 |
diff -u -r1.1 -r1.2 |
| 54 |
--- libprojectm-2.0.1-r1.ebuild 22 Dec 2009 13:22:35 -0000 1.1 |
| 55 |
+++ libprojectm-2.0.1-r1.ebuild 29 Jul 2010 22:11:16 -0000 1.2 |
| 56 |
@@ -1,9 +1,9 @@ |
| 57 |
-# Copyright 1999-2009 Gentoo Foundation |
| 58 |
+# Copyright 1999-2010 Gentoo Foundation |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild,v 1.1 2009/12/22 13:22:35 aballier Exp $ |
| 61 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild,v 1.2 2010/07/29 22:11:16 ssuominen Exp $ |
| 62 |
|
| 63 |
EAPI=2 |
| 64 |
-inherit cmake-utils flag-o-matic eutils |
| 65 |
+inherit cmake-utils flag-o-matic eutils toolchain-funcs |
| 66 |
|
| 67 |
MY_P=${P/m/M}-Source ; MY_P=${MY_P/lib} |
| 68 |
|
| 69 |
@@ -14,23 +14,41 @@ |
| 70 |
LICENSE="LGPL-2" |
| 71 |
SLOT="0" |
| 72 |
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 73 |
-IUSE="debug" |
| 74 |
+IUSE="debug openmp video_cards_nvidia" |
| 75 |
|
| 76 |
RDEPEND=">=media-libs/ftgl-2.1.3_rc5 |
| 77 |
media-libs/freetype:2 |
| 78 |
media-libs/mesa |
| 79 |
media-libs/glew |
| 80 |
- sys-libs/zlib" |
| 81 |
+ sys-libs/zlib |
| 82 |
+ video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit )" |
| 83 |
DEPEND="${RDEPEND} |
| 84 |
dev-util/pkgconfig" |
| 85 |
|
| 86 |
S=${WORKDIR}/${MY_P} |
| 87 |
|
| 88 |
src_prepare() { |
| 89 |
- epatch "${FILESDIR}/${P}-pcfix.patch" |
| 90 |
+ epatch "${FILESDIR}"/${P}-pcfix.patch |
| 91 |
} |
| 92 |
|
| 93 |
src_configure() { |
| 94 |
append-ldflags $(no-as-needed) |
| 95 |
+ |
| 96 |
+ if use video_cards_nvidia; then |
| 97 |
+ append-ldflags -L/opt/nvidia-cg-toolkit/lib |
| 98 |
+ append-flags -I/opt/nvidia-cg-toolkit/include |
| 99 |
+ fi |
| 100 |
+ |
| 101 |
+ mycmakeargs=( |
| 102 |
+ $(cmake-utils_use_use video_cards_nvidia CG) |
| 103 |
+ "-DUSE_OPENMP=OFF" |
| 104 |
+ ) |
| 105 |
+ |
| 106 |
+ if use openmp && tc-has-openmp; then |
| 107 |
+ mycmakeargs+=( |
| 108 |
+ $(cmake-utils_use_use openmp) |
| 109 |
+ ) |
| 110 |
+ fi |
| 111 |
+ |
| 112 |
cmake-utils_src_configure |
| 113 |
} |
Archives