summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Mavrinac <aaron@pygar.(none)>2009-08-31 15:32:34 -0400
committerAaron Mavrinac <aaron@pygar.(none)>2009-08-31 15:32:34 -0400
commitb2832d2c2cc5b84e8c8de87d78360e76b66f82cf (patch)
treee934bc357ec7dc45cd16f03c77f97861f651535a /media-libs
parentInitial import of dev-python/progressbar ebuild. (diff)
downloadezod-b2832d2c2cc5b84e8c8de87d78360e76b66f82cf.tar.gz
ezod-b2832d2c2cc5b84e8c8de87d78360e76b66f82cf.tar.bz2
ezod-b2832d2c2cc5b84e8c8de87d78360e76b66f82cf.zip
Added 2 patches to media-libs/opencv to fix libtool errors.
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/opencv/ChangeLog3
-rw-r--r--media-libs/opencv/Manifest6
-rw-r--r--media-libs/opencv/files/opencv-1.1.0_pre1-libtool.patch11
-rw-r--r--media-libs/opencv/files/opencv-1.1.0_pre1-link.patch26
-rw-r--r--media-libs/opencv/opencv-1.1.0_pre1.ebuild5
5 files changed, 48 insertions, 3 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index b170434..22158b8 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 31 Aug 2009; Aaron Mavrinac <mavrinac@gmail.com> opencv-1.1.0_pre1.ebuild:
+ Added 2 patches to fix libtool errors
+
30 Jun 2009; Aaron Mavrinac <mavrinac@gmail.com> opencv-1.1.0_pre1.ebuild:
Fixed some configure options (including for -python)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 26520c4..a40f5a2 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,5 +1,7 @@
+AUX opencv-1.1.0_pre1-libtool.patch 425 RMD160 677c2dee8aba8b5170eabc39528f904f58ec9f43 SHA1 90fb1baa007e0137a6113fe526528198e0660445 SHA256 603b333a005fcf8dbd87d43264dbd67f10de740b92f1cabf70a01799b2e312c3
+AUX opencv-1.1.0_pre1-link.patch 1264 RMD160 9b189456b9d7c089c61755368950e47f9e6bb716 SHA1 2430a3028c02729038b447f4a90fffa9c2bd86a9 SHA256 5535327774d5062ff24a6ac26d874db1377cbd64f1e1052b65e8f4557f8b145b
AUX opencv-1.1.0_pre1-stereorectify.patch 1409 RMD160 0b317df1cb2a2b61be6e673b1b52ecf836b0e7cf SHA1 2a4d841dac0882de2087bcf7c495045b4639d142 SHA256 2a25dd7b7cf968dfbac143a1cfbd1a5afaaafb2fceb62e60d51d21220139c8af
DIST opencv-1.1pre1.tar.gz 22301291 RMD160 d105a97f211637edbbac1eb21dca2b140b1f37be SHA1 4bc4bda92a250adcb82b236161d364c059021a43 SHA256 7e4f0026e5543c38afcf8a4298b1da2bace977499f99b885c925fc784783d812
-EBUILD opencv-1.1.0_pre1.ebuild 2208 RMD160 7c2fd75fe7d7cc2d9fd216845c7b06152e4cc360 SHA1 0125760b57d2674a340cc0c2ba08ebb1f1b4d967 SHA256 021ac9bfc2047c193fc96064136ab90dead67291ae1048a38af17bdee99fb50b
-MISC ChangeLog 380 RMD160 a5c9caee67a7e90f5ec07aef804d64409084b66c SHA1 d8f56dde9f5f89de56cafb85c2c66b56681ce4ce SHA256 545d051d01b0e7d5f117743fb43a6f4e8451ace56b64cd90735dd6a574facc0b
+EBUILD opencv-1.1.0_pre1.ebuild 2202 RMD160 9c72d6df155bb5a48d70a8477a9a01ac0e025c25 SHA1 063b196077b590059d481c97146fe277446e324b SHA256 23fdb53121f496b02da39ae6cdada8be6cc7aea7c4d4379087de77602e19187a
+MISC ChangeLog 498 RMD160 f89c83c814ce8043c99e5739d35b11e9129da6dc SHA1 436a89fb9671b8f0010bd75dc6c554d422d5455d SHA256 c5267d48f7b4ccb0c080bb3f0c7ae7c002655b95b0e4974518b6976f8cfcba83
MISC metadata.xml 758 RMD160 bdfc7cd1bf469fe5951429333659946f377faa48 SHA1 812545f8fab4fc2304006b8ebc6bfcb1155cc519 SHA256 7468b2722153f29842e40153f877e1bd980ef617f46a3f438b686b2f1a9f1dea
diff --git a/media-libs/opencv/files/opencv-1.1.0_pre1-libtool.patch b/media-libs/opencv/files/opencv-1.1.0_pre1-libtool.patch
new file mode 100644
index 0000000..63c725f
--- /dev/null
+++ b/media-libs/opencv/files/opencv-1.1.0_pre1-libtool.patch
@@ -0,0 +1,11 @@
+--- opencv-1.1.0/configure.in.orig
++++ opencv-1.1.0/configure.in
+@@ -37,7 +37,7 @@
+ AC_INIT([opencv],[opencv_version],[opencvlibrary-devel@lists.sourceforge.net])
+ AC_CONFIG_SRCDIR([opencv.pc.in])
+ AC_CONFIG_AUX_DIR([autotools])
+-AC_CONFIG_MACRO_DIR([autotools/aclocal])
++#AC_CONFIG_MACRO_DIR([autotools/aclocal])
+
+ # put CVS revision of this configure.in into the resulting configure script
+ AC_REVISION($Revision: 1.60 $)
diff --git a/media-libs/opencv/files/opencv-1.1.0_pre1-link.patch b/media-libs/opencv/files/opencv-1.1.0_pre1-link.patch
new file mode 100644
index 0000000..a72c2c8
--- /dev/null
+++ b/media-libs/opencv/files/opencv-1.1.0_pre1-link.patch
@@ -0,0 +1,26 @@
+--- interfaces/swig/python/Makefile.am.orig
++++ interfaces/swig/python/Makefile.am
+@@ -122,20 +122,17 @@
+ cv.i imagedata.i cvarr.i nointpb.i pytypemaps.i cvseq.i cvshadow.i
+ _cv_la_CXXFLAGS = $(PYTHON_CSPEC)
+ _cv_la_LIBADD = $(top_builddir)/cv/src/libcv.la
+-_cv_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
+- -L$(SWIG_PYTHON_LIBS)
++_cv_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC)
+
+ _ml_la_SOURCES = _ml.cpp pyhelpers.cpp pyhelpers.h
+ _ml_la_CXXFLAGS = $(PYTHON_CSPEC)
+ _ml_la_LIBADD = $(top_builddir)/ml/src/libml.la
+-_ml_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
+- -L$(SWIG_PYTHON_LIBS)
++_ml_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC)
+
+ _highgui_la_SOURCES = _highgui.cpp pyhelpers.cpp pyhelpers.h \
+ highgui.i
+ _highgui_la_CXXFLAGS = $(PYTHON_CSPEC)
+ _highgui_la_LIBADD = $(top_builddir)/otherlibs/highgui/libhighgui.la
+-_highgui_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
+- -L$(SWIG_PYTHON_LIBS)
++_highgui_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC)
+
+ endif
diff --git a/media-libs/opencv/opencv-1.1.0_pre1.ebuild b/media-libs/opencv/opencv-1.1.0_pre1.ebuild
index 8ce780c..5d74d6e 100644
--- a/media-libs/opencv/opencv-1.1.0_pre1.ebuild
+++ b/media-libs/opencv/opencv-1.1.0_pre1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-1.0.0-r1.ebuild,v 1.4 2008/10/25 22:22:51 pvdabeel Exp $
+# $Header: $
EAPI="1"
inherit eutils flag-o-matic autotools
@@ -41,6 +41,8 @@ src_unpack() {
# remove the install-hook that runs ldconfig.
sed -i '/install-hook:/,/^$/d' Makefile.am
+ epatch "${FILESDIR}"/${P}-libtool.patch
+ epatch "${FILESDIR}"/${P}-link.patch
epatch "${FILESDIR}"/${P}-stereorectify.patch
eautoreconf || die "eautoreconf failed"
@@ -48,6 +50,7 @@ src_unpack() {
src_compile() {
use debug && filter-ldflags -O1 -Wl --enable-new-dtags -s
+ filter-ldflags -L
local myconf="--without-quicktime"
use python && myconf="${myconf} --with-swig --with-python" \