[vigra] Updates for 1.8.0 release

bpostle bpostle at fedoraproject.org
Sat Sep 24 21:37:35 UTC 2011 

commit 53f8230b5231ea95d74228ce66dcfd5e9029a015
Author: Bruno Postle <bruno at postle.net>
Date:   Sat Sep 24 22:38:54 2011 +0100

    Updates for 1.8.0 release

 .gitignore                   |    1 +
 sources                      |    2 +-
 vigra-1.8.0.lib_suffix.patch |   78 ++++++++++++++++++++++++++++++++++++++++++
 vigra.spec                   |   12 ++++---
 4 files changed, 87 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8bccd16..b4ed855 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 vigra-1.7.0-src.tar.gz
 /vigra-1.7.1-src.tar.gz
+/vigra-1.8.0-src.tar.gz
diff --git a/sources b/sources
index b107e4c..7773616 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2bde208e0fd7626770169dd4fa097282  vigra-1.7.1-src.tar.gz
+15c5544448e529ee60020758ab6be264  vigra-1.8.0-src.tar.gz
diff --git a/vigra-1.8.0.lib_suffix.patch b/vigra-1.8.0.lib_suffix.patch
new file mode 100644
index 0000000..d813ca0
--- /dev/null
+++ b/vigra-1.8.0.lib_suffix.patch
@@ -0,0 +1,78 @@
+Note: for some reason vigra uses a non-standard LIBDIR_SUFFIX definition
+whereas usually this is LIB_SUFFIX.  This patch fixes this since fedora expects
+to use the standard.
+
+diff -baur vigra-1.8.0/CMakeLists.txt vigra-1.8.0.new/CMakeLists.txt
+--- vigra-1.8.0/CMakeLists.txt	2011-09-20 19:38:36.000000000 +0100
++++ vigra-1.8.0.new/CMakeLists.txt	2011-09-24 21:20:55.000000000 +0100
+@@ -128,6 +128,8 @@
+ ENDIF()
+ 
+ 
++set(LIB_SUFFIX "" CACHE STRING "Define suffix of lib directory name (32/64)" )
++
+ ##################################################
+ #
+ #     global installation commands
+@@ -213,10 +215,10 @@
+ 
+ # export targets:
+ INSTALL(EXPORT vigra-targets
+-        DESTINATION lib${LIBDIR_SUFFIX}/vigra)
++        DESTINATION lib${LIB_SUFFIX}/vigra)
+ INSTALL(FILES ${PROJECT_BINARY_DIR}/lib/vigra/CMake/VigraConfig.cmake
+             ${PROJECT_BINARY_DIR}/lib/vigra/CMake/VigraConfigVersion.cmake
+-        DESTINATION lib${LIBDIR_SUFFIX}/vigra)
++        DESTINATION lib${LIB_SUFFIX}/vigra)
+ EXPORT(TARGETS vigraimpex FILE vigra-targets.cmake)
+ 
+ ##################################################
+@@ -289,7 +291,7 @@
+ MESSAGE( STATUS "---------------------------------------------------------" )
+ 
+ MESSAGE( STATUS "  includes will be installed at: ${CMAKE_INSTALL_PREFIX}/include")
+-MESSAGE( STATUS "  libraries will be installed at: ${CMAKE_INSTALL_PREFIX}/lib${LIBDIR_SUFFIX}")
++MESSAGE( STATUS "  libraries will be installed at: ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
+ 
+ IF (MSVC)
+   MESSAGE( STATUS "  binaries and DLLs will be installed at: ${CMAKE_INSTALL_PREFIX}/bin")
+diff -baur vigra-1.8.0/doc/vigra/Installation.html vigra-1.8.0.new/doc/vigra/Installation.html
+--- vigra-1.8.0/doc/vigra/Installation.html	2011-09-20 19:43:37.000000000 +0100
++++ vigra-1.8.0.new/doc/vigra/Installation.html	2011-09-24 21:21:39.000000000 +0100
+@@ -58,8 +58,8 @@
+ <dd>build VIGRA Python bindings (default: 1). Pass -DWITH_VIGRANUMPY=0 to suppress vigranumpy. </dd>
+ <dt>-DWITH_HDF5=1 </dt>
+ <dd>build VIGRA with HDF5 support (default: 1). Pass -DDWITH_HDF5=0 to compile without HDF5. </dd>
+-<dt>-DLIBDIR_SUFFIX=64 </dt>
+-<dd>define suffix of lib directory name (default: empty string, i.e. no suffix). Use -DLIBDIR_SUFFIX=64 when you want to install libraries in $CMAKE_INSTALL_PREFIX/lib64. </dd>
++<dt>-DLIB_SUFFIX=64 </dt>
++<dd>define suffix of lib directory name (default: empty string, i.e. no suffix). Use -DLIB_SUFFIX=64 when you want to install libraries in $CMAKE_INSTALL_PREFIX/lib64. </dd>
+ </dl>
+ <p>More fine-grained customization (e.g. specification of explicit paths for all dependencies, customization of compiler flags) is possible by editing the file &lt;vigra_build_path&gt;/CMakeCache.txt. This is best done by means of the interactive programs <b>ccmake</b> or <b>cmake-gui</b>. Consult the <a href="http://www.cmake.org/cmake/help/documentation.html">cmake documentation</a> for more detailed help.</p>
+ <p>For using VIGRA in another CMake-built project, you can use the CMake command FIND_PACKAGE(Vigra), which will set the CMake variables ${Vigra_INCLUDE_DIRS} with the correct include path, and import the binary targets (currently vigraimpex) to link against (e.g., TARGET_LINK_LIBRARIES(targetname vigraimpex)). For this mechanism to work, CMake reads a config file VigraConfig.cmake, which is installed along with the library in CMAKE_INSTALL_PREFIX/lib/vigra. Alternatively, you can point CMake (cache entry Vigra_DIR) to VIGRA's build directory, where a corresponding VigraConfig.cmake resides for using the build version directly without installation. </p>
+diff -baur vigra-1.8.0/docsrc/installation.dxx vigra-1.8.0.new/docsrc/installation.dxx
+--- vigra-1.8.0/docsrc/installation.dxx	2011-09-20 19:38:36.000000000 +0100
++++ vigra-1.8.0.new/docsrc/installation.dxx	2011-09-24 21:19:52.000000000 +0100
+@@ -53,9 +53,9 @@
+          vigranumpy.
+     <DT> -DWITH_HDF5=1
+          <DD> build VIGRA with HDF5 support (default: 1). Pass -DDWITH_HDF5=0 to compile without HDF5.
+-    <DT> -DLIBDIR_SUFFIX=64
++    <DT> -DLIB_SUFFIX=64
+          <DD> define suffix of lib directory name (default: empty string, i.e. no suffix). Use 
+-         -DLIBDIR_SUFFIX=64 when you want to install libraries in $CMAKE_INSTALL_PREFIX/lib64.
++         -DLIB_SUFFIX=64 when you want to install libraries in $CMAKE_INSTALL_PREFIX/lib64.
+     </DL>
+ 
+     More fine-grained customization (e.g. specification of explicit paths for all dependencies, customization of compiler flags) is possible by editing the file &lt;vigra_build_path&gt;/CMakeCache.txt. This is best done by means of the interactive programs <b>ccmake</b> or <b>cmake-gui</b>. Consult the <a href="http://www.cmake.org/cmake/help/documentation.html">cmake documentation</a> for more detailed help.
+diff -baur vigra-1.8.0/src/impex/CMakeLists.txt vigra-1.8.0.new/src/impex/CMakeLists.txt
+--- vigra-1.8.0/src/impex/CMakeLists.txt	2011-09-20 19:38:36.000000000 +0100
++++ vigra-1.8.0.new/src/impex/CMakeLists.txt	2011-09-24 21:19:52.000000000 +0100
+@@ -80,5 +80,5 @@
+ INSTALL(TARGETS vigraimpex
+         EXPORT vigra-targets
+         RUNTIME DESTINATION bin 
+-        LIBRARY DESTINATION lib${LIBDIR_SUFFIX} 
+-        ARCHIVE DESTINATION lib${LIBDIR_SUFFIX})
++        LIBRARY DESTINATION lib${LIB_SUFFIX} 
++        ARCHIVE DESTINATION lib${LIB_SUFFIX})
diff --git a/vigra.spec b/vigra.spec
index 576d749..c96a252 100644
--- a/vigra.spec
+++ b/vigra.spec
@@ -1,17 +1,17 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 Summary:        Generic Programming for Computer Vision
 Name:           vigra
