summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/opencv')
-rw-r--r--media-libs/opencv/ChangeLog8
-rw-r--r--media-libs/opencv/files/opencv-1.0.0-swiginvalidlinkingoptions.patch29
-rw-r--r--media-libs/opencv/opencv-1.0.0-r1.ebuild3
3 files changed, 38 insertions, 2 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index ac9b5b0aeb22..ac178b2784a3 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-libs/opencv
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.6 2008/09/14 18:46:32 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.7 2008/10/12 22:45:33 gentoofan23 Exp $
+
+ 12 Oct 2008; Thomas Anderson <gentoofan23@gentoo.org>
+ +files/opencv-1.0.0-swiginvalidlinkingoptions.patch,
+ opencv-1.0.0-r1.ebuild:
+ Fix problems when SWIG_PYTHON_LIBS was empty, resulting in '-L -o'. Reported
+ by Blorby in bug #239563, patch stolen from Exherbo
14 Sep 2008; Thomas Anderson <gentoofan23@gentoo.org> metadata.xml:
Picking up maintainership as current maintainer is inactive.
diff --git a/media-libs/opencv/files/opencv-1.0.0-swiginvalidlinkingoptions.patch b/media-libs/opencv/files/opencv-1.0.0-swiginvalidlinkingoptions.patch
new file mode 100644
index 000000000000..02e100a4a0fa
--- /dev/null
+++ b/media-libs/opencv/files/opencv-1.0.0-swiginvalidlinkingoptions.patch
@@ -0,0 +1,29 @@
+--- opencv-1.0.0-orig/autotools/aclocal/swig_complete.m4 2006-07-18 07:45:24.000000000 +0000
++++ opencv-1.0.0/autotools/aclocal/swig_complete.m4 2008-09-13 17:57:48.000000000 +0000
+@@ -163,7 +163,7 @@
+ if test x"$ac_version_at_least" = "xyes"; then
+ SWIG_PYTHON_LIBS=""
+ else
+- SWIG_PYTHON_LIBS="$SWIG_RUNTIME_LIBS_DIR -lswigpy"
++ SWIG_PYTHON_LIBS="-L$SWIG_RUNTIME_LIBS_DIR -lswigpy"
+ fi
+ else
+ AC_MSG_ERROR([SWIG version number unknown - cannot set python libs])
+--- opencv-1.0.0-orig/interfaces/swig/python/Makefile.am 2006-08-10 13:29:20.000000000 +0000
++++ opencv-1.0.0/interfaces/swig/python/Makefile.am 2008-09-13 17:59:46.000000000 +0000
+@@ -107,13 +107,13 @@
+ _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)
++ $(SWIG_PYTHON_LIBS)
+
+ _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)
++ $(SWIG_PYTHON_LIBS)
+
+ endif
diff --git a/media-libs/opencv/opencv-1.0.0-r1.ebuild b/media-libs/opencv/opencv-1.0.0-r1.ebuild
index 9a130d4eb858..54a4d17db5c0 100644
--- a/media-libs/opencv/opencv-1.0.0-r1.ebuild
+++ b/media-libs/opencv/opencv-1.0.0-r1.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.2 2008/06/29 14:41:01 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-1.0.0-r1.ebuild,v 1.3 2008/10/12 22:45:33 gentoofan23 Exp $
EAPI="1"
inherit eutils flag-o-matic autotools
@@ -45,6 +45,7 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-addoptionalsamples.patch
epatch "${FILESDIR}"/${P}-cvcapffmpegundefinedsymbols.patch
epatch "${FILESDIR}"/${P}-ffmpeg-0.4.9_p20080326.patch
+ epatch "${FILESDIR}"/${P}-swiginvalidlinkingoptions.patch
eautoreconf || die "eautoreconf failed"
}