gmic/gmic-make-build-without-gmic-cpp.patch

35 lines
1.1 KiB
Diff
Raw Normal View History

Accepting request 946946 from home:darix:playground - added https://github.com/dtschump/gmic/commit/56f7340ecb1fbbe6fce87d0a5c8d35dd13359577.patch make it search in /usr/share/gmic/ with all clients. - prepare gimp 3 support - install also the denoise data file - introduce a new gmic-data subpackage and require it from all the frontends so we can access it more easily once this is resolved: https://discuss.pixls.us/t/fixing-more-things-in-gmic-packaging/28894 - make bash-completion noarch - move shared options for all the gmic-qt versions into a define to reduce duplication - Rework patches: - drop old patches with git generated copies: - 5e34754707b78358ef818d542d1e81d008bb2d12.patch - dont-set-gmic_build.patch - gmic-krita5.patch - make-build-without-gmic-cpp.patch - new patches: - gmic-make-build-without-gmic-cpp.patch - gmic-qt-make-it-work-without-gmic-cpp.patch - krita5.patch - Update krita patch so we can apply it as normal patch without breaking other gmic-qt instances - Remove unneeded BuildRequires fftw3-devel and cmake(KF5CoreAddons) - Use simpler syntax for the pkg version comparison - enable building with Krita 5 new BR: krita-devel new patches: - 5e34754707b78358ef818d542d1e81d008bb2d12.patch - gmic-krita5.patch - Add dont-set-gmic_build.patch: Make gmic-qt flavors build without gmic.cpp. This should help with getting the new krita plugin built - enable opencv support xshm support - Add BuildRequires xorg-x11-devel - add missing files for to make the devel package work: make-build-without-gmic-cpp.patch - also track series for easier patching - Add Conflicts for krita >= 5 as it needs the intree version of gmic-qt now - Update to 3.0.1 https://discuss.pixls.us/t/on-the-road-to-3-1/28221 OBS-URL: https://build.opensuse.org/request/show/946946 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=65
2022-01-18 10:47:00 +01:00
Index: gmic-3.0.1/src/gmic.h
===================================================================
--- gmic-3.0.1.orig/src/gmic.h
+++ gmic-3.0.1/src/gmic.h
@@ -258,12 +258,12 @@ inline double gmic_mp_store(const Ts *co
#endif // #if cimg_OS==2
+#endif // #ifndef gmic_build
+
// Define some special character codes used for replacement in double quoted strings.
const char gmic_dollar = 23, gmic_lbrace = 24, gmic_rbrace = 25, gmic_comma = 26, gmic_dquote = 28,
gmic_store = 29; // <- this one is only used in variable names.
-#endif // #ifndef gmic_build
-
// Define main libgmic class 'gmic'.
//----------------------------------
#define gmic_image cimg_library::CImg
Index: gmic-3.0.1/CMakeLists.txt
===================================================================
--- gmic-3.0.1.orig/CMakeLists.txt
+++ gmic-3.0.1/CMakeLists.txt
@@ -165,7 +165,7 @@ if(BUILD_LIB)
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
)
- install(FILES src/gmic.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+ install(FILES src/gmic.h src/CImg.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
endif()