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