Drop -mfpmath=387 hardcode for x86 systems -- this breaks cross-compiling as the detection is uname based instead of target, and we really do not want to hardcode this anyways (let the user pick).

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 65 insertions, 29 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index cef1fed5b211..5191dac2c3e8 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.68 2012/04/22 16:41:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.69 2012/04/24 22:57:47 vapier Exp $
+
+  24 Apr 2012; Mike Frysinger <vapier@gentoo.org>
+  files/opencv-2.3.0-convert_sets_to_options.patch,
+  files/opencv-2.3.1a-convert_sets_to_options.patch:
+  Drop -mfpmath=387 hardcode for x86 systems -- this breaks cross-compiling as
+  the detection is uname based instead of target, and we really do not want to
+  hardcode this anyways (let the user pick).
 
   22 Apr 2012; Agostino Sarubbo <ago@gentoo.org> opencv-2.3.1a-r1.ebuild:
   Stable for amd64, wrt bug #409733
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 5e2906f29732..c89cfecbab35 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-AUX opencv-2.3.0-convert_sets_to_options.patch 14590 RMD160 1fdf49d3981ddb4e222728c133ec68d2d5ffd17d SHA1 91a34455fc16be04ebc5e89bb9c093928fae39cd SHA256 60e50e5e66213fe174d220a546f40081def4604862e060ba9dce6cbd012a52ac
+AUX opencv-2.3.0-convert_sets_to_options.patch 14334 RMD160 9a557472e8dc48e2f1a02c01d852abfd26cda5f8 SHA1 9c26c3ae88dea7fc5964d6759e05392d7c995a00 SHA256 892a7d698131c3706e75c23eac76aacdc8732343ea1adfde84e8f1c9daa10d9e
 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
 AUX opencv-2.3.1a-True-False.patch 5120 RMD160 a8b22fa625dab6a6aa589226bab3169594bab2bb SHA1 f0e8e393c57ea70a4e1b78b7a56413e04eb3ebfd SHA256 8076260c01e8ec22d30ced74be64b158e96408b81990a7d14f031170e3165f7f
-AUX opencv-2.3.1a-convert_sets_to_options.patch 9798 RMD160 6265ae4e223def1b5e199f665c740951bdabc78e SHA1 64142f43079ef5d5a4cf91f8ad58f9a744ea6de9 SHA256 fef051756bac47ec68fed3468a5d7d339ab21ae325a21482554f34f9b19f1e08
+AUX opencv-2.3.1a-convert_sets_to_options.patch 10029 RMD160 20e811ed397740cb7d0238b11a9fef1e265d6c27 SHA1 81cd8bb7c5df0a0cd9195d2ec273d47f41428839 SHA256 7ac857ed496245cb39ccbb4ec7bfdcc4128654def5732bb0de3631404a7ffc2c
 AUX opencv-2.3.1a-libav-0.7.patch 415 RMD160 cc9ae832bb72e0ecb09ad25356cb6bcc9ee5e084 SHA1 b1021d451c0949edd0da8dd05c88e2a433c33bbb SHA256 3186998b7b9eaae061d538633276c7de47b2388b639106e190d80dcf09fb9099
 AUX opencv-2.3.1a-libsuffix.patch 1949 RMD160 55ef74fec3ec29aa9b7c7af98b6a2a3be186141e SHA1 7dc609754bbf0de85e0b48ff4622b80b9a70f4c7 SHA256 442c5e7fab7cf28f806c8fc2057d17705b71d95da8ba0792828dab91c6742f44
 AUX opencv-2.3.1a-nocaps.patch 5220 RMD160 8ffadf7c3cdeb4a903d9d31e4363dcfff6a2ec75 SHA1 6efd881f96c4464d825616dd6c556867cb085402 SHA256 eedd2f7881e592a34217e8217a5600c307dbb9558197ca576b431e4c30ce8207
@@ -17,16 +17,22 @@ EBUILD opencv-2.3.0.ebuild 4132 RMD160 aab0b193dd67a36b81d6f6829fd8097a2b868d6f
 EBUILD opencv-2.3.1a-r1.ebuild 4173 RMD160 2706ae308a0f2615abe0ef52020d63c702a9b105 SHA1 a448f3ed43665b636989d36ee7767e321a2bf1b8 SHA256 6b556e6320b665b9a24c56a5032616082b9ee528f87944ad295f89dc327f0bf5
 EBUILD opencv-2.3.1a-r20.ebuild 4221 RMD160 9e4aa82c33b849aa592977c45d73d976dd977bbf SHA1 46f5202293965c95567b5374d69abf7d3872c387 SHA256 26753938deff73902e5671974c21e928f91855cd601ee6df2f98355220053119
 EBUILD opencv-2.3.1a.ebuild 4168 RMD160 b01928a220ed028fb983b675c714e1d7f4fdb68f SHA1 6491a5cab7d2cfb1b3c465053bb9b42fbe372fa8 SHA256 57ce4152e4dbb3f0dc501745d8bd4784499889d9f147b5aadec928ad2dbc42bf
