mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-21 08:42:23 +00:00
Code Issues Releases Activity

graphics/frei0r*: Update to 1.7.0

Browse Source
This commit is contained in:
Jason E. Hale 2021-01-16 16:13:43 +00:00
parent 48f8860e32
commit 30d005addc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=561731
7 changed files with 25 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
graphics/frei0r/Makefile
View File

@ -2,8 +2,9 @@
# $FreeBSD$
PORTNAME= frei0r
PORTVERSION= 1.6.1
PORTVERSION= 1.7.0
DISTVERSIONPREFIX= plugins-
PORTREVISION?= 0
CATEGORIES= graphics
MASTER_SITES?= https://files.dyne.org/frei0r/releases/
@ -22,15 +23,13 @@ IGNORE= cannot build OpenCV and gavl plugins simultaneously
.endif
.if defined(BUILDING_FREI0R_OPENCV) || defined(BUILDING_FREI0R_GAVL)
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-frei0r-plugins \
${PATCHDIR}/extra-patch-src_filter_facedetect_CMakeLists.txt \
${PATCHDIR}/extra-patch-src_filter_facebl0r_facebl0r.cpp
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-frei0r-plugins
USES+= localbase
.endif
.if defined(BUILDING_FREI0R_OPENCV)
PORTREVISION= 1
PORTREVISION= 0
COMMENT= Frei0r OpenCV plugins
PKGNAMESUFFIX= -plugins-opencv
LIB_DEPENDS+= libopencv_core.so:graphics/opencv-core \

6
graphics/frei0r/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1518779363
SHA256 (frei0r-plugins-1.6.1.tar.gz) = e0c24630961195d9bd65aa8d43732469e8248e8918faa942cfb881769d11515e
SIZE (frei0r-plugins-1.6.1.tar.gz) = 1103969
TIMESTAMP = 1610463878
SHA256 (frei0r-plugins-1.7.0.tar.gz) = 1b1ff8f0f9bc23eed724e94e9a7c1d8f0244bfe33424bb4fe68e6460c088523a
SIZE (frei0r-plugins-1.7.0.tar.gz) = 1214323

10
graphics/frei0r/files/extra-patch-CMakeLists.txt
View File

@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2016-04-02 00:29:38 UTC
--- CMakeLists.txt.orig 2019-12-06 16:20:37 UTC
+++ CMakeLists.txt
@@ -48,7 +48,7 @@ INCLUDE( cmake/modules/TargetDistclean.c
@@ -41,7 +41,7 @@ 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)
@ -9,9 +9,9 @@
add_subdirectory (src)
# Generate frei0r.pc and install it.
@@ -57,4 +57,4 @@ set (exec_prefix "${CMAKE_INSTALL_PREFIX
set (libdir "${CMAKE_INSTALL_PREFIX}/lib")
@@ -50,4 +50,4 @@ 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 lib/pkgconfig)
-install (FILES "${CMAKE_CURRENT_BINARY_DIR}/frei0r.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+install (FILES "${CMAKE_CURRENT_BINARY_DIR}/frei0r.pc" DESTINATION libdata/pkgconfig)

17
graphics/frei0r/files/extra-patch-frei0r-plugins
View File

@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2017-05-31 05:57:25 UTC
--- CMakeLists.txt.orig 2019-12-06 16:20:37 UTC
+++ CMakeLists.txt
@@ -10,8 +10,6 @@ if (NOT WITHOUT_OPENCV)
@@ -11,8 +11,6 @@ if (NOT WITHOUT_OPENCV)
find_package (OpenCV)
endif ()
@ -9,7 +9,7 @@
include(FindPkgConfig)
option (WITHOUT_GAVL "Disable plugins dependent upon gavl" OFF)
if (PKG_CONFIG_FOUND AND NOT WITHOUT_GAVL)
@@ -45,16 +43,8 @@ set (FREI0R_1_1_DEF ${CMAKE_SOURCE_DIR}/msvc/frei0r_1_
@@ -38,16 +36,8 @@ set (FREI0R_1_1_DEF "${CMAKE_SOURCE_DIR}/msvc/frei0r_1
# --- custom targets: ---
INCLUDE( cmake/modules/TargetDistclean.cmake OPTIONAL)
@ -23,13 +23,13 @@
-# Generate frei0r.pc and install it.
set (prefix "${CMAKE_INSTALL_PREFIX}")
set (exec_prefix "${CMAKE_INSTALL_PREFIX}")
set (libdir "${CMAKE_INSTALL_PREFIX}/lib")
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 lib/pkgconfig)
--- src/filter/CMakeLists.txt.orig 2017-05-31 05:57:25 UTC
-install (FILES "${CMAKE_CURRENT_BINARY_DIR}/frei0r.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
--- src/filter/CMakeLists.txt.orig 2019-12-06 16:20:37 UTC
+++ src/filter/CMakeLists.txt
@@ -8,89 +8,3 @@ if (${OpenCV_FOUND})
@@ -8,92 +8,3 @@ if (${OpenCV_FOUND})
add_subdirectory (facebl0r)
add_subdirectory (facedetect)
endif (${OpenCV_FOUND})
@ -67,6 +67,7 @@
-add_subdirectory (distort0r)
-add_subdirectory (dither)
-add_subdirectory (edgeglow)
-add_subdirectory (elastic_scale)
-add_subdirectory (emboss)
-add_subdirectory (equaliz0r)
-add_subdirectory (flippo)
@ -90,10 +91,12 @@
-endif ()
-add_subdirectory (ndvi)
-add_subdirectory (nervous)
-add_subdirectory (normaliz0r)
-add_subdirectory (nosync0r)
-add_subdirectory (perspective)
-add_subdirectory (pixeliz0r)
-add_subdirectory (posterize)
-add_subdirectory (premultiply)
-add_subdirectory (primaries)
-add_subdirectory (RGB)
-add_subdirectory (rgbnoise)

10
graphics/frei0r/files/extra-patch-src_filter_facebl0r_facebl0r.cpp
View File

@ -1,10 +0,0 @@
--- src/filter/facebl0r/facebl0r.cpp.orig 2020-12-20 08:53:32 UTC
+++ src/filter/facebl0r/facebl0r.cpp
@@ -19,6 +19,7 @@
#include <stdlib.h>
#include <opencv/cv.h>
#include <opencv/highgui.h>
+#include <opencv2/imgproc.hpp>
#include <frei0r.hpp>
#include <frei0r_math.h>

15
graphics/frei0r/files/extra-patch-src_filter_facedetect_CMakeLists.txt
View File

@ -1,15 +0,0 @@
The facedetect plugin cannot be built with C++11:
frei0r-plugins-1.5.0/src/filter/facedetect/facedetect.cpp:271:15:
error: non-constant-expression cannot be narrowed from type 'int'
to 'double' in initializer list [-Wc++11-narrowing]
--- src/filter/facedetect/CMakeLists.txt.orig 2018-01-17 09:42:26 UTC
+++ src/filter/facedetect/CMakeLists.txt
@@ -11,5 +11,6 @@ LINK_LIBRARIES(${OpenCV_LIBS} ${OpenCV_LIBRARIES})
add_library (${TARGET} MODULE ${SOURCES})
set_target_properties (${TARGET} PROPERTIES PREFIX "")
+set_property(TARGET facedetect PROPERTY CXX_STANDARD 98)
install (TARGETS ${TARGET} LIBRARY DESTINATION ${LIBDIR})

3
graphics/frei0r/pkg-plist
View File

@ -52,6 +52,7 @@ 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/flippo.so
@ -80,6 +81,7 @@ 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
@ -90,6 +92,7 @@ lib/frei0r-1/plasma.so
lib/frei0r-1/posterize.so
lib/frei0r-1/pr0be.so
lib/frei0r-1/pr0file.so
lib/frei0r-1/premultiply.so
lib/frei0r-1/primaries.so
lib/frei0r-1/rgbnoise.so
lib/frei0r-1/rgbsplit0r.so