| 1 |
dilfridge 12/05/28 20:13:58 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog |
| 4 |
Added: opencv-2.4.0.ebuild |
| 5 |
Log: |
| 6 |
Version bump |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.13 media-libs/opencv/metadata.xml |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/metadata.xml?rev=1.13&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/metadata.xml?rev=1.13&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/metadata.xml?r1=1.12&r2=1.13 |
| 16 |
|
| 17 |
Index: metadata.xml |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/metadata.xml,v |
| 20 |
retrieving revision 1.12 |
| 21 |
retrieving revision 1.13 |
| 22 |
diff -u -r1.12 -r1.13 |
| 23 |
--- metadata.xml 15 Oct 2011 23:17:54 -0000 1.12 |
| 24 |
+++ metadata.xml 28 May 2012 20:13:57 -0000 1.13 |
| 25 |
@@ -17,5 +17,8 @@ |
| 26 |
<flag name="ipp">Enable Intel Integrated Primitive support</flag> |
| 27 |
<flag name="sse3">Enable optimization for SSE3 capable chips</flag> |
| 28 |
<flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag> |
| 29 |
+ <flag name="sse41">Enable optimization for SSE4.1 capable chips</flag> |
| 30 |
+ <flag name="sse42">Enable optimization for SSE4.2 capable chips</flag> |
| 31 |
+ <flag name="tbb">Add support for the Intel threadingbuildingblocks library</flag> |
| 32 |
</use> |
| 33 |
</pkgmetadata> |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.74 media-libs/opencv/ChangeLog |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.74&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.74&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?r1=1.73&r2=1.74 |
| 42 |
|
| 43 |
Index: ChangeLog |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v |
| 46 |
retrieving revision 1.73 |
| 47 |
retrieving revision 1.74 |
| 48 |
diff -u -r1.73 -r1.74 |
| 49 |
--- ChangeLog 21 May 2012 20:42:14 -0000 1.73 |
| 50 |
+++ ChangeLog 28 May 2012 20:13:57 -0000 1.74 |
| 51 |
@@ -1,6 +1,12 @@ |
| 52 |
# ChangeLog for media-libs/opencv |
| 53 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.73 2012/05/21 20:42:14 johu Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.74 2012/05/28 20:13:57 dilfridge Exp $ |
| 56 |
+ |
| 57 |
+*opencv-2.4.0 (28 May 2012) |
| 58 |
+ |
| 59 |
+ 28 May 2012; Andreas K. Huettel <dilfridge@g.o> +opencv-2.4.0.ebuild, |
| 60 |
+ +files/opencv-2.4.0-cflags.patch, metadata.xml: |
| 61 |
+ Version bump |
| 62 |
|
| 63 |
21 May 2012; Johannes Huber <johu@g.o> |
| 64 |
-files/opencv-2.3.0-convert_sets_to_options.patch, |
| 65 |
|
| 66 |
|
| 67 |
|
| 68 |
1.1 media-libs/opencv/opencv-2.4.0.ebuild |
| 69 |
|
| 70 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.0.ebuild?rev=1.1&view=markup |
| 71 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.0.ebuild?rev=1.1&content-type=text/plain |
| 72 |
|
| 73 |
Index: opencv-2.4.0.ebuild |
| 74 |
=================================================================== |
| 75 |
# Copyright 1999-2012 Gentoo Foundation |
| 76 |
# Distributed under the terms of the GNU General Public License v2 |
| 77 |
# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.0.ebuild,v 1.1 2012/05/28 20:13:58 dilfridge Exp $ |
| 78 |
|
| 79 |
EAPI=3 |
| 80 |
|
| 81 |
PYTHON_DEPEND="python? 2:2.6" |
| 82 |
|
| 83 |
inherit base toolchain-funcs cmake-utils python |
| 84 |
|
| 85 |
MY_P=OpenCV-${PV} |
| 86 |
|
| 87 |
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" |
| 88 |
HOMEPAGE="http://opencv.willowgarage.com" |
| 89 |
SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2" |
| 90 |
|
| 91 |
LICENSE="BSD" |
| 92 |
SLOT="0" |
| 93 |
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux" |
| 94 |
IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 sse41 sse42 tbb test tiff v4l xine" |
| 95 |
|
| 96 |
RDEPEND=" |
| 97 |
app-arch/bzip2 |
| 98 |
sys-libs/zlib |
| 99 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-4 ) |
| 100 |
eigen? ( dev-cpp/eigen:2 ) |
| 101 |
ffmpeg? ( virtual/ffmpeg ) |
| 102 |
gstreamer? ( |
| 103 |
media-libs/gstreamer |
| 104 |
media-libs/gst-plugins-base |
| 105 |
) |
| 106 |
gtk? ( |
| 107 |
dev-libs/glib:2 |
| 108 |
x11-libs/gtk+:2 |
| 109 |
) |
| 110 |
jpeg? ( virtual/jpeg ) |
| 111 |
jpeg2k? ( media-libs/jasper ) |
| 112 |
ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) |
| 113 |
ipp? ( sci-libs/ipp ) |
| 114 |
openexr? ( media-libs/openexr ) |
| 115 |
png? ( media-libs/libpng ) |
| 116 |
python? ( dev-python/numpy ) |
| 117 |
qt4? ( |
| 118 |
x11-libs/qt-gui:4 |
| 119 |
x11-libs/qt-test:4 |
| 120 |
opengl? ( x11-libs/qt-opengl:4 ) |
| 121 |
) |
| 122 |
tbb? ( dev-cpp/tbb ) |
| 123 |
tiff? ( media-libs/tiff ) |
| 124 |
v4l? ( >=media-libs/libv4l-0.8.3 ) |
| 125 |
xine? ( media-libs/xine-lib ) |
| 126 |
" |
| 127 |
DEPEND="${RDEPEND} |
| 128 |
doc? ( virtual/latex-base ) |
| 129 |
virtual/pkgconfig |
| 130 |
" |
| 131 |
|
| 132 |
# REQUIRED_USE="opengl? ( qt )" |
| 133 |
|
| 134 |
PATCHES=( |
| 135 |
"${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch" |
| 136 |
"${FILESDIR}/${PN}-2.3.1a-True-False.patch" |
| 137 |
"${FILESDIR}/${PN}-2.3.1a-gcc47.patch" |
| 138 |
"${FILESDIR}/${PN}-2.4.0-cflags.patch" |
| 139 |
) |
| 140 |
|
| 141 |
CMAKE_BUILD_TYPE="Release" |
| 142 |
|
| 143 |
S=${WORKDIR}/${MY_P} |
| 144 |
|
| 145 |
pkg_setup() { |
| 146 |
if use python; then |
| 147 |
python_set_active_version 2 |
| 148 |
python_pkg_setup |
| 149 |
fi |
| 150 |
} |
| 151 |
|
| 152 |
src_prepare() { |
| 153 |
base_src_prepare |
| 154 |
|
| 155 |
# remove bundled stuff |
| 156 |
rm -rf 3rdparty |
| 157 |
sed -i \ |
| 158 |
-e '/add_subdirectory(3rdparty)/ d' \ |
| 159 |
CMakeLists.txt || die |
| 160 |
} |
| 161 |
|
| 162 |
src_configure() { |
| 163 |
# please dont sort here, order is the same as in CMakeLists.txt |
| 164 |
local mycmakeargs=( |
| 165 |
# the optinal dependency libraries |
| 166 |
$(cmake-utils_use_with ieee1394 1394) |
| 167 |
-DWITH_AVFOUNDATION=OFF |
| 168 |
-DWITH_CARBON=OFF |
| 169 |
$(cmake-utils_use_with eigen) |
| 170 |
$(cmake-utils_use_with ffmpeg) |
| 171 |
$(cmake-utils_use_with gstreamer) |
| 172 |
$(cmake-utils_use_with gtk) |
| 173 |
$(cmake-utils_use_with ipp) |
| 174 |
$(cmake-utils_use_with jpeg2k JASPER) |
| 175 |
$(cmake-utils_use_with jpeg) |
| 176 |
$(cmake-utils_use_with openexr) |
| 177 |
$(cmake-utils_use_with opengl) |
| 178 |
-DWITH_OPENNI=OFF # not packaged |
| 179 |
$(cmake-utils_use_with png) |
| 180 |
-DWITH_PVAPI=OFF # not packaged |
| 181 |
$(cmake-utils_use_with qt4 QT) |
| 182 |
-DWITH_QUICKTIME=OFF |
| 183 |
$(cmake-utils_use_with tbb) |
| 184 |
$(cmake-utils_use_with tiff) |
| 185 |
-DWITH_UNICAP=OFF # not packaged |
| 186 |
$(cmake-utils_use_with v4l V4L) |
| 187 |
-DWITH_VIDEOINPUT=OFF # windows only |
| 188 |
-DWITH_XIMEA=OFF # windows only |
| 189 |
$(cmake-utils_use_with xine) |
| 190 |
# the build components |
| 191 |
-DBUILD_SHARED_LIBS=ON |
| 192 |
-DBUILD_ANDROID_EXAMPLES=OFF |
| 193 |
$(cmake-utils_use_build doc DOCS) |
| 194 |
$(cmake-utils_use_build examples) |
| 195 |
-DBUILD_PERF_TESTS=ON |
| 196 |
$(cmake-utils_use_build test TESTS) |
| 197 |
# install examples |
| 198 |
$(cmake-utils_use examples INSTALL_C_EXAMPLES) |
| 199 |
# build options |
| 200 |
-DENABLE_PRECOMPILED_HEADERS=OFF # for my sanity |
| 201 |
-DENABLE_OMIT_FRAME_POINTER=OFF # dito |
| 202 |
-DENABLE_FAST_MATH=OFF # dito |
| 203 |
$(cmake-utils_use_enable sse) |
| 204 |
$(cmake-utils_use_enable sse2) |
| 205 |
$(cmake-utils_use_enable sse3) |
| 206 |
$(cmake-utils_use_enable ssse3) |
| 207 |
$(cmake-utils_use_enable sse41) |
| 208 |
$(cmake-utils_use_enable sse42) |
| 209 |
-DOPENCV_EXTRA_C_FLAGS_RELEASE="" # black magic |
| 210 |
) |
| 211 |
|
| 212 |
if use cuda; then |
| 213 |
if [[ "$(gcc-version)" > "4.4" ]]; then |
| 214 |
ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support." |
| 215 |
mycmakeargs+=( "-DWITH_CUDA=OFF" ) |
| 216 |
mycmakeargs+=( "-DWITH_CUBLAS=OFF" ) |
| 217 |
mycmakeargs+=( "-DWITH_CUFFT=OFF" ) |
| 218 |
else |
| 219 |
mycmakeargs+=( "-DWITH_CUDA=ON" ) |
| 220 |
mycmakeargs+=( "-DWITH_CUBLAS=ON" ) |
| 221 |
mycmakeargs+=( "-DWITH_CUFFT=ON" ) |
| 222 |
fi |
| 223 |
else |
| 224 |
mycmakeargs+=( "-DWITH_CUDA=OFF" ) |
| 225 |
fi |
| 226 |
|
| 227 |
if use python && use examples; then |
| 228 |
mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" ) |
| 229 |
else |
| 230 |
mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" ) |
| 231 |
fi |
| 232 |
|
| 233 |
# things we want to be hard off or not yet figured out |
| 234 |
mycmakeargs+=( |
| 235 |
"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF" |
| 236 |
"-DBUILD_LATEX_DOCS=OFF" |
| 237 |
"-DBUILD_PACKAGE=OFF" |
| 238 |
"-DENABLE_PROFILING=OFF" |
| 239 |
) |
| 240 |
|
| 241 |
# things we want to be hard enabled not worth useflag |
| 242 |
mycmakeargs+=( |
| 243 |
"-DCMAKE_SKIP_RPATH=ON" |
| 244 |
"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}" |
| 245 |
) |
| 246 |
|
| 247 |
# hardcode cuda paths |
| 248 |
mycmakeargs+=( |
| 249 |
"-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda" |
| 250 |
) |
| 251 |
|
| 252 |
cmake-utils_src_configure |
| 253 |
} |
Archives