diff --git a/graphics/frei0r/Makefile b/graphics/frei0r/Makefile index 51cd7385d34c..d24fdea64334 100644 --- a/graphics/frei0r/Makefile +++ b/graphics/frei0r/Makefile @@ -1,57 +1,48 @@ PORTNAME= frei0r DISTVERSIONPREFIX= v DISTVERSION= ${FREI0R_VERSION} PORTREVISION?= 0 CATEGORIES= graphics MAINTAINER= jhale@FreeBSD.org COMMENT?= Minimalistic plugin API for video effects WWW= https://frei0r.dyne.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING USES= cmake compiler:c++11-lang pkgconfig USE_GITHUB= yes GH_ACCOUNT= dyne .if defined(EXTRA_PLUGINS) RUN_DEPENDS= frei0r>=${FREI0R_VERSION}:graphics/frei0r . if ${EXTRA_PLUGINS:tl} == "cairo" USES+= gnome USE_GNOME+= cairo CMAKE_ON= WITHOUT_GAVL \ WITHOUT_OPENCV CMAKE_OFF= WITHOUT_CAIRO . elif ${EXTRA_PLUGINS:tl} == "gavl" LIB_DEPENDS+= libgavl.so:multimedia/gavl CMAKE_ON= WITHOUT_CAIRO \ WITHOUT_OPENCV CMAKE_OFF= WITHOUT_GAVL . elif ${EXTRA_PLUGINS:tl} == "opencv" LIB_DEPENDS+= libopencv_core.so:graphics/opencv CMAKE_ON= WITHOUT_CAIRO \ WITHOUT_GAVL CMAKE_OFF= WITHOUT_OPENCV . endif .else CMAKE_ON= WITHOUT_CAIRO \ WITHOUT_GAVL \ WITHOUT_OPENCV CMAKE_OFF= BUILD_EXTRA_PLUGINS .endif .include "version.mk" -.include - -.if ${CHOSEN_COMPILER_TYPE} == gcc -# work around regression seen in GCC 10 but not in GCC 9: -# src/filter/elastic_scale/elastic_scale.cpp:152: error: ISO C++ forbids initialization of member 'm_transformationCalculations' -CFLAGS+= -Wno-error -CXXFLAGS+= -Wno-error -.endif - -.include +.include diff --git a/graphics/frei0r/distinfo b/graphics/frei0r/distinfo index ad3a06785455..0743cb4c9cce 100644 --- a/graphics/frei0r/distinfo +++ b/graphics/frei0r/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1760584037 -SHA256 (dyne-frei0r-v2.5.0_GH0.tar.gz) = c511aeb51faeb0de2afe47327c30026d5b76ccc910a0b93d286029f07d29c656 -SIZE (dyne-frei0r-v2.5.0_GH0.tar.gz) = 939132 +TIMESTAMP = 1767253601 +SHA256 (dyne-frei0r-v2.5.1_GH0.tar.gz) = 318ec4a3042c94a00a58fccdc1eb0d911f36a22beb3504d27aefcca4598f40b0 +SIZE (dyne-frei0r-v2.5.1_GH0.tar.gz) = 942271 diff --git a/graphics/frei0r/files/patch-CMakeLists.txt b/graphics/frei0r/files/patch-CMakeLists.txt index 5b47386f10e6..66509e8b3364 100644 --- a/graphics/frei0r/files/patch-CMakeLists.txt +++ b/graphics/frei0r/files/patch-CMakeLists.txt @@ -1,59 +1,56 @@ - Fix VERSION. - Make plugins that depend upon cairo optional. - Add logic so extra plugins can build without installing base components. ---- CMakeLists.txt.orig 2025-09-03 14:34:34 UTC +--- CMakeLists.txt.orig 2025-12-02 16:23:47 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.4.0) +@@ -7,6 +7,8 @@ include(GNUInstallDirs) 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) + option (WITHOUT_FACERECOGNITION "Disable facedetect plugin to avoid protobuf conflicts" OFF) + +@@ -14,7 +16,10 @@ endif () 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,17 +40,24 @@ INCLUDE( cmake/modules/TargetDistclean.cmake OPTIONAL) +@@ -37,17 +42,24 @@ INCLUDE( cmake/modules/TargetDistclean.cmake OPTIONAL) # --- custom targets: --- INCLUDE( cmake/modules/TargetDistclean.cmake OPTIONAL) -install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +if (NOT BUILD_EXTRA_PLUGINS) + 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 () + add_subdirectory (src/filter) + add_subdirectory (src/mixer2) +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 b3de8938b99f..a0a796ae6499 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. +- Add logic so extra plugins can build without installing base components. ---- src/filter/CMakeLists.txt.orig 2025-10-07 14:15:56 UTC +--- src/filter/CMakeLists.txt.orig 2025-12-02 16:23:47 UTC +++ src/filter/CMakeLists.txt @@ -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) -@@ -102,3 +103,4 @@ add_subdirectory (vignette) +@@ -103,3 +104,4 @@ add_subdirectory (vignette) add_subdirectory (twolay0r) add_subdirectory (vertigo) add_subdirectory (vignette) +endif () diff --git a/graphics/frei0r/files/patch-src_filter_heatmap0r_CMakeLists.txt b/graphics/frei0r/files/patch-src_filter_heatmap0r_CMakeLists.txt deleted file mode 100644 index 58f3c3557a18..000000000000 --- a/graphics/frei0r/files/patch-src_filter_heatmap0r_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -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 7b33c9b8bd1a..1a75538ee149 100644 --- a/graphics/frei0r/files/patch-src_mixer2_CMakeLists.txt +++ b/graphics/frei0r/files/patch-src_mixer2_CMakeLists.txt @@ -1,17 +1,17 @@ -- Add logic so slave ports can build without installing base plugins. +- Add logic so extra plugins can build without installing base components. --- 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) endif (${Cairo_FOUND}) +if (NOT BUILD_EXTRA_PLUGINS) add_subdirectory (addition) add_subdirectory (addition_alpha) add_subdirectory (alphaatop) @@ -35,3 +36,4 @@ add_subdirectory (sleid0r) add_subdirectory (value) add_subdirectory (xfade0r) add_subdirectory (sleid0r) +endif () diff --git a/graphics/frei0r/version.mk b/graphics/frei0r/version.mk index de7ec6e8b8d6..7d58d6721389 100644 --- a/graphics/frei0r/version.mk +++ b/graphics/frei0r/version.mk @@ -1 +1 @@ -FREI0R_VERSION= 2.5.0 +FREI0R_VERSION= 2.5.1