April 2013 - Olena-patches

olena-2.0-64-g669afb2 distrib/rpm/olena.spec: New.
by Guillaume Lazzara 10 Apr '13

10 Apr '13

--- ChangeLog | 4 + distrib/rpm/olena.spec | 181 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 185 insertions(+), 0 deletions(-) create mode 100644 distrib/rpm/olena.spec diff --git a/ChangeLog b/ChangeLog index f707206..95c83b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + * distrib/rpm/olena.spec: New. + 2012-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> Fix last warnings with Lintian. diff --git a/distrib/rpm/olena.spec b/distrib/rpm/olena.spec new file mode 100644 index 0000000..37d285f --- /dev/null +++ b/distrib/rpm/olena.spec @@ -0,0 +1,181 @@ +%bcond_with apps +%bcond_with doc + +Name: olena +Version: 1.0 +Release: %mkrel 4 +Epoch: 2 +License: GPLv2 +Summary: Olena is a platform dedicated to image processing +Group: Development/C++ +URL: http://www.lrde.epita.fr/cgi-bin/twiki/view/Olena/WebHome +# Get from https://svn.lrde.epita.fr/svn/oln/tags/olena-1.0 to have scribo +Source0: %name-%version.tar.bz2 +Patch0: olena-1.0-subdirs.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: cfitsio-devel +BuildRequires: tiff-devel +BuildRequires: imagemagick-devel +BuildRequires: mesaglut-devel +BuildRequires: mesagl-devel +BuildRequires: vtk-devel +BuildRequires: gdcm-devel +BuildRequires: tesseract-devel >= 2.04-3 + +%description +Olena is a platform dedicated to image processing. At the +moment it is mainly composed of a C++ library: Milena. This library features +many tools to easily perform image processing tasks. Its main characteristic is +its genericity: it allows to write an algorithm once and run it over many kinds +of images (grey scale, color, 1D, 2D, 3D, ...). + +#------------------------------------------------------------------------------ + +%if %with doc + +%package doc +Summary: Olena documentation +Group: Books/Howtos + +%description doc +This is the documentation for Olena. +Olena is a platform dedicated to image processing. At the +moment it is mainly composed of a C++ library: Milena. This library features +many tools to easily perform image processing tasks. Its main characteristic is +its genericity: it allows to write an algorithm once and run it over many kinds +of images (grey scale, color, 1D, 2D, 3D, ...). + +%files doc +%defattr(-,root,root,-) +%_docdir/olena + +%endif + +#------------------------------------------------------------------------------ + +%package tools +Summary: Olena tools +Group: Development/C++ + +%description tools +Olena is a platform dedicated to image processing. At the +moment it is mainly composed of a C++ library: Milena. This library features +many tools to easily perform image processing tasks. Its main characteristic is +its genericity: it allows to write an algorithm once and run it over many kinds +of images (grey scale, color, 1D, 2D, 3D, ...). + +%files tools +%defattr(-,root,root,-) +%_bindir/* +%_datadir/olena/images + +#------------------------------------------------------------------------------ + +%define gluit_major 0 +%define libgluit %mklibname gluit %{gluit_major} + +%package -n %{libgluit} +Summary: Gluit C++ main Olena library +Group: Development/C++ + +%description -n %{libgluit} +Gluit C++ main Olena library. + +%files -n %{libgluit} +%_libdir/libgluit.so.%{gluit_major}* + +#------------------------------------------------------------------------------ + +%define tri_major 0 +%define libtrimesh %mklibname trimesh %{tri_major} + +%package -n %{libtrimesh} +Summary: trimesh C++ main Olena library +Group: Development/C++ + +%description -n %{libtrimesh} +trimesh C++ main Olena library. + +%files -n %{libtrimesh} +%defattr(-,root,root,-) +%{_libdir}/libtrimesh.so.%{tri_major}* + +#------------------------------------------------------------------------------ + +%package devel +Summary: Olena devel files +Group: Development/C++ +Requires: %{libtrimesh} = %{epoch}:%{version} +Requires: %{libgluit} = %{epoch}:%{version} +Requires: olena-tools + +%description devel +Olena devel files +Olena is a platform dedicated to image processing. At the +moment it is mainly composed of a C++ library: Milena. This library features +many tools to easily perform image processing tasks. Its main characteristic is +its genericity: it allows to write an algorithm once and run it over many kinds +of images (grey scale, color, 1D, 2D, 3D, ...). + +%files devel +%defattr(-,root,root,-) +%{_libdir}/*.so +%{_libdir}/*.la +%{_includedir}/* +%exclude %_libdir/*.a + +#------------------------------------------------------------------------------ + +%prep +%setup -q +%if ! %with doc +%patch0 -p0 -b .orig +%endif + +%build +CXXFLAGS="$CXXFLAGS -I%{_includedir}/ImageMagick" +export CPPFLAGS CXXFLAGS + +%configure2_5x \ + --enable-scribo \ + --enable-trimesh \ +%if %with apps + --enable-apps \ +%endif + --enable-tools + +%make + +%install +rm -rf %{buildroot} +%makeinstall_std + +%clean +rm -rf %buildroot + + + +%changelog +* Wed Sep 23 2009 Helio Chissini de Castro <helio(a)mandriva.com> 2:1.0-4mdv2010.0 ++ Revision: 448013 +- Respect description, as requested in Mandriva bug #53959 + +* Wed Sep 16 2009 Helio Chissini de Castro <helio(a)mandriva.com> 2:1.0-3mdv2010.0 ++ Revision: 443577 +- Build against tesseract shared. + +* Wed Sep 16 2009 Helio Chissini de Castro <helio(a)mandriva.com> 2:1.0-2mdv2010.0 ++ Revision: 443356 +- Fix the mess with olena revision + +* Mon Sep 14 2009 Helio Chissini de Castro <helio(a)mandriva.com> 1:1.0-0.0.419mdv2010.0 ++ Revision: 440844 +- finally fixed olen package as requested by nepomuk team. Disable milena doc + was necessary and use current trunk sources + +* Tue Aug 25 2009 Helio Chissini de Castro <helio(a)mandriva.com> 1.0-1mdv2010.0 ++ Revision: 421273 +- imported package olena + + + Nicolas LÃ©cureuil <neoclust(a)mandriva.org> + - import olena \ No newline at end of file -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-469-g4440fda
by git＠lrde.epita.fr 10 Apr '13