-Version:        1.7.1
-Release:        4%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 License:        MIT
 Group:          Development/Libraries
 Source:         http://hci.iwr.uni-heidelberg.de/%{name}/%{name}-%{version}-src.tar.gz
-Patch1:         vigra-1.7.1.lib_suffix.patch
-Patch2:         vigra-1.7.1.gcc460.patch
+Patch1:         vigra-1.8.0.lib_suffix.patch
 URL:            http://hci.iwr.uni-heidelberg.de/vigra/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  zlib-devel libjpeg-devel libpng-devel libtiff-devel fftw-devel >= 3
 BuildRequires:  cmake hdf5-devel boost-devel boost-python doxygen python-sphinx numpy-f2py
+BuildRequires:  OpenEXR-devel
 
 %description
 VIGRA stands for "Vision with Generic Algorithms". It's a novel computer vision
@@ -42,7 +42,6 @@ The vigra-python package provides python bindings for vigra
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
 
 %build
 %cmake .
@@ -80,6 +79,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/vigra
 
 %changelog
+* Sat Sep 24 2011 Bruno Postle <bruno at postle.net> 1.8.0-1
+- upstream release
+
 * Fri Aug 26 2011 Tom Callaway <spot at fedoraproject.org> - 1.7.1-4
 - rebuild against boost

More information about the scm-commits mailing list