old

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

4 files changed, 14 insertions, 65 deletions

diff --git a/media-plugins/frei0r-plugins/ChangeLog b/media-plugins/frei0r-plugins/ChangeLog
index 85e982a0ffb1..8cb1cfeaa626 100644
--- a/media-plugins/frei0r-plugins/ChangeLog
+++ b/media-plugins/frei0r-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/frei0r-plugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/frei0r-plugins/ChangeLog,v 1.13 2011/12/10 23:52:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/frei0r-plugins/ChangeLog,v 1.14 2011/12/10 23:54:10 ssuominen Exp $
+
+  10 Dec 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:
+  old
 
 *frei0r-plugins-1.3 (10 Dec 2011)
 
diff --git a/media-plugins/frei0r-plugins/Manifest b/media-plugins/frei0r-plugins/Manifest
index 46710ebfa494..7758030c3a9b 100644
--- a/media-plugins/frei0r-plugins/Manifest
+++ b/media-plugins/frei0r-plugins/Manifest
@@ -3,23 +3,21 @@ Hash: SHA1
 
 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
 DIST frei0r-plugins-1.3.tar.gz 1092809 RMD160 abc279996bb5ffe83f796e1699c9b1cdbece60ec SHA1 f6b463440017934d01ac3c8fdf70b93c915e3d08 SHA256 b25da901115aa7f960cf5e541057266fddf132a7521d628e6cb344c9f16c0236
 EBUILD frei0r-plugins-1.1.22-r1.ebuild 1048 RMD160 3c4e9ad11a9d7c637c7c820616adf8f7077ae54f SHA1 c211624e5484f10a9ed02d25d074483c56b5f3b5 SHA256 465eb59c2a47edc6cbe7c258133163acee4df142f0b41ed5fcaff9c152c1d9f5
-EBUILD frei0r-plugins-1.1.22-r2.ebuild 1101 RMD160 4a2cc0b36f958a65dc6ddc11958055764794a2a4 SHA1 06489db9e7ebc594b2e1c7ab1b7ca663673da438 SHA256 b49350a047abfe6a8c642ff765ad052f7fee991c89aa1cd2d5143024e0c13344
 EBUILD frei0r-plugins-1.3.ebuild 1354 RMD160 c2885e78ad58bc61cfada51486d23f4aa9a188d7 SHA1 71d500d7c2755fff3d6def6890a81ff0b3823bf5 SHA256 872069557debf6b7856a36b56cc394e9cf5fd945617b7239039f7c29c69831ad
-MISC ChangeLog 2551 RMD160 cd6fbfb0da3e6d52193040ad34e9d3f2ec79cead SHA1 8359dcb0a7593b18876467018ed27dc189465713 SHA256 8e3cee041bba661edbb063c53d8c5f6c7bd7d3dff63935de915f8fe144fd5c2d
+MISC ChangeLog 2703 RMD160 10f3cbc8b15672e3a7d1d5a36f79e8cab5fe0134 SHA1 3f9b71bde55881148e25011fe7436e76ba2ed259 SHA256 2cf0de71d01aae34f980936706226f8e41f62e20d255308ff17b6336f36e66c5
 MISC metadata.xml 453 RMD160 d54fd465735d542228a0f80d382616d9176a09d6 SHA1 6f86bb28c6648783483a4b9431522ae18029afc9 SHA256 021091b96ea43dc9024eaa225d6b4601251ea6b46e1f601ca423d996dfa80794
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO4/CAAAoJEEdUh39IaPFN4VwH/01rlZ1VhR4Xeo0X+AuI0bnB
-eDEkfdBbE/RZ6iPeT61OGcH3791kRbtCFwpbCmyOpUi+9hosXdsIXZHrt+O+VTAE
-VOc7Lba0FAb8MZRdtDOAqkGzFr8pbvQV1EbLN3ZVqELkFeuQLCGpj0Cs5t69A228
-iAZFkWo+zYCnzIgAfVoDAKNNERdOcApudFraGFFEK/guM9vxxOyAyqqKH2Wv1Dej
-4n6yJSOrvKDdjxGdNyKykRBCZm+Pj7RjBnT3AAc7ZGzYK0eVbgtzTrKEHvvt6UZ4
-SXVG7DcdWSSO/zerUgUwg60m3TSJkxeu4AAyZBcR68YSsL9wf/jR/l1+QByCLkg=
-=8ncw
+iQEcBAEBAgAGBQJO4/D+AAoJEEdUh39IaPFNnh0H/RLDE3DPm2PWUpBzCcfb7c4c
+vDrtA0cM2td6H/+nmM7HN5Nsr2WIi+QYwvU6PxXE0KOqFo3UhNrbE1VP5tTxSvlg
+wsJh6GG5kyK1L0VK/XDB0xs8oBUqHrmSZzepOo+o44rGCmKTDyKSJtsQhFFaQs0j
+skUuEpA3ZlF4zVxiHv2+0MRF33OqLJSSSA3MkTv7cGbJIc7WsJQZOHoLJ1JnD3gf
+SKXiGYT/QtHBtHVV/yOmBOG+Wh4/b/WRbSf1q/0LcxDZfSNZ3/t5vc+jo00MmbYj
+eL97Cja/sGlv8L0IYGpFh75WwlzzlmnxoAU9IX4sovJfajsqYxJ9alOk6C5SSpE=
+=AGs5
 -----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
deleted file mode 100644
index 3ea6ec6d2214..000000000000
--- a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-opencv-2.2.0-api.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 8300dd5cbab6..000000000000
--- a/media-plugins/frei0r-plugins/frei0r-plugins-1.1.22-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.2 2011/08/10 16:53:33 xarthisius 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 ~ppc ~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
-}