Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv1354
Modified Files:
opencv-shlibs.info
Log Message:
fix broken fix from last checkin
Use a more robust way to set install_name in the dylibs
Index: opencv-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/opencv-shlibs.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- opencv-shlibs.info 20 Oct 2011 22:04:33 -0000 1.2
+++ opencv-shlibs.info 20 Oct 2011 23:11:09 -0000 1.3
@@ -1,6 +1,6 @@
Package: opencv-shlibs
Version: 2.3.1
-Revision: 1
+Revision: 2
Description: Open Source Computer Vision Library
License: GPL
Maintainer: Hanspeter Niederstrasser <[email protected]>
@@ -27,12 +27,17 @@
<<
Source: mirror:sourceforge:opencvlibrary/opencv-unix/%v/OpenCV-%va.tar.bz2
Source-MD5: 82e4b6bfa349777233eea09b075e931e
+SourceDirectory: OpenCV-%v
#PatchFile: %n.patch
#PatchFile-MD5: 885a0e43f783a6c1a5ff17220ff0237d
PatchScript: <<
# sed -e 's|@@PYTHON_PKGD@@|%p/lib/python2.7/site-packages|g' <
%{PatchFile} | patch -p1
### The python module should be a dlopen bundle, not a dylib
perl -pi -e 's,SHARED src2/cv2.cpp,MODULE src2/cv2.cpp,g'
modules/python/CMakeLists.txt
+ ### give a proper install_name to the libraries
+ ### fixed: https://code.ros.org/trac/opencv/changeset/3298
+ ### unfixed later: https://code.ros.org/trac/opencv/changeset/5262
+ perl -pi -e 's,INSTALL_NAME_DIR lib,INSTALL_NAME_DIR
\"\$\{CMAKE_INSTALL_PREFIX\}\/lib\",g' OpenCVModule.cmake
modules/gpu/CMakeLists.txt modules/highgui/CMakeLists.txt
<<
SetCC: llvm-gcc-4.2
SetCXX: llvm-g++-4.2
@@ -64,10 +69,10 @@
-DBUILD_DOCS=OFF \
..
### cmake sets -install_name root to %b, so have to change it to %p
- export OPENCVLIBS="calib3d contrib core features2d flann gpu highgui
imgproc legacy ml objdetect ts video"
- for OCVLIB in $OPENCVLIBS; do
- perl -pi -e 's,-install_name %b/finkbuild/lib,-install_name
%p/lib,g' modules/${OCVLIB}/CMakeFiles/opencv_${OCVLIB}.dir/link.txt
- done
+ #export OPENCVLIBS="calib3d contrib core features2d flann gpu highgui
imgproc legacy ml objdetect ts video"
+ #for OCVLIB in $OPENCVLIBS; do
+ # perl -pi -e 's,-install_name %b/finkbuild/lib,-install_name
%p/lib,g' modules/${OCVLIB}/CMakeFiles/opencv_${OCVLIB}.dir/link.txt
+ #done
make
<<
InstallScript: <<
@@ -75,10 +80,10 @@
cd finkbuild
make -j1 install DESTDIR=%d
### even worse, cmake then blanks the prefix for the libraries during
install
- export OPENCVLIBS="calib3d contrib core features2d flann gpu highgui
imgproc legacy ml objdetect ts video"
- for OCVLIB in $OPENCVLIBS; do
- install_name_tool -id %p/lib/libopencv_${OCVLIB}.2.3.dylib
%i/lib/libopencv_${OCVLIB}.2.3.dylib
- done
+ #export OPENCVLIBS="calib3d contrib core features2d flann gpu highgui
imgproc legacy ml objdetect ts video"
+ #for OCVLIB in $OPENCVLIBS; do
+ # install_name_tool -id %p/lib/libopencv_${OCVLIB}.2.3.dylib
%i/lib/libopencv_${OCVLIB}.2.3.dylib
+ #done
<<
Shlibs: <<
%p/lib/libopencv_calib3d.2.3.dylib 2.3.0 %n (>= 2.3.1-1)
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
