Accepting request 646975 from home:darix:branches:graphics

- added cmake-fixes.patch:
  - allow older cmake versions again to allow building on distros
    older than TW
  - install cmake modules into the proper path

- update to 2.4.1
  https://discuss.pixls.us/t/release-of-gmic-2-4-0/8093
  https://discuss.pixls.us/t/on-the-road-to-2-5-0/9413

OBS-URL: https://build.opensuse.org/request/show/646975
OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=14
This commit is contained in:
Dirk Stoecker 2018-11-07 14:40:48 +00:00 committed by Git OBS Bridge
parent 725e3cd6cc
commit 9df63a6533
6 changed files with 48 additions and 7 deletions

25
cmake-fixes.patch Normal file
View File

@ -0,0 +1,25 @@
Index: gmic-2.4.1/CMakeLists.txt
===================================================================
--- gmic-2.4.1.orig/CMakeLists.txt
+++ gmic-2.4.1/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.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)

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Nov 7 12:30:34 UTC 2018 - Marcus Rueckert <mrueckert@suse.de>
- added cmake-fixes.patch:
- allow older cmake versions again to allow building on distros
older than TW
- install cmake modules into the proper path
-------------------------------------------------------------------
Wed Nov 7 00:33:15 UTC 2018 - Marcus Rueckert <mrueckert@suse.de>
- update to 2.4.1
https://discuss.pixls.us/t/release-of-gmic-2-4-0/8093
https://discuss.pixls.us/t/on-the-road-to-2-5-0/9413
-------------------------------------------------------------------
Thu Aug 30 08:28:35 UTC 2018 - Andreas Schneider <asn@cryptomilk.org>

View File

@ -23,17 +23,17 @@
#define __builder ninja
Name: gmic
Version: 2.3.6
Version: 2.4.1
Release: 0
URL: https://gmic.eu
Source0: https://gmic.eu/files/source/gmic_%{version}.tar.gz
Source10: http://gmic.eu/gmic_reference.pdf
Patch: cmake-fixes.patch
Summary: GREYC's Magick for Image Computing (denoise and others)
License: CECILL-2.1
Group: Productivity/Graphics/Bitmap Editors
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: OpenEXR-devel
@ -277,5 +277,6 @@ popd
%defattr(-,root,root)
%{_includedir}/gmic.h
%{_libdir}/libgmic.so
%{_libdir}/cmake/gmic/
%changelog

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:86fe671879725863acecc207bdb86c4428635cd1a20d6043618864cf4c366113
size 3723069

3
gmic_2.4.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:446b465d2ff7314add634115f6bffecd136ad96759eb92f76c03f231f44188d6
size 3809170

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:988c6fff02a8105c89d9b3a9dda2c658645570537f6115683c3ea22321bdb28d
size 35833761
oid sha256:bb2d275f41fb79dadac34cad56b511e778a2f1073ef1eb630f24938116bd0fb5
size 63279425