* [gentoo-commits] gentoo-x86 commit in media-libs/opencv: ChangeLog opencv-2.4.4a.ebuild
@ 2013-03-29 17:29 Andreas HAttel (dilfridge)
0 siblings, 0 replies; 3+ messages in thread
From: Andreas HAttel (dilfridge) @ 2013-03-29 17:29 UTC (permalink / raw
To: gentoo-commits
dilfridge 13/03/29 17:29:14
Modified: ChangeLog
Added: opencv-2.4.4a.ebuild
Log:
Add first version without java support. Needs work.
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 7887F787)
Revision Changes Path
1.89 media-libs/opencv/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.89&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.89&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?r1=1.88&r2=1.89
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- ChangeLog 2 Mar 2013 21:46:34 -0000 1.88
+++ ChangeLog 29 Mar 2013 17:29:14 -0000 1.89
@@ -1,6 +1,12 @@
# ChangeLog for media-libs/opencv
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.88 2013/03/02 21:46:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.89 2013/03/29 17:29:14 dilfridge Exp $
+
+*opencv-2.4.4a (29 Mar 2013)
+
+ 29 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+ +files/opencv-2.4.4-javamagic.patch, +opencv-2.4.4a.ebuild:
+ Add first version without java support. Needs work.
02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> opencv-2.3.1a-r1.ebuild,
opencv-2.4.2.ebuild, opencv-2.4.3.ebuild:
1.1 media-libs/opencv/opencv-2.4.4a.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.4a.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.4a.ebuild?rev=1.1&content-type=text/plain
Index: opencv-2.4.4a.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.4a.ebuild,v 1.1 2013/03/29 17:29:14 dilfridge Exp $
EAPI=5
PYTHON_DEPEND="2:2.6"
inherit base toolchain-funcs cmake-utils python
#java-pkg-opt-2 java-ant-2
MY_P=OpenCV-${PV}
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
HOMEPAGE="http://opencv.willowgarage.com"
SRC_URI="mirror://sourceforge/opencvlibrary/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl pch png qt4 testprograms threads tiff v4l xine"
RDEPEND="
app-arch/bzip2
dev-python/numpy
sys-libs/zlib
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2 )
eigen? ( dev-cpp/eigen:2 )
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
)
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/glu )
png? ( media-libs/libpng )
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 )
xine? ( media-libs/xine-lib )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
"
# REQUIRED_USE="opengl? ( qt )"
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.4-javamagic.patch"
)
S=${WORKDIR}/opencv-2.4.4
pkg_setup() {
python_set_active_version 2
python_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() {
# 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)
-DWITH_JAVA=OFF
$(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)
-DWITH_OPENNI=OFF # not packaged
$(cmake-utils_use_with png)
-DWITH_PVAPI=OFF # not packaged
$(cmake-utils_use_with qt4 QT)
-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)
-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
$(cmake-utils_use examples INSTALL_C_EXAMPLES)
# 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 cuda; then
if [[ "$(gcc-version)" > "4.6" ]]; then
ewarn "CUDA and >=sys-devel/gcc-4.7 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; 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"
)
cmake-utils_src_configure
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/opencv: ChangeLog opencv-2.4.4a.ebuild
@ 2013-03-29 20:05 Andreas HAttel (dilfridge)
0 siblings, 0 replies; 3+ messages in thread
From: Andreas HAttel (dilfridge) @ 2013-03-29 20:05 UTC (permalink / raw
To: gentoo-commits
dilfridge 13/03/29 20:05:47
Modified: ChangeLog opencv-2.4.4a.ebuild
Log:
Add java support, thanks to sera for the help
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Revision Changes Path
1.90 media-libs/opencv/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?r1=1.89&r2=1.90
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- ChangeLog 29 Mar 2013 17:29:14 -0000 1.89
+++ ChangeLog 29 Mar 2013 20:05:47 -0000 1.90
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/opencv
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.89 2013/03/29 17:29:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.90 2013/03/29 20:05:47 dilfridge Exp $
+
+ 29 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.4a.ebuild:
+ Add java support, thanks to sera for the help
*opencv-2.4.4a (29 Mar 2013)
1.2 media-libs/opencv/opencv-2.4.4a.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.4a.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.4a.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.4a.ebuild?r1=1.1&r2=1.2
Index: opencv-2.4.4a.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.4a.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opencv-2.4.4a.ebuild 29 Mar 2013 17:29:14 -0000 1.1
+++ opencv-2.4.4a.ebuild 29 Mar 2013 20:05:47 -0000 1.2
@@ -1,12 +1,11 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.4a.ebuild,v 1.1 2013/03/29 17:29:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.4a.ebuild,v 1.2 2013/03/29 20:05:47 dilfridge Exp $
EAPI=5
PYTHON_DEPEND="2:2.6"
-inherit base toolchain-funcs cmake-utils python
-#java-pkg-opt-2 java-ant-2
+inherit base toolchain-funcs cmake-utils python java-pkg-opt-2 java-ant-2
MY_P=OpenCV-${PV}
@@ -34,6 +33,7 @@
dev-libs/glib:2
x11-libs/gtk+:2
)
+ java? ( >=virtual/jre-1.6 )
jpeg? ( virtual/jpeg )
jpeg2k? ( media-libs/jasper )
ieee1394? (
@@ -57,6 +57,7 @@
"
DEPEND="${RDEPEND}
virtual/pkgconfig
+ java? ( >=virtual/jdk-1.6 )
"
# REQUIRED_USE="opengl? ( qt )"
@@ -73,7 +74,7 @@
pkg_setup() {
python_set_active_version 2
python_pkg_setup
-# java-pkg-opt-2_pkg_setup
+ java-pkg-opt-2_pkg_setup
}
src_prepare() {
@@ -85,11 +86,14 @@
-e '/add_subdirectory(3rdparty)/ d' \
CMakeLists.txt || die
-# java-pkg-opt-2_src_prepare
+ java-pkg-opt-2_src_prepare
}
src_configure() {
-# java-ant-2_src_configure
+ 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=(
@@ -102,8 +106,7 @@
$(cmake-utils_use_with gstreamer)
$(cmake-utils_use_with gtk)
$(cmake-utils_use_with ipp)
- # $(cmake-utils_use_with java)
- -DWITH_JAVA=OFF
+ $(cmake-utils_use_with java)
$(cmake-utils_use_with jpeg2k JASPER)
$(cmake-utils_use_with jpeg)
$(cmake-utils_use_with opencl)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/opencv: ChangeLog opencv-2.4.4a.ebuild
@ 2013-06-20 19:34 Andreas HAttel (dilfridge)
0 siblings, 0 replies; 3+ messages in thread
From: Andreas HAttel (dilfridge) @ 2013-06-20 19:34 UTC (permalink / raw
To: gentoo-commits
dilfridge 13/06/20 19:34:35
Modified: ChangeLog
Removed: opencv-2.4.4a.ebuild
Log:
Clean up
(Portage version: 2.2.0_alpha183/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Revision Changes Path
1.95 media-libs/opencv/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.95&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.95&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?r1=1.94&r2=1.95
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- ChangeLog 11 Jun 2013 21:10:19 -0000 1.94
+++ ChangeLog 20 Jun 2013 19:34:35 -0000 1.95
@@ -1,6 +1,14 @@
# ChangeLog for media-libs/opencv
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.94 2013/06/11 21:10:19 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.95 2013/06/20 19:34:35 dilfridge Exp $
+
+ 20 Jun 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+ -files/opencv-2.3.0-numpy.patch, -files/opencv-2.3.1a-True-False.patch,
+ -files/opencv-2.3.1a-convert_sets_to_options.patch,
+ -files/opencv-2.3.1a-gcc47.patch, -files/opencv-2.3.1a-libsuffix.patch,
+ -files/opencv-2.3.1a-nocaps.patch, -files/opencv-2.4.4-javamagic.patch,
+ -opencv-2.4.4a.ebuild:
+ Clean up
11 Jun 2013; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.5.ebuild:
Add workaround for bug 413429
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-20 19:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-20 19:34 [gentoo-commits] gentoo-x86 commit in media-libs/opencv: ChangeLog opencv-2.4.4a.ebuild Andreas HAttel (dilfridge)
-- strict thread matches above, loose matches on Subject: below --
2013-03-29 20:05 Andreas HAttel (dilfridge)
2013-03-29 17:29 Andreas HAttel (dilfridge)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox