summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2015-11-05 16:53:39 +0100
committerAlexis Ballier <aballier@gentoo.org>2015-11-05 16:53:39 +0100
commit26c350c3b214c3b5f20f4caba6c9c58b5b67a42c (patch)
tree19c8a4a5e2df7f09ee380d992c897c4362340b0d
parentmedia-plugins/frei0r-plugins: fix swapped useflag. bug #563826 by Anton Gubar... (diff)
downloadgentoo-26c350c3b214c3b5f20f4caba6c9c58b5b67a42c.tar.gz
gentoo-26c350c3b214c3b5f20f4caba6c9c58b5b67a42c.tar.bz2
gentoo-26c350c3b214c3b5f20f4caba6c9c58b5b67a42c.zip
media-plugins/frei0r-plugins: remove stray patches
Package-Manager: portage-2.2.24 Signed-off-by: Alexis Ballier <aballier@gentoo.org>
-rw-r--r--media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-libdir.patch24
-rw-r--r--media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-no-automagic-deps.patch47
-rw-r--r--media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-pkgconfig-support.patch49
3 files changed, 0 insertions, 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 70d20329ff8d..000000000000
--- 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 142a9a8c24f9..000000000000
--- 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 a60f18f217da..000000000000
--- 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