Accepting request 632272 from home:gladiac:branches:graphics

- Update to gmic-2.3.6
  * New/improved filters (poissondisk, colorful blobs, pointcloud, ...).
  * Better interactivity with points on preview window.
  * A bunch of other bugfixes and small improvements.
- Removed gmic-2.3.0-add-cmake-for-qt.patch

OBS-URL: https://build.opensuse.org/request/show/632272
OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=13
This commit is contained in:
Ismail Dönmez 2018-08-30 10:01:04 +00:00 committed by Git OBS Bridge
parent 50ef62ac48
commit 725e3cd6cc
5 changed files with 15 additions and 216 deletions

View File

@ -1,208 +0,0 @@
Index: gmic-2.3.3/gmic-qt/cmake/modules/COPYING-CMAKE-SCRIPTS
===================================================================
--- /dev/null
+++ gmic-2.3.3/gmic-qt/cmake/modules/COPYING-CMAKE-SCRIPTS
@@ -0,0 +1,22 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Index: gmic-2.3.3/gmic-qt/cmake/modules/FindFFTW3.cmake
===================================================================
--- /dev/null
+++ gmic-2.3.3/gmic-qt/cmake/modules/FindFFTW3.cmake
@@ -0,0 +1,59 @@
+ # - Try to find the Fftw3 Library
+# Once done this will define
+#
+# FFTW3_FOUND - system has fftw3
+# FFTW3_INCLUDE_DIRS - the fftw3 include directories
+# FFTW3_LIBRARIES - the libraries needed to use fftw3
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+if (NOT WIN32)
+include(LibFindMacros)
+libfind_pkg_check_modules(FFTW3_PKGCONF fftw3>=3.2)
+
+find_path(FFTW3_INCLUDE_DIR
+ NAMES fftw3.h
+ HINTS ${FFTW3_PKGCONF_INCLUDE_DIRS} ${FFTW3_PKGCONF_INCLUDEDIR}
+ PATH_SUFFIXES fftw3
+)
+
+find_library(FFTW3_LIBRARY
+ NAMES fftw3
+ HINTS ${FFTW3_PKGCONF_LIBRARY_DIRS} ${FFTW3_PKGCONF_LIBDIR}
+)
+
+set(FFTW3_PROCESS_LIBS FFTW3_LIBRARY)
+set(FFTW3_PROCESS_INCLUDES FFTW3_INCLUDE_DIR)
+libfind_process(FFTW3)
+
+if(FFTW3_FOUND)
+ message(STATUS "FFTW Found Version: " ${FFTW_VERSION})
+endif()
+
+else()
+
+# TODO: Maybe use fftw3/FFTW3Config.cmake?
+
+find_path(FFTW3_INCLUDE_DIR
+ NAMES fftw3.h
+)
+
+
+find_library(
+ FFTW3_LIBRARY
+ NAMES libfftw3 libfftw3-3 libfftw3f-3 libfftw3l-3
+ DOC "Libraries to link against for FFT Support")
+
+if (FFTW3_LIBRARY)
+ set(FFTW3_LIBRARY_DIR ${FFTW3_LIBRARY})
+endif()
+
+set (FFTW3_LIBRARIES ${FFTW3_LIBRARY})
+
+if(FFTW3_INCLUDE_DIR AND FFTW3_LIBRARY_DIR)
+ set (FFTW3_FOUND true)
+ message(STATUS "Correctly found FFTW3")
+else()
+ message(STATUS "Could not find FFTW3")
+endif()
+endif()
Index: gmic-2.3.3/gmic-qt/cmake/modules/LibFindMacros.cmake
===================================================================
--- /dev/null
+++ gmic-2.3.3/gmic-qt/cmake/modules/LibFindMacros.cmake
@@ -0,0 +1,112 @@
+# Version 1.0 (2013-04-12)
+# Public Domain, originally written by Lasse Kärkkäinen <tronic@zi.fi>
+# Published at http://www.cmake.org/Wiki/CMake:How_To_Find_Libraries
+
+# If you improve the script, please modify the forementioned wiki page because
+# I no longer maintain my scripts (hosted as static files at zi.fi). Feel free
+# to remove this entire header if you use real version control instead.
+
+# Changelog:
+# 2013-04-12 Added version number (1.0) and this header, no other changes
+# 2009-10-08 Originally published
+
+
+# Works the same as find_package, but forwards the "REQUIRED" and "QUIET" arguments
+# used for the current package. For this to work, the first parameter must be the
+# prefix of the current package, then the prefix of the new package etc, which are
+# passed to find_package.
+macro (libfind_package PREFIX)
+ set (LIBFIND_PACKAGE_ARGS ${ARGN})
+ if (${PREFIX}_FIND_QUIETLY)
+ set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} QUIET)
+ endif ()
+ if (${PREFIX}_FIND_REQUIRED)
+ set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} REQUIRED)
+ endif ()
+ find_package(${LIBFIND_PACKAGE_ARGS})
+endmacro (libfind_package)
+
+# CMake developers made the UsePkgConfig system deprecated in the same release (2.6)
+# where they added pkg_check_modules. Consequently I need to support both in my scripts
+# to avoid those deprecated warnings. Here's a helper that does just that.
+# Works identically to pkg_check_modules, except that no checks are needed prior to use.
+macro (libfind_pkg_check_modules PREFIX PKGNAME)
+ if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+ include(UsePkgConfig)
+ pkgconfig(${PKGNAME} ${PREFIX}_INCLUDE_DIRS ${PREFIX}_LIBRARY_DIRS ${PREFIX}_LDFLAGS ${PREFIX}_CFLAGS)
+ else ()
+ find_package(PkgConfig)
+ if (PKG_CONFIG_FOUND)
+ pkg_check_modules(${PREFIX} QUIET ${PKGNAME})
+ endif ()
+ endif ()
+endmacro (libfind_pkg_check_modules)
+
+# Do the final processing once the paths have been detected.
+# If include dirs are needed, ${PREFIX}_PROCESS_INCLUDES should be set to contain
+# all the variables, each of which contain one include directory.
+# Ditto for ${PREFIX}_PROCESS_LIBS and library files.
+# Will set ${PREFIX}_FOUND, ${PREFIX}_INCLUDE_DIRS and ${PREFIX}_LIBRARIES.
+# Also handles errors in case library detection was required, etc.
+macro (libfind_process PREFIX)
+ # Skip processing if already processed during this run
+ if (NOT ${PREFIX}_FOUND)
+ # Start with the assumption that the library was found
+ set (${PREFIX}_FOUND TRUE)
+
+ # Process all includes and set _FOUND to false if any are missing
+ foreach (i ${${PREFIX}_PROCESS_INCLUDES})
+ if (${i})
+ set (${PREFIX}_INCLUDE_DIRS ${${PREFIX}_INCLUDE_DIRS} ${${i}})
+ mark_as_advanced(${i})
+ else ()
+ set (${PREFIX}_FOUND FALSE)
+ endif ()
+ endforeach (i)
+
+ # Process all libraries and set _FOUND to false if any are missing
+ foreach (i ${${PREFIX}_PROCESS_LIBS})
+ if (${i})
+ set (${PREFIX}_LIBRARIES ${${PREFIX}_LIBRARIES} ${${i}})
+ mark_as_advanced(${i})
+ else ()
+ set (${PREFIX}_FOUND FALSE)
+ endif ()
+ endforeach (i)
+
+ # Print message and/or exit on fatal error
+ if (${PREFIX}_FOUND)
+ if (NOT ${PREFIX}_FIND_QUIETLY)
+ message (STATUS "Found ${PREFIX} ${${PREFIX}_VERSION}")
+ endif ()
+ else ()
+ if (${PREFIX}_FIND_REQUIRED)
+ foreach (i ${${PREFIX}_PROCESS_INCLUDES} ${${PREFIX}_PROCESS_LIBS})
+ message("${i}=${${i}}")
+ endforeach (i)
+ message (FATAL_ERROR "Required library ${PREFIX} NOT FOUND.\nInstall the library (dev version) and try again. If the library is already installed, use ccmake to set the missing variables manually.")
+ endif ()
+ endif ()
+ endif ()
+endmacro (libfind_process)
+
+macro(libfind_library PREFIX basename)
+ set(TMP "")
+ if(MSVC80)
+ set(TMP -vc80)
+ endif()
+ if(MSVC90)
+ set(TMP -vc90)
+ endif()
+ set(${PREFIX}_LIBNAMES ${basename}${TMP})
+ if(${ARGC} GREATER 2)
+ set(${PREFIX}_LIBNAMES ${basename}${TMP}-${ARGV2})
+ string(REGEX REPLACE "\\." "_" TMP ${${PREFIX}_LIBNAMES})
+ set(${PREFIX}_LIBNAMES ${${PREFIX}_LIBNAMES} ${TMP})
+ endif()
+ find_library(${PREFIX}_LIBRARY
+ NAMES ${${PREFIX}_LIBNAMES}
+ PATHS ${${PREFIX}_PKGCONF_LIBRARY_DIRS}
+ )
+endmacro(libfind_library)
+

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Aug 30 08:28:35 UTC 2018 - Andreas Schneider <asn@cryptomilk.org>
- Update to gmic-2.3.6
* New/improved filters (poissondisk, colorful blobs, pointcloud, ...).
* Better interactivity with points on preview window.
* A bunch of other bugfixes and small improvements.
- Removed gmic-2.3.0-add-cmake-for-qt.patch
-------------------------------------------------------------------
Fri Aug 24 09:27:55 UTC 2018 - asn@cryptomilk.org

View File

@ -23,12 +23,11 @@
#define __builder ninja
Name: gmic
Version: 2.3.5
Version: 2.3.6
Release: 0
URL: https://gmic.eu
Source0: https://gmic.eu/files/source/gmic_%{version}.tar.gz
Patch: gmic-2.3.0-add-cmake-for-qt.patch
Source0: https://gmic.eu/files/source/gmic_%{version}.tar.gz
Source10: http://gmic.eu/gmic_reference.pdf
Summary: GREYC's Magick for Image Computing (denoise and others)
@ -153,8 +152,7 @@ manipulations on a video stream acquired from a webcam. In other words, ZArt is
a GUI for G'MIC real-time manipulations on the output of a webcam.
%prep
%setup
%patch -p1
%autosetup -p1
cp %{SOURCE10} .

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:57166757666cdcb2e968ae33426b4dcd5fb961d59dadd4effca5bf0f7ccf0162
size 3712461

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

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