diff --git a/graphics/frei0r/distinfo b/graphics/frei0r/distinfo index ccf6cfbc90de..1b847f84c808 100644 --- a/graphics/frei0r/distinfo +++ b/graphics/frei0r/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1702503487 -SHA256 (dyne-frei0r-v2.3.2_GH0.tar.gz) = 304291e0ecb456a8b054fe04e14adc50ace54d0223b7b29165ff5343e820ef9d -SIZE (dyne-frei0r-v2.3.2_GH0.tar.gz) = 897297 +TIMESTAMP = 1718180347 +SHA256 (dyne-frei0r-v2.3.3_GH0.tar.gz) = aeeefe3a9b44761b2cf110017d2b1dfa2ceeb873da96d283ba5157380c5d0ce5 +SIZE (dyne-frei0r-v2.3.3_GH0.tar.gz) = 921452 diff --git a/graphics/frei0r/files/patch-CMakeLists.txt b/graphics/frei0r/files/patch-CMakeLists.txt index 40d194744292..a3d9fadcc109 100644 --- a/graphics/frei0r/files/patch-CMakeLists.txt +++ b/graphics/frei0r/files/patch-CMakeLists.txt @@ -1,59 +1,61 @@ - Fix VERSION. - Make plugins dependent upon cairo optional. - Add logic so slave ports can build without installing base files or plugins. ---- CMakeLists.txt.orig 2023-05-17 21:20:20 UTC +--- CMakeLists.txt.orig 2024-06-07 09:00:56 UTC +++ CMakeLists.txt @@ -3,16 +3,21 @@ project (frei0r) list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) project (frei0r) -set (VERSION 1.8) +set (VERSION 2.3) include(GNUInstallDirs) +option (BUILD_EXTRA_PLUGINS "Build plugins with optional dependencies" ON) + option (WITHOUT_OPENCV "Disable plugins dependent upon OpenCV" OFF) if (NOT WITHOUT_OPENCV) find_package (OpenCV) endif () -find_package (Cairo) +option (WITHOUT_CAIRO "Disable plugins dependent upon cairo" OFF) +if (NOT WITHOUT_CAIRO) + find_package (Cairo) +endif () include(FindPkgConfig) option (WITHOUT_GAVL "Disable plugins dependent upon gavl" OFF) -@@ -35,16 +40,22 @@ INCLUDE( cmake/modules/TargetDistclean.cmake OPTIONAL) +@@ -35,18 +40,25 @@ INCLUDE( cmake/modules/TargetDistclean.cmake OPTIONAL) # --- custom targets: --- INCLUDE( cmake/modules/TargetDistclean.cmake OPTIONAL) -# See this thread for a ridiculous discussion about the simple question how to install a header file with CMake: http://www.cmake.org/pipermail/cmake/2009-October/032874.html -install (DIRECTORY include DESTINATION . FILES_MATCHING PATTERN "frei0r.h" PATTERN "msvc" EXCLUDE) +if (NOT BUILD_EXTRA_PLUGINS) + # See this thread for a ridiculous discussion about the simple question how to install a header file with CMake: http://www.cmake.org/pipermail/cmake/2009-October/032874.html + install (DIRECTORY include DESTINATION . FILES_MATCHING PATTERN "frei0r.h" PATTERN "msvc" EXCLUDE) --add_subdirectory (doc) + # For code documentation run: doxygen doc/Doxyfile + # add_subdirectory (doc) + -add_subdirectory (src) + add_subdirectory (src) -+else () ++else() + add_subdirectory (src/filter) + add_subdirectory (src/mixer2) -+endif () ++endif() # Generate frei0r.pc and install it. set (prefix "${CMAKE_INSTALL_PREFIX}") set (exec_prefix "${CMAKE_INSTALL_PREFIX}") set (libdir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") set (includedir "${CMAKE_INSTALL_PREFIX}/include") -configure_file ("frei0r.pc.in" "frei0r.pc" @ONLY) -install (FILES "${CMAKE_CURRENT_BINARY_DIR}/frei0r.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +if (NOT BUILD_EXTRA_PLUGINS) + configure_file ("frei0r.pc.in" "frei0r.pc" @ONLY) + install (FILES "${CMAKE_CURRENT_BINARY_DIR}/frei0r.pc" DESTINATION "libdata/pkgconfig") +endif () diff --git a/graphics/frei0r/files/patch-src_filter_CMakeLists.txt b/graphics/frei0r/files/patch-src_filter_CMakeLists.txt index b3cbcd82e5d9..e2e70420920e 100644 --- a/graphics/frei0r/files/patch-src_filter_CMakeLists.txt +++ b/graphics/frei0r/files/patch-src_filter_CMakeLists.txt @@ -1,17 +1,17 @@ - Add logic so slave ports can build without installing base plugins. ---- src/filter/CMakeLists.txt.orig 2023-01-14 18:22:37 UTC +--- src/filter/CMakeLists.txt.orig 2024-06-07 09:00:56 UTC +++ src/filter/CMakeLists.txt @@ -14,6 +14,7 @@ endif (${Cairo_FOUND}) add_subdirectory (cairogradient) endif (${Cairo_FOUND}) +if (NOT BUILD_EXTRA_PLUGINS) add_subdirectory (3dflippo) add_subdirectory (aech0r) add_subdirectory (alpha0ps) -@@ -96,3 +97,4 @@ add_subdirectory (vignette) +@@ -99,3 +100,4 @@ add_subdirectory (vignette) add_subdirectory (twolay0r) add_subdirectory (vertigo) add_subdirectory (vignette) +endif () diff --git a/graphics/frei0r/pkg-plist b/graphics/frei0r/pkg-plist index c262ee062c87..6a6659c01952 100644 --- a/graphics/frei0r/pkg-plist +++ b/graphics/frei0r/pkg-plist @@ -1,147 +1,149 @@ include/frei0r.h lib/frei0r-1/3dflippo.so lib/frei0r-1/B.so lib/frei0r-1/G.so lib/frei0r-1/IIRblur.so lib/frei0r-1/R.so lib/frei0r-1/RGB.so lib/frei0r-1/addition.so lib/frei0r-1/addition_alpha.so lib/frei0r-1/aech0r.so lib/frei0r-1/alpha0ps_alpha0ps.so lib/frei0r-1/alpha0ps_alphagrad.so lib/frei0r-1/alpha0ps_alphaspot.so lib/frei0r-1/alphaatop.so lib/frei0r-1/alphain.so lib/frei0r-1/alphainjection.so lib/frei0r-1/alphaout.so lib/frei0r-1/alphaover.so lib/frei0r-1/alphaxor.so lib/frei0r-1/balanc0r.so lib/frei0r-1/baltan.so lib/frei0r-1/bgsubtract0r.so lib/frei0r-1/blend.so lib/frei0r-1/bluescreen0r.so lib/frei0r-1/brightness.so lib/frei0r-1/burn.so lib/frei0r-1/bw0r.so lib/frei0r-1/c0rners.so lib/frei0r-1/cartoon.so lib/frei0r-1/cluster.so lib/frei0r-1/colgate.so lib/frei0r-1/color_only.so lib/frei0r-1/coloradj_RGB.so lib/frei0r-1/colordistance.so lib/frei0r-1/colorhalftone.so lib/frei0r-1/colorize.so lib/frei0r-1/colortap.so lib/frei0r-1/composition.so lib/frei0r-1/contrast0r.so lib/frei0r-1/curves.so lib/frei0r-1/d90stairsteppingfix.so lib/frei0r-1/darken.so lib/frei0r-1/defish0r.so lib/frei0r-1/delay0r.so lib/frei0r-1/delaygrab.so lib/frei0r-1/denoise_hqdn3d.so lib/frei0r-1/difference.so lib/frei0r-1/distort0r.so lib/frei0r-1/dither.so lib/frei0r-1/divide.so lib/frei0r-1/dodge.so lib/frei0r-1/edgeglow.so lib/frei0r-1/elastic_scale.so lib/frei0r-1/emboss.so lib/frei0r-1/equaliz0r.so +lib/frei0r-1/filmgrain.so lib/frei0r-1/flippo.so lib/frei0r-1/gamma.so +lib/frei0r-1/gateweave.so lib/frei0r-1/glitch0r.so lib/frei0r-1/glow.so lib/frei0r-1/grain_extract.so lib/frei0r-1/grain_merge.so lib/frei0r-1/hardlight.so lib/frei0r-1/hue.so lib/frei0r-1/hueshift0r.so lib/frei0r-1/invert0r.so lib/frei0r-1/ising0r.so lib/frei0r-1/kaleid0sc0pe.so lib/frei0r-1/keyspillm0pup.so lib/frei0r-1/lenscorrection.so lib/frei0r-1/letterb0xed.so lib/frei0r-1/levels.so lib/frei0r-1/lighten.so lib/frei0r-1/lightgraffiti.so lib/frei0r-1/lissajous0r.so lib/frei0r-1/luminance.so lib/frei0r-1/mask0mate.so lib/frei0r-1/measure_pr0be.so lib/frei0r-1/measure_pr0file.so lib/frei0r-1/medians.so lib/frei0r-1/multiply.so lib/frei0r-1/ndvi.so lib/frei0r-1/nervous.so lib/frei0r-1/nois0r.so lib/frei0r-1/normaliz0r.so lib/frei0r-1/nosync0r.so lib/frei0r-1/onecol0r.so lib/frei0r-1/overlay.so lib/frei0r-1/partik0l.so lib/frei0r-1/perspective.so lib/frei0r-1/pixeliz0r.so lib/frei0r-1/pixs0r.so lib/frei0r-1/plasma.so lib/frei0r-1/posterize.so lib/frei0r-1/premultiply.so lib/frei0r-1/primaries.so lib/frei0r-1/rgbnoise.so lib/frei0r-1/rgbsplit0r.so lib/frei0r-1/saturat0r.so lib/frei0r-1/saturation.so lib/frei0r-1/scanline0r.so lib/frei0r-1/screen.so lib/frei0r-1/select0r.so lib/frei0r-1/sharpness.so lib/frei0r-1/sigmoidaltransfer.so lib/frei0r-1/sleid0r_push-down.so lib/frei0r-1/sleid0r_push-left.so lib/frei0r-1/sleid0r_push-right.so lib/frei0r-1/sleid0r_push-up.so lib/frei0r-1/sleid0r_slide-down.so lib/frei0r-1/sleid0r_slide-left.so lib/frei0r-1/sleid0r_slide-right.so lib/frei0r-1/sleid0r_slide-up.so lib/frei0r-1/sleid0r_wipe-barn-door-h.so lib/frei0r-1/sleid0r_wipe-barn-door-v.so lib/frei0r-1/sleid0r_wipe-circle.so lib/frei0r-1/sleid0r_wipe-down.so lib/frei0r-1/sleid0r_wipe-left.so lib/frei0r-1/sleid0r_wipe-rect.so lib/frei0r-1/sleid0r_wipe-right.so lib/frei0r-1/sleid0r_wipe-up.so lib/frei0r-1/sobel.so lib/frei0r-1/softglow.so lib/frei0r-1/softlight.so lib/frei0r-1/sopsat.so lib/frei0r-1/spillsupress.so lib/frei0r-1/squareblur.so lib/frei0r-1/subtract.so lib/frei0r-1/tehroxx0r.so lib/frei0r-1/test_pat_B.so lib/frei0r-1/test_pat_C.so lib/frei0r-1/test_pat_G.so lib/frei0r-1/test_pat_I.so lib/frei0r-1/test_pat_L.so lib/frei0r-1/test_pat_R.so lib/frei0r-1/three_point_balance.so lib/frei0r-1/threelay0r.so lib/frei0r-1/threshold0r.so lib/frei0r-1/timeout.so lib/frei0r-1/tint0r.so lib/frei0r-1/transparency.so lib/frei0r-1/twolay0r.so lib/frei0r-1/uvmap.so lib/frei0r-1/value.so lib/frei0r-1/vertigo.so lib/frei0r-1/vignette.so lib/frei0r-1/xfade0r.so libdata/pkgconfig/frei0r.pc diff --git a/graphics/frei0r/version.mk b/graphics/frei0r/version.mk index 65647102e758..e90ed7d077b8 100644 --- a/graphics/frei0r/version.mk +++ b/graphics/frei0r/version.mk @@ -1 +1 @@ -FREI0R_VERSION= 2.3.2 +FREI0R_VERSION= 2.3.3