diff --git a/cmake-fix-png-include-dir.patch b/cmake-fix-png-include-dir.patch new file mode 100644 index 0000000..e40cd00 --- /dev/null +++ b/cmake-fix-png-include-dir.patch @@ -0,0 +1,22 @@ +Index: b/Modules/FindPNG.cmake +=================================================================== +--- a/Modules/FindPNG.cmake ++++ b/Modules/FindPNG.cmake +@@ -52,11 +52,15 @@ + find_package(ZLIB ${_FIND_ZLIB_ARG}) + + if(ZLIB_FOUND) +- find_path(PNG_PNG_INCLUDE_DIR png.h PATH_SUFFIXES include/libpng) ++ set(_PNG_VERSION_SUFFIXES 17 16 15 14 12) ++ foreach(v IN LISTS _PNG_VERSION_SUFFIXES) ++ list(APPEND _PNG_INCLUDE_SUFFIXES libpng${v}) ++ endforeach() ++ find_path(PNG_PNG_INCLUDE_DIR png.h PATH_SUFFIXES include/libpng ${_PNG_INCLUDE_SUFFIXES}) ++ unset(_PNG_INCLUDE_SUFFIXES) + + list(APPEND PNG_NAMES png libpng) + unset(PNG_NAMES_DEBUG) +- set(_PNG_VERSION_SUFFIXES 17 16 15 14 12) + if (PNG_FIND_VERSION MATCHES "^([0-9]+)\\.([0-9]+)(\\..*)?$") + set(_PNG_VERSION_SUFFIX_MIN "${CMAKE_MATCH_1}${CMAKE_MATCH_2}") + if (PNG_FIND_VERSION_EXACT) diff --git a/cmake.changes b/cmake.changes index f9bb519..50d36d6 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 17 20:53:02 UTC 2020 - Vitaly Yermolchyk + +- Add cmake-fix-png-include-dir.patch to fix the png include dir + search. + ------------------------------------------------------------------- Fri Apr 10 10:00:03 UTC 2020 - Andreas Stieger diff --git a/cmake.spec b/cmake.spec index 2acdc3c..1b58793 100644 --- a/cmake.spec +++ b/cmake.spec @@ -54,6 +54,7 @@ Source99: README.SUSE Patch0: cmake-fix-ruby-test.patch # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice Patch1: feature-suse-python-interp-search-order.patch +Patch2: cmake-fix-png-include-dir.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig