Fix building with OpenCV >= 2.2.0 API wrt #365495 by Nickolay Kolchin-Semyonov

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

4 files changed, 77 insertions, 3 deletions

diff --git a/media-plugins/frei0r-plugins/ChangeLog b/media-plugins/frei0r-plugins/ChangeLog
index ec6534783aca..feed84e0d7f0 100644
--- a/media-plugins/frei0r-plugins/ChangeLog
+++ b/media-plugins/frei0r-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/frei0r-plugins
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/frei0r-plugins/ChangeLog,v 1.8 2010/11/26 16:29:51 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/frei0r-plugins/ChangeLog,v 1.9 2011/06/13 18:42:49 ssuominen Exp $
+
+*frei0r-plugins-1.1.22-r2 (13 Jun 2011)
+
+  13 Jun 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +frei0r-plugins-1.1.22-r2.ebuild,
+  +files/frei0r-plugins-1.1.22-opencv-2.2.0-api.patch:
+  Fix building with OpenCV >= 2.2.0 API wrt #365495 by Nickolay
+  Kolchin-Semyonov
 
   26 Nov 2010; Jeroen Roovers <jer@gentoo.org> frei0r-plugins-1.1.22-r1.ebuild:
   Marked ~hppa (bug #340269).
diff --git a/media-plugins/frei0r-plugins/Manifest b/media-plugins/frei0r-plugins/Manifest
index 92f9de50ee19..c0295750a8e1 100644
--- a/media-plugins/frei0r-plugins/Manifest
+++ b/media-plugins/frei0r-plugins/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX frei0r-plugins-1.1.22-libdir.patch 1060 RMD160 c59266a3ce829d2141acdbbc089d496e7b212323 SHA1 35a00c5460d00a6764d7f78b96f85000f2c331b6 SHA256 69f3eb3f037da712a4a27a499dab732d4735620d83c7f3445f10e021c73ae99b
 AUX frei0r-plugins-1.1.22-no-automagic-deps.patch 2128 RMD160 8b6be3e1b2a66a2370080b041c5a4a565cd548e1 SHA1 459f6ab54c5ff5e5acff07348dcc56ebb0ca8ffb SHA256 7a727e213e95691d467597da1c7dd97cc28a1818b81509bbd4df5f738f77c102
+AUX frei0r-plugins-1.1.22-opencv-2.2.0-api.patch 564 RMD160 482eacbb258bc5521e278c4ee5bacc6581f69e31 SHA1 67fbbcc94fe887595afdaa8d2d0d30cf4e7db681 SHA256 bdcba01e175e044aebf322447269b1e3b87b096c080781ca53dc720d25981572
 AUX frei0r-plugins-1.1.22-pkgconfig-support.patch 1072 RMD160 afc04b80c9df9e682efff9fcdfa80f0db5455062 SHA1 89398a72ed82594fe26d3284546bdb14882adb59 SHA256 cf2fa605e5fe32e43474a59610d65843e405002da39b67b5d0f9ab806381baaf
 DIST frei0r-plugins-1.1.22.tar.gz 570186 RMD160 d5f989583839fde1e15c791ed4c62eeda4ddb760 SHA1 2bd488fc0e6d12b2f0b141ec21a3c74b7c85d4b4 SHA256 436e933c079bdf8b3d2d2b2fcc9a601c82ba68f34af6f0716ba837041a149da0
 EBUILD frei0r-plugins-1.1.22-r1.ebuild 1050 RMD160 55b6014fbb23b1cc2b6151b2932a363490d48660 SHA1 4fcae8e94d3fa209bedff11128b167bbc9566a3c SHA256 fb85f09ac5af161c2dd0d77141db073b76819f28b4e8356e31b8e4ba176562d9
-MISC ChangeLog 1702 RMD160 605d409876a10c88a54821c641badedacd2038a5 SHA1 de91733ec3154263d5168a06cb960ae2a722979d SHA256 4d207fd0c820a4c742bdbf040d594850d0675c75cf74c70e273bbb51aa681d35
+EBUILD frei0r-plugins-1.1.22-r2.ebuild 1095 RMD160 642b88d9349feba851d2d65a1b45bd7f8fa17dce SHA1 74a1b36836ad83d1716d196d3f6150a48492270d SHA256 af9951734aed0c7a3423aae1f889a4b200b67904f1eb5653283bf66fb3aa3081
+MISC ChangeLog 1978 RMD160 78ceda05b37071eb6e63e4176ac62d81d7795ec5 SHA1 4f71369ed308b46099f392fb042f1fd540074f2c SHA256 95d5d562175a9e03b265ab949f7e95f5cf57ddc5a7e54019204f77d8b88f31bc
 MISC metadata.xml 453 RMD160 d54fd465735d542228a0f80d382616d9176a09d6 SHA1 6f86bb28c6648783483a4b9431522ae18029afc9 SHA256 021091b96ea43dc9024eaa225d6b4601251ea6b46e1f601ca423d996dfa80794
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk32WPYACgkQXkR9YqOcLPGObgD+M2aiW5uf6mZs6xF7Mp45wHyY
+yZeYKUhD26qGZeFLeqwA/jsS2hdBjJp+ILhRm/iGzQU4vwHa9Ns2tU15ERP2INCO
+=igrS
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-opencv-2.2.0-api.patch b/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-opencv-2.2.0-api.patch
new file mode 100644
index 000000000000..3ea6ec6d2214
--- /dev/null
+++ b/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-opencv-2.2.0-api.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/365495
+
+--- src/filter/facedetect/facedetect.c
++++ src/filter/facedetect/facedetect.c
+@@ -228,7 +228,7 @@
+       double t = (double)cvGetTickCount();
+       faces = cvHaarDetectObjects( small_img, cascade, storage,
+                                    1.1, 2, 0/*CV_HAAR_DO_CANNY_PRUNING*/,
+-                                   cvSize(30, 30) );
++                                   cvSize(30, 30), cvSize(0, 0) );
+       t = (double)cvGetTickCount() - t;
+       //printf( "detection time = %gms\n", t/((double)cvGetTickFrequency()*1000.) );
+ 
diff --git a/media-plugins/frei0r-plugins/frei0r-plugins-1.1.22-r2.ebuild b/media-plugins/frei0r-plugins/frei0r-plugins-1.1.22-r2.ebuild
new file mode 100644
index 000000000000..96b45d57090e
--- /dev/null
+++ b/media-plugins/frei0r-plugins/frei0r-plugins-1.1.22-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/frei0r-plugins/frei0r-plugins-1.1.22-r2.ebuild,v 1.1 2011/06/13 18:42:49 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils multilib
+
+DESCRIPTION="A minimalistic plugin API for video effects"
+HOMEPAGE="http://www.piksel.org/frei0r/"
+SRC_URI="http://propirate.net/frei0r/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
+IUSE="doc facedetect scale0tilt"
+
+DEPEND="facedetect? ( >=media-libs/opencv-2.2.0 )
+	scale0tilt? ( media-libs/gavl )"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-opencv-2.2.0-api.patch
+	epatch "${FILESDIR}"/${P}-no-automagic-deps.patch
+	epatch "${FILESDIR}"/${P}-libdir.patch
+	epatch "${FILESDIR}"/${P}-pkgconfig-support.patch   # needed by media-libs/mlt
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable facedetect) \
+		$(use_enable scale0tilt) \
+		--libdir=/usr/$(get_libdir)
+}
+
+src_install() {
+	default
+	use doc && dohtml -r doc/html
+}