10 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch unstable/scribo has been updated via 4440fda1f38a89860a17a08a7794dcd93aa53e36 (commit) via d56053863dbf752b967c2d2351558313255a210d (commit) via 3634a0dd2d93538c5af7962f47c7a585cd9506ae (commit) from 6487a9dba1b813f2d50df08d397ec3080e0be7bb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 4440fda doc/Makefile.am: Fix permissions on documentation files. d560538 doc/Makefile.am: Fix permissions on documentation files. 3634a0d doc/Makefile.am: Fix permissions on documentation files. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ doc/Makefile.am | 1 + milena/ChangeLog | 4 ++++ milena/doc/Makefile.am | 1 + scribo/ChangeLog | 4 ++++ scribo/doc/Makefile.am | 4 +++- 6 files changed, 17 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-469-g5a67b47 doc/Makefile.am: Fix permissions on documentation files.
by Guillaume Lazzara 10 Apr '13

10 Apr '13

--- ChangeLog | 4 ++++ doc/Makefile.am | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b1004e..ff27a41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Makefile.am: Fix permissions on documentation files. + +2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix path to other documentations. * doc/Makefile.am, diff --git a/doc/Makefile.am b/doc/Makefile.am index c328b77..bcc06af 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -211,6 +211,7 @@ install-data-local: # rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN) cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/$(USER_REFMAN) # Fix documentation paths + chmod -R u+w $(DESTDIR)$(htmldir)/$(USER_REFMAN) sed -i -e "s,$(abs_top_srcdir)/milena/doc,../milena,g" \ -e "s,$(abs_top_srcdir)/scribo/doc,../scribo,g" \ -e "s,$(abs_top_srcdir)/doc/$(USER_REFMAN)/html,$(DESTDIR)$(htmldir)/$(USER_REFMAN),g" \ -- 1.7.2.5

1 0

olena-2.0-469-g4440fda doc/Makefile.am: Fix permissions on documentation files.
by Guillaume Lazzara 10 Apr '13

10 Apr '13

