Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv832
Modified Files: paraview.info Added Files: paraview.patch Log Message: New version 2.6.0 Index: paraview.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/paraview.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- paraview.info 2 Sep 2006 09:45:10 -0000 1.1 +++ paraview.info 18 Mar 2007 17:33:42 -0000 1.2 @@ -1,18 +1,21 @@ Package: paraview -Version: 2.4.4 -Revision: 1001 -Source: http://www.paraview.org/files/v2.4/%n-%v.tar.gz -Source-MD5: 7f8e926542268546563e8e8c1d4ad852 +Version: 2.6.0 +Revision: 1002 +Source: http://www.paraview.org/files/v2.6/ParaView-%v.tar.gz +Source-MD5: 7df79f56097230e89666f16ad65590f5 License: BSD Depends: x11, x11-shlibs BuildDepends: cmake (>= 2.4.2-1), x11-dev +Patch: %n.patch CompileScript: << #!/bin/sh -ex mkdir ../%n-darwin cd ../%n-darwin - %p/bin/cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \ + %p/bin/cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_INSTALL_PREFIX:PATH=%p \ + -DCMAKE_INSTALL_NAME_DIR:STRING=%p/lib/%n-2.6 \ + -DVTK_USE_RPATH=ON \ -DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,-search_paths_first" \ -DCMAKE_SHARED_LINKER_FLAGS:STRING="-Wl,-search_paths_first" \ -DVTK_USE_CARBON:BOOL=OFF \ @@ -23,11 +26,18 @@ -DOPENGL_glu_LIBRARY:STRING="-L/usr/X11R6/lib -lGLU" \ -DOPENGL_INCLUDE_DIR:PATH="/usr/X11R6/include" \ -DOPENGL_xmesa_INCLUDE_DIR:PATH=/usr/X11R6/include \ - ../%n-%v + -DVTK_USE_INFOVIS:BOOL=ON \ + -DPARAVIEW_WRAP_PYTHON:BOOL=ON \ + -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \ + %b +# On essaiera ca apres: +# -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \ +# # ugly hack to fix the -install_name of the dylibs # cmake-2.4 has a mechanism for it, but it is unusable - perl -pi -e 's|install_name lib|install_name %p/lib/%n-2.4/lib|g' `find . -name build.make -or -name link.txt` +# perl -pi -e 's|install_name lib|install_name %p/lib/%n-2.4/lib|g' `find . -name build.make -or -name link.txt` # + export DYLD_LIBRARY_PATH=`pwd`/bin make << InstallScript: << @@ -65,7 +75,11 @@ DescPort: << The dylibs are still created with compat version 0.0.0, because cmake doesn't know about compatibility versions. - It is bad enough already to get them a decent install_name. + + This version uses CMake's RPATH mechanism to get correct + install_names for dibraries. + The patch is needed to desactivate the weird default that + does not install any executables when RPATH is used. Cmake knows now about versioned file names for dylibs, so that a future repacked version will be able to adhere to --- NEW FILE: paraview.patch --- --- ParaView-2.6.0/CMake/ParaViewCommon.cmake~ 2006-10-24 17:12:48.000000000 +0200 +++ ParaView-2.6.0/CMake/ParaViewCommon.cmake 2007-03-18 17:52:55.000000000 +0100 @@ -66,12 +66,12 @@ INCLUDE(${VTK_CMAKE_DIR}/vtkSelectSharedLibraries.cmake) # Disable the install targets if using the rpath feature. -IF(NOT WIN32) +IF(NOT WIN32 AND NOT APPLE) IF(VTK_USE_RPATH) SET(PV_INSTALL_NO_DEVELOPMENT 1) SET(PV_INSTALL_NO_RUNTIME 1) ENDIF(VTK_USE_RPATH) -ENDIF(NOT WIN32) +ENDIF(NOT WIN32 AND NOT APPLE) # ParaView needs static Tcl/Tk if not using shared libraries. IF(NOT BUILD_SHARED_LIBS) ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits