[arch-commits] Commit in frei0r-plugins/trunk (PKGBUILD frei0r-plugins-opencv3.patch)

Sergej Pupykin spupykin at archlinux.org
Tue Mar 14 12:24:13 UTC 2017


    Date: Tuesday, March 14, 2017 @ 12:24:13
  Author: spupykin
Revision: 216237

upgpkg: frei0r-plugins 1.5.0-1

upd

Modified:
  frei0r-plugins/trunk/PKGBUILD
Deleted:
  frei0r-plugins/trunk/frei0r-plugins-opencv3.patch

------------------------------+
 PKGBUILD                     |   15 +++++-------
 frei0r-plugins-opencv3.patch |   50 -----------------------------------------
 2 files changed, 7 insertions(+), 58 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-14 12:02:25 UTC (rev 216236)
+++ PKGBUILD	2017-03-14 12:24:13 UTC (rev 216237)
@@ -2,8 +2,8 @@
 # Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
 
 pkgname=frei0r-plugins
-pkgver=1.4
-pkgrel=5
+pkgver=1.5.0
+pkgrel=1
 pkgdesc="A minimalistic plugin API for video sources and filters"
 arch=(i686 x86_64)
 url="http://www.piksel.org/frei0r"
@@ -11,18 +11,17 @@
 depends=('gcc-libs' 'gavl>=1.0.0' 'opencv>=2.4.3')
 makedepends=('doxygen')
 options=('!emptydirs')
-source=(https://files.dyne.org/frei0r/releases/$pkgname-$pkgver.tar.gz frei0r-plugins-opencv3.patch)
-md5sums=('202375d1bcb545c1b6eb8f34e0260ec5'
-         '52d21eee99b5f38a97b905c5243e9143')
+source=(https://files.dyne.org/frei0r/releases/$pkgname-$pkgver.tar.gz)
+sha256sums=('781cf84a6c2a9a3252f54d2967b57f6de75a31fc1684371e112638c981f72b60')
 
 prepare() {
-  cd $pkgname-$pkgver
-# Fix build with opencv 3 (Gentoo)
-  patch -p2 -i ../frei0r-plugins-opencv3.patch
+  cd "$srcdir/$pkgname-$pkgver"
+  touch README AUTHORS ChangeLog TODO
 }
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  ./autogen.sh
   ./configure --prefix=/usr
   make
 }

Deleted: frei0r-plugins-opencv3.patch
===================================================================
--- frei0r-plugins-opencv3.patch	2017-03-14 12:02:25 UTC (rev 216236)
+++ frei0r-plugins-opencv3.patch	2017-03-14 12:24:13 UTC (rev 216237)
@@ -1,50 +0,0 @@
---- ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.c.opencv3	2013-02-24 14:43:22.000000000 +0100
-+++ ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.c	2015-07-08 12:44:30.987056878 +0200
-@@ -211,8 +211,8 @@ CvSeq* detect_and_draw( IplImage* img, C
- 
-   double scale = 1.3;
-   IplImage* gray = cvCreateImage( cvSize(img->width,img->height), 8, 1 );
--  IplImage* small_img = cvCreateImage( cvSize( cvRound (img->width/scale),
--                                               cvRound (img->height/scale)),
-+  IplImage* small_img = cvCreateImage( cvSize( cvRound ((double)img->width/scale),
-+                                               cvRound ((double)img->height/scale)),
-                                        8, 1 );
-   int i;
- 
---- ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.cpp.opencv3	2013-02-24 14:43:22.000000000 +0100
-+++ ./frei0r-plugins-1.4/src/filter/facedetect/facedetect.cpp	2015-07-08 12:48:32.754615885 +0200
-@@ -259,11 +259,11 @@ private:
-     {
-         double scale = this->scale == 0? 1.0 : this->scale;
-         CvScalar colors[5] = {
--            {{cvRound(color[0].r * 255), cvRound(color[0].g * 255), cvRound(color[0].b * 255), cvRound(alpha * 255)}},
--            {{cvRound(color[1].r * 255), cvRound(color[1].g * 255), cvRound(color[1].b * 255), cvRound(alpha * 255)}},
--            {{cvRound(color[2].r * 255), cvRound(color[2].g * 255), cvRound(color[2].b * 255), cvRound(alpha * 255)}},
--            {{cvRound(color[3].r * 255), cvRound(color[3].g * 255), cvRound(color[3].b * 255), cvRound(alpha * 255)}},
--            {{cvRound(color[4].r * 255), cvRound(color[4].g * 255), cvRound(color[4].b * 255), cvRound(alpha * 255)}},
-+            CvScalar(cvRound(color[0].r * 255), cvRound(color[0].g * 255), cvRound(color[0].b * 255), cvRound(alpha * 255)),
-+            CvScalar(cvRound(color[1].r * 255), cvRound(color[1].g * 255), cvRound(color[1].b * 255), cvRound(alpha * 255)),
-+            CvScalar(cvRound(color[2].r * 255), cvRound(color[2].g * 255), cvRound(color[2].b * 255), cvRound(alpha * 255)),
-+            CvScalar(cvRound(color[3].r * 255), cvRound(color[3].g * 255), cvRound(color[3].b * 255), cvRound(alpha * 255)),
-+            CvScalar(cvRound(color[4].r * 255), cvRound(color[4].g * 255), cvRound(color[4].b * 255), cvRound(alpha * 255)),
-         };
-         
-         for (int i = 0; i < (objects ? objects->total : 0); i++)
-@@ -287,14 +287,14 @@ private:
-                 }
-             case 1:
-                 {
--                    CvBox2D box = {{center.x, center.y}, {r->width / scale, (r->height / scale) * 1.2}, 90};
-+                    CvBox2D box = CvBox2D(CvPoint2D32f(center.x, center.y), CvSize2D32f(r->width / scale, (r->height / scale) * 1.2), 90);
-                     cvEllipseBox(image, box, colors[i % 5], thickness, linetype);
-                     break;
-                 }
-             case 2:
-                 {
--                    CvPoint pt1 = {r->x / scale, r->y / scale};
--                    CvPoint pt2 = {(r->x + r->width) / scale, (r->y + r->height) / scale};
-+                    CvPoint pt1 = CvPoint(r->x / scale, r->y / scale);
-+                    CvPoint pt2 = CvPoint((r->x + r->width) / scale, (r->y + r->height) / scale);
-                     cvRectangle(image, pt1, pt2, colors[i % 5], thickness, linetype);
-                     break;
-                 }


More information about the arch-commits mailing list