From f4d2b04ef6ef5c6fa900003b2d225f3c182d59f8 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sat, 15 Oct 2011 23:16:59 +0000 Subject: [PATCH] old Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64 --- media-libs/opencv/ChangeLog | 16 +- media-libs/opencv/Manifest | 34 +- .../opencv/files/opencv-2.0.0-libpng14.patch | 13 - .../opencv/files/opencv-2.1.0-mmap.patch | 14 - .../opencv/files/opencv-2.1.0-multilib.patch | 110 ------ ...opencv-2.2.0-convert_sets_to_options.patch | 365 ------------------ .../opencv/files/opencv-2.2.0-ffmpeg01.patch | 105 ----- .../opencv/files/opencv-2.2.0-ffmpeg02.patch | 58 --- .../opencv/files/opencv-2.2.0-findblas.patch | 36 -- .../opencv/files/opencv-2.2.0-findnpp.patch | 86 ----- .../opencv/files/opencv-2.2.0-fortran.patch | 13 - .../opencv/files/opencv-2.2.0-gcc46.patch | 10 - .../opencv/files/opencv-2.2.0-libpng1.5.patch | 40 -- .../opencv/files/opencv-2.2.0-numpy.patch | 12 - .../files/opencv-2.2.0-ptrcvcapture.patch | 17 - .../files/opencv-2.2.0-use_system_libs.patch | 94 ----- .../files/opencv-2.2.0-v4l_2.6.38.patch | 33 -- media-libs/opencv/opencv-2.1.0.ebuild | 117 ------ media-libs/opencv/opencv-2.2.0-r10.ebuild | 179 --------- media-libs/opencv/opencv-2.2.0.ebuild | 166 -------- 20 files changed, 24 insertions(+), 1494 deletions(-) delete mode 100644 media-libs/opencv/files/opencv-2.0.0-libpng14.patch delete mode 100644 media-libs/opencv/files/opencv-2.1.0-mmap.patch delete mode 100644 media-libs/opencv/files/opencv-2.1.0-multilib.patch delete mode 100644 media-libs/opencv/files/opencv-2.2.0-convert_sets_to_options.patch delete mode 100644 media-libs/opencv/files/opencv-2.2.0-ffmpeg01.patch delete mode 100644 media-libs/opencv/files/opencv-2.2.0-ffmpeg02.patch delete mode 100644 media-libs/opencv/files/opencv-2.2.0-findblas.patch delete mode 100644 media-libs/opencv/files/opencv-2.2.0-findnpp.patch delete mode 100644 media-libs/opencv/files/opencv-2.2.0-fortran.patch delete mode 100644 media-libs/opencv/files/opencv-2.2.0-gcc46.patch delete mode 100644 media-libs/opencv/files/opencv-2.2.0-libpng1.5.patch delete mode 100644 media-libs/opencv/files/opencv-2.2.0-numpy.patch delete mode 100644 media-libs/opencv/files/opencv-2.2.0-ptrcvcapture.patch delete mode 100644 media-libs/opencv/files/opencv-2.2.0-use_system_libs.patch delete mode 100644 media-libs/opencv/files/opencv-2.2.0-v4l_2.6.38.patch delete mode 100644 media-libs/opencv/opencv-2.1.0.ebuild delete mode 100644 media-libs/opencv/opencv-2.2.0-r10.ebuild delete mode 100644 media-libs/opencv/opencv-2.2.0.ebuild diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index 994907345127..7735c69cbf2f 100644 --- a/media-libs/opencv/ChangeLog +++ b/media-libs/opencv/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for media-libs/opencv # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.54 2011/10/15 23:14:39 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.55 2011/10/15 23:16:59 ssuominen Exp $ + + 15 Oct 2011; Samuli Suominen + -files/opencv-2.0.0-libpng14.patch, -opencv-2.1.0.ebuild, + -files/opencv-2.1.0-mmap.patch, -files/opencv-2.1.0-multilib.patch, + -opencv-2.2.0.ebuild, -opencv-2.2.0-r10.ebuild, + -files/opencv-2.2.0-convert_sets_to_options.patch, + -files/opencv-2.2.0-ffmpeg01.patch, -files/opencv-2.2.0-ffmpeg02.patch, + -files/opencv-2.2.0-findblas.patch, -files/opencv-2.2.0-findnpp.patch, + -files/opencv-2.2.0-fortran.patch, -files/opencv-2.2.0-gcc46.patch, + -files/opencv-2.2.0-libpng1.5.patch, -files/opencv-2.2.0-numpy.patch, + -files/opencv-2.2.0-ptrcvcapture.patch, + -files/opencv-2.2.0-use_system_libs.patch, + -files/opencv-2.2.0-v4l_2.6.38.patch: + old 15 Oct 2011; Markus Meier opencv-2.3.0.ebuild: x86 stable, bug #385211 diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index c0a626b1234d..b03ca357b863 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -1,40 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX opencv-2.0.0-libpng14.patch 505 RMD160 86ef29284531519dcc5c6da1bb3abfd3c46efc73 SHA1 81bf18db6984144a0cc5b49e47e180e5337aae75 SHA256 78dc27ae16b2fcbef7cc05496dddf227640f47c37d8da05fe469eeb04146af4a -AUX opencv-2.1.0-mmap.patch 483 RMD160 a1e1843d1845307d1e6bb7ef03f3fe45fe45380e SHA1 981e4614b5360351426990e2e12d276b04b7043a SHA256 f05a7d79218bfd5ec392a5f0017dd9efce4cdc08bbda7b223bf72525fa40a322 -AUX opencv-2.1.0-multilib.patch 5132 RMD160 a47c10e8f8c7fc325a562b19a925b96288605600 SHA1 167358eb0b32112c2a877a27015b2b7fb04c69b8 SHA256 25280be148a410af8f8cf79dcdcba4d2ae24ddce041af7712f1d76cf0cd863a6 -AUX opencv-2.2.0-convert_sets_to_options.patch 16756 RMD160 0fa3fb99eafcf31cdcaa8dc8296b7904268449f8 SHA1 64158ca0539f742fbb419ccf332ba941c7d5a17e SHA256 b673edaa3de01d7e858205435ab663bf17ccd8aa5c6811a3bb3895f041693df2 -AUX opencv-2.2.0-ffmpeg01.patch 3464 RMD160 13fcca8090fd84b9b0cfc4c7d05656bfe5bba33c SHA1 5af4e27004603e3da8abb0d4c21565146a99a742 SHA256 a60950322b373f25c47c6681e241cb77d2fd7499dcdbbad18d7e5472ce01bb4e -AUX opencv-2.2.0-ffmpeg02.patch 1764 RMD160 8d755cc29bdee4ee239e178d42d8ae980df4b6e7 SHA1 14cdcc5bf9b11dcd614f3a9296531cd287e6f6fa SHA256 9e293a66e0b914fba279fc53c0c483763460aeca7ee34ffcbb70c616ddccd8d2 -AUX opencv-2.2.0-findblas.patch 1381 RMD160 117b3774ce42e73fc375da79b653c6bf69114be9 SHA1 5e34a74d79b3ec8f53759e3120ff85f054e05e51 SHA256 16f69a37283fb3e8ec3ab5435edd0a800e506c1f25997ecbbd4f7a02fa99aa8c -AUX opencv-2.2.0-findnpp.patch 3783 RMD160 90d0ad6f5163c26014365539cdae234dd949f711 SHA1 a8d289f12886dc90d7048bf0011a8b5e962deb83 SHA256 9fcf34f285db106ba282aeaa955d6d8e0f0e9f410ebe6410eb49ab2cc705b439 -AUX opencv-2.2.0-fortran.patch 424 RMD160 ca1d46937cf80bc898f324575705d42af18247cf SHA1 393f4d2bb9daa257a259e54d196af977facb7506 SHA256 4c2f2fbcb9d6d3c5418813ed14c11bac1708b04b8af7f1803fb260885063ca76 -AUX opencv-2.2.0-gcc46.patch 400 RMD160 e440ca115de06fe8d3aac012ce77a008ce0184ed SHA1 44d15398e571defc2e7971f5e90f934f645d9281 SHA256 e1c86c20725ac47592ed426efa63efaaf3412913bd78a0d39ab1a3efc28b4f25 -AUX opencv-2.2.0-libpng1.5.patch 1461 RMD160 31db2e4df582c30a6787b3c8d6081c7e6f204e5b SHA1 7025f170a11f286dd2b81e392c3662bc1ab11d9e SHA256 c44a5127cad582a94ea8ad375b5f979f5fb34cde41009319d1265ca4c4d495ca -AUX opencv-2.2.0-numpy.patch 632 RMD160 8652c618eebab2769952f47c8cceed33027079e1 SHA1 cf1cd90150686961a6c2f4d1f2d08d3e4c3cfbdb SHA256 09e62d9d60cc1e7490bc1ed416085fefd933a9a89bc3c6cffe24569166430a25 -AUX opencv-2.2.0-ptrcvcapture.patch 512 RMD160 79e1f005b1aa494468edd3f57f944e0b51ac32d1 SHA1 7f49f7b25d93b734435dc572b65f0e2f45f42645 SHA256 d3c063e742abf7bc4898003d464a795ecf421a1d67a1abcdff9c712de0a3c7ad -AUX opencv-2.2.0-use_system_libs.patch 5117 RMD160 02a9c2e896ebc453ee63770e5f216e5d696bc103 SHA1 ba0ac15a4f60a7b875b9e28e51a2e41b1ba26fb9 SHA256 f83725b7b7fe8e47e98269abc803bb678cd0566646735d78f3e82c3f70b872de -AUX opencv-2.2.0-v4l_2.6.38.patch 1165 RMD160 1bf13eca350e015ce53611c77dc4e85d81fa8530 SHA1 64e4ea4df8d17843c73248bef778459660b556d9 SHA256 2d4e0c72c3f4e9c60cb10a5fc5a8512275c48e3f38ec3441a240ed49dd8a1b5b AUX opencv-2.3.0-convert_sets_to_options.patch 14590 RMD160 1fdf49d3981ddb4e222728c133ec68d2d5ffd17d SHA1 91a34455fc16be04ebc5e89bb9c093928fae39cd SHA256 60e50e5e66213fe174d220a546f40081def4604862e060ba9dce6cbd012a52ac AUX opencv-2.3.0-ffmpeg.patch 4940 RMD160 ad9e319212530581cecefe1880605000ff8d8dfe SHA1 002fe2cfe2b9ecd00ac0a83681c2d2291fd61c89 SHA256 4c181a768089366d3e124130629df4ac9a0a975a239c77031b7ab2d1e76fc861 AUX opencv-2.3.0-libpng15.patch 214 RMD160 ec21b397068516716749a0550baa262c5acb22e9 SHA1 6543c741b1cf79b2ceb0a9c681aa3e93661c97b5 SHA256 03cd546c755d4be88b14d5ad2f5987c5abc78633a3e608f4a471db85b21fa22c AUX opencv-2.3.0-numpy.patch 551 RMD160 d777f008d8b569076a78f91b6f06a25c4d08bb0f SHA1 766e8c14f4e407a5e252f3a9228f260be8f50e28 SHA256 5b835add26f1a20601126a8cde89b2ee7bb26211e426f35c11b85798d8de2378 AUX opencv-2.3.0-symlink.patch 838 RMD160 787ef6c6ae59a4d614701fbafe48c8803cf29807 SHA1 08059632d29f08069c8abbc294e501487d97d201 SHA256 286f946ca13760406c8afcf71358758df0051fd51a74578058f263610c05c448 -DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f -DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81e9 SHA1 53b5d5aab835eb63d4546489b1c1246eeba1da29 SHA256 bcbfff0ff767f0cf2523707a307a5fd0db4853c19c3498f322c8c5839429940b -EBUILD opencv-2.1.0.ebuild 2962 RMD160 e6db74fcd2d4c76c3b1f0dc50b6623921ffc5d4f SHA1 9a266d3406186a1e6ca1c619cda3119ea3483413 SHA256 e0f1622906fcefd8f128e60291db8a23eecc5179286704080c8663c7663423b5 -EBUILD opencv-2.2.0-r10.ebuild 4496 RMD160 e4f404e4d2368b27736501bd0d493e6e9dddb196 SHA1 50673483544b1760774a7c25629273b98e15df3a SHA256 979fe4eaf0b7ad221080e5663a973af68ad64385e7adb70017306328def340da -EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc EBUILD opencv-2.3.0-r1.ebuild 4195 RMD160 46b13021e73b963663d136602ef024bbff53e080 SHA1 047df422d2f2d622ba55cb0efc03cccec31d8d00 SHA256 588aa6f79a4aa89af558cd9e527a341836b079c6e69886620baa280c8e307ff7 EBUILD opencv-2.3.0.ebuild 4147 RMD160 e554d1fd86ab5c143f6249bf5d33b75397a1cbf8 SHA1 f6166a850f807e40ee7e879145584eb746d6f8b8 SHA256 db1dfb92e5006f4bb8f0b4ea7297ad8bd22f1191e2a5f5e9444747790b22b7f7 -MISC ChangeLog 9212 RMD160 0ea7e46d6c1080b12730981e7f204c06e996d2fc SHA1 f9c3b7ac068bf8755e8cbd0f703ca0fa5e211e8e SHA256 e9c8d081c49d77c5fcd15202d244e06eb266a29f61fa20018c8026f90e301141 +MISC ChangeLog 9925 RMD160 9189f501c0976714abe9ecd404ac800ef3bfc4c2 SHA1 bd4be102bedfb57189dc611b10330c0aab22ed30 SHA256 87930d6375dc5048e238f8d9dd5ffbea7f11399885731c35efdb72a4af14328d MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk6aFCUACgkQkKaRLQcq0GLRnwCgnJCbomne1+e09uRFp2fBRNpV -MggAnivhOn64V963UcUFM9jR9nuK/OdK -=4kcr +iQEcBAEBAgAGBQJOmhRkAAoJEEdUh39IaPFNuhoH/3T5hh+Pcr6/Jw+qU6F1FvP/ +VuNBF48kC8kIgThHGU81C+rDSIss83eGeuHGD5ogAQTxMyTP040yB5OTUDT1YPOq +NXutik3Kek1IhsztGp+iu2ez9xFMJ4MB854NX5KaNiNKDbI0mduAA/PCgmc2e2tV +qnVZNTHk8Q2X/1SjqbJn1BAB3/9biMfr5i6zrkmviCsL8kswT5GowuXkhBx3XX8e +VOr0RVXGuuzXnJn4vCRsZ9qxp2CU+R0UY6lus15qvlvCNSY8qJyuO9cNmiexWAs+ +W1o1qkRT0MFphZmpoHGMBx/G/90+lCRrK3bYOfTgElLG7RjlnAJ9xFzh9uFRASo= +=Mjj2 -----END PGP SIGNATURE----- diff --git a/media-libs/opencv/files/opencv-2.0.0-libpng14.patch b/media-libs/opencv/files/opencv-2.0.0-libpng14.patch deleted file mode 100644 index 56f7a4e6e401..000000000000 --- a/media-libs/opencv/files/opencv-2.0.0-libpng14.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt - ---- src/highgui/grfmt_png.cpp -+++ src/highgui/grfmt_png.cpp -@@ -223,7 +223,7 @@ - png_set_palette_to_rgb( png_ptr ); - - if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 ) -- png_set_gray_1_2_4_to_8( png_ptr ); -+ png_set_expand_gray_1_2_4_to_8( png_ptr ); - - if( CV_MAT_CN(m_type) > 1 && color ) - png_set_bgr( png_ptr ); // convert RGB to BGR diff --git a/media-libs/opencv/files/opencv-2.1.0-mmap.patch b/media-libs/opencv/files/opencv-2.1.0-mmap.patch deleted file mode 100644 index b7bbc9b74ed5..000000000000 --- a/media-libs/opencv/files/opencv-2.1.0-mmap.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://code.ros.org/trac/opencv/ticket/141 -http://bugs.gentoo.org/313649 - ---- src/highgui/cvcap_libv4l.cpp -+++ src/highgui/cvcap_libv4l.cpp -@@ -782,7 +782,7 @@ - - capture->buffers[n_buffers].length = buf.length; - capture->buffers[n_buffers].start = -- mmap (NULL /* start anywhere */, -+ v4l2_mmap (NULL /* start anywhere */, - buf.length, - PROT_READ | PROT_WRITE /* required */, - MAP_SHARED /* recommended */, diff --git a/media-libs/opencv/files/opencv-2.1.0-multilib.patch b/media-libs/opencv/files/opencv-2.1.0-multilib.patch deleted file mode 100644 index 752ca6fe1ddd..000000000000 --- a/media-libs/opencv/files/opencv-2.1.0-multilib.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -ur OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt ---- OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt 2010-04-06 04:24:34.000000000 +0300 -+++ OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt 2010-07-27 21:41:18.000000000 +0300 -@@ -89,8 +89,8 @@ - INSTALL ( - TARGETS flann # flann_s - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" - ) - - # INSTALL ( -diff -ur OpenCV-2.1.0.orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt ---- OpenCV-2.1.0.orig/CMakeLists.txt 2010-04-06 04:24:37.000000000 +0300 -+++ OpenCV-2.1.0/CMakeLists.txt 2010-07-27 21:56:58.000000000 +0300 -@@ -467,8 +467,8 @@ - - string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}") - if(UNIX) -- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv) -- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages) -+ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv) -+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages) - endif() - if(WIN32) - get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE) -diff -ur OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt ---- OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt 2010-04-06 04:24:40.000000000 +0300 -+++ OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt 2010-07-27 21:42:00.000000000 +0300 -@@ -40,6 +40,6 @@ - - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main -- ARCHIVE DESTINATION lib COMPONENT main -- LIBRARY DESTINATION lib COMPONENT main -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main - ) -diff -ur OpenCV-2.1.0.orig/src/cv/CMakeLists.txt OpenCV-2.1.0/src/cv/CMakeLists.txt ---- OpenCV-2.1.0.orig/src/cv/CMakeLists.txt 2010-04-06 04:24:42.000000000 +0300 -+++ OpenCV-2.1.0/src/cv/CMakeLists.txt 2010-07-27 21:44:32.000000000 +0300 -@@ -71,8 +71,8 @@ - - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main -- LIBRARY DESTINATION lib COMPONENT main -- ARCHIVE DESTINATION lib COMPONENT main) -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main) - - install(FILES ${lib_hdrs} - DESTINATION include/opencv -diff -ur OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.1.0/src/cvaux/CMakeLists.txt ---- OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt 2010-04-06 04:24:43.000000000 +0300 -+++ OpenCV-2.1.0/src/cvaux/CMakeLists.txt 2010-07-27 21:43:22.000000000 +0300 -@@ -76,8 +76,8 @@ - - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main -- LIBRARY DESTINATION lib COMPONENT main -- ARCHIVE DESTINATION lib COMPONENT main) -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main) - - install(FILES ${aux_hdrs_ext} - DESTINATION include/opencv -diff -ur OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.1.0/src/cxcore/CMakeLists.txt ---- OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt 2010-04-06 04:24:44.000000000 +0300 -+++ OpenCV-2.1.0/src/cxcore/CMakeLists.txt 2010-07-27 21:44:51.000000000 +0300 -@@ -71,8 +71,8 @@ - - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main -- LIBRARY DESTINATION lib COMPONENT main -- ARCHIVE DESTINATION lib COMPONENT main) -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main) - - # install each module headers separately - install(FILES ${lib_hdrs} -diff -ur OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt OpenCV-2.1.0/src/highgui/CMakeLists.txt ---- OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt 2010-04-06 04:24:44.000000000 +0300 -+++ OpenCV-2.1.0/src/highgui/CMakeLists.txt 2010-07-27 21:43:00.000000000 +0300 -@@ -282,8 +282,8 @@ - - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main -- LIBRARY DESTINATION lib COMPONENT main -- ARCHIVE DESTINATION lib COMPONENT main) -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main) - - install(FILES ${highgui_ext_hdrs} - DESTINATION include/opencv -diff -ur OpenCV-2.1.0.orig/src/ml/CMakeLists.txt OpenCV-2.1.0/src/ml/CMakeLists.txt ---- OpenCV-2.1.0.orig/src/ml/CMakeLists.txt 2010-04-06 04:24:45.000000000 +0300 -+++ OpenCV-2.1.0/src/ml/CMakeLists.txt 2010-07-27 21:43:42.000000000 +0300 -@@ -61,8 +61,8 @@ - - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main -- LIBRARY DESTINATION lib COMPONENT main -- ARCHIVE DESTINATION lib COMPONENT main) -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main) - - install(FILES ${lib_hdrs} - DESTINATION include/opencv diff --git a/media-libs/opencv/files/opencv-2.2.0-convert_sets_to_options.patch b/media-libs/opencv/files/opencv-2.2.0-convert_sets_to_options.patch deleted file mode 100644 index 7da06cbd9d95..000000000000 --- a/media-libs/opencv/files/opencv-2.2.0-convert_sets_to_options.patch +++ /dev/null @@ -1,365 +0,0 @@ -diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0.new/CMakeLists.txt ---- OpenCV-2.2.0.old/CMakeLists.txt 2010-12-05 04:35:23.000000000 +0100 -+++ OpenCV-2.2.0.new/CMakeLists.txt 2011-04-30 11:57:37.000000000 +0200 -@@ -13,7 +13,7 @@ - # Add these standard paths to the search paths for FIND_LIBRARY - # to find libraries from these locations first - if(UNIX) -- set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib) -+ set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX}) - endif() - # it _must_ go before PROJECT(OpenCV) in order to work - if (NOT CMAKE_INSTALL_PREFIX) -@@ -94,7 +94,7 @@ - # Build static or dynamic libs? - # ---------------------------------------------------------------------------- - # Default: dynamic libraries: --SET(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)") -+OPTION(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" ON) - IF(BUILD_SHARED_LIBS) - SET(OPENCV_BUILD_SHARED_LIB 1) # For cvconfig.h, etc. - ELSE(BUILD_SHARED_LIBS) -@@ -196,13 +196,13 @@ - - # Build/install (or not) some apps: - # =================================================== --set(BUILD_EXAMPLES OFF CACHE BOOL "Build all examples") --set(INSTALL_C_EXAMPLES OFF CACHE BOOL "Install C examples") --set(INSTALL_PYTHON_EXAMPLES OFF CACHE BOOL "Install Python examples") -+option(BUILD_EXAMPLES "Build all examples" OFF) -+option(INSTALL_C_EXAMPLES "Install C examples" OFF) -+option(INSTALL_PYTHON_EXAMPLES "Install Python examples" OFF) - - # Build tests: - # =================================================== --set(BUILD_TESTS ON CACHE BOOL "Build tests") -+option(BUILD_TESTS "Build tests" ON) - - # Build 3rdparty libraries under unix - # =================================================== -@@ -229,12 +229,12 @@ - #set(ENABLE_OPENMP ${DEFAULT_ENABLE_OPENMP} CACHE BOOL "") - - if(CMAKE_COMPILER_IS_GNUCXX) -- set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC compiler (Add flags: -g -pg)") -- set(USE_OMIT_FRAME_POINTER ON CACHE BOOL "Enable -fomit-frame-pointer for GCC") -+ option(ENABLE_PROFILING "Enable profiling in the GCC compiler (Add flags: -g -pg)" OFF) -+ option(USE_OMIT_FRAME_POINTER "Enable -fomit-frame-pointer for GCC" ON) - if(${CMAKE_SYSTEM_PROCESSOR} MATCHES arm*) - # We can use only -O2 because the -O3 causes gcc crash -- set(USE_O2 ON CACHE BOOL "Enable -O2 for GCC") -- set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math for GCC") -+ option(USE_O2 "Enable -O2 for GCC" ON) -+ option(USE_FAST_MATH "Enable -ffast-math for GCC" ON) - endif() - - if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*) -@@ -255,56 +255,56 @@ - endif() - - if(${CMAKE_SYSTEM_PROCESSOR} MATCHES powerpc*) -- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC") -- set(ENABLE_POWERPC ON CACHE BOOL "Enable PowerPC for GCC") -+ option(USE_O3 "Enable -O3 for GCC" ON) -+ option(ENABLE_POWERPC "Enable PowerPC for GCC" ON) - endif () - - if(X86 OR X86_64) - # enable everything, since the available set of instructions is checked at runtime -- set(USE_O3 ON CACHE BOOL "Enable -O3") -- set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math") -- set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions") -- set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions") -- set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions") -- set(ENABLE_SSSE3 OFF CACHE BOOL "Enable SSSE3 instructions") -- set(ENABLE_SSE41 OFF CACHE BOOL "Enable SSE4.1 instructions") -- set(ENABLE_SSE42 OFF CACHE BOOL "Enable SSE4.2 instructions") -+ set(USE_O3 "Enable -O3" ON) -+ set(USE_FAST_MATH "Enable -ffast-math" ON) -+ option(ENABLE_SSE "Enable SSE instructions" ON) -+ option(ENABLE_SSE2 "Enable SSE2 instructions" ON) -+ option(ENABLE_SSE3 "Enable SSE3 instructions" OFF) -+ option(ENABLE_SSSE3 "Enable SSSE3 instructions" OFF) -+ option(ENABLE_SSE41 "Enable SSE4.1 instructions" OFF) -+ option(ENABLE_SSE42 "Enable SSE4.2 instructions" OFF) - endif() - endif() - - # allow fine grained control over which libraries not to link, even if - # they are available on the system - # ==================================================================== --set(WITH_PNG ON CACHE BOOL "Include PNG support") --set(WITH_JPEG ON CACHE BOOL "Include JPEG support") --set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support") --set(WITH_TIFF ON CACHE BOOL "Include TIFF support") --set(WITH_OPENEXR ON CACHE BOOL "Include ILM support via OpenEXR") -+option(WITH_PNG "Include PNG support" ON) -+option(WITH_JPEG "Include JPEG support" ON) -+option(WITH_JASPER "Include JPEG2K support" ON) -+option(WITH_TIFF "Include TIFF support" ON) -+option(WITH_OPENEXR "Include ILM support via OpenEXR" ON) - - if(UNIX) -- set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support") -+ option(WITH_FFMPEG "Include FFMPEG support" ON) - if(NOT APPLE) -- set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)") -- set(WITH_GTK ON CACHE BOOL "Include GTK support") -- set(WITH_GSTREAMER ON CACHE BOOL "Include Gstreamer support") -- set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support") -- set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)") -+ option(WITH_UNICAP "Include Unicap support (GPL)" OFF) -+ option(WITH_GTK "Include GTK support" ON) -+ option(WITH_GSTREAMER "Include Gstreamer support" ON) -+ option(WITH_V4L "Include Video 4 Linux support" ON) -+ option(WITH_XINE "Include Xine support (GPL)" OFF) - endif() -- set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support") -- set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support") -+ option(WITH_PVAPI "Include Prosilica GigE support" ON) -+ option(WITH_1394 "Include IEEE1394 support" ON) - endif() - - if(APPLE) -- set(WITH_CARBON OFF CACHE BOOL "Use Carbon for UI instead of Cocoa") -- set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit") -+ option(WITH_CARBON "Use Carbon for UI instead of Cocoa" OFF) -+ option(WITH_QUICKTIME "Use QuickTime for Video I/O insted of QTKit" OFF) - endif() - --set(WITH_TBB OFF CACHE BOOL "Include TBB support") --set(WITH_EIGEN2 ON CACHE BOOL "Include Eigen2/Eigen3 support") --set(WITH_CUDA OFF CACHE BOOL "Include NVidia Cuda Runtime support") -+option(WITH_TBB "Include TBB support" OFF) -+option(WITH_EIGEN2 "Include Eigen2/Eigen3 support" ON) -+option(WITH_CUDA "Include NVidia Cuda Runtime support" OFF) - - if(WIN32) -- set(WITH_VIDEOINPUT ON CACHE BOOL "Enable VideoInput support") -+ option(WITH_VIDEOINPUT "Enable VideoInput support" ON) - endif() - - # =================================================== -@@ -496,7 +496,7 @@ - include(OpenCVFindOpenEXR.cmake) - endif() - --set(BUILD_NEW_PYTHON_SUPPORT ON CACHE BOOL "Build with Python support") -+option(BUILD_NEW_PYTHON_SUPPORT "Build with Python support" ON) - - if(BUILD_NEW_PYTHON_SUPPORT) - find_package(PythonInterp) -@@ -513,8 +513,8 @@ - - string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}") - if(UNIX) -- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv) -- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages) -+ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv) -+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages) - endif() - if(WIN32) - get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE) -@@ -543,8 +543,8 @@ - #YV - ############################### QT ################################ - --set(WITH_QT OFF CACHE BOOL "Build with Qt Backend support") --set(WITH_QT_OPENGL OFF CACHE BOOL "Add OpenGL extension to Qt") -+option(WITH_QT "Build with Qt Backend support" OFF) -+option(WITH_QT_OPENGL "Add OpenGL extension to Qt" OFF) - - set(HAVE_QT 0) - set(HAVE_QT_OPENGL 0) -@@ -823,15 +823,12 @@ - - - ################## LATEX ################## --set(BUILD_LATEX_DOCS OFF CACHE BOOL "Build LaTeX OpenCV Documentation") -+option(BUILD_LATEX_DOCS "Build LaTeX OpenCV Documentation" OFF) - - ################### DOXYGEN ############### - - find_package(Doxygen) -- --if(DOXYGEN_FOUND) -- set(BUILD_DOXYGEN_DOCS ON CACHE BOOL "Generate HTML docs using Doxygen") --endif() -+option(BUILD_DOXYGEN_DOCS "Generate HTML docs using Doxygen" ON) - - # ---------------------------------------------------------------------------- - # UPDATE CONFIG FILES & SCRIPTS: -@@ -863,7 +860,7 @@ - # Set the maximum level of warnings: - # ---------------------------------------------------------------------------- - # Should be set to true for development --set(OPENCV_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors") -+option(OPENCV_WARNINGS_ARE_ERRORS "Treat warnings as errors" OFF) - - set(EXTRA_C_FLAGS "") - set(EXTRA_C_FLAGS_RELEASE "") -@@ -1070,9 +1067,9 @@ - set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Output directory for applications" ) - - if(WIN32) --set(OPENCV_DOC_INSTALL_PATH doc) -+set(OPENCV_DOC_INSTALL_PATH doc CACHE PATH "Directory for documentation to install (without prefix)") - else() --set(OPENCV_DOC_INSTALL_PATH share/opencv/doc) -+set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/ CACHE PATH "Directory for documentation to install (without prefix)") - endif() - - # -------------------------------------------------------------------------------------------- -@@ -1106,7 +1103,7 @@ - set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/include/opencv" "${CMAKE_INSTALL_PREFIX}/include") - set(CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE "\"\"") - --set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/lib") -+set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") - - exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"" OUTPUT_VARIABLE RET_VAL) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" IMMEDIATE @ONLY) -@@ -1164,14 +1161,14 @@ - # ------------------------------------------------------------------------------------------- - set(prefix ${CMAKE_INSTALL_PREFIX}) - set(exec_prefix "\${prefix}") --set(libdir "\${exec_prefix}/lib") -+set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}") - set(includedir "\${prefix}/include") - set(VERSION ${OPENCV_VERSION}) - - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE) - - if(UNIX) -- install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib/pkgconfig) -+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) - endif() - - -@@ -1191,7 +1188,7 @@ - # CPack target - # ---------------------------------------------------------------------------- - --set(BUILD_PACKAGE OFF CACHE BOOL "Build a installer with the SDK") -+option(BUILD_PACKAGE "Build a installer with the SDK" OFF) - - if(BUILD_PACKAGE) - -diff -urN OpenCV-2.2.0.old/modules/ffmpeg/CMakeLists.txt OpenCV-2.2.0.new/modules/ffmpeg/CMakeLists.txt ---- OpenCV-2.2.0.old/modules/ffmpeg/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100 -+++ OpenCV-2.2.0.new/modules/ffmpeg/CMakeLists.txt 2011-04-30 10:51:26.000000000 +0200 -@@ -43,12 +43,12 @@ - VERSION ${OPENCV_VERSION} - OUTPUT_NAME "${the_target}${OPENCV_DLLVERSION}" - DEFINE_SYMBOL "CVAPI_EXPORTS" -- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/" -+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/" - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/" - ) - - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main -- ARCHIVE DESTINATION lib COMPONENT main -- LIBRARY DESTINATION lib COMPONENT main -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main -+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main - ) -diff -urN OpenCV-2.2.0.old/modules/gpu/CMakeLists.txt OpenCV-2.2.0.new/modules/gpu/CMakeLists.txt ---- OpenCV-2.2.0.old/modules/gpu/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100 -+++ OpenCV-2.2.0.new/modules/gpu/CMakeLists.txt 2011-04-30 10:51:08.000000000 +0200 -@@ -96,9 +96,9 @@ - # Additional target properties - set_target_properties(${the_target} PROPERTIES - DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}" -- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/" -+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/" - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/" -- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" -+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" - ) - - # Add the required libraries for linking: -@@ -124,8 +124,8 @@ - - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main -- LIBRARY DESTINATION lib COMPONENT main -- ARCHIVE DESTINATION lib COMPONENT main) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) - - install(FILES ${lib_hdrs} - DESTINATION include/opencv2/${name} -diff -urN OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt OpenCV-2.2.0.new/modules/highgui/CMakeLists.txt ---- OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100 -+++ OpenCV-2.2.0.new/modules/highgui/CMakeLists.txt 2011-04-30 10:53:11.000000000 +0200 -@@ -250,9 +250,9 @@ - # Additional target properties - set_target_properties(${the_target} PROPERTIES - DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}" -- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/" -+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/" - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/" -- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" -+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" - LINK_INTERFACE_LIBRARIES "" - ) - -@@ -302,8 +302,8 @@ - - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main -- LIBRARY DESTINATION lib COMPONENT main -- ARCHIVE DESTINATION lib COMPONENT main) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) - - install(FILES ${highgui_ext_hdrs} - DESTINATION include/opencv2/highgui -diff -urN OpenCV-2.2.0.old/OpenCVModule.cmake OpenCV-2.2.0.new/OpenCVModule.cmake ---- OpenCV-2.2.0.old/OpenCVModule.cmake 2010-12-05 04:35:25.000000000 +0100 -+++ OpenCV-2.2.0.new/OpenCVModule.cmake 2011-04-30 10:53:45.000000000 +0200 -@@ -51,9 +51,9 @@ - # Additional target properties - set_target_properties(${the_target} PROPERTIES - DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}" -- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/" -+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/" - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/" -- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" -+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" - ) - - # Add the required libraries for linking: -@@ -75,8 +75,8 @@ - - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main -- LIBRARY DESTINATION lib COMPONENT main -- ARCHIVE DESTINATION lib COMPONENT main) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) - - install(FILES ${lib_hdrs} - DESTINATION include/opencv2/${name} -diff -urN OpenCV-2.2.0.old/tests/cxts/CMakeLists.txt OpenCV-2.2.0.new/tests/cxts/CMakeLists.txt ---- OpenCV-2.2.0.old/tests/cxts/CMakeLists.txt 2010-12-05 04:35:25.000000000 +0100 -+++ OpenCV-2.2.0.new/tests/cxts/CMakeLists.txt 2011-04-30 10:54:15.000000000 +0200 -@@ -51,7 +51,7 @@ - # Additional target properties - set_target_properties(${the_target} PROPERTIES - DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}" -- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/" -+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/" - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/" - DEFINE_SYMBOL "CVAPI_EXPORTS" - ) -@@ -64,6 +64,6 @@ - if(WIN32) - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main -- LIBRARY DESTINATION lib COMPONENT main -- ARCHIVE DESTINATION lib COMPONENT main) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) - endif() diff --git a/media-libs/opencv/files/opencv-2.2.0-ffmpeg01.patch b/media-libs/opencv/files/opencv-2.2.0-ffmpeg01.patch deleted file mode 100644 index bfde3a92c78f..000000000000 --- a/media-libs/opencv/files/opencv-2.2.0-ffmpeg01.patch +++ /dev/null @@ -1,105 +0,0 @@ - -Index: D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp -=================================================================== ---- D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2112) -+++ D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2113) -@@ -466,7 +466,7 @@ - AVCodecContext *enc = &ic->streams[i]->codec; - #endif - -- if( CODEC_TYPE_VIDEO == enc->codec_type && video_stream < 0) { -+ if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) { - AVCodec *codec = avcodec_find_decoder(enc->codec_id); - if (!codec || - avcodec_open(enc, codec) < 0) -@@ -550,15 +550,27 @@ - continue; - } - --#if LIBAVFORMAT_BUILD > 4628 -- avcodec_decode_video(video_st->codec, -- picture, &got_picture, -- packet.data, packet.size); --#else -- avcodec_decode_video(&video_st->codec, -- picture, &got_picture, -- packet.data, packet.size); --#endif -+ -+ AVPacket avpkt; -+ av_init_packet(&avpkt); -+ avpkt.data = packet.data; -+ avpkt.size = packet.size; -+ // -+ // HACK for CorePNG to decode as normal PNG by default -+ // same method used by ffmpeg -+ avpkt.flags = AV_PKT_FLAG_KEY; -+ avcodec_decode_video2(video_st->codec, -+ picture, &got_picture, &avpkt); -+//Functions Removed from ffmpeg on 4/19/11 -+//#if LIBAVFORMAT_BUILD > 4628 -+// avcodec_decode_video(video_st->codec, -+// picture, &got_picture, -+// packet.data, packet.size); -+//#else -+// avcodec_decode_video(&video_st->codec, -+// picture, &got_picture, -+// packet.data, packet.size); -+//#endif - - if (got_picture) { - // we have a new picture, so memorize it -@@ -899,7 +911,7 @@ - #endif - - #if LIBAVFORMAT_BUILD > 4621 -- c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO); -+ c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO); - #else - c->codec_id = oc->oformat->video_codec; - #endif -@@ -911,7 +923,7 @@ - //if(codec_tag) c->codec_tag=codec_tag; - codec = avcodec_find_encoder(c->codec_id); - -- c->codec_type = CODEC_TYPE_VIDEO; -+ c->codec_type = AVMEDIA_TYPE_VIDEO; - - /* put sample parameters */ - c->bit_rate = bitrate; -@@ -998,7 +1010,7 @@ - AVPacket pkt; - av_init_packet(&pkt); - -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - pkt.stream_index= video_st->index; - pkt.data= (uint8_t *)picture; - pkt.size= sizeof(AVPicture); -@@ -1018,7 +1030,7 @@ - pkt.pts = c->coded_frame->pts; - #endif - if(c->coded_frame->key_frame) -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - pkt.stream_index= video_st->index; - pkt.data= outbuf; - pkt.size= out_size; -@@ -1215,7 +1227,7 @@ - av_register_all (); - - /* auto detect the output format from the name and fourcc code. */ -- fmt = guess_format(NULL, filename, NULL); -+ fmt = av_guess_format(NULL, filename, NULL); - if (!fmt) - return false; - -@@ -1238,7 +1250,7 @@ - #endif - - // alloc memory for context -- oc = av_alloc_format_context(); -+ oc = avformat_alloc_context(); - assert (oc); - - /* set file name */ diff --git a/media-libs/opencv/files/opencv-2.2.0-ffmpeg02.patch b/media-libs/opencv/files/opencv-2.2.0-ffmpeg02.patch deleted file mode 100644 index 00ee541590c5..000000000000 --- a/media-libs/opencv/files/opencv-2.2.0-ffmpeg02.patch +++ /dev/null @@ -1,58 +0,0 @@ - -Index: D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp -=================================================================== ---- D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2121) -+++ D:/WaterWATCH/dev/opencv/modules/highgui/src/cap_ffmpeg.cpp (revision 2122) -@@ -815,24 +815,25 @@ - #endif - }; - --static const char * icvFFMPEGErrStr(int err) --{ -- switch(err) { -- case AVERROR_NUMEXPECTED: -- return "Incorrect filename syntax"; -- case AVERROR_INVALIDDATA: -- return "Invalid data in header"; -- case AVERROR_NOFMT: -- return "Unknown format"; -- case AVERROR_IO: -- return "I/O error occurred"; -- case AVERROR_NOMEM: -- return "Memory allocation error"; -- default: -- break; -- } -- return "Unspecified error"; --} -+//Deprecated Errors, should be using AVERROR(EINVAL) to return error strings -+//static const char * icvFFMPEGErrStr(int err) -+//{ -+// switch(err) { -+// case AVERROR_NUMEXPECTED: -+// return "Incorrect filename syntax"; -+// case AVERROR_INVALIDDATA: -+// return "Invalid data in header"; -+// case AVERROR_NOFMT: -+// return "Unknown format"; -+// case AVERROR_IO: -+// return "I/O error occurred"; -+// case AVERROR_NOMEM: -+// return "Memory allocation error"; -+// default: -+// break; -+// } -+// return "Unspecified error"; -+//} - - /* function internal to FFMPEG (libavformat/riff.c) to lookup codec id by fourcc tag*/ - extern "C" { -@@ -1322,7 +1323,7 @@ - /* open the codec */ - if ( (err=avcodec_open(c, codec)) < 0) { - char errtext[256]; -- sprintf(errtext, "Could not open codec '%s': %s", codec->name, icvFFMPEGErrStr(err)); -+ sprintf(errtext, "Could not open codec '%s': %s", codec->name, AVERROR(EINVAL)); - CV_Error(CV_StsBadArg, errtext); - } - diff --git a/media-libs/opencv/files/opencv-2.2.0-findblas.patch b/media-libs/opencv/files/opencv-2.2.0-findblas.patch deleted file mode 100644 index 0c205f5781af..000000000000 --- a/media-libs/opencv/files/opencv-2.2.0-findblas.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ruN OpenCV-2.2.0.orig/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt ---- OpenCV-2.2.0.orig/CMakeLists.txt 2011-07-13 21:49:54.474595691 +0200 -+++ OpenCV-2.2.0/CMakeLists.txt 2011-07-13 21:51:01.917595716 +0200 -@@ -196,10 +196,30 @@ - # ---------------------------------------------------------------------------- - # CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC.. - # ---------------------------------------------------------------------------- -+find_package(PkgConfig REQUIRED) -+ -+if(BLAS_LIBRARIES) -+ include(CheckFortranFunctionExists) -+ set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES}) -+ CHECK_FORTRAN_FUNCTION_EXISTS("dgemm" BLAS_FOUND) -+ unset( CMAKE_REQUIRED_LIBRARIES ) -+ if(BLAS_FOUND) -+ message(STATUS "BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.") -+ else(BLAS_FOUND) -+ message(FATAL_ERROR "BLAS supplied by user is not WORKING, CANNOT USE ${BLAS_LIBRARIES}.") -+ endif(BLAS_FOUND) -+else(BLAS_LIBRARIES) -+ # User did not provide a BLAS Library -+ pkg_check_modules(BLAS blas) -+endif (BLAS_LIBRARIES) -+ -+if(NOT BLAS_FOUND) -+ message(FATAL_ERROR "BLAS libraries not found.") -+endif(NOT BLAS_FOUND) -+ - find_package(LAPACK REQUIRED) --find_package(BLAS REQUIRED) - find_package(ZLIB REQUIRED) --find_package(PkgConfig REQUIRED) -+ - pkg_check_modules(FLANN REQUIRED flann) - - # Build/install (or not) some apps: diff --git a/media-libs/opencv/files/opencv-2.2.0-findnpp.patch b/media-libs/opencv/files/opencv-2.2.0-findnpp.patch deleted file mode 100644 index 86ef8e2a8551..000000000000 --- a/media-libs/opencv/files/opencv-2.2.0-findnpp.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -ruN OpenCV-2.2.0.orig/modules/gpu/FindNPP.cmake OpenCV-2.2.0/modules/gpu/FindNPP.cmake ---- OpenCV-2.2.0.orig/modules/gpu/FindNPP.cmake 2010-12-05 04:35:24.000000000 +0100 -+++ OpenCV-2.2.0/modules/gpu/FindNPP.cmake 2011-05-14 20:52:29.026582967 +0200 -@@ -7,42 +7,12 @@ - # CUDA_NPP_LIBRARIES -- NPP libraries. - # NPP_VERSION -- NPP version in format "major.minor.build". - # --# If not found automatically, please set CUDA_NPP_LIBRARY_ROOT_DIR --# in CMake or set enviroment varivabe $CUDA_NPP_ROOT --# --# Author: Anatoly Baksheev, Itseez Ltd. --# --# The MIT License --# --# License for the specific language governing rights and limitations under --# Permission is hereby granted, free of charge, to any person obtaining a --# copy of this software and associated documentation files (the "Software"), --# to deal in the Software without restriction, including without limitation --# the rights to use, copy, modify, merge, publish, distribute, sublicense, --# and/or sell copies of the Software, and to permit persons to whom the --# Software is furnished to do so, subject to the following conditions: --# --# The above copyright notice and this permission notice shall be included --# in all copies or substantial portions of the Software. --# --# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL --# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING --# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER --# DEALINGS IN THE SOFTWARE. --# - ############################################################################### - - cmake_policy(PUSH) - cmake_minimum_required(VERSION 2.8.0) - cmake_policy(POP) - --if(NOT "${CUDA_NPP_LIBRARY_ROOT_DIR}" STREQUAL "${CUDA_NPP_LIBRARY_ROOT_DIR_INTERNAL}") -- unset(CUDA_NPP_INCLUDES CACHE) -- unset(CUDA_NPP_LIBRARIES CACHE) --endif() - - if(CMAKE_SIZEOF_VOID_P EQUAL 4) - if (UNIX OR APPLE) -@@ -58,28 +28,18 @@ - endif() - endif(CMAKE_SIZEOF_VOID_P EQUAL 4) - --if(NOT CUDA_NPP_LIBRARY_ROOT_DIR OR CUDA_NPP_LIBRARY_ROOT_DIR STREQUAL "") -- unset(CUDA_NPP_LIBRARY_ROOT_DIR CACHE) -- find_path(CUDA_NPP_LIBRARY_ROOT_DIR "common/npp/include/npp.h" PATHS ENV CUDA_NPP_ROOT DOC "NPP root directory.") -- MESSAGE(STATUS "NPP root directory: " ${CUDA_NPP_LIBRARY_ROOT_DIR}) --endif() -+unset(CUDA_NPP_LIBRARY_ROOT_DIR) - --# Search includes in our own paths. --find_path(CUDA_NPP_INCLUDES npp.h PATHS "${CUDA_NPP_LIBRARY_ROOT_DIR}/common/npp/include") --# Search default search paths, after we search our own set of paths. --find_path(CUDA_NPP_INCLUDES device_functions.h) -+# Search includes -+find_path(CUDA_NPP_INCLUDES npp.h PATHS "/opt/cuda/include") - mark_as_advanced(CUDA_NPP_INCLUDES) - - # Find NPP library - find_library(CUDA_NPP_LIBRARIES - NAMES "npp" "npp${NPP_SUFFIX}" "libnpp${NPP_SUFFIX}" -- PATHS "${CUDA_NPP_LIBRARY_ROOT_DIR}" -- PATH_SUFFIXES "common/lib" "common/npp/lib" -+ PATHS "/opt/cuda/lib" - DOC "NPP library" - ) -- --# Search default search paths, after we search our own set of paths. --find_library(CUDA_NPP_LIBRARIES NAMES npp${NPP_SUFFIX} libnpp${NPP_SUFFIX} DOC "NPP library") - mark_as_advanced(CUDA_NPP_LIBRARIES) - - if(EXISTS ${CUDA_NPP_INCLUDES}/nppversion.h) -@@ -120,6 +80,3 @@ - endif() - - set(CUDA_NPP_FOUND TRUE) --set(CUDA_NPP_LIBRARY_ROOT_DIR_INTERNAL "${CUDA_NPP_LIBRARY_ROOT_DIR}" CACHE INTERNAL "This is the value of the last time CUDA_NPP_LIBRARY_ROOT_DIR was set successfully." FORCE) -- -- diff --git a/media-libs/opencv/files/opencv-2.2.0-fortran.patch b/media-libs/opencv/files/opencv-2.2.0-fortran.patch deleted file mode 100644 index 3ebe57056c23..000000000000 --- a/media-libs/opencv/files/opencv-2.2.0-fortran.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN OpenCV-2.2.0.orig/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt ---- OpenCV-2.2.0.orig/CMakeLists.txt 2010-12-05 04:35:23.000000000 +0100 -+++ OpenCV-2.2.0/CMakeLists.txt 2011-05-01 19:49:06.901193498 +0200 -@@ -3,6 +3,9 @@ - # - # From the off-tree build directory, invoke: - # $ cmake -+ -+ENABLE_LANGUAGE(Fortran) -+ - # - # - # - OCT-2008: Initial version diff --git a/media-libs/opencv/files/opencv-2.2.0-gcc46.patch b/media-libs/opencv/files/opencv-2.2.0-gcc46.patch deleted file mode 100644 index a69499b4f171..000000000000 --- a/media-libs/opencv/files/opencv-2.2.0-gcc46.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: /trunk/opencv/modules/core/include/opencv2/core/core.hpp -=================================================================== ---- /trunk/opencv/modules/core/include/opencv2/core/core.hpp (revision 4804) -+++ /trunk/opencv/modules/core/include/opencv2/core/core.hpp (revision 4861) -@@ -56,4 +56,5 @@ - #include - #include -+#include - #include - #include diff --git a/media-libs/opencv/files/opencv-2.2.0-libpng1.5.patch b/media-libs/opencv/files/opencv-2.2.0-libpng1.5.patch deleted file mode 100644 index fce010da4d7e..000000000000 --- a/media-libs/opencv/files/opencv-2.2.0-libpng1.5.patch +++ /dev/null @@ -1,40 +0,0 @@ - -Index: /trunk/opencv/modules/highgui/src/grfmt_png.cpp -=================================================================== ---- /trunk/opencv/modules/highgui/src/grfmt_png.cpp (revision 4337) -+++ /trunk/opencv/modules/highgui/src/grfmt_png.cpp (revision 4945) -@@ -108,5 +108,5 @@ - { - png_structp png_ptr = (png_structp)_png_ptr; -- PngDecoder* decoder = (PngDecoder*)(png_ptr->io_ptr); -+ PngDecoder* decoder = (PngDecoder*)(png_get_io_ptr(png_ptr)); - CV_Assert( decoder ); - const Mat& buf = decoder->m_buf; -@@ -139,5 +139,5 @@ - if( info_ptr && end_info ) - { -- if( setjmp( png_ptr->jmpbuf ) == 0 ) -+ if( setjmp( png_jmpbuf( png_ptr ) ) == 0 ) - { - if( !m_buf.empty() ) -@@ -201,5 +201,5 @@ - png_infop end_info = (png_infop)m_end_info; - -- if( setjmp(png_ptr->jmpbuf) == 0 ) -+ if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 ) - { - int y; -@@ -285,5 +285,5 @@ - return; - png_structp png_ptr = (png_structp)_png_ptr; -- PngEncoder* encoder = (PngEncoder*)(png_ptr->io_ptr); -+ PngEncoder* encoder = (PngEncoder*)(png_get_io_ptr(png_ptr)); - CV_Assert( encoder && encoder->m_buf ); - size_t cursz = encoder->m_buf->size(); -@@ -327,5 +327,5 @@ - if( info_ptr ) - { -- if( setjmp( png_ptr->jmpbuf ) == 0 ) -+ if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 ) - { - if( m_buf ) diff --git a/media-libs/opencv/files/opencv-2.2.0-numpy.patch b/media-libs/opencv/files/opencv-2.2.0-numpy.patch deleted file mode 100644 index 0690eab2f25f..000000000000 --- a/media-libs/opencv/files/opencv-2.2.0-numpy.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up OpenCV-2.2.0/CMakeLists.txt.numpy OpenCV-2.2.0/CMakeLists.txt ---- OpenCV-2.2.0/CMakeLists.txt.numpy 2010-12-07 17:54:56.369070005 +0100 -+++ OpenCV-2.2.0/CMakeLists.txt 2010-12-07 17:58:31.987070004 +0100 -@@ -532,7 +532,7 @@ if(BUILD_NEW_PYTHON_SUPPORT) - OUTPUT_STRIP_TRAILING_WHITESPACE) - if(PYTHON_NUMPY_PROCESS EQUAL 0) - set(PYTHON_USE_NUMPY 1) -- add_definitions(-D PYTHON_USE_NUMPY=1) -+ add_definitions(-DPYTHON_USE_NUMPY=1) - include_directories(AFTER ${PYTHON_NUMPY_INCLUDE_DIRS}) - message(STATUS " Use INCLUDE: ${PYTHON_NUMPY_INCLUDE_DIRS}") - else() diff --git a/media-libs/opencv/files/opencv-2.2.0-ptrcvcapture.patch b/media-libs/opencv/files/opencv-2.2.0-ptrcvcapture.patch deleted file mode 100644 index c1316f0eacee..000000000000 --- a/media-libs/opencv/files/opencv-2.2.0-ptrcvcapture.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: modules/highgui/src/cap.cpp -=================================================================== ---- modules/highgui/src/cap.cpp (revision 4283) -+++ modules/highgui/src/cap.cpp (working copy) -@@ -52,10 +52,10 @@ - namespace cv - { - --template<> inline void Ptr::delete_obj() -+template<> void Ptr::delete_obj() - { cvReleaseCapture(&obj); } - --template<> inline void Ptr::delete_obj() -+template<> void Ptr::delete_obj() - { cvReleaseVideoWriter(&obj); } - - } diff --git a/media-libs/opencv/files/opencv-2.2.0-use_system_libs.patch b/media-libs/opencv/files/opencv-2.2.0-use_system_libs.patch deleted file mode 100644 index 5d22a9be17bf..000000000000 --- a/media-libs/opencv/files/opencv-2.2.0-use_system_libs.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt ---- OpenCV-2.2.0.old/CMakeLists.txt 2010-12-05 04:35:23.000000000 +0100 -+++ OpenCV-2.2.0/CMakeLists.txt 2011-04-29 23:48:20.000000000 +0200 -@@ -193,6 +193,11 @@ - # ---------------------------------------------------------------------------- - # CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC.. - # ---------------------------------------------------------------------------- -+find_package(LAPACK REQUIRED) -+find_package(BLAS REQUIRED) -+find_package(ZLIB REQUIRED) -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(FLANN REQUIRED flann) - - # Build/install (or not) some apps: - # =================================================== -diff -urN OpenCV-2.2.0.old/modules/core/CMakeLists.txt OpenCV-2.2.0/modules/core/CMakeLists.txt ---- OpenCV-2.2.0.old/modules/core/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100 -+++ OpenCV-2.2.0/modules/core/CMakeLists.txt 2011-04-30 10:56:32.000000000 +0200 -@@ -1,3 +1,3 @@ --include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/include") --set(deps opencv_lapack zlib) -+include_directories("${ZLIB_INCLUDE_DIRS}") -+set(deps ${ZLIB_LIBRARIES} ${LAPACK_LIBRARIES}) - define_opencv_module(core ${deps}) -diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp OpenCV-2.2.0/modules/core/src/lapack.cpp ---- OpenCV-2.2.0.old/modules/core/src/lapack.cpp 2010-12-05 04:35:24.000000000 +0100 -+++ OpenCV-2.2.0/modules/core/src/lapack.cpp 2011-04-30 11:50:09.000000000 +0200 -@@ -48,7 +48,7 @@ - typedef __CLPK_integer integer; - typedef __CLPK_real real; - #else -- #include "clapack.h" -+ #include - #endif - - #undef abs -diff -urN OpenCV-2.2.0.old/modules/haartraining/CMakeLists.txt OpenCV-2.2.0/modules/haartraining/CMakeLists.txt ---- OpenCV-2.2.0.old/modules/haartraining/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100 -+++ OpenCV-2.2.0/modules/haartraining/CMakeLists.txt 2011-04-29 23:48:41.000000000 +0200 -@@ -18,7 +18,7 @@ - link_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/bin ${CMAKE_CURRENT_BINARY_DIR}) - endif() - --set(haartraining_libs opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_haartraining_engine) -+set(haartraining_libs opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_haartraining_engine ${BLAS_LIBRARIES} ${FLANN_LIBRARIES} ${LAPACK_LIBRARIES}) - - link_libraries(${haartraining_libs}) - -diff -urN OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt OpenCV-2.2.0/modules/highgui/CMakeLists.txt ---- OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt 2010-12-05 04:35:24.000000000 +0100 -+++ OpenCV-2.2.0/modules/highgui/CMakeLists.txt 2011-04-29 23:11:47.000000000 +0200 -@@ -219,8 +219,8 @@ - set(the_target "opencv_highgui") - - add_definitions(-DHIGHGUI_EXPORTS -DCVAPI_EXPORTS) -- --include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include" -+include_directories("${ZLIB_INCLUDE_DIRS}" -+ "${CMAKE_CURRENT_SOURCE_DIR}/include" - "${CMAKE_CURRENT_SOURCE_DIR}/../core/include" - "${CMAKE_CURRENT_SOURCE_DIR}/../imgproc/include" - "${CMAKE_CURRENT_SOURCE_DIR}/src" -@@ -285,7 +285,7 @@ - #target_link_libraries(${the_target} libtiff) - endif() - --target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core opencv_imgproc zlib ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES} ${JASPER_LIBRARIES} ${HIGHGUI_LIBRARIES} ${OPENEXR_LIBRARIES}) -+target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core opencv_imgproc ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES} ${JASPER_LIBRARIES} ${HIGHGUI_LIBRARIES} ${OPENEXR_LIBRARIES}) - - if(APPLE) - target_link_libraries(${the_target} "-lbz2 -framework Cocoa -framework QuartzCore") -diff -urN OpenCV-2.2.0.old/modules/highgui/src/grfmt_png.cpp OpenCV-2.2.0/modules/highgui/src/grfmt_png.cpp ---- OpenCV-2.2.0.old/modules/highgui/src/grfmt_png.cpp 2010-12-05 04:35:25.000000000 +0100 -+++ OpenCV-2.2.0/modules/highgui/src/grfmt_png.cpp 2011-04-29 22:25:25.000000000 +0200 -@@ -42,6 +42,7 @@ - - #include "precomp.hpp" - -+#include - #ifdef HAVE_PNG - - /****************************************************************************************\ -diff -urN OpenCV-2.2.0.old/OpenCVFindOpenEXR.cmake OpenCV-2.2.0/OpenCVFindOpenEXR.cmake ---- OpenCV-2.2.0.old/OpenCVFindOpenEXR.cmake 2010-12-05 04:35:25.000000000 +0100 -+++ OpenCV-2.2.0/OpenCVFindOpenEXR.cmake 2011-04-30 10:57:21.000000000 +0200 -@@ -44,7 +44,7 @@ - IF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) - SET(OPENEXR_FOUND TRUE) - SET(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATH} CACHE STRING "The include paths needed to use OpenEXR") -- SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} zlib CACHE STRING "The libraries needed to use OpenEXR") -+ SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR") - ENDIF () - - IF(OPENEXR_FOUND) diff --git a/media-libs/opencv/files/opencv-2.2.0-v4l_2.6.38.patch b/media-libs/opencv/files/opencv-2.2.0-v4l_2.6.38.patch deleted file mode 100644 index dd23cd133ccf..000000000000 --- a/media-libs/opencv/files/opencv-2.2.0-v4l_2.6.38.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp ---- OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 2010-12-05 11:35:25.000000000 +0800 -+++ OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp 2011-04-18 10:40:01.984950054 +0800 -@@ -214,7 +214,7 @@ - #include - #include - --#include -+#include - - #include - #include -diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp.cpp ---- OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp.nov4l1 2010-12-05 11:35:25.000000000 +0800 -+++ OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp 2011-04-18 10:39:07.568578185 +0800 -@@ -224,7 +224,7 @@ - #include "highgui.h" - #include "precomp.hpp" - --#if !defined WIN32 && defined HAVE_CAMV4L && defined HAVE_CAMV4L2 -+#if !defined WIN32 && defined HAVE_CAMV4L2 - - #define CLEAR(x) memset (&(x), 0, sizeof (x)) - -@@ -241,7 +241,7 @@ - #include - #include - --#include -+#include - #include - - #include diff --git a/media-libs/opencv/opencv-2.1.0.ebuild b/media-libs/opencv/opencv-2.1.0.ebuild deleted file mode 100644 index c8dec83c2769..000000000000 --- a/media-libs/opencv/opencv-2.1.0.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.1.0.ebuild,v 1.12 2011/08/10 16:49:17 xarthisius Exp $ - -EAPI=3 - -PYTHON_DEPEND="python? 2:2.6" - -inherit cmake-utils eutils flag-o-matic python - -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/${PN}library/${MY_P}.tar.bz2" - -LICENSE="v4l? ( GPL-2 ) xine? ( GPL-2 ) BSD" -SLOT="0" -KEYWORDS="~amd64 ppc ~x86" -IUSE="debug +deprecated examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k octave png python sse sse2 sse3 ssse3 test tiff v4l xine" - -RDEPEND=" - sys-libs/zlib - virtual/fortran - ipp? ( sci-libs/ipp ) - ieee1394? ( - sys-libs/libraw1394 - media-libs/libdc1394:2 ) - ffmpeg? ( virtual/ffmpeg ) - gstreamer? ( media-libs/gstreamer ) - gtk? ( x11-libs/gtk+:2 ) - jpeg2k? ( media-libs/jasper ) - jpeg? ( virtual/jpeg ) - png? ( >=media-libs/libpng-1.4 ) - tiff? ( media-libs/tiff ) - xine? ( media-libs/xine-lib ) - octave? ( sci-mathematics/octave )" -DEPEND="${RDEPEND} - octave? ( dev-lang/swig ) - python? ( deprecated? ( dev-lang/swig ) ) - dev-util/pkgconfig" - -S=${WORKDIR}/${MY_P} - -RESTRICT="test" #296681 - -pkg_setup() { - fortran-2_pkg_setup - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - sed -i \ - -e "s:share/opencv/doc:share/doc/${PF}:" \ - CMakeLists.txt || die - - epatch "${FILESDIR}"/${P}-multilib.patch \ - "${FILESDIR}"/${P}-mmap.patch \ - "${FILESDIR}"/${PN}-2.0.0-libpng14.patch -} - -src_configure() { - append-cppflags -D__STDC_CONSTANT_MACROS #324259 - - mycmakeargs=( - "-DCMAKE_SKIP_RPATH=ON" - $(cmake-utils_use_build examples) - "-DBUILD_LATEX_DOCS=OFF" - $(cmake-utils_use_build python NEW_PYTHON_SUPPORT) - $(cmake-utils_use_build octave OCTAVE_SUPPORT) - $(cmake-utils_use_build test TESTS) - $(cmake-utils_use sse USE_SSE) - $(cmake-utils_use sse2 USE_SSE2) - $(cmake-utils_use sse3 USE_SSE3) - $(cmake-utils_use ssse3 USE_SSSE3) - $(cmake-utils_use examples INSTALL_C_EXAMPLES) - $(cmake-utils_use_with ipp) - "-DUSE_O3=OFF" - $(cmake-utils_use_with ieee1394 1394) - $(cmake-utils_use_with ffmpeg) - $(cmake-utils_use_with gstreamer) - $(cmake-utils_use_with gtk) - $(cmake-utils_use_with jpeg2k jasper) - $(cmake-utils_use_with jpeg) - $(cmake-utils_use_with png) - $(cmake-utils_use_with tiff) - "-DWITH_UNICAP=OFF" - $(cmake-utils_use_with v4l) - $(cmake-utils_use_with xine) - ) - - if use octave; then - mycmakeargs+=( - $(cmake-utils_use examples INSTALL_OCTAVE_EXAMPLES) - ) - fi - - if use python; then - mycmakeargs+=( - $(cmake-utils_use_build deprecated SWIG_PYTHON_SUPPORT) - $(cmake-utils_use examples INSTALL_PYTHON_EXAMPLES) - ) - fi - - cmake-utils_src_configure -} - -pkg_postinst() { - use python && python_mod_optimize opencv -} - -pkg_postrm() { - use python && python_mod_cleanup opencv -} diff --git a/media-libs/opencv/opencv-2.2.0-r10.ebuild b/media-libs/opencv/opencv-2.2.0-r10.ebuild deleted file mode 100644 index e067847577a4..000000000000 --- a/media-libs/opencv/opencv-2.2.0-r10.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild,v 1.9 2011/09/06 20:56:37 dilfridge Exp $ - -EAPI=3 - -PYTHON_DEPEND="python? 2:2.6" - -inherit base cmake-utils fortran-2 python - -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/${PN}library/${MY_P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine" - -# all tests fail, needs further investigation, bug 296681 - dilfridge -RESTRICT=test - -RDEPEND=" - app-arch/bzip2 - dev-libs/libf2c - sys-libs/zlib - >=sci-libs/clapack-3.2.1-r4 - sci-libs/flann - virtual/lapack - virtual/fortran - cuda? ( - >=dev-util/nvidia-cuda-toolkit-3.2 - >=dev-util/nvidia-cuda-npp-3.2 - ) - eigen? ( dev-cpp/eigen:2 ) - ffmpeg? ( virtual/ffmpeg ) - gstreamer? ( - media-libs/gstreamer - media-libs/gst-plugins-base - ) - gtk? ( - dev-libs/glib:2 - x11-libs/gtk+:2 - ) - jpeg? ( virtual/jpeg ) - jpeg2k? ( media-libs/jasper ) - ieee1394? ( >=media-libs/libdc1394-2.1.3-r1 sys-libs/libraw1394 ) - ipp? ( sci-libs/ipp ) - openexr? ( media-libs/openexr ) - png? ( media-libs/libpng ) - python? ( dev-python/numpy ) - qt4? ( - x11-libs/qt-gui:4 - opengl? ( x11-libs/qt-opengl:4 ) - ) - tiff? ( media-libs/tiff ) - v4l? ( >=media-libs/libv4l-0.8.3 ) - xine? ( media-libs/xine-lib ) -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[-nodot] ) - >=dev-util/cmake-2.8.5-r2 - dev-util/pkgconfig -" - -# REQUIRED_USE="opengl? ( qt )" - -PATCHES=( - "${FILESDIR}/${P}-convert_sets_to_options.patch" - "${FILESDIR}/${P}-fortran.patch" - "${FILESDIR}/${P}-ffmpeg01.patch" - "${FILESDIR}/${P}-ffmpeg02.patch" - "${FILESDIR}/${P}-gcc46.patch" - "${FILESDIR}/${P}-libpng1.5.patch" - "${FILESDIR}/${P}-numpy.patch" - "${FILESDIR}/${P}-ptrcvcapture.patch" - "${FILESDIR}/${P}-use_system_libs.patch" - "${FILESDIR}/${P}-v4l_2.6.38.patch" - "${FILESDIR}/${P}-findnpp.patch" - "${FILESDIR}/${P}-findblas.patch" -) - -CMAKE_BUILD_TYPE="Release" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - fortran-2_pkg_setup - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - base_src_prepare - - # remove bundled stuff - rm -rf 3rdparty - sed -i \ - -e '/add_subdirectory(3rdparty)/ d' \ - CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build doc DOXYGEN_DOCS) - $(cmake-utils_use_build examples) - $(cmake-utils_use examples INSTALL_C_EXAMPLES) - $(cmake-utils_use_build python NEW_PYTHON_SUPPORT) - $(cmake-utils_use_build test TESTS) - $(cmake-utils_use_enable sse SSE) - $(cmake-utils_use_enable sse2 SSE2) - $(cmake-utils_use_enable sse3 SSE3) - $(cmake-utils_use_enable ssse3 SSSE3) - $(cmake-utils_use_use ipp) - $(cmake-utils_use_with ieee1394 1394) - $(cmake-utils_use_with cuda) - $(cmake-utils_use_with eigen) - $(cmake-utils_use_with ffmpeg) - $(cmake-utils_use_with gstreamer) - $(cmake-utils_use_with gtk) - $(cmake-utils_use_with jpeg2k JASPER) - $(cmake-utils_use_with openexr) - $(cmake-utils_use_with png) - $(cmake-utils_use_with qt4 QT) - $(cmake-utils_use_with opengl QT_OPENGL) - $(cmake-utils_use_with tiff) - $(cmake-utils_use_with v4l V4L) - $(cmake-utils_use_with xine) - ) - - if use python && 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 - # UNICAP: http://bugs.gentoo.org/show_bug.cgi?id=175881 - mycmakeargs+=( - "-DUSE_OMIT_FRAME_POINTER=OFF" - "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF" - "-DOPENCV_WARNINGS_ARE_ERRORS=OFF" - "-DBUILD_LATEX_DOCS=OFF" - "-DENABLE_POWERPC=OFF" - "-DBUILD_PACKAGE=OFF" - "-DENABLE_PROFILING=OFF" - "-DUSE_O2=OFF" - "-DUSE_O3=OFF" - "-DUSE_FAST_MATH=OFF" - "-DENABLE_SSE41=OFF" - "-DENABLE_SSE42=OFF" - "-DWITH_PVAPI=OFF" - "-DWITH_UNICAP=OFF" - "-DWITH_TBB=OFF" - ) - - # things we want to be hardly enabled not worth useflag - mycmakeargs+=( - "-DCMAKE_SKIP_RPATH=ON" - "-DBUILD_SHARED_LIBS=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 -} - -src_test() { - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CMAKE_BUILD_DIR}/lib" - cmake-utils_src_test -} diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild deleted file mode 100644 index b65ff3b126e9..000000000000 --- a/media-libs/opencv/opencv-2.2.0.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild,v 1.8 2011/06/21 16:12:06 jlec Exp $ - -EAPI=3 - -PYTHON_DEPEND="python? 2:2.6" - -inherit base cmake-utils fortran-2 python - -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/${PN}library/${MY_P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine" - -# all tests fail, needs further investigation, bug 296681 - dilfridge -RESTRICT=test - -RDEPEND=" - app-arch/bzip2 - dev-libs/libf2c - sys-libs/zlib - >=sci-libs/clapack-3.2.1-r4 - sci-libs/flann - virtual/lapack - virtual/fortran - eigen? ( dev-cpp/eigen:2 ) - ffmpeg? ( virtual/ffmpeg ) - gstreamer? ( - media-libs/gstreamer - media-libs/gst-plugins-base - ) - gtk? ( - dev-libs/glib:2 - x11-libs/gtk+:2 - ) - jpeg? ( virtual/jpeg ) - jpeg2k? ( media-libs/jasper ) - ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) - openexr? ( media-libs/openexr ) - png? ( media-libs/libpng ) - python? ( dev-python/numpy ) - qt4? ( - x11-libs/qt-gui:4 - opengl? ( x11-libs/qt-opengl:4 ) - ) - tiff? ( media-libs/tiff ) - v4l? ( >=media-libs/libv4l-0.8.3 ) - xine? ( media-libs/xine-lib ) -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[-nodot] ) - dev-util/pkgconfig -" - -# REQUIRED_USE="opengl? ( qt )" - -PATCHES=( - "${FILESDIR}/${P}-convert_sets_to_options.patch" - "${FILESDIR}/${P}-fortran.patch" - "${FILESDIR}/${P}-ffmpeg01.patch" - "${FILESDIR}/${P}-ffmpeg02.patch" - "${FILESDIR}/${P}-gcc46.patch" - "${FILESDIR}/${P}-libpng1.5.patch" - "${FILESDIR}/${P}-numpy.patch" - "${FILESDIR}/${P}-ptrcvcapture.patch" - "${FILESDIR}/${P}-use_system_libs.patch" - "${FILESDIR}/${P}-v4l_2.6.38.patch" -) - -CMAKE_BUILD_TYPE="Release" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - fortran-2_pkg_setup - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - base_src_prepare - - # remove bundled stuff - rm -rf 3rdparty - sed -i \ - -e '/add_subdirectory(3rdparty)/ d' \ - CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build doc DOXYGEN_DOCS) - $(cmake-utils_use_build examples) - $(cmake-utils_use examples INSTALL_C_EXAMPLES) - $(cmake-utils_use_build python NEW_PYTHON_SUPPORT) - $(cmake-utils_use_build test TESTS) - $(cmake-utils_use_enable sse SSE) - $(cmake-utils_use_enable sse2 SSE2) - $(cmake-utils_use_enable sse3 SSE3) - $(cmake-utils_use_enable ssse3 SSSE3) - -DUSE_ipp=OFF - $(cmake-utils_use_with ieee1394 1394) - -DWITH_cuda=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 jpeg2k JASPER) - $(cmake-utils_use_with openexr) - $(cmake-utils_use_with png) - $(cmake-utils_use_with qt4 QT) - $(cmake-utils_use_with opengl QT_OPENGL) - $(cmake-utils_use_with tiff) - $(cmake-utils_use_with v4l V4L) - $(cmake-utils_use_with xine) - ) - - if use python && 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 - # UNICAP: http://bugs.gentoo.org/show_bug.cgi?id=175881 - mycmakeargs+=( - "-DUSE_OMIT_FRAME_POINTER=OFF" - "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF" - "-DOPENCV_WARNINGS_ARE_ERRORS=OFF" - "-DBUILD_LATEX_DOCS=OFF" - "-DENABLE_POWERPC=OFF" - "-DBUILD_PACKAGE=OFF" - "-DENABLE_PROFILING=OFF" - "-DUSE_O2=OFF" - "-DUSE_O3=OFF" - "-DUSE_FAST_MATH=OFF" - "-DENABLE_SSE41=OFF" - "-DENABLE_SSE42=OFF" - "-DWITH_PVAPI=OFF" - "-DWITH_UNICAP=OFF" - "-DWITH_TBB=OFF" - ) - - # things we want to be hardly enabled not worth useflag - mycmakeargs+=( - "-DCMAKE_SKIP_RPATH=ON" - "-DBUILD_SHARED_LIBS=ON" - "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}" - ) - - cmake-utils_src_configure -} - -src_test() { - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CMAKE_BUILD_DIR}/lib" - cmake-utils_src_test -} -- 2.26.2