dilfridge 14/06/14 21:44:07 Modified: metadata.xml ChangeLog Added: opencv-2.4.9.ebuild Removed: opencv-2.4.7.ebuild Log: Version bump, bug 510884 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Revision Changes Path 1.18 media-libs/opencv/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/metadata.xml?rev=1.18&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/metadata.xml?rev=1.18&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/metadata.xml?r1=1.17&r2=1.18 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/metadata.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- metadata.xml 2 May 2013 16:53:15 -0000 1.17 +++ metadata.xml 14 Jun 2014 21:44:07 -0000 1.18 @@ -17,5 +17,6 @@ <flag name="ipp">Enable Intel Integrated Primitive support</flag> <flag name="opencl">Add support for OpenCL</flag> <flag name="testprograms">Build and install programs for testing OpenCV (performance)</flag> + <flag name="vtk">Build new 3D visualization module viz based on sci-libs/vtk</flag> </use> </pkgmetadata> 1.108 media-libs/opencv/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.108&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.108&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?r1=1.107&r2=1.108 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- ChangeLog 25 Jan 2014 11:01:29 -0000 1.107 +++ ChangeLog 14 Jun 2014 21:44:07 -0000 1.108 @@ -1,6 +1,12 @@ # ChangeLog for media-libs/opencv # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.107 2014/01/25 11:01:29 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.108 2014/06/14 21:44:07 dilfridge Exp $ + +*opencv-2.4.9 (14 Jun 2014) + + 14 Jun 2014; Andreas K. Huettel <[email protected]> -opencv-2.4.7.ebuild, + +opencv-2.4.9.ebuild: + Version bump, bug 510884 25 Jan 2014; Andreas K. Huettel <[email protected]> opencv-2.4.8.ebuild: Remove constraint on opengl useflag, bug 499188 1.1 media-libs/opencv/opencv-2.4.9.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild?rev=1.1&content-type=text/plain Index: opencv-2.4.9.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.9.ebuild,v 1.1 2014/06/14 21:44:07 dilfridge Exp $ EAPI=5 PYTHON_COMPAT=( python2_{6,7} ) inherit base toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2 DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" HOMEPAGE="http://opencv.willowgarage.com"; SRC_URI="mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip" LICENSE="BSD" SLOT="0/2.4" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux" IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl openmp pch png +python qt4 testprograms threads tiff v4l vtk xine" REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) " # The following logic is intrinsic in the build system, but we do not enforce # it on the useflags since this just blocks emerging pointlessly: # gtk? ( !qt4 ) # opengl? ( || ( gtk qt4 ) ) # openmp? ( !threads ) RDEPEND=" app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] ) qt4? ( dev-qt/qtgui:4 dev-qt/qttest:4 opengl? ( dev-qt/qtopengl:4 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk ) xine? ( media-libs/xine-lib ) " DEPEND="${RDEPEND} virtual/pkgconfig eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) " PATCHES=( "${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch" "${FILESDIR}/${PN}-2.4.3-gcc47.patch" "${FILESDIR}/${PN}-2.4.2-cflags.patch" "${FILESDIR}/${PN}-2.4.8-javamagic.patch" ) pkg_setup() { use python && python-single-r1_pkg_setup java-pkg-opt-2_pkg_setup } src_prepare() { base_src_prepare # remove bundled stuff rm -rf 3rdparty sed -i \ -e '/add_subdirectory(3rdparty)/ d' \ CMakeLists.txt || die java-pkg-opt-2_src_prepare } src_configure() { if use openmp; then tc-has-openmp || die "Please switch to an openmp compatible compiler" fi JAVA_ANT_ENCODING="iso-8859-1" # set encoding so even this cmake build will pick it up. export ANT_OPTS+=" -Dfile.encoding=iso-8859-1" java-ant-2_src_configure # please dont sort here, order is the same as in CMakeLists.txt local mycmakeargs=( # the optinal dependency libraries $(cmake-utils_use_with ieee1394 1394) -DWITH_AVFOUNDATION=OFF -DWITH_CARBON=OFF $(cmake-utils_use_with eigen) $(cmake-utils_use_with ffmpeg) $(cmake-utils_use_with gstreamer) $(cmake-utils_use_with gtk) $(cmake-utils_use_with ipp) $(cmake-utils_use_with java) $(cmake-utils_use_with jpeg2k JASPER) $(cmake-utils_use_with jpeg) $(cmake-utils_use_with opencl) # $(cmake-utils_use_with opencl OPENCLAMDFFT) # $(cmake-utils_use_with opencl OPENCLAMDBLAS) $(cmake-utils_use_with openexr) $(cmake-utils_use_with opengl) $(cmake-utils_use_with openmp) -DWITH_OPENNI=OFF # not packaged $(cmake-utils_use_with png) $(cmake-utils_use_build python opencv_python) -DWITH_PVAPI=OFF # not packaged -DWITH_QUICKTIME=OFF $(cmake-utils_use_with threads TBB) $(cmake-utils_use_with tiff) -DWITH_UNICAP=OFF # not packaged $(cmake-utils_use_with v4l V4L) $(cmake-utils_use_with vtk VTK) -DWITH_LIBV4L=ON -DWITH_VIDEOINPUT=OFF # windows only -DWITH_XIMEA=OFF # windows only $(cmake-utils_use_with xine) # the build components -DBUILD_SHARED_LIBS=ON -DBUILD_ANDROID_EXAMPLES=OFF $(cmake-utils_use_build doc DOCS) $(cmake-utils_use_build examples) -DBUILD_PERF_TESTS=OFF $(cmake-utils_use_build testprograms TESTS) # install examples, tests etc $(cmake-utils_use examples INSTALL_C_EXAMPLES) $(cmake-utils_use testprograms INSTALL_TESTS) # build options $(cmake-utils_use_enable pch PRECOMPILED_HEADERS) -DENABLE_OMIT_FRAME_POINTER=OFF # -DENABLE_FAST_MATH=OFF # -DENABLE_SSE=OFF # these options do nothing but -DENABLE_SSE2=OFF # add params to CFLAGS -DENABLE_SSE3=OFF -DENABLE_SSSE3=OFF -DENABLE_SSE41=OFF -DENABLE_SSE42=OFF -DOPENCV_EXTRA_FLAGS_RELEASE="" # black magic ) if use qt4; then mycmakeargs+=( "-DWITH_QT=4" ) else mycmakeargs+=( "-DWITH_QT=OFF" ) fi if use cuda; then if [[ "$(gcc-version)" > "4.7" ]]; then ewarn "CUDA and >=sys-devel/gcc-4.8 do not play well together. Disabling CUDA support." mycmakeargs+=( "-DWITH_CUDA=OFF" ) mycmakeargs+=( "-DWITH_CUBLAS=OFF" ) mycmakeargs+=( "-DWITH_CUFFT=OFF" ) else mycmakeargs+=( "-DWITH_CUDA=ON" ) mycmakeargs+=( "-DWITH_CUBLAS=ON" ) mycmakeargs+=( "-DWITH_CUFFT=ON" ) fi else mycmakeargs+=( "-DWITH_CUDA=OFF" ) mycmakeargs+=( "-DWITH_CUBLAS=OFF" ) mycmakeargs+=( "-DWITH_CUFFT=OFF" ) fi if use examples && use python; then mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" ) else mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" ) fi # things we want to be hard off or not yet figured out mycmakeargs+=( "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF" "-DBUILD_LATEX_DOCS=OFF" "-DBUILD_PACKAGE=OFF" "-DENABLE_PROFILING=OFF" ) # things we want to be hard enabled not worth useflag mycmakeargs+=( "-DCMAKE_SKIP_RPATH=ON" "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}" ) # hardcode cuda paths mycmakeargs+=( "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda" ) # workaround for bug 413429 tc-export CC CXX cmake-utils_src_configure }
