| 1 |
scarabeus 11/07/29 11:49:33 |
| 2 |
|
| 3 |
Modified: ChangeLog vigra-1.7.1.ebuild |
| 4 |
Log: |
| 5 |
Add doc support for the vigra package. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.31 media-libs/vigra/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/ChangeLog?rev=1.31&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/ChangeLog?rev=1.31&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/ChangeLog?r1=1.30&r2=1.31 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v |
| 19 |
retrieving revision 1.30 |
| 20 |
retrieving revision 1.31 |
| 21 |
diff -u -r1.30 -r1.31 |
| 22 |
--- ChangeLog 3 May 2011 07:41:02 -0000 1.30 |
| 23 |
+++ ChangeLog 29 Jul 2011 11:49:33 -0000 1.31 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for media-libs/vigra |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.30 2011/05/03 07:41:02 scarabeus Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.31 2011/07/29 11:49:33 scarabeus Exp $ |
| 29 |
+ |
| 30 |
+ 29 Jul 2011; Tomáš Chvátal <scarabeus@g.o> vigra-1.7.1.ebuild: |
| 31 |
+ Add doc support for the vigra package. |
| 32 |
|
| 33 |
03 May 2011; Tomáš Chvátal <scarabeus@g.o> |
| 34 |
+files/1.7.1-gcc4.6.patch, vigra-1.7.1.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.5 media-libs/vigra/vigra-1.7.1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/vigra-1.7.1.ebuild?rev=1.5&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/vigra-1.7.1.ebuild?rev=1.5&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/vigra-1.7.1.ebuild?r1=1.4&r2=1.5 |
| 43 |
|
| 44 |
Index: vigra-1.7.1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.7.1.ebuild,v |
| 47 |
retrieving revision 1.4 |
| 48 |
retrieving revision 1.5 |
| 49 |
diff -u -r1.4 -r1.5 |
| 50 |
--- vigra-1.7.1.ebuild 3 May 2011 07:41:02 -0000 1.4 |
| 51 |
+++ vigra-1.7.1.ebuild 29 Jul 2011 11:49:33 -0000 1.5 |
| 52 |
@@ -1,15 +1,15 @@ |
| 53 |
# Copyright 1999-2011 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.7.1.ebuild,v 1.4 2011/05/03 07:41:02 scarabeus Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.7.1.ebuild,v 1.5 2011/07/29 11:49:33 scarabeus Exp $ |
| 57 |
|
| 58 |
-EAPI=4 |
| 59 |
+EAPI=3 |
| 60 |
|
| 61 |
MY_P=${P}-src |
| 62 |
inherit base cmake-utils multilib |
| 63 |
|
| 64 |
DESCRIPTION="C++ computer vision library with emphasize on customizable algorithms and data structures" |
| 65 |
-HOMEPAGE="http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/" |
| 66 |
-SRC_URI="http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${MY_P}.tar.gz" |
| 67 |
+HOMEPAGE="http://hci.iwr.uni-heidelberg.de/vigra/" |
| 68 |
+SRC_URI="http://hci.iwr.uni-heidelberg.de/vigra/${MY_P}.tar.gz" |
| 69 |
|
| 70 |
LICENSE="MIT" |
| 71 |
SLOT="0" |
| 72 |
@@ -18,12 +18,17 @@ |
| 73 |
|
| 74 |
RDEPEND=" |
| 75 |
dev-libs/boost |
| 76 |
+ fftw? ( >=sci-libs/fftw-3 ) |
| 77 |
+ hdf5? ( sci-libs/hdf5[-mpi] ) |
| 78 |
+ jpeg? ( virtual/jpeg ) |
| 79 |
png? ( media-libs/libpng ) |
| 80 |
tiff? ( media-libs/tiff ) |
| 81 |
- jpeg? ( virtual/jpeg ) |
| 82 |
- hdf5? ( sci-libs/hdf5 ) |
| 83 |
- fftw? ( >=sci-libs/fftw-3 )" |
| 84 |
-DEPEND="${RDEPEND}" |
| 85 |
+" |
| 86 |
+DEPEND="${RDEPEND} |
| 87 |
+ doc? ( |
| 88 |
+ app-doc/doxygen |
| 89 |
+ ) |
| 90 |
+" |
| 91 |
|
| 92 |
PATCHES=( |
| 93 |
"${FILESDIR}/1.7.1-png-1.5.patch" |
| 94 |
@@ -32,23 +37,25 @@ |
| 95 |
"${FILESDIR}/1.7.1-gcc4.6.patch" |
| 96 |
) |
| 97 |
|
| 98 |
-# Tests fail because they have hardcoded dependencies on those |
| 99 |
-# optional in source so restrict them for now. |
| 100 |
-# Possibly could be fixed and sent upstream |
| 101 |
+# Restrict tests due to miscompilations |
| 102 |
RESTRICT="test" |
| 103 |
|
| 104 |
src_configure() { |
| 105 |
local libdir=$(get_libdir) |
| 106 |
|
| 107 |
+ # required for ddocdir |
| 108 |
+ _check_build_dir init |
| 109 |
# vigranumpy needs python so i can't test |
| 110 |
# doc needs doxygen and python |
| 111 |
# walgrind no use for us since we restrict test |
| 112 |
# $(cmake-utils_use_with valgrind VALGRIND) |
| 113 |
local mycmakeargs=( |
| 114 |
+ "-DDOCDIR=${CMAKE_BUILD_DIR}/doc" |
| 115 |
"-DLIBDIR_SUFFIX=${libdir/lib}" |
| 116 |
"-DDOCINSTALL=share/doc/${PF}" |
| 117 |
- "-DENABLE_DOC=OFF" |
| 118 |
+ "-DWITH_VALGRIND=OFF" |
| 119 |
"-DWITH_VIGRANUMPY=OFF" |
| 120 |
+ $(cmake-utils_use_enable doc DOC) |
| 121 |
$(cmake-utils_use_with png) |
| 122 |
$(cmake-utils_use_with jpeg) |
| 123 |
$(cmake-utils_use_with tiff) |
| 124 |
@@ -62,6 +69,11 @@ |
| 125 |
cmake-utils_src_configure |
| 126 |
} |
| 127 |
|
| 128 |
+src_compile() { |
| 129 |
+ cmake-utils_src_compile |
| 130 |
+ use doc && cmake-utils_src_make doc |
| 131 |
+} |
| 132 |
+ |
| 133 |
src_install() { |
| 134 |
cmake-utils_src_install |
Archives