| 1 |
maekke 08/06/28 14:42:47 |
| 2 |
|
| 3 |
Modified: ChangeLog aqsis-1.3.0_p20080627.ebuild |
| 4 |
Log: |
| 5 |
use cmake-utils eclass |
| 6 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc7 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.13 media-gfx/aqsis/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/aqsis/ChangeLog?rev=1.13&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/aqsis/ChangeLog?rev=1.13&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/aqsis/ChangeLog?r1=1.12&r2=1.13 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/aqsis/ChangeLog,v |
| 18 |
retrieving revision 1.12 |
| 19 |
retrieving revision 1.13 |
| 20 |
diff -u -r1.12 -r1.13 |
| 21 |
--- ChangeLog 28 Jun 2008 06:17:50 -0000 1.12 |
| 22 |
+++ ChangeLog 28 Jun 2008 14:42:46 -0000 1.13 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for media-gfx/aqsis |
| 25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/ChangeLog,v 1.12 2008/06/28 06:17:50 maekke Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/ChangeLog,v 1.13 2008/06/28 14:42:46 maekke Exp $ |
| 28 |
+ |
| 29 |
+ 28 Jun 2008; Markus Meier <maekke@g.o> |
| 30 |
+ aqsis-1.3.0_p20080627.ebuild: |
| 31 |
+ use cmake-utils eclass |
| 32 |
|
| 33 |
*aqsis-1.3.0_p20080627 (28 Jun 2008) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.3 media-gfx/aqsis/aqsis-1.3.0_p20080627.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/aqsis/aqsis-1.3.0_p20080627.ebuild?rev=1.3&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/aqsis/aqsis-1.3.0_p20080627.ebuild?rev=1.3&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/aqsis/aqsis-1.3.0_p20080627.ebuild?r1=1.2&r2=1.3 |
| 43 |
|
| 44 |
Index: aqsis-1.3.0_p20080627.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/aqsis/aqsis-1.3.0_p20080627.ebuild,v |
| 47 |
retrieving revision 1.2 |
| 48 |
retrieving revision 1.3 |
| 49 |
diff -u -r1.2 -r1.3 |
| 50 |
--- aqsis-1.3.0_p20080627.ebuild 28 Jun 2008 14:19:39 -0000 1.2 |
| 51 |
+++ aqsis-1.3.0_p20080627.ebuild 28 Jun 2008 14:42:46 -0000 1.3 |
| 52 |
@@ -1,10 +1,10 @@ |
| 53 |
# Copyright 1999-2008 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/aqsis-1.3.0_p20080627.ebuild,v 1.2 2008/06/28 14:19:39 mr_bones_ Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/aqsis-1.3.0_p20080627.ebuild,v 1.3 2008/06/28 14:42:46 maekke Exp $ |
| 57 |
|
| 58 |
EAPI="1" |
| 59 |
|
| 60 |
-inherit versionator multilib eutils |
| 61 |
+inherit versionator multilib eutils cmake-utils |
| 62 |
|
| 63 |
DESCRIPTION="Open source RenderMan-compliant 3D rendering solution" |
| 64 |
HOMEPAGE="http://www.aqsis.org" |
| 65 |
@@ -41,41 +41,27 @@ |
| 66 |
# (upstream doesn't autodetect the gentoo install path for fltk) |
| 67 |
fltk_version="$(get_version_component_range 1-2 \ |
| 68 |
$(best_version x11-libs/fltk | sed -e 's/^x11-libs\/fltk//'))" |
| 69 |
- fltk_flags=" |
| 70 |
+ mycmakeargs="${mycmakeargs} |
| 71 |
-DAQSIS_USE_FLTK:BOOL=ON |
| 72 |
-DAQSIS_FLTK_INCLUDE_DIR:PATH=/usr/include/fltk-${fltk_version} |
| 73 |
-DAQSIS_FLTK_LIBRARIES_DIR:PATH=/usr/$(get_libdir)/fltk-${fltk_version}" |
| 74 |
else |
| 75 |
- fltk_flags="-DAQSIS_USE_FLTK:BOOL=OFF" |
| 76 |
+ mycmakeargs="${mycmakeargs} -DAQSIS_USE_FLTK:BOOL=OFF" |
| 77 |
fi |
| 78 |
|
| 79 |
- if use openexr ; then |
| 80 |
- exr_flags="-DAQSIS_USE_OPENEXR:BOOL=ON" |
| 81 |
- else |
| 82 |
- exr_flags="-DAQSIS_USE_OPENEXR:BOOL=OFF" |
| 83 |
- fi |
| 84 |
- |
| 85 |
- # The aqsis build system prevents in-source builds, so we make a seperate |
| 86 |
- # directory inside ${S} to perform the build. |
| 87 |
- mkdir _build |
| 88 |
- cd _build |
| 89 |
- |
| 90 |
- cmake -DAQSIS_BOOST_LIB_SUFFIX:STRING=-mt \ |
| 91 |
- ${fltk_flags} \ |
| 92 |
- ${exr_flags} \ |
| 93 |
- -DAQSIS_USE_RPATH:BOOL=OFF \ |
| 94 |
- -DLIBDIR:STRING=$(get_libdir) \ |
| 95 |
- -DSYSCONFDIR:STRING=/etc \ |
| 96 |
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \ |
| 97 |
- "${S}" |
| 98 |
+ mycmakeargs="${mycmakeargs} |
| 99 |
+ -DAQSIS_BOOST_LIB_SUFFIX:STRING=-mt |
| 100 |
+ -DAQSIS_USE_OPENEXR:BOOL=$(use openexr && echo ON || echo OFF) |
| 101 |
+ -DAQSIS_USE_RPATH:BOOL=OFF |
| 102 |
+ -DLIBDIR:STRING=$(get_libdir) |
| 103 |
+ -DSYSCONFDIR:STRING=/etc |
| 104 |
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr" |
| 105 |
|
| 106 |
- emake || die "Compilation failed" |
| 107 |
+ cmake-utils_src_compile |
| 108 |
} |
| 109 |
|
| 110 |
src_install() { |
| 111 |
- cd _build |
| 112 |
- emake install DESTDIR="${D}" |
| 113 |
- cd .. |
| 114 |
- dodoc AUTHORS INSTALL README ReleaseNotes |
| 115 |
+ DOCS="AUTHORS INSTALL README ReleaseNotes" |
| 116 |
+ cmake-utils_src_install |
| 117 |
# TODO: Make sure examples are installed. |
| 118 |
} |
| 119 |
|
| 120 |
|
| 121 |
|
| 122 |
-- |
| 123 |
gentoo-commits@l.g.o mailing list |
Archives