| 1 |
dilfridge 13/03/29 20:05:47 |
| 2 |
|
| 3 |
Modified: ChangeLog opencv-2.4.4a.ebuild |
| 4 |
Log: |
| 5 |
Add java support, thanks to sera for the help |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.90 media-libs/opencv/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.90&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.90&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?r1=1.89&r2=1.90 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v |
| 19 |
retrieving revision 1.89 |
| 20 |
retrieving revision 1.90 |
| 21 |
diff -u -r1.89 -r1.90 |
| 22 |
--- ChangeLog 29 Mar 2013 17:29:14 -0000 1.89 |
| 23 |
+++ ChangeLog 29 Mar 2013 20:05:47 -0000 1.90 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for media-libs/opencv |
| 26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.89 2013/03/29 17:29:14 dilfridge Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.90 2013/03/29 20:05:47 dilfridge Exp $ |
| 29 |
+ |
| 30 |
+ 29 Mar 2013; Andreas K. Huettel <dilfridge@g.o> opencv-2.4.4a.ebuild: |
| 31 |
+ Add java support, thanks to sera for the help |
| 32 |
|
| 33 |
*opencv-2.4.4a (29 Mar 2013) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 media-libs/opencv/opencv-2.4.4a.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.4a.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.4a.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.4a.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: opencv-2.4.4a.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.4a.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- opencv-2.4.4a.ebuild 29 Mar 2013 17:29:14 -0000 1.1 |
| 51 |
+++ opencv-2.4.4a.ebuild 29 Mar 2013 20:05:47 -0000 1.2 |
| 52 |
@@ -1,12 +1,11 @@ |
| 53 |
# Copyright 1999-2013 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.4a.ebuild,v 1.1 2013/03/29 17:29:14 dilfridge Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.4a.ebuild,v 1.2 2013/03/29 20:05:47 dilfridge Exp $ |
| 57 |
|
| 58 |
EAPI=5 |
| 59 |
PYTHON_DEPEND="2:2.6" |
| 60 |
|
| 61 |
-inherit base toolchain-funcs cmake-utils python |
| 62 |
-#java-pkg-opt-2 java-ant-2 |
| 63 |
+inherit base toolchain-funcs cmake-utils python java-pkg-opt-2 java-ant-2 |
| 64 |
|
| 65 |
MY_P=OpenCV-${PV} |
| 66 |
|
| 67 |
@@ -34,6 +33,7 @@ |
| 68 |
dev-libs/glib:2 |
| 69 |
x11-libs/gtk+:2 |
| 70 |
) |
| 71 |
+ java? ( >=virtual/jre-1.6 ) |
| 72 |
jpeg? ( virtual/jpeg ) |
| 73 |
jpeg2k? ( media-libs/jasper ) |
| 74 |
ieee1394? ( |
| 75 |
@@ -57,6 +57,7 @@ |
| 76 |
" |
| 77 |
DEPEND="${RDEPEND} |
| 78 |
virtual/pkgconfig |
| 79 |
+ java? ( >=virtual/jdk-1.6 ) |
| 80 |
" |
| 81 |
|
| 82 |
# REQUIRED_USE="opengl? ( qt )" |
| 83 |
@@ -73,7 +74,7 @@ |
| 84 |
pkg_setup() { |
| 85 |
python_set_active_version 2 |
| 86 |
python_pkg_setup |
| 87 |
-# java-pkg-opt-2_pkg_setup |
| 88 |
+ java-pkg-opt-2_pkg_setup |
| 89 |
} |
| 90 |
|
| 91 |
src_prepare() { |
| 92 |
@@ -85,11 +86,14 @@ |
| 93 |
-e '/add_subdirectory(3rdparty)/ d' \ |
| 94 |
CMakeLists.txt || die |
| 95 |
|
| 96 |
-# java-pkg-opt-2_src_prepare |
| 97 |
+ java-pkg-opt-2_src_prepare |
| 98 |
} |
| 99 |
|
| 100 |
src_configure() { |
| 101 |
-# java-ant-2_src_configure |
| 102 |
+ JAVA_ANT_ENCODING="iso-8859-1" |
| 103 |
+ # set encoding so even this cmake build will pick it up. |
| 104 |
+ export ANT_OPTS+=" -Dfile.encoding=iso-8859-1" |
| 105 |
+ java-ant-2_src_configure |
| 106 |
|
| 107 |
# please dont sort here, order is the same as in CMakeLists.txt |
| 108 |
local mycmakeargs=( |
| 109 |
@@ -102,8 +106,7 @@ |
| 110 |
$(cmake-utils_use_with gstreamer) |
| 111 |
$(cmake-utils_use_with gtk) |
| 112 |
$(cmake-utils_use_with ipp) |
| 113 |
- # $(cmake-utils_use_with java) |
| 114 |
- -DWITH_JAVA=OFF |
| 115 |
+ $(cmake-utils_use_with java) |
| 116 |
$(cmake-utils_use_with jpeg2k JASPER) |
| 117 |
$(cmake-utils_use_with jpeg) |
| 118 |
$(cmake-utils_use_with opencl) |
Archives