--- ChangeLog | 4 ++++ doc/Makefile.am | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b1004e..ff27a41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Makefile.am: Fix permissions on documentation files. + +2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix path to other documentations. * doc/Makefile.am, diff --git a/doc/Makefile.am b/doc/Makefile.am index c328b77..5a8c483 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -211,6 +211,7 @@ install-data-local: # rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN) cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/$(USER_REFMAN) # Fix documentation paths + find $(DESTDIR)$(htmldir)/$(USER_REFMAN) -name '*.html' -exec chmod u+w {} \; sed -i -e "s,$(abs_top_srcdir)/milena/doc,../milena,g" \ -e "s,$(abs_top_srcdir)/scribo/doc,../scribo,g" \ -e "s,$(abs_top_srcdir)/doc/$(USER_REFMAN)/html,$(DESTDIR)$(htmldir)/$(USER_REFMAN),g" \ -- 1.7.2.5

1 0

olena-2.0-468-g731ab1a doc/Makefile.am: Fix permissions on documentation files.
by Guillaume Lazzara 10 Apr '13

10 Apr '13

--- scribo/ChangeLog | 4 ++++ scribo/doc/Makefile.am | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index dea2689..3e1afbe 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Makefile.am: Fix permissions on documentation files. + +2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix path to other documentations. * doc/Doxyfile.in, diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index 38f2d1d..ca773e6 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2011, 2013 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # @@ -235,6 +236,7 @@ install-data-local: cp -r $(srcdir)/$(USER_REFMAN)/html \ $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) ## Fix path to the main page of the documentation. + chmod -R u+w $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) sed -i -e "s,$(top_srcdir)/doc/$(USER_REFMAN)/html/,$(DESTDIR)$(htmldir)/$(USER_REFMAN)/,g" \ -e "s,$(top_srcdir)/milena/doc,$(DESTDIR)$(htmldir)/milena/$(USER_REFMAN),g" \ `find $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) -name '*.html'` -- 1.7.2.5

1 0

olena-2.0-468-gd560538 doc/Makefile.am: Fix permissions on documentation files.
by Guillaume Lazzara 10 Apr '13

10 Apr '13

--- scribo/ChangeLog | 4 ++++ scribo/doc/Makefile.am | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index dea2689..3e1afbe 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Makefile.am: Fix permissions on documentation files. + +2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix path to other documentations. * doc/Doxyfile.in, diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index 38f2d1d..cfb1c6c 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2011, 2013 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # @@ -235,6 +236,7 @@ install-data-local: cp -r $(srcdir)/$(USER_REFMAN)/html \ $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) ## Fix path to the main page of the documentation. + find $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) -name '*.html' -exec chmod u+w {} \; sed -i -e "s,$(top_srcdir)/doc/$(USER_REFMAN)/html/,$(DESTDIR)$(htmldir)/$(USER_REFMAN)/,g" \ -e "s,$(top_srcdir)/milena/doc,$(DESTDIR)$(htmldir)/milena/$(USER_REFMAN),g" \ `find $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) -name '*.html'` -- 1.7.2.5

1 0

olena-2.0-467-g375b4e6 doc/Makefile.am: Fix permissions on documentation files.
by Guillaume Lazzara 10 Apr '13

10 Apr '13

--- milena/ChangeLog | 4 ++++ milena/doc/Makefile.am | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8fe0c7b..efb3e12 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Makefile.am: Fix permissions on documentation files. + +2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Makefile.am: Disable user refman PDF compilation. 2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index cd33f63..c79945b 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -768,6 +768,7 @@ install-data-local: rm -rf $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN)/html cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) ## Fix path to the main page of the documentation. + chmod -R u+w $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) sed -i -e "s,\$(top_srcdir)/doc/$(USER_REFMAN)/html,$(DESTDIR)$(htmldir)/$(USER_REFMAN),g" \ `find $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) -name '*.html'` # Other HTML directories can be processed uniformly. -- 1.7.2.5

1 0

olena-2.0-467-g3634a0d doc/Makefile.am: Fix permissions on documentation files.
by Guillaume Lazzara 10 Apr '13

10 Apr '13

--- milena/ChangeLog | 4 ++++ milena/doc/Makefile.am | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8fe0c7b..efb3e12 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Makefile.am: Fix permissions on documentation files. + +2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Makefile.am: Disable user refman PDF compilation. 2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index cd33f63..b57d2b7 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -768,6 +768,7 @@ install-data-local: rm -rf $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN)/html cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) ## Fix path to the main page of the documentation. + find $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) -name '*.html' -exec chmod u+w {} \; sed -i -e "s,\$(top_srcdir)/doc/$(USER_REFMAN)/html,$(DESTDIR)$(htmldir)/$(USER_REFMAN),g" \ `find $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) -name '*.html'` # Other HTML directories can be processed uniformly. -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-466-g6487a9d
by git＠lrde.epita.fr 10 Apr '13

