git: 7cf6897c2a92 - main - graphics/frei0r*: Update to 2.4.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 04 Sep 2025 04:30:05 UTC
The branch main has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7cf6897c2a922e13940c70c2a9d8fc3d4ff2d853
commit 7cf6897c2a922e13940c70c2a9d8fc3d4ff2d853
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2025-09-04 04:18:52 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2025-09-04 04:29:57 +0000
graphics/frei0r*: Update to 2.4.0
Rename potentially offensive/insensitive variables in Makefiles.
https://github.com/dyne/frei0r/releases/tag/v2.4.0
---
graphics/frei0r-plugins-cairo/Makefile | 6 +++---
graphics/frei0r-plugins-cairo/pkg-plist | 1 +
graphics/frei0r-plugins-gavl/Makefile | 6 +++---
graphics/frei0r-plugins-opencv/Makefile | 8 ++++----
graphics/frei0r/Makefile | 8 ++++----
graphics/frei0r/distinfo | 6 +++---
graphics/frei0r/files/patch-CMakeLists.txt | 20 +++++++++-----------
.../frei0r/files/patch-src_filter_CMakeLists.txt | 8 ++++----
.../frei0r/files/patch-src_mixer2_CMakeLists.txt | 4 ++--
graphics/frei0r/pkg-plist | 8 ++++++++
graphics/frei0r/version.mk | 2 +-
11 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/graphics/frei0r-plugins-cairo/Makefile b/graphics/frei0r-plugins-cairo/Makefile
index 65bd9970e6f8..f6f725167722 100644
--- a/graphics/frei0r-plugins-cairo/Makefile
+++ b/graphics/frei0r-plugins-cairo/Makefile
@@ -1,11 +1,11 @@
PORTREVISION= 0
-PKGNAMESUFFIX= -plugins-${SLAVE_PORT:tl}
+PKGNAMESUFFIX= -plugins-${EXTRA_PLUGINS:tl}
-COMMENT= Frei0r ${SLAVE_PORT} plugins
+COMMENT= Frei0r ${EXTRA_PLUGINS} plugins
MASTERDIR= ${.CURDIR}/../frei0r
PLIST= ${.CURDIR}/pkg-plist
-SLAVE_PORT= cairo
+EXTRA_PLUGINS= cairo
.include "${MASTERDIR}/Makefile"
diff --git a/graphics/frei0r-plugins-cairo/pkg-plist b/graphics/frei0r-plugins-cairo/pkg-plist
index 01c4f99c20e5..b590a1f6ac22 100644
--- a/graphics/frei0r-plugins-cairo/pkg-plist
+++ b/graphics/frei0r-plugins-cairo/pkg-plist
@@ -2,3 +2,4 @@ lib/frei0r-1/cairoaffineblend.so
lib/frei0r-1/cairoblend.so
lib/frei0r-1/cairogradient.so
lib/frei0r-1/cairoimagegrid.so
+lib/frei0r-1/mirr0r.so
diff --git a/graphics/frei0r-plugins-gavl/Makefile b/graphics/frei0r-plugins-gavl/Makefile
index 84128a9dc03a..777909ec3c1e 100644
--- a/graphics/frei0r-plugins-gavl/Makefile
+++ b/graphics/frei0r-plugins-gavl/Makefile
@@ -1,11 +1,11 @@
PORTREVISION= 0
-PKGNAMESUFFIX= -plugins-${SLAVE_PORT:tl}
+PKGNAMESUFFIX= -plugins-${EXTRA_PLUGINS:tl}
-COMMENT= Frei0r ${SLAVE_PORT} plugins
+COMMENT= Frei0r ${EXTRA_PLUGINS} plugins
MASTERDIR= ${.CURDIR}/../frei0r
PLIST= ${.CURDIR}/pkg-plist
-SLAVE_PORT= gavl
+EXTRA_PLUGINS= gavl
.include "${MASTERDIR}/Makefile"
diff --git a/graphics/frei0r-plugins-opencv/Makefile b/graphics/frei0r-plugins-opencv/Makefile
index 5682aa685045..55f65ba70379 100644
--- a/graphics/frei0r-plugins-opencv/Makefile
+++ b/graphics/frei0r-plugins-opencv/Makefile
@@ -1,11 +1,11 @@
-PORTREVISION= 1
-PKGNAMESUFFIX= -plugins-${SLAVE_PORT:tl}
+PORTREVISION= 0
+PKGNAMESUFFIX= -plugins-${EXTRA_PLUGINS:tl}
-COMMENT= Frei0r ${SLAVE_PORT} plugins
+COMMENT= Frei0r ${EXTRA_PLUGINS} plugins
MASTERDIR= ${.CURDIR}/../frei0r
PLIST= ${.CURDIR}/pkg-plist
-SLAVE_PORT= OpenCV
+EXTRA_PLUGINS= OpenCV
.include "${MASTERDIR}/Makefile"
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..fbbd64e50389 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 = 1756953325
+SHA256 (dyne-frei0r-v2.4.0_GH0.tar.gz) = 6b3491ee65c775b251ecd0ba2cb86955ca2469de47c73718170442732cb9ce75
+SIZE (dyne-frei0r-v2.4.0_GH0.tar.gz) = 935395
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..2d6a3fd597e5 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-09-03 14:34:34 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)
+@@ -101,3 +102,4 @@ add_subdirectory (vignette)
add_subdirectory (twolay0r)
add_subdirectory (vertigo)
add_subdirectory (vignette)
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..43cd158e817b 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
@@ -85,6 +92,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..4857de20d005 100644
--- a/graphics/frei0r/version.mk
+++ b/graphics/frei0r/version.mk
@@ -1 +1 @@
-FREI0R_VERSION= 2.3.3
+FREI0R_VERSION= 2.4.0