1 |
dilfridge 13/12/07 00:20:15 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: opencv-2.4.7.ebuild |
5 |
Log: |
6 |
Version bump |
7 |
|
8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!) |
9 |
|
10 |
Revision Changes Path |
11 |
1.103 media-libs/opencv/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.103&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.103&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?r1=1.102&r2=1.103 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v |
20 |
retrieving revision 1.102 |
21 |
retrieving revision 1.103 |
22 |
diff -u -r1.102 -r1.103 |
23 |
--- ChangeLog 6 Sep 2013 16:39:48 -0000 1.102 |
24 |
+++ ChangeLog 7 Dec 2013 00:20:15 -0000 1.103 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for media-libs/opencv |
27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.102 2013/09/06 16:39:48 dilfridge Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.103 2013/12/07 00:20:15 dilfridge Exp $ |
30 |
+ |
31 |
+*opencv-2.4.7 (07 Dec 2013) |
32 |
+ |
33 |
+ 07 Dec 2013; Andreas K. Huettel <dilfridge@g.o> +opencv-2.4.7.ebuild: |
34 |
+ Version bump |
35 |
|
36 |
06 Sep 2013; Andreas K. Huettel <dilfridge@g.o> opencv-2.4.5.ebuild: |
37 |
OpenCV-2.4.5 only works with CUDA 5.0 or lower, bug 483634 |
38 |
|
39 |
|
40 |
|
41 |
1.1 media-libs/opencv/opencv-2.4.7.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.7.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.7.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: opencv-2.4.7.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2013 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.7.ebuild,v 1.1 2013/12/07 00:20:15 dilfridge Exp $ |
51 |
|
52 |
EAPI=5 |
53 |
PYTHON_DEPEND="2:2.6" |
54 |
|
55 |
inherit base toolchain-funcs cmake-utils python java-pkg-opt-2 java-ant-2 |
56 |
|
57 |
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" |
58 |
HOMEPAGE="http://opencv.willowgarage.com" |
59 |
SRC_URI="mirror://sourceforge/opencvlibrary/${P}.tar.gz" |
60 |
|
61 |
LICENSE="BSD" |
62 |
SLOT="0/2.4" |
63 |
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~amd64-linux" |
64 |
IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl openmp pch png qt4 testprograms threads tiff v4l xine" |
65 |
|
66 |
RDEPEND=" |
67 |
app-arch/bzip2 |
68 |
dev-python/numpy |
69 |
sys-libs/zlib |
70 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) |
71 |
eigen? ( dev-cpp/eigen:2 ) |
72 |
ffmpeg? ( virtual/ffmpeg ) |
73 |
gstreamer? ( |
74 |
media-libs/gstreamer:0.10 |
75 |
media-libs/gst-plugins-base:0.10 |
76 |
) |
77 |
gtk? ( |
78 |
dev-libs/glib:2 |
79 |
x11-libs/gtk+:2 |
80 |
) |
81 |
java? ( >=virtual/jre-1.6 ) |
82 |
jpeg? ( virtual/jpeg ) |
83 |
jpeg2k? ( media-libs/jasper ) |
84 |
ieee1394? ( |
85 |
media-libs/libdc1394 |
86 |
sys-libs/libraw1394 |
87 |
) |
88 |
ipp? ( sci-libs/ipp ) |
89 |
opencl? ( virtual/opencl ) |
90 |
openexr? ( media-libs/openexr ) |
91 |
opengl? ( virtual/glu ) |
92 |
png? ( media-libs/libpng:0= ) |
93 |
qt4? ( |
94 |
dev-qt/qtgui:4 |
95 |
dev-qt/qttest:4 |
96 |
opengl? ( dev-qt/qtopengl:4 ) |
97 |
) |
98 |
threads? ( dev-cpp/tbb ) |
99 |
tiff? ( media-libs/tiff ) |
100 |
v4l? ( >=media-libs/libv4l-0.8.3 ) |
101 |
xine? ( media-libs/xine-lib ) |
102 |
" |
103 |
DEPEND="${RDEPEND} |
104 |
virtual/pkgconfig |
105 |
java? ( >=virtual/jdk-1.6 ) |
106 |
" |
107 |
|
108 |
# REQUIRED_USE="opengl? ( qt )" |
109 |
|
110 |
PATCHES=( |
111 |
"${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch" |
112 |
"${FILESDIR}/${PN}-2.4.3-gcc47.patch" |
113 |
"${FILESDIR}/${PN}-2.4.2-cflags.patch" |
114 |
"${FILESDIR}/${PN}-2.4.5-javamagic.patch" |
115 |
) |
116 |
|
117 |
pkg_setup() { |
118 |
python_set_active_version 2 |
119 |
python_pkg_setup |
120 |
java-pkg-opt-2_pkg_setup |
121 |
} |
122 |
|
123 |
src_prepare() { |
124 |
base_src_prepare |
125 |
|
126 |
# remove bundled stuff |
127 |
rm -rf 3rdparty |
128 |
sed -i \ |
129 |
-e '/add_subdirectory(3rdparty)/ d' \ |
130 |
CMakeLists.txt || die |
131 |
|
132 |
java-pkg-opt-2_src_prepare |
133 |
} |
134 |
|
135 |
src_configure() { |
136 |
use openmp && tc-has-openmp || die "Please switch to an openmp compatible compiler" |
137 |
|
138 |
JAVA_ANT_ENCODING="iso-8859-1" |
139 |
# set encoding so even this cmake build will pick it up. |
140 |
export ANT_OPTS+=" -Dfile.encoding=iso-8859-1" |
141 |
java-ant-2_src_configure |
142 |
|
143 |
# please dont sort here, order is the same as in CMakeLists.txt |
144 |
local mycmakeargs=( |
145 |
# the optinal dependency libraries |
146 |
$(cmake-utils_use_with ieee1394 1394) |
147 |
-DWITH_AVFOUNDATION=OFF |
148 |
-DWITH_CARBON=OFF |
149 |
$(cmake-utils_use_with eigen) |
150 |
$(cmake-utils_use_with ffmpeg) |
151 |
$(cmake-utils_use_with gstreamer) |
152 |
$(cmake-utils_use_with gtk) |
153 |
$(cmake-utils_use_with ipp) |
154 |
$(cmake-utils_use_with java) |
155 |
$(cmake-utils_use_with jpeg2k JASPER) |
156 |
$(cmake-utils_use_with jpeg) |
157 |
$(cmake-utils_use_with opencl) |
158 |
# $(cmake-utils_use_with opencl OPENCLAMDFFT) |
159 |
# $(cmake-utils_use_with opencl OPENCLAMDBLAS) |
160 |
$(cmake-utils_use_with openexr) |
161 |
$(cmake-utils_use_with opengl) |
162 |
$(cmake-utils_use_with openmp) |
163 |
-DWITH_OPENNI=OFF # not packaged |
164 |
$(cmake-utils_use_with png) |
165 |
-DWITH_PVAPI=OFF # not packaged |
166 |
$(cmake-utils_use_with qt4 QT) |
167 |
-DWITH_QUICKTIME=OFF |
168 |
$(cmake-utils_use_with threads TBB) |
169 |
$(cmake-utils_use_with tiff) |
170 |
-DWITH_UNICAP=OFF # not packaged |
171 |
$(cmake-utils_use_with v4l V4L) |
172 |
-DWITH_LIBV4L=ON |
173 |
-DWITH_VIDEOINPUT=OFF # windows only |
174 |
-DWITH_XIMEA=OFF # windows only |
175 |
$(cmake-utils_use_with xine) |
176 |
# the build components |
177 |
-DBUILD_SHARED_LIBS=ON |
178 |
-DBUILD_ANDROID_EXAMPLES=OFF |
179 |
$(cmake-utils_use_build doc DOCS) |
180 |
$(cmake-utils_use_build examples) |
181 |
-DBUILD_PERF_TESTS=OFF |
182 |
$(cmake-utils_use_build testprograms TESTS) |
183 |
# install examples |
184 |
$(cmake-utils_use examples INSTALL_C_EXAMPLES) |
185 |
# build options |
186 |
$(cmake-utils_use_enable pch PRECOMPILED_HEADERS) |
187 |
-DENABLE_OMIT_FRAME_POINTER=OFF # |
188 |
-DENABLE_FAST_MATH=OFF # |
189 |
-DENABLE_SSE=OFF # these options do nothing but |
190 |
-DENABLE_SSE2=OFF # add params to CFLAGS |
191 |
-DENABLE_SSE3=OFF |
192 |
-DENABLE_SSSE3=OFF |
193 |
-DENABLE_SSE41=OFF |
194 |
-DENABLE_SSE42=OFF |
195 |
-DOPENCV_EXTRA_FLAGS_RELEASE="" # black magic |
196 |
) |
197 |
|
198 |
if use cuda; then |
199 |
if [[ "$(gcc-version)" > "4.7" ]]; then |
200 |
ewarn "CUDA and >=sys-devel/gcc-4.8 do not play well together. Disabling CUDA support." |
201 |
mycmakeargs+=( "-DWITH_CUDA=OFF" ) |
202 |
mycmakeargs+=( "-DWITH_CUBLAS=OFF" ) |
203 |
mycmakeargs+=( "-DWITH_CUFFT=OFF" ) |
204 |
else |
205 |
mycmakeargs+=( "-DWITH_CUDA=ON" ) |
206 |
mycmakeargs+=( "-DWITH_CUBLAS=ON" ) |
207 |
mycmakeargs+=( "-DWITH_CUFFT=ON" ) |
208 |
fi |
209 |
else |
210 |
mycmakeargs+=( "-DWITH_CUDA=OFF" ) |
211 |
mycmakeargs+=( "-DWITH_CUBLAS=OFF" ) |
212 |
mycmakeargs+=( "-DWITH_CUFFT=OFF" ) |
213 |
fi |
214 |
|
215 |
if use examples; then |
216 |
mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" ) |
217 |
else |
218 |
mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" ) |
219 |
fi |
220 |
|
221 |
# things we want to be hard off or not yet figured out |
222 |
mycmakeargs+=( |
223 |
"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF" |
224 |
"-DBUILD_LATEX_DOCS=OFF" |
225 |
"-DBUILD_PACKAGE=OFF" |
226 |
"-DENABLE_PROFILING=OFF" |
227 |
) |
228 |
|
229 |
# things we want to be hard enabled not worth useflag |
230 |
mycmakeargs+=( |
231 |
"-DCMAKE_SKIP_RPATH=ON" |
232 |
"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}" |
233 |
) |
234 |
|
235 |
# hardcode cuda paths |
236 |
mycmakeargs+=( |
237 |
"-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda" |
238 |
) |
239 |
|
240 |
# workaround for bug 413429 |
241 |
tc-export CC CXX |
242 |
|
243 |
cmake-utils_src_configure |
244 |
} |