Date: Mon, 17 Aug 2009 11:36:40 GMT From: Alberto Villa <villa.alberto@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/137871: [patch] graphics/opencv - fix build with latest libtool and take maintainership Message-ID: <200908171136.n7HBaepN075000@www.freebsd.org> Resent-Message-ID: <200908171140.n7HBe1gn006259@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 137871
>Category: ports
>Synopsis: [patch] graphics/opencv - fix build with latest libtool and take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 17 11:40:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Alberto Villa
>Release: FreeBSD 8-STABLE
>Organization:
>Environment:
FreeBSD echo.hoth 8.0-BETA2 FreeBSD 8.0-BETA2 #11: Sat Aug 15 17:55:03 CEST 2009 root@echo.hoth:/usr/obj/usr/src/sys/TPR60 i386
>Description:
opencv fails to build with libtool 2.2 and python enabled
>How-To-Repeat:
cd /usr/ports/graphics/opencv && make WITH_PYTHON=yes
>Fix:
patch below, tested and coauthored by dima panov (fluffy@)
it's independent from ports/137805, but that patch is needed too
it also makes some polishing of the makefile, cares about PTHREAD_LIBS and sets me as the new maintainer
added files:
files/patch-interfaces-swig-python-Makefile.in
Patch attached with submission follows:
diff -ruN /usr/ports/graphics/opencv/Makefile /tmp/opencv/Makefile
--- /usr/ports/graphics/opencv/Makefile 2009-08-03 15:59:21.470128457 +0200
+++ /tmp/opencv/Makefile 2009-08-17 13:04:05.241330839 +0200
@@ -12,8 +12,8 @@
CATEGORIES= graphics
MASTER_SITES= SF/opencvlibrary
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Open Source Computer Vision Library from Intel
+MAINTAINER= villa.alberto@gmail.com
+COMMENT= Open Source Computer Vision library from Intel
BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
@@ -26,21 +26,24 @@
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-v4l --without-quicktime --without-carbon \
- --without-1394libs \
- --without-swig # I don't know anything about swig ...
+ --without-1394libs \
+ --without-swig # I don't know anything about swig ...
LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \
- png:${PORTSDIR}/graphics/png \
- tiff:${PORTSDIR}/graphics/tiff \
- jasper:${PORTSDIR}/graphics/jasper \
- IlmImf:${PORTSDIR}/graphics/OpenEXR
+ png:${PORTSDIR}/graphics/png \
+ tiff:${PORTSDIR}/graphics/tiff \
+ jasper:${PORTSDIR}/graphics/jasper \
+ IlmImf:${PORTSDIR}/graphics/OpenEXR
USE_GNOME=
-OPTIONS= GTK "Enable GTK+-2.0 support" Off \
- XINE "Enable XINE support" Off \
- FFMPEG "Enable FFMPEG support" Off \
- PYTHON "Enable PYTHON support" Off \
- DEBUG "Build debugging symbols" Off \
- DEMO "Build demo apps" Off
+NOT_FOR_ARCHS= sparc64
+NOT_FOR_ARCHS_REASON_sparc64= does not compile on sparc64
+
+OPTIONS= DEBUG "Build debugging symbols" off \
+ DEMO "Build demo apps" off \
+ FFMPEG "Enable FFMPEG support" off \
+ GTK "Enable GTK+-2.0 support" off \
+ PYTHON "Enable PYTHON support" off \
+ XINE "Enable XINE support" off
# XXX:
# I cannot disable the following features if they have been installed,
# thus they should be enable now ...
@@ -122,8 +125,11 @@
PLIST_SUB+= DEMO="@comment "
.endif
-.if ${ARCH} == "sparc64"
-BROKEN= Does not compile
-.endif
+pre-configure:
+ @${REINPLACE_CMD} -e 's/-pthread/-pthread|${PTHREAD_LIBS}/' \
+ ${WRKSRC}/autotools/ltmain.sh
+ @${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' \
+ ${WRKSRC}/configure \
+ ${WRKSRC}/Makefile.*
.include <bsd.port.post.mk>
diff -ruN /usr/ports/graphics/opencv/files/patch-interfaces-swig-python-Makefile.in /tmp/opencv/files/patch-interfaces-swig-python-Makefile.in
--- /usr/ports/graphics/opencv/files/patch-interfaces-swig-python-Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ /tmp/opencv/files/patch-interfaces-swig-python-Makefile.in 2009-08-17 13:14:28.287172536 +0200
@@ -0,0 +1,21 @@
+--- interfaces/swig/python/Makefile.in.orig 2009-08-17 13:05:42.767591162 +0200
++++ interfaces/swig/python/Makefile.in 2009-08-17 13:12:40.803413956 +0200
+@@ -338,16 +338,14 @@
+
+ @BUILD_PYTHON_WRAPPERS_TRUE@_cv_la_CXXFLAGS = $(PYTHON_CSPEC)
+ @BUILD_PYTHON_WRAPPERS_TRUE@_cv_la_LIBADD = $(top_builddir)/cv/src/libcv.la
+-@BUILD_PYTHON_WRAPPERS_TRUE@_cv_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
+-@BUILD_PYTHON_WRAPPERS_TRUE@ -L$(SWIG_PYTHON_LIBS)
++@BUILD_PYTHON_WRAPPERS_TRUE@_cv_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC)
+
+ @BUILD_PYTHON_WRAPPERS_TRUE@_highgui_la_SOURCES = _highgui.cpp pyhelpers.cpp pyhelpers.h \
+ @BUILD_PYTHON_WRAPPERS_TRUE@ highgui.i
+
+ @BUILD_PYTHON_WRAPPERS_TRUE@_highgui_la_CXXFLAGS = $(PYTHON_CSPEC)
+ @BUILD_PYTHON_WRAPPERS_TRUE@_highgui_la_LIBADD = $(top_builddir)/otherlibs/highgui/libhighgui.la
+-@BUILD_PYTHON_WRAPPERS_TRUE@_highgui_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
+-@BUILD_PYTHON_WRAPPERS_TRUE@ -L$(SWIG_PYTHON_LIBS)
++@BUILD_PYTHON_WRAPPERS_TRUE@_highgui_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LSPEC)
+
+ all: all-am
+
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908171136.n7HBaepN075000>