aboutsummaryrefslogtreecommitdiff
path: root/graphics/frei0r
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/frei0r')
-rw-r--r--graphics/frei0r/Makefile8
-rw-r--r--graphics/frei0r/distinfo6
-rw-r--r--graphics/frei0r/files/patch-CMakeLists.txt20
-rw-r--r--graphics/frei0r/files/patch-src_filter_CMakeLists.txt8
-rw-r--r--graphics/frei0r/files/patch-src_filter_heatmap0r_CMakeLists.txt10
-rw-r--r--graphics/frei0r/files/patch-src_mixer2_CMakeLists.txt4
-rw-r--r--graphics/frei0r/pkg-plist9
-rw-r--r--graphics/frei0r/version.mk2
8 files changed, 42 insertions, 25 deletions
diff --git a/graphics/frei0r/Makefile b/graphics/frei0r/Makefile
index 2a5cace02dc4..51cd7385d34c 100644
--- a/graphics/frei0r/Makefile
+++ b/graphics/frei0r/Makefile
@@ -15,22 +15,22 @@ USES= cmake compiler:c++11-lang pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= dyne
-.if defined(SLAVE_PORT)
+.if defined(EXTRA_PLUGINS)
RUN_DEPENDS= frei0r>=${FREI0R_VERSION}:graphics/frei0r
-. if ${SLAVE_PORT:tl} == "cairo"
+. if ${EXTRA_PLUGINS:tl} == "cairo"
USES+= gnome
USE_GNOME+= cairo
CMAKE_ON= WITHOUT_GAVL \
WITHOUT_OPENCV
CMAKE_OFF= WITHOUT_CAIRO
-. elif ${SLAVE_PORT:tl} == "gavl"
+. elif ${EXTRA_PLUGINS:tl} == "gavl"
LIB_DEPENDS+= libgavl.so:multimedia/gavl
CMAKE_ON= WITHOUT_CAIRO \
WITHOUT_OPENCV
CMAKE_OFF= WITHOUT_GAVL
-. elif ${SLAVE_PORT:tl} == "opencv"
+. elif ${EXTRA_PLUGINS:tl} == "opencv"
LIB_DEPENDS+= libopencv_core.so:graphics/opencv
CMAKE_ON= WITHOUT_CAIRO \
diff --git a/graphics/frei0r/distinfo b/graphics/frei0r/distinfo
index 1b847f84c808..ad3a06785455 100644
--- a/graphics/frei0r/distinfo
+++ b/graphics/frei0r/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718180347
-SHA256 (dyne-frei0r-v2.3.3_GH0.tar.gz) = aeeefe3a9b44761b2cf110017d2b1dfa2ceeb873da96d283ba5157380c5d0ce5
-SIZE (dyne-frei0r-v2.3.3_GH0.tar.gz) = 921452
+TIMESTAMP = 1760584037
+SHA256 (dyne-frei0r-v2.5.0_GH0.tar.gz) = c511aeb51faeb0de2afe47327c30026d5b76ccc910a0b93d286029f07d29c656
+SIZE (dyne-frei0r-v2.5.0_GH0.tar.gz) = 939132
diff --git a/graphics/frei0r/files/patch-CMakeLists.txt b/graphics/frei0r/files/patch-CMakeLists.txt
index a3d9fadcc109..5b47386f10e6 100644
--- a/graphics/frei0r/files/patch-CMakeLists.txt
+++ b/graphics/frei0r/files/patch-CMakeLists.txt
@@ -1,15 +1,15 @@
- Fix VERSION.
-- Make plugins dependent upon cairo optional.
-- Add logic so slave ports can build without installing base files or plugins.
+- Make plugins that depend upon cairo optional.
+- Add logic so extra plugins can build without installing base components.
---- CMakeLists.txt.orig 2024-06-07 09:00:56 UTC
+--- CMakeLists.txt.orig 2025-09-03 14:34:34 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)
++set (VERSION 2.4.0)
include(GNUInstallDirs)
@@ -28,25 +28,23 @@
include(FindPkgConfig)
option (WITHOUT_GAVL "Disable plugins dependent upon gavl" OFF)
-@@ -35,18 +40,25 @@ INCLUDE( cmake/modules/TargetDistclean.cmake OPTIONAL)
+@@ -35,17 +40,24 @@ 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)
+-install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+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)
++ install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
# 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}")
diff --git a/graphics/frei0r/files/patch-src_filter_CMakeLists.txt b/graphics/frei0r/files/patch-src_filter_CMakeLists.txt
index e2e70420920e..b3de8938b99f 100644
--- a/graphics/frei0r/files/patch-src_filter_CMakeLists.txt
+++ b/graphics/frei0r/files/patch-src_filter_CMakeLists.txt
@@ -1,16 +1,16 @@
- Add logic so slave ports can build without installing base plugins.
---- src/filter/CMakeLists.txt.orig 2024-06-07 09:00:56 UTC
+--- src/filter/CMakeLists.txt.orig 2025-10-07 14:15:56 UTC
+++ src/filter/CMakeLists.txt
-@@ -14,6 +14,7 @@ endif (${Cairo_FOUND})
- add_subdirectory (cairogradient)
+@@ -15,6 +15,7 @@ endif (${Cairo_FOUND})
+ add_subdirectory (mirr0r)
endif (${Cairo_FOUND})
+if (NOT BUILD_EXTRA_PLUGINS)
add_subdirectory (3dflippo)
add_subdirectory (aech0r)
add_subdirectory (alpha0ps)
-@@ -99,3 +100,4 @@ add_subdirectory (vignette)
+@@ -102,3 +103,4 @@ add_subdirectory (vignette)
add_subdirectory (twolay0r)
add_subdirectory (vertigo)
add_subdirectory (vignette)
diff --git a/graphics/frei0r/files/patch-src_filter_heatmap0r_CMakeLists.txt b/graphics/frei0r/files/patch-src_filter_heatmap0r_CMakeLists.txt
new file mode 100644
index 000000000000..58f3c3557a18
--- /dev/null
+++ b/graphics/frei0r/files/patch-src_filter_heatmap0r_CMakeLists.txt
@@ -0,0 +1,10 @@
+Don't forget to install it!
+
+--- src/filter/heatmap0r/CMakeLists.txt.orig 2025-10-07 14:15:56 UTC
++++ src/filter/heatmap0r/CMakeLists.txt
+@@ -9,3 +9,5 @@ set_target_properties (${TARGET} PROPERTIES PREFIX "")
+
+ # No «lib» prefix (name.so instead of libname.so)
+ set_target_properties (${TARGET} PROPERTIES PREFIX "")
++
++install (TARGETS ${TARGET} LIBRARY DESTINATION ${LIBDIR})
diff --git a/graphics/frei0r/files/patch-src_mixer2_CMakeLists.txt b/graphics/frei0r/files/patch-src_mixer2_CMakeLists.txt
index d4e8f4cb0a0a..7b33c9b8bd1a 100644
--- a/graphics/frei0r/files/patch-src_mixer2_CMakeLists.txt
+++ b/graphics/frei0r/files/patch-src_mixer2_CMakeLists.txt
@@ -1,6 +1,6 @@
- Add logic so slave ports can build without installing base plugins.
---- src/mixer2/CMakeLists.txt.orig 2023-01-14 18:47:26 UTC
+--- src/mixer2/CMakeLists.txt.orig 2025-09-03 14:34:34 UTC
+++ src/mixer2/CMakeLists.txt
@@ -3,6 +3,7 @@ endif (${Cairo_FOUND})
add_subdirectory (cairoblend)
@@ -10,7 +10,7 @@
add_subdirectory (addition)
add_subdirectory (addition_alpha)
add_subdirectory (alphaatop)
-@@ -34,3 +35,4 @@ add_subdirectory (sleid0r)
+@@ -35,3 +36,4 @@ add_subdirectory (sleid0r)
add_subdirectory (value)
add_subdirectory (xfade0r)
add_subdirectory (sleid0r)
diff --git a/graphics/frei0r/pkg-plist b/graphics/frei0r/pkg-plist
index 6a6659c01952..57124bae10c0 100644
--- a/graphics/frei0r/pkg-plist
+++ b/graphics/frei0r/pkg-plist
@@ -1,4 +1,10 @@
include/frei0r.h
+include/frei0r.hpp
+include/frei0r/blur.h
+include/frei0r/cairo.h
+include/frei0r/cfc.h
+include/frei0r/colorspace.h
+include/frei0r/math.h
lib/frei0r-1/3dflippo.so
lib/frei0r-1/B.so
lib/frei0r-1/G.so
@@ -53,6 +59,7 @@ lib/frei0r-1/edgeglow.so
lib/frei0r-1/elastic_scale.so
lib/frei0r-1/emboss.so
lib/frei0r-1/equaliz0r.so
+lib/frei0r-1/euclid_eraser.so
lib/frei0r-1/filmgrain.so
lib/frei0r-1/flippo.so
lib/frei0r-1/gamma.so
@@ -62,6 +69,7 @@ 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/heatmap0r.so
lib/frei0r-1/hue.so
lib/frei0r-1/hueshift0r.so
lib/frei0r-1/invert0r.so
@@ -85,6 +93,7 @@ lib/frei0r-1/nervous.so
lib/frei0r-1/nois0r.so
lib/frei0r-1/normaliz0r.so
lib/frei0r-1/nosync0r.so
+lib/frei0r-1/ntsc.so
lib/frei0r-1/onecol0r.so
lib/frei0r-1/overlay.so
lib/frei0r-1/partik0l.so
diff --git a/graphics/frei0r/version.mk b/graphics/frei0r/version.mk
index e90ed7d077b8..de7ec6e8b8d6 100644
--- a/graphics/frei0r/version.mk
+++ b/graphics/frei0r/version.mk
@@ -1 +1 @@
-FREI0R_VERSION= 2.3.3
+FREI0R_VERSION= 2.5.0