10 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch unstable/scribo has been updated via 6487a9dba1b813f2d50df08d397ec3080e0be7bb (commit) via 90aac13355f5f5518d291a41a81550471d75c97a (commit) via 5afba3842bb7cf3e22d63a13326e3907a4a9c972 (commit) via 4a0ee16f50566efb2180ae81764141bed236563b (commit) from a1c740d02538ff9dd3f68b07cd561c67af3cabdc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 6487a9d doc/Makefile.am: Disable user refman PDF compilation. 90aac13 Fix path to other documentations. 5afba38 doc/Makefile.am: Fix path to other documentations. 4a0ee16 Fix path to other documentations. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 8 ++++++++ doc/Makefile.am | 9 ++++++++- doc/header.html | 2 +- doc/mainpage.dox | 4 ++-- milena/ChangeLog | 8 ++++++++ milena/doc/Makefile.am | 40 +++++++++++++++++++++++++++------------- scribo/ChangeLog | 7 +++++++ scribo/doc/Doxyfile.in | 2 +- scribo/doc/Makefile.am | 9 +++++++-- 9 files changed, 69 insertions(+), 20 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-466-g6487a9d doc/Makefile.am: Disable user refman PDF compilation.
by Guillaume Lazzara 10 Apr '13

10 Apr '13

--- milena/ChangeLog | 4 ++++ milena/doc/Makefile.am | 28 +++++++++++++++++++--------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 018fe9c..8fe0c7b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Makefile.am: Disable user refman PDF compilation. + +2013-04-10 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/Makefile.am: Fix path to other documentations. 2013-04-04 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index bdeb86d..cd33f63 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -226,13 +226,19 @@ MAINTAINERCLEANFILES += $(DOXYFILE_USER) USER_REFMAN = user-refman + +# Disable PDF output since the file is too large to be processed +# correctly by latex with the default configuration. This file is also +# too large to be effectively usable by the user. + # PDF. -USER_REFMAN_PDF = user-refman.pdf -dist_pdf_DATA = $(srcdir)/$(USER_REFMAN_PDF) +#USER_REFMAN_PDF = user-refman.pdf +#dist_pdf_DATA = $(srcdir)/$(USER_REFMAN_PDF) +dist_pdf_DATA = -$(srcdir)/$(USER_REFMAN_PDF): $(srcdir)/$(USER_REFMAN) - cd $(srcdir)/$(USER_REFMAN)/latex && $(MAKE) $(AM_MAKEFLAGS) pdf - cp -f $(srcdir)/$(USER_REFMAN)/latex/refman.pdf $@ +#$(srcdir)/$(USER_REFMAN_PDF): $(srcdir)/$(USER_REFMAN) +# cd $(srcdir)/$(USER_REFMAN)/latex && $(MAKE) $(AM_MAKEFLAGS) pdf +# cp -f $(srcdir)/$(USER_REFMAN)/latex/refman.pdf $@ # HTML. EXTRA_DIST += $(srcdir)/user-refman.stamp @@ -309,14 +315,18 @@ MAINTAINERCLEANFILES += $(DOXYFILE_DEVEL) DEVEL_REFMAN = devel-refman +# Disable PDF output since the file is too large to be processed +# correctly by latex with the default configuration. This file is also +# too large to be effectively usable by the user. + # PDF. -DEVEL_REFMAN_PDF = devel-refman.pdf +#DEVEL_REFMAN_PDF = devel-refman.pdf # Be warned, most LaTeX installations will not be able to compile the # PDF development documentation as-is, as TeX's default memory # capacities are usually too small to handle such a large document. -$(srcdir)/$(DEVEL_REFMAN_PDF): $(srcdir)/$(DEVEL_REFMAN) - cd $(srcdir)/$(DEVEL_REFMAN)/latex && $(MAKE) $(AM_MAKEFLAGS) pdf - cp -f $(srcdir)/$(DEVEL_REFMAN)/latex/refman.pdf $@ +#$(srcdir)/$(DEVEL_REFMAN_PDF): $(srcdir)/$(DEVEL_REFMAN) +# cd $(srcdir)/$(DEVEL_REFMAN)/latex && $(MAKE) $(AM_MAKEFLAGS) pdf +# cp -f $(srcdir)/$(DEVEL_REFMAN)/latex/refman.pdf $@ # HTML. MAINTAINERCLEANFILES += $(srcdir)/devel-refman.stamp -- 1.7.2.5

1 0