-MISC ChangeLog 11979 RMD160 d3847418d82ad4bd89407274f54a6c3270f39e04 SHA1 d1bb07266a144198cd23c80c9cf90aac6f652e2a SHA256 11420953c37c03466e5bb25fabb7588f55aae907f6bc9c0e767b49e861828bab
+MISC ChangeLog 12341 RMD160 022b5f84122a1729a847ffd93c6a0c467b157456 SHA1 277152fd1845247b0f563863de1d861d10fa099a SHA256 93026b4598b835ce9001bd082cb4f4af958894fa70138607e9d510b1a02a9f61
 MISC metadata.xml 1099 RMD160 beba86d77f6e837750d5d8a92d0a2f94b4527ccc SHA1 b41e5330b2ef6a31db843e997a4ed88c01529321 SHA256 174e8c3a8340c15f8fb92100e489f9b2bed0a4558c3ef3352c68252ef0fab201
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPlDTYAAoJEOTDgjZ80txd+VkH/2coi4UV0P/hxDCU0UtmY+Lc
-8xi6vaztN6bZeeBzXDsojj0u44L4GZQp8V5UWRhdPxL+7FGKwOax4wremo7yJ09c
-qe2UPKHuXqaWPPtP0CgstjnwGxCzH8oSrQBaH0PfzcL4lZQi/N1zH3tb+D+019+t
-TJ3nXaXuQHoRQXsMJi14e4fWBCQTbMj2VFfvmxp8/ZX9QOXwfJjBMHPKo2VFpc8u
-HGCNO/T+hFrrhTUnWS9oqROG2OW48TSsS0cdT2a4boPEDBkZrB7dK4NeV2GsDv5G
-5H/BTr1no3NMfQp1VZNHS0dvSgLrDmI2tyH0NtlqJNK7m305/dmQ4XiQwQfG0lw=
-=LXgl
+iQIcBAEBAgAGBQJPlzBQAAoJELEHsLL7fEFWhV4P/R6N/d0MyyMIxzaNPX8UK/fL
+atTwoYuVNEBHL/rZRi3z6SpXS9/j4jd31figG13NSgDDdppY3FqGXyl74/BVXnI8
+bNvu4JMng/50bo0+6g/e4+xuwaMXZr4bjiZTUXGGQUrI8INnBHWW/pWLd4exnZv9
+zWNlD1dkfx0UIruZPegxzJKEpZhUSBCY6YuNCdo9bGJcbufNzYZwNdiB9kB67xkJ
+DquQ5BzAtm5BPlHuoDgO9Syioa/HyuYYm7LDF61sqZmvf4GfZc1Jjy0brmKfYJrt
+Trx0JgNzJx5gTojE09YnKqtBTs/OGtVr0EtIhOtI6Epx5TI60kPuEexNyNFu2W3U
+Xx41ZvCDxBkhqCmlxWPxXKbVyxt2mlIVonHrUKyMPrCxRago49kQgjpcnOTLJtZ1
+9wNytWqRH4JqxdQrm/ny0BpslLdMyYgzfeNMaNz2xYgAsSjAXyPYJ8TGSE0l9nkm
+uqAlOqzddAaMHJnY8BkbGL8+wHaef0l9rvqns8k220BRAc9W7m00utVMNyfFZBJk
+dTaPIGDvU39QIT50cvyY8dR9rHkGgReXwlAggksNpgEFStojV2yFahVnsTohPGFa
+DzKd615vlRjvE8GPt0Scl2ttUg9LpKw1mT0haE6WjhHC1IGbNn13v6M/hV5U8vXq
+JoiFlpj3wD5T/AmpJCsv
+=pIzR
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.3.0-convert_sets_to_options.patch b/media-libs/opencv/files/opencv-2.3.0-convert_sets_to_options.patch
index 2f768bcd3355..7a794cd28a02 100644
--- a/media-libs/opencv/files/opencv-2.3.0-convert_sets_to_options.patch
+++ b/media-libs/opencv/files/opencv-2.3.0-convert_sets_to_options.patch
@@ -1,6 +1,5 @@
-diff -ruN OpenCV-2.3.0-0-vanilla/CMakeLists.txt OpenCV-2.3.0/CMakeLists.txt
---- OpenCV-2.3.0-0-vanilla/CMakeLists.txt	2011-07-04 06:21:50.000000000 +0200
-+++ OpenCV-2.3.0/CMakeLists.txt	2011-09-18 19:32:20.000000000 +0200
+--- OpenCV-2.3.0-0-vanilla/CMakeLists.txt
++++ OpenCV-2.3.0/CMakeLists.txt
 @@ -14,7 +14,7 @@
  # Add these standard paths to the search paths for FIND_LIBRARY
  # to find libraries from these locations first
@@ -215,6 +214,21 @@ diff -ruN OpenCV-2.3.0-0-vanilla/CMakeLists.txt OpenCV-2.3.0/CMakeLists.txt
  
  set(EXTRA_C_FLAGS "")
  set(EXTRA_C_FLAGS_RELEASE "")
