diff --git a/cmake-fixes.patch b/cmake-fixes.patch index 7a83b44..771d01f 100644 --- a/cmake-fixes.patch +++ b/cmake-fixes.patch @@ -1,25 +1,13 @@ -Index: gmic-2.4.1/CMakeLists.txt +Index: gmic-2.4.5/CMakeLists.txt =================================================================== ---- gmic-2.4.1.orig/CMakeLists.txt -+++ gmic-2.4.1/CMakeLists.txt +--- gmic-2.4.5.orig/CMakeLists.txt ++++ gmic-2.4.5/CMakeLists.txt @@ -53,7 +53,7 @@ # knowledge of the CeCILL and CeCILL-C licenses and that you accept its terms. # --cmake_minimum_required(VERSION 3.12) +-cmake_minimum_required(VERSION 3.9) +cmake_minimum_required(VERSION 3.5) cmake_policy(SET CMP0046 OLD) if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR) -@@ -380,8 +380,8 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/ - configure_package_config_file( - ${CMAKE_CURRENT_BINARY_DIR}/GmicConfig.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/GmicConfig.cmake -- INSTALL_DESTINATION lib/cmake/gmic -+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/gmic - ) --install(EXPORT GmicTargets DESTINATION lib/cmake/gmic) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/GmicConfig.cmake DESTINATION lib/cmake/gmic) -+install(EXPORT GmicTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/gmic) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/GmicConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/gmic) - feature_summary(WHAT ALL) diff --git a/gmic.changes b/gmic.changes index 6221a4c..6ab6c0d 100644 --- a/gmic.changes +++ b/gmic.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Mar 14 17:17:41 UTC 2019 - Marcus Rueckert + +- update to 2.5.1 + https://discuss.pixls.us/t/release-of-gmic-2-5/9413 +- refresh cmake-fixes.patch: + only lowering of cmake version remains, all other changes are + upstream + ------------------------------------------------------------------- Wed Nov 7 12:30:34 UTC 2018 - Marcus Rueckert diff --git a/gmic.spec b/gmic.spec index 9d2155c..b8616e3 100644 --- a/gmic.spec +++ b/gmic.spec @@ -23,10 +23,10 @@ #define __builder ninja Name: gmic -Version: 2.4.1 +Version: 2.5.1 Release: 0 URL: https://gmic.eu - +# Git URL: https://framagit.org/dtschump/gmic Source0: https://gmic.eu/files/source/gmic_%{version}.tar.gz Source10: http://gmic.eu/gmic_reference.pdf Patch: cmake-fixes.patch @@ -52,6 +52,7 @@ BuildRequires: libtiff-devel BuildRequires: ninja BuildRequires: opencv-devel BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(eigen3) %description G'MIC is an open and full-featured framework for image processing, providing @@ -210,7 +211,7 @@ install -m 0644 build/resources/gmic_bashcompletion.sh %{buildroot}%{_sysconfdir # Film color lookup tables install -d -m 0755 %{buildroot}%{_gimpplugindir} -install -m 0644 resources/gmic_film_cluts.gmz %{buildroot}%{_gimpplugindir}/gmic_film_cluts.gmz +install -m 0644 resources/gmic_cluts.gmz %{buildroot}%{_gimpplugindir}/gmic_cluts.gmz # qt_gmic pushd gmic-qt @@ -260,7 +261,7 @@ popd #license gmic-qt/COPYING %doc gmic-qt/README.md %{_gimpplugindir}/gmic_gimp_qt -%{_gimpplugindir}/gmic_film_cluts.gmz +%{_gimpplugindir}/gmic_cluts.gmz %files -n krita-plugin-gmic %defattr(-,root,root) diff --git a/gmic_2.4.1.tar.gz b/gmic_2.4.1.tar.gz deleted file mode 100644 index 8285ff2..0000000 --- a/gmic_2.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:446b465d2ff7314add634115f6bffecd136ad96759eb92f76c03f231f44188d6 -size 3809170 diff --git a/gmic_2.5.1.tar.gz b/gmic_2.5.1.tar.gz new file mode 100644 index 0000000..a253878 --- /dev/null +++ b/gmic_2.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec36d5d43ba2be8ead7a39205f45614ff1a2e580c9df5109d54991f5c3e867f2 +size 5278477