From 25b24c565e4b50ff7f266a831d00593ce4b2a2ee Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Wed, 16 Jun 2010 16:36:55 +0000 Subject: [PATCH] Fix building with FFmpeg >= 0.6 wrt #324259 by Alexis Ballier. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- media-libs/opencv/ChangeLog | 6 ++++- media-libs/opencv/Manifest | 4 ++-- media-libs/opencv/opencv-2.0.0-r1.ebuild | 30 ++++++++++++++---------- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index e2d8aa6efeb6..c5a2c35086f5 100644 --- a/media-libs/opencv/ChangeLog +++ b/media-libs/opencv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/opencv # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.20 2010/05/12 11:33:38 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.21 2010/06/16 16:36:55 ssuominen Exp $ + + 16 Jun 2010; Samuli Suominen + opencv-2.0.0-r1.ebuild: + Fix building with FFmpeg >= 0.6 wrt #324259 by Alexis Ballier. 12 May 2010; Samuli Suominen opencv-2.0.0.ebuild: Backport -libpng14.patch to -r0 of 2.0.0 because -r1 can't be stabilized. diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index 493aae56ab09..d507290dcd9c 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -1,7 +1,7 @@ AUX opencv-2.0.0-libpng14.patch 505 RMD160 86ef29284531519dcc5c6da1bb3abfd3c46efc73 SHA1 81bf18db6984144a0cc5b49e47e180e5337aae75 SHA256 78dc27ae16b2fcbef7cc05496dddf227640f47c37d8da05fe469eeb04146af4a AUX opencv-2.0.0-multilib.patch 5569 RMD160 f519c1276600d6d22bce7415a0fd1411fc4bd5aa SHA1 1727a3d8d5673d647b128f627e24ec22584fea40 SHA256 594cdaf2b49253b6ab1e1d7c6b55c99e4f0a9924d743e5bf0947846459099777 DIST OpenCV-2.0.0.tar.bz2 12779856 RMD160 f46b993ded3d579dc52175131e5485476ac1f569 SHA1 2090c2aaff77c3b0cc669c2ee81bea389db0a366 SHA256 c17db9974d87290aefc12bf7987a9f417946bc313823985de4df48ae3e1e0022 -EBUILD opencv-2.0.0-r1.ebuild 2315 RMD160 92a3e36cd71f59b97d70b1f228dc3b48330bf759 SHA1 0017175fb8c702842bd1f020f800a8f4b6d4ea7f SHA256 85bf3c9726d44989c860615c2d7dc6774d1ae424d289f08848a63d3caf381d9d +EBUILD opencv-2.0.0-r1.ebuild 2361 RMD160 ea81bdea7faca96818f183f5d25eb1525698f47a SHA1 a6c040e43a15358d2a6b2633238c065d8e7fcfcd SHA256 e475145023a0d62ac56746af7071055b299932c29a0d891c71d862a2e439fe5c EBUILD opencv-2.0.0.ebuild 2327 RMD160 9f27eb71e973ca968d0232dcc18c8e5e958a31a9 SHA1 675ecf5832d77923ac3f5be887d68ba91f158caa SHA256 70bd98da973a6738d6dfee8970cea956745b4f15ae08b59ed01d19081b190560 -MISC ChangeLog 3785 RMD160 ba43e4621660b8a6197e9c5cc64f9cd7290298f7 SHA1 f20b922efef549f8d1a21e100120203c89db54ed SHA256 0e3bb5b54b22806849b840e58500d669d8077faf0ffa26ee4e729b0e85110280 +MISC ChangeLog 3931 RMD160 c8cc918226b2812064515d83c31890920caab95b SHA1 91247159a1db24d3455ad36560ebc04c181a7ca3 SHA256 d7f346adfc84d9567f919111800bcc2a28164b4abcc3b30698319f2ae84bb787 MISC metadata.xml 959 RMD160 531c61b88ecf1af6829078553580f7025d369bc0 SHA1 ce297f8ddef36af86f1e711a958a5f9873e1df7d SHA256 7f676e603c47c6182fe0b333395f735993743c22b2989b11e71fed579f7aa359 diff --git a/media-libs/opencv/opencv-2.0.0-r1.ebuild b/media-libs/opencv/opencv-2.0.0-r1.ebuild index 0357e17c3bca..a02a84b23df2 100644 --- a/media-libs/opencv/opencv-2.0.0-r1.ebuild +++ b/media-libs/opencv/opencv-2.0.0-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0-r1.ebuild,v 1.4 2010/03/09 12:45:38 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0-r1.ebuild,v 1.5 2010/06/16 16:36:55 ssuominen Exp $ EAPI=2 -inherit cmake-utils +inherit cmake-utils flag-o-matic MY_P=OpenCV-${PV} @@ -38,12 +38,16 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} -PATCHES=( "${FILESDIR}/${P}-multilib.patch" - "${FILESDIR}/${P}-libpng14.patch" ) +PATCHES=( + "${FILESDIR}/${P}-multilib.patch" + "${FILESDIR}/${P}-libpng14.patch" + ) src_configure() { - mycmakeargs="${mycmakeargs} - -DCMAKE_SKIP_RPATH=ON + append-cppflags -D__STDC_CONSTANT_MACROS + + mycmakeargs=( + "-DCMAKE_SKIP_RPATH=ON" $(cmake-utils_use_build examples) $(cmake-utils_use_build python NEW_PYTHON_SUPPORT) $(cmake-utils_use_build octave OCTAVE_SUPPORT) @@ -51,8 +55,8 @@ src_configure() { $(cmake-utils_use_enable openmp) $(cmake-utils_use ipp USE_IPP) $(cmake-utils_use mmx USE_MMX) - -DUSE_O3=OFF - -DUSE_OMIT_FRAME_POINTER=OFF + "-DUSE_O3=OFF" + "-DUSE_OMIT_FRAME_POINTER=OFF" $(cmake-utils_use sse USE_SSE) $(cmake-utils_use sse2 USE_SSE2) $(cmake-utils_use sse3 USE_SSE3) @@ -64,13 +68,15 @@ src_configure() { $(cmake-utils_use_with jpeg) $(cmake-utils_use_with png) $(cmake-utils_use_with tiff) - -DWITH_UNICAP=OFF + "-DWITH_UNICAP=OFF" $(cmake-utils_use_with v4l) - $(cmake-utils_use_with xine)" + $(cmake-utils_use_with xine) + ) if use python; then - mycmakeargs="${mycmakeargs} - $(cmake-utils_use_build deprecated SWIG_PYTHON_SUPPORT)" + mycmakeargs+=( + $(cmake-utils_use_build deprecated SWIG_PYTHON_SUPPORT) + ) fi cmake-utils_src_configure -- 2.26.2