+@@ -1073,14 +1073,6 @@
+         endif()
+     endif()
+ 
+-    if(X86 OR X86_64)
+-        if(NOT APPLE)
+-            if(${CMAKE_SIZEOF_VOID_P} EQUAL 4)
+-                set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mfpmath=387")
+-            endif()
+-        endif()
+-    endif()
+-
+     # Profiling?
+     if(ENABLE_PROFILING)
+         set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -pg -g")
 @@ -1197,7 +1197,7 @@
  if(WIN32)
  set(OPENCV_DOC_INSTALL_PATH doc)
@@ -259,9 +273,8 @@ diff -ruN OpenCV-2.3.0-0-vanilla/CMakeLists.txt OpenCV-2.3.0/CMakeLists.txt
  
  if(BUILD_PACKAGE)
  
-diff -ruN OpenCV-2.3.0-0-vanilla/OpenCVModule.cmake OpenCV-2.3.0/OpenCVModule.cmake
---- OpenCV-2.3.0-0-vanilla/OpenCVModule.cmake	2011-07-04 06:21:59.000000000 +0200
-+++ OpenCV-2.3.0/OpenCVModule.cmake	2011-09-18 19:32:20.000000000 +0200
+--- OpenCV-2.3.0-0-vanilla/OpenCVModule.cmake
++++ OpenCV-2.3.0/OpenCVModule.cmake
 @@ -63,7 +63,7 @@
          DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
          ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
@@ -282,9 +295,8 @@ diff -ruN OpenCV-2.3.0-0-vanilla/OpenCVModule.cmake OpenCV-2.3.0/OpenCVModule.cm
  
      install(FILES ${lib_hdrs}
          DESTINATION include/opencv2/${name}
-diff -ruN OpenCV-2.3.0-0-vanilla/modules/gpu/CMakeLists.txt OpenCV-2.3.0/modules/gpu/CMakeLists.txt
---- OpenCV-2.3.0-0-vanilla/modules/gpu/CMakeLists.txt	2011-07-04 06:21:58.000000000 +0200
-+++ OpenCV-2.3.0/modules/gpu/CMakeLists.txt	2011-09-18 19:32:20.000000000 +0200
+--- OpenCV-2.3.0-0-vanilla/modules/gpu/CMakeLists.txt
++++ OpenCV-2.3.0/modules/gpu/CMakeLists.txt
 @@ -121,7 +121,7 @@
  	DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
      ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
@@ -305,9 +317,8 @@ diff -ruN OpenCV-2.3.0-0-vanilla/modules/gpu/CMakeLists.txt OpenCV-2.3.0/modules
  
  install(FILES ${lib_hdrs}
  	DESTINATION include/opencv2/${name}
-diff -ruN OpenCV-2.3.0-0-vanilla/modules/highgui/CMakeLists.txt OpenCV-2.3.0/modules/highgui/CMakeLists.txt
---- OpenCV-2.3.0-0-vanilla/modules/highgui/CMakeLists.txt	2011-07-04 06:21:58.000000000 +0200
-+++ OpenCV-2.3.0/modules/highgui/CMakeLists.txt	2011-09-18 19:32:20.000000000 +0200
+--- OpenCV-2.3.0-0-vanilla/modules/highgui/CMakeLists.txt
++++ OpenCV-2.3.0/modules/highgui/CMakeLists.txt
 @@ -295,7 +295,7 @@
      DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
      ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
diff --git a/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch b/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch
index 174a1d68fdd1..522561bafbfc 100644
--- a/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch
+++ b/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch
@@ -1,6 +1,5 @@
-diff -ruN OpenCV-2.3.1-0-vanilla/CMakeLists.txt OpenCV-2.3.1-2-options/CMakeLists.txt
---- OpenCV-2.3.1-0-vanilla/CMakeLists.txt	2011-09-12 20:45:38.000000000 +0200
-+++ OpenCV-2.3.1-2-options/CMakeLists.txt	2011-11-13 14:11:45.000000000 +0100
+--- OpenCV-2.3.1-0-vanilla/CMakeLists.txt
++++ OpenCV-2.3.1-2-options/CMakeLists.txt
 @@ -72,13 +72,13 @@
  # Build static or dynamic libs?
  # Default: dynamic libraries
@@ -206,7 +205,20 @@ diff -ruN OpenCV-2.3.1-0-vanilla/CMakeLists.txt OpenCV-2.3.1-2-options/CMakeList
  if (WIN32 AND ${CMAKE_GENERATOR} MATCHES "(MinGW)|(MSYS)")
      set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "")
  endif()
-@@ -1494,7 +1494,7 @@
+@@ -1222,12 +1222,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+         endif()
+     endif()
+ 
+-    if(X86 OR X86_64)
+-        if(NOT APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+-            set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mfpmath=387")
+-        endif()
+-    endif()
+-
+     # Profiling?
+     if(ENABLE_PROFILING)
+         set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -pg -g")
+@@@ -1494,7 +1494,7 @@
  #-----------------------------------
  # Source package:
  #-----------------------------------