Hello community, here is the log from the commit of package enblend-enfuse for openSUSE:Factory checked in at 2018-07-09 13:27:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/enblend-enfuse (Old) and /work/SRC/openSUSE:Factory/.enblend-enfuse.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "enblend-enfuse" Mon Jul 9 13:27:25 2018 rev:34 rq:621063 version:4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/enblend-enfuse/enblend-enfuse.changes 2017-02-10 09:50:18.794911497 +0100 +++ /work/SRC/openSUSE:Factory/.enblend-enfuse.new/enblend-enfuse.changes 2018-07-09 13:27:27.490970826 +0200 @@ -1,0 +2,12 @@ +Tue Jun 19 10:43:30 UTC 2018 - a...@cryptomilk.org + +- Switched to cmake build + * Removed patch for autotools: enblend-latex-optional.patch +- Added enblend-enfuse-4.2-add-missing-cmakelists.patch +- Enabled support for OpenMP +- Enabled support for SSE2 +- Turn on optimizations again +- Info pages are no longer available +- Added PDF documentation for enblend and enfuse + +------------------------------------------------------------------- Old: ---- enblend-latex-optional.patch New: ---- _constraints enblend-enfuse-4.2-add-missing-cmakelists.patch enblend.pdf enfuse.pdf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enblend-enfuse.spec ++++++ --- /var/tmp/diff_new_pack.YUCJxt/_old 2018-07-09 13:27:28.138969431 +0200 +++ /var/tmp/diff_new_pack.YUCJxt/_new 2018-07-09 13:27:28.138969431 +0200 @@ -1,7 +1,7 @@ # # spec file for package enblend-enfuse # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,54 +16,64 @@ # -%define _build_doc 0 +# We use pregenerated documentation, as packages for rsvg-convert and hevea are +# not packaged yet. +%global _build_doc 0 + +#%%define __builder ninja Name: enblend-enfuse Url: http://enblend.sourceforge.net/ Summary: Tool for Composing Images -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Graphics/Other Version: 4.2 Release: 0 -Source: http://sourceforge.net/projects/enblend/files/%{name}/%{name}-4.2/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM enblend-latex-optional.patch sf#1565269 dims...@opensuse.org -- Make latex optional -Patch0: enblend-latex-optional.patch +Source0: http://sourceforge.net/projects/enblend/files/%{name}/%{name}-4.2/%{name}-%{version}.tar.gz + +Source10: enblend.pdf +Source11: enfuse.pdf + +# PATCH-FIX-UPSTREAM enblend-enfuse-4.2-add-missing-cmakelists.patch +Patch0: enblend-enfuse-4.2-add-missing-cmakelists.patch + BuildRequires: OpenEXR-devel -BuildRequires: automake -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel >= 1.55 -%endif +BuildRequires: cmake BuildRequires: freeglut-devel BuildRequires: gcc-c++ BuildRequires: glew-devel BuildRequires: gsl-devel BuildRequires: help2man BuildRequires: libICE-devel +BuildRequires: libboost_filesystem-devel +BuildRequires: libboost_headers-devel BuildRequires: libjpeg-devel BuildRequires: liblcms2-devel >= 2.5 BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: libxml2-tools -#BuildRequires: mathml-dtd +BuildRequires: opencl-headers BuildRequires: perl-TimeDate BuildRequires: pkg-config BuildRequires: plotutils-devel -BuildRequires: sed BuildRequires: vigra-devel + +# Documentation %if %{_build_doc} BuildRequires: ImageMagick BuildRequires: gnuplot +BuildRequires: graphviz +BuildRequires: help2man +BuildRequires: hevea +BuildRequires: m4 +BuildRequires: rsvg-convert BuildRequires: texinfo +BuildRequires: texlive-dvips-bin BuildRequires: texlive-latex-bin-bin BuildRequires: tidy BuildRequires: transfig -#BuildRequires: xhtml-dtd -%if 0%{?suse_version} > 1220 -BuildRequires: help2man -%endif %endif + Provides: enblend = %{version} Provides: enfuse = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -81,49 +91,55 @@ the opposite. These features must be blended across a wide transition zone because any sudden change in color is immediately noticeable. +%package doc +Summary: Usage Documentation for enblend and enfuse +Group: Documentation + +%description doc +PDF usage documentation for the enblend and enfuse command line tools. %prep %setup -q %patch0 -p1 -%build -ACLOCAL="aclocal -I m4" autoreconf -f -i -# The gcc 4.5 performs too poor compiling this package with -O2, can take days. -# gcc-4.7 still needs too much resources to build on x86_64 with -O2 and OBS virtual engine crashes after a hour. -export CFLAGS="$RPM_OPT_FLAGS -Os" -export CXXFLAGS="$RPM_OPT_FLAGS -Os" -%configure -# NO, do not use this here, it breaks the build due to lack of resources -#make %{?_smp_mflags} -make -# FIXME: We need xhtml-math-svg.dtd https://bugzilla.novell.com/show_bug.cgi?id=799075 -#make %{?_smp_mflags} xhtml - -%install -%makeinstall -#make install-xhtml DESTDIR=%{buildroot} +%if ! %{_build_doc} +cp %{SOURCE10} doc/ +cp %{SOURCE11} doc/ +%endif +%build +%cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DMARCHNATIVE=FALSE \ + -DMTUNENATIVE=FALSE \ + -DENABLE_OPENMP=ON \ +%ifarch x86_64 + -DENABLE_SSE2=ON \ +%endif %if %{_build_doc} -%post -%install_info --info-dir=%{_infodir} %{_infodir}/enblend.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/enfuse.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/enfuse-focus-stacking.info.gz - -%postun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/enblend.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/enfuse.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/enfuse-focus-stacking.info.gz + -DDOC=ON \ + -DINSTALL_PS_DOC=ON \ + -DINSTALL_PDF_DOC=ON \ %endif + || cat CMakeFiles/CMakeError.log + +%make_jobs + +%install +%cmake_install %files %defattr(-,root,root) -# ChangeLog does not contain anything useful -%doc AUTHORS COPYING NEWS README -%if %{_build_doc} -%doc doc/*.pdf -%doc %{_infodir}/*.* -%endif -%{_bindir}/* -%doc %{_mandir}/*/*.* +%license COPYING +%doc AUTHORS NEWS README + +%{_bindir}/enblend +%{_bindir}/enfuse +%{_mandir}/man1/* + +%files doc +%defattr(-,root,root) +%license COPYING +%doc doc/enblend.pdf doc/enfuse.pdf %changelog ++++++ _constraints ++++++ <!-- We build well with 2 CPUs/1.5GB, 3CPUs/2GB, 4CPUs/2.5GB--> <constraints> <hardware> <physicalmemory> <size unit="M">1920</size> </physicalmemory> <processors>3</processors> </hardware> </constraints> ++++++ enblend-enfuse-4.2-add-missing-cmakelists.patch ++++++ diff -Naur enblend-enfuse-4.2/src/dynamic_loader/CMakeLists.txt enblend-enfuse-4.2.new/src/dynamic_loader/CMakeLists.txt --- enblend-enfuse-4.2/src/dynamic_loader/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ enblend-enfuse-4.2.new/src/dynamic_loader/CMakeLists.txt 2016-04-27 10:12:20.701143343 +0200 @@ -0,0 +1,25 @@ +set(DYNAMIC_LOADER_FILES + dynamic_loader.h dynamic_loader.cc + dynamic_loader_implementation.h dynamic_loader_implementation.cc +) + +if(WIN32) + list(APPEND DYNAMIC_LOADER_FILES win32_implementation.h win32_implementation.cc) + add_definitions(-DWIN32_DL) + set(DL_DEFINITION -DWIN32_DL PARENT_SCOPE) +else() + if(HAVE_DL) + list(APPEND DYNAMIC_LOADER_FILES posix_implementation.h posix_implementation.cc) + add_definitions(-DPOSIX_DL) + set(DL_DEFINITION -DPOSIX_DL PARENT_SCOPE) + else() + if(HAVE_GMODULE) + list(APPEND DYNAMIC_LOADER_FILES gmodule_implementation.h gmodule_implementation.cc) + add_definitions(-DGMODULE_DL) + set(DL_DEFINITION -DGMODULE_DL PARENT_SCOPE) + else() + list(APPEND DYNAMIC_LOADER_FILES null_implementation.h) + endif() + endif() +endif() +add_library(dynamic_loader STATIC ${DYNAMIC_LOADER_FILES}) diff -Naur enblend-enfuse-4.2/src/layer_selection/CMakeLists.txt enblend-enfuse-4.2.new/src/layer_selection/CMakeLists.txt --- enblend-enfuse-4.2/src/layer_selection/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ enblend-enfuse-4.2.new/src/layer_selection/CMakeLists.txt 2016-04-27 10:12:55.735622446 +0200 @@ -0,0 +1,5 @@ +set(LAYER_SELECTION_FILES + info.h info.cc layer_selection.h layer_selection.cc + selector.h selector.cc +) +add_library(layer_selection STATIC ${LAYER_SELECTION_FILES})
