* [gentoo-commits] repo/gentoo:master commit in: media-plugins/frei0r-plugins/files/
@ 2015-11-05 15:55 Alexis Ballier
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2015-11-05 15:55 UTC (permalink / raw
To: gentoo-commits
commit: 26c350c3b214c3b5f20f4caba6c9c58b5b67a42c
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 5 15:53:39 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Nov 5 15:53:39 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26c350c3
media-plugins/frei0r-plugins: remove stray patches
Package-Manager: portage-2.2.24
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
.../files/frei0r-plugins-1.1.22-libdir.patch | 24 -----------
.../frei0r-plugins-1.1.22-no-automagic-deps.patch | 47 ---------------------
.../frei0r-plugins-1.1.22-pkgconfig-support.patch | 49 ----------------------
3 files changed, 120 deletions(-)
diff --git a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-libdir.patch b/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-libdir.patch
deleted file mode 100644
index 70d2032..0000000
--- a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-libdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up frei0r-plugins-1.1.21/src/Makefile.am.libdir frei0r-plugins-1.1.21/src/Makefile.am
---- frei0r-plugins-1.1.21/src/Makefile.am.libdir 2008-06-07 15:21:48.000000000 +0200
-+++ frei0r-plugins-1.1.21/src/Makefile.am 2008-06-07 15:23:30.000000000 +0200
-@@ -112,7 +112,7 @@ AM_CPPFLAGS = -I@top_srcdir@/include
- AM_CFLAGS = -I@top_srcdir@/include
- AM_LDFLAGS = -module -avoid-version -Wc,-nostartfiles
-
--plugindir = @prefix@/lib/frei0r-1
-+plugindir = @libdir@/frei0r-1
-
-
- install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-diff -up frei0r-plugins-1.1.21/src/Makefile.in.libdir frei0r-plugins-1.1.21/src/Makefile.in
---- frei0r-plugins-1.1.21/src/Makefile.in.libdir 2008-06-07 15:21:44.000000000 +0200
-+++ frei0r-plugins-1.1.21/src/Makefile.in 2008-06-07 15:23:08.000000000 +0200
-@@ -583,7 +583,7 @@ RGB_la_SOURCES = mixer3/RGB/RGB.c
- AM_CPPFLAGS = -I@top_srcdir@/include
- AM_CFLAGS = -I@top_srcdir@/include
- AM_LDFLAGS = -module -avoid-version -Wc,-nostartfiles
--plugindir = @prefix@/lib/frei0r-1
-+plugindir = @libdir@/frei0r-1
- all: all-am
-
- .SUFFIXES:
diff --git a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-no-automagic-deps.patch b/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-no-automagic-deps.patch
deleted file mode 100644
index 142a9a8..0000000
--- a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-no-automagic-deps.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- orig/configure.ac 2008-10-28 11:57:18.000000000 +0100
-+++ patched/configure.ac 2009-07-05 15:19:37.000000000 +0200
-@@ -11,12 +11,18 @@
- AC_PROG_CC
- AC_PROG_LIBTOOL
-
-+
-+AC_ARG_ENABLE([facedetect], [ --enable-facedetect enable facedetect plugin (needs opencv)],
-+ [facedetect=${enableval}], [facedetect=no])
-+
- HAVE_OPENCV=false
--PKG_CHECK_MODULES(OPENCV, opencv >= 1.0.0, [HAVE_OPENCV=true], [true])
--if test x$HAVE_OPENCV = xfalse; then
-- AC_MSG_WARN([*** opencv >= 1.0.0 not found - this program enables optional plugin with the Open Source Computer Vision library >= 1.0.0 http://opencvlibrary.sourceforge.net/ ***])
--else
-- OPENCV_CFLAGS="$OPENCV_CFLAGS -DOPENCV_PREFIX=`pkg-config opencv --variable=prefix`"
-+if test "x${facedetect}" = xyes; then
-+ PKG_CHECK_MODULES(OPENCV, opencv >= 1.0.0, [HAVE_OPENCV=true], [true])
-+ if test x$HAVE_OPENCV = xfalse; then
-+ AC_MSG_WARN([*** opencv >= 1.0.0 not found - this program enables optional plugin with the Open Source Computer Vision library >= 1.0.0 http://opencvlibrary.sourceforge.net/ ***])
-+ else
-+ OPENCV_CFLAGS="$OPENCV_CFLAGS -DOPENCV_PREFIX=`pkg-config opencv --variable=prefix`"
-+ fi
- fi
- AM_CONDITIONAL([HAVE_OPENCV], [test x$HAVE_OPENCV = xtrue])
-
-@@ -35,11 +41,16 @@
- AC_FUNC_MALLOC
- AC_CHECK_FUNCS([floor memset pow sqrt])
-
-+
-+AC_ARG_ENABLE([scale0tilt], [ --enable-scale0tilt enable scale0tilt plugin (needs gavl)],
-+ [scale0tilt=${enableval}], [scale0tilt=no])
-+
- HAVE_GAVL=false
--PKG_CHECK_MODULES(GAVL, gavl >= 0.2.3, [HAVE_GAVL=true], [true])
--if test x$HAVE_GAVL = xfalse; then
-- AC_MSG_WARN([*** gavl >= 0.2.3 not found - this program enables optional plugin with the gmerlin audio
-- video library >= 0.2.3 http://gmerlin.sourceforge.net/ ***])
-+if test "x${scale0tilt}" = xyes; then
-+ PKG_CHECK_MODULES(GAVL, gavl >= 0.2.3, [HAVE_GAVL=true], [true])
-+ if test x$HAVE_GAVL = xfalse; then
-+ AC_MSG_WARN([*** gavl >= 0.2.3 not found - this program enables optional plugin with the gmerlin audio video library >= 0.2.3 http://gmerlin.sourceforge.net/ ***])
-+ fi
- fi
- AM_CONDITIONAL([HAVE_GAVL], [test x$HAVE_GAVL = xtrue])
-
diff --git a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-pkgconfig-support.patch b/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-pkgconfig-support.patch
deleted file mode 100644
index a60f18f..0000000
--- a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-pkgconfig-support.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From c950588f3e9188aa51e2cd3b9346bf346ad34118 Mon Sep 17 00:00:00 2001
-From: Luca Bigliardi <shammash@artha.org>
-Date: Thu, 09 Apr 2009 15:10:53 +0000
-Subject: Add pkg-config support
-
----
-diff --git a/Makefile.am b/Makefile.am
-index 8e8dbf9..511dbc0 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -10,3 +10,7 @@
-
- SUBDIRS=src include doc
- EXTRA_DIST = Doxyfile
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = frei0r.pc
-+
-diff --git a/configure.ac b/configure.ac
-index ed440a9..49d65b2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -67,6 +67,7 @@ fi
- AM_CONDITIONAL([HAVE_GAVL], [test x$HAVE_GAVL = xtrue])
-
- AC_CONFIG_FILES([
-+ frei0r.pc
- Makefile
- include/Makefile
- src/Makefile
-diff --git a/frei0r.pc.in b/frei0r.pc.in
-new file mode 100644
-index 0000000..3bd60da
---- a/dev/null
-+++ b/frei0r.pc.in
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: frei0r
-+Description: minimalistic plugin API for video effects
-+Version: @VERSION@
-+Libs:
-+Cflags: -I${includedir}
-+
---
-cgit v0.7.2-83-g9ec5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/frei0r-plugins/files/
@ 2016-05-06 16:01 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2016-05-06 16:01 UTC (permalink / raw
To: gentoo-commits
commit: 2dbcf233bb85e3785ff8748d364c24ef42b84ffd
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri May 6 15:59:32 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri May 6 16:01:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dbcf233
media-plugins/frei0r-plugins: update patch to restore opencv-2 compatibility
Patch by PhobosK <phobosk <AT> fastmail.fm>.
Gentoo-bug: 568608
Package-Manager: portage-2.2.28
.../files/frei0r-plugins-1.4-opencv3.patch | 48 ++++++++++++++--------
1 file changed, 31 insertions(+), 17 deletions(-)
diff --git a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.4-opencv3.patch b/media-plugins/frei0r-plugins/files/frei0r-plugins-1.4-opencv3.patch
index 6188c98..d6d96b0 100644
--- a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.4-opencv3.patch
+++ b/media-plugins/frei0r-plugins/files/frei0r-plugins-1.4-opencv3.patch
@@ -1,50 +1,64 @@
---- ./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
+diff -ur a/frei0r-plugins-1.4/src/filter/facedetect/facedetect.c b/frei0r-plugins-1.4/src/filter/facedetect/facedetect.c
+--- a/frei0r-plugins-1.4/src/filter/facedetect/facedetect.c 2013-02-24 15:43:22.000000000 +0200
++++ b/frei0r-plugins-1.4/src/filter/facedetect/facedetect.c 2015-12-19 12:27:05.984180725 +0200
+@@ -211,8 +211,13 @@
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)),
++#if (CV_VERSION_EPOCH != 2)
+ IplImage* small_img = cvCreateImage( cvSize( cvRound ((double)img->width/scale),
+ cvRound ((double)img->height/scale)),
++#else
+ IplImage* small_img = cvCreateImage( cvSize( cvRound (img->width/scale),
+ cvRound (img->height/scale)),
++#endif
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:
+diff -ur a/frei0r-plugins-1.4/src/filter/facedetect/facedetect.cpp b/frei0r-plugins-1.4/src/filter/facedetect/facedetect.cpp
+--- a/frei0r-plugins-1.4/src/filter/facedetect/facedetect.cpp 2013-02-24 15:43:22.000000000 +0200
++++ b/frei0r-plugins-1.4/src/filter/facedetect/facedetect.cpp 2015-12-19 12:24:00.023349871 +0200
+@@ -259,11 +259,19 @@
{
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)}},
++#if (CV_VERSION_EPOCH != 2)
+ 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)),
++#else
+ {{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)}},
++#endif
};
for (int i = 0; i < (objects ? objects->total : 0); i++)
-@@ -287,14 +287,14 @@ private:
+@@ -287,14 +295,23 @@
}
case 1:
{
-- CvBox2D box = {{center.x, center.y}, {r->width / scale, (r->height / scale) * 1.2}, 90};
++#if (CV_VERSION_EPOCH != 2)
+ CvBox2D box = CvBox2D(CvPoint2D32f(center.x, center.y), CvSize2D32f(r->width / scale, (r->height / scale) * 1.2), 90);
++#else
+ CvBox2D box = {{center.x, center.y}, {r->width / scale, (r->height / scale) * 1.2}, 90};
++#endif
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};
++#if (CV_VERSION_EPOCH != 2)
+ CvPoint pt1 = CvPoint(r->x / scale, r->y / scale);
+ CvPoint pt2 = CvPoint((r->x + r->width) / scale, (r->y + r->height) / scale);
++#else
+ CvPoint pt1 = {r->x / scale, r->y / scale};
+ CvPoint pt2 = {(r->x + r->width) / scale, (r->y + r->height) / scale};
++#endif
cvRectangle(image, pt1, pt2, colors[i % 5], thickness, linetype);
break;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-05-06 16:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-05 15:55 [gentoo-commits] repo/gentoo:master commit in: media-plugins/frei0r-plugins/files/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2016-05-06 16:01 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox