[patch] opencv-tesseract.patch

opencv-tesseract.patch (text/plain), 4.69 KB, created by Adrian on 2016-06-22 16:41:27 UTC

diff -Naur /usr/portage/media-libs/opencv/files/opencv_contrib-3.1.0-tesseract-opencl.patch media-libs/opencv/files/opencv_contrib-3.1.0-tesseract-opencl.patch
--- /usr/portage/media-libs/opencv/files/opencv_contrib-3.1.0-tesseract-opencl.patch	1970-01-01 09:30:00.000000000 +0930
+++ media-libs/opencv/files/opencv_contrib-3.1.0-tesseract-opencl.patch	2016-06-23 00:05:20.003715476 +0930
@@ -0,0 +1,41 @@
+diff -Naur a/opencv_contrib-3.1.0/modules/text/CMakeLists.txt b/opencv_contrib-3.1.0/modules/text/CMakeLists.txt
+--- a/opencv_contrib-3.1.0/modules/text/CMakeLists.txt	2016-06-22 22:30:13.427798189 +0930
++++ b/opencv_contrib-3.1.0/modules/text/CMakeLists.txt	2016-06-22 22:31:41.472796913 +0930
+@@ -1,11 +1,13 @@
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+-find_package(Tesseract)
+-if(Tesseract_FOUND)
+-    message(STATUS "Tesseract:   YES")
+-    set(HAVE_TESSERACT 1)
+-else()
+-    message(STATUS "Tesseract:   NO")
++if (WITH_TESSERACT)
++    find_package(Tesseract)
++    if(Tesseract_FOUND)
++        message(STATUS "Tesseract:   YES")
++        set(HAVE_TESSERACT 1)
++    else()
++        message(STATUS "Tesseract:   NO")
++    endif()
+ endif()
+ 
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/text_config.hpp.in
+--- a/opencv_contrib-3.1.0/modules/text/FindTesseract.cmake	2015-12-18 03:41:31.000000000 +1030
++++ b/opencv_contrib-3.1.0/modules/text/FindTesseract.cmake	2016-06-22 22:48:46.344782058 +0930
+@@ -16,7 +16,14 @@
+   /usr/lib
+   /usr/local/lib)
+ 
+-set(Tesseract_LIBS ${Tesseract_LIBRARY} ${Lept_LIBRARY})
++if (WITH_CUDA OR WITH_OPENCL)
++  find_library(OpenCL_LIBRARY NAMES OpenCL
++    HINTS
++    /usr/lib
++    /usr/local/lib)
++endif()
++
++set(Tesseract_LIBS ${Tesseract_LIBRARY} ${Lept_LIBRARY} ${OpenCL_LIBRARY})
+ if(Tesseract_LIBS AND Tesseract_INCLUDE_DIR)
+     set(Tesseract_FOUND 1)
+ endif()
diff -Naur /usr/portage/media-libs/opencv/metadata.xml media-libs/opencv/metadata.xml
--- /usr/portage/media-libs/opencv/metadata.xml	2016-03-14 05:34:00.000000000 +1030
+++ media-libs/opencv/metadata.xml	2016-06-21 21:04:11.860835607 +0930
@@ -26,6 +26,7 @@
 		<flag name="gdal">Enable support for sci-libs/gdal library</flag>
 		<flag name="ipp">Enable Intel Integrated Primitive support</flag>
 		<flag name="opencl">Add support for OpenCL</flag>
+		<flag name="tesseract">Add support for OCR using <pkg>app-text/tesseract</pkg></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>
 		<flag name="webp">Enable support for webp image format</flag>
diff -Naur /usr/portage/media-libs/opencv/opencv-3.1.0-r4.ebuild media-libs/opencv/opencv-3.1.0-r4.ebuild
--- /usr/portage/media-libs/opencv/opencv-3.1.0-r4.ebuild	2016-06-09 23:22:31.000000000 +0930
+++ media-libs/opencv/opencv-3.1.0-r4.ebuild	2016-06-23 00:54:38.788672591 +0930
@@ -22,7 +22,7 @@
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="contrib cuda +eigen examples ffmpeg gdal gphoto2 gstreamer gtk \
 	ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png \
-	+python qt4 qt5 testprograms threads tiff vaapi v4l vtk webp xine"
+	+python qt4 qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	?? ( qt4 qt5 )"
@@ -76,6 +76,10 @@
 		dev-qt/qtconcurrent:5
 		opengl? ( dev-qt/qtopengl:5 )
 	)
+	tesseract? (
+		app-text/tesseract
+		!opencl? ( !cuda? ( app-text/tesseract[-opencl] ) )
+	)
 	threads? ( dev-cpp/tbb )
 	tiff? ( media-libs/tiff:0 )
 	v4l? ( >=media-libs/libv4l-0.8.3 )
@@ -105,6 +109,10 @@
 src_prepare() {
 	default
 
+	cd "${WORKDIR}/${PN}_contrib-${PV}"
+	epatch "${FILESDIR}"/${PN}_contrib-${PV}-tesseract-opencl.patch
+	cd "${S}"
+
 	# remove bundled stuff
 	rm -rf 3rdparty || die "Removing 3rd party components failed"
 	sed -i \
@@ -178,6 +186,7 @@
 		-DWITH_VA_INTEL=$(usex vaapi ON OFF)
 		-DWITH_GDAL=$(usex gdal ON OFF)
 		-DWITH_GPHOTO2=$(usex gphoto2 ON OFF)
+		-DWITH_TESSERACT=$(usex tesseract ON OFF)
 	# ===================================================
 	# OpenCV build components
 	# ===================================================
@@ -211,11 +220,8 @@
 		if [[ "$(gcc-version)" > "4.8" ]]; then
 			# bug 577410 
 			# #error -- unsupported GNU version! gcc 4.9 and up are not supported!
-			ewarn "CUDA and >=sys-devel/gcc-4.9 do not play well together. Disabling CUDA support."
-			mycmakeargs+=( -DWITH_CUDA=OFF )
-			mycmakeargs+=( -DWITH_CUBLAS=OFF )
-			mycmakeargs+=( -DWITH_CUFFT=OFF )
-
+			ewarn "CUDA and >=sys-devel/gcc-4.9 do not play well together. Remove the cuda USE flag from opencv."
+			die
 		else
 			mycmakeargs+=( -DWITH_CUDA=ON )
 			mycmakeargs+=( -DWITH_CUBLAS=ON )