Index: head/graphics/frei0r/Makefile =================================================================== --- head/graphics/frei0r/Makefile (revision 462007) +++ head/graphics/frei0r/Makefile (revision 462008) @@ -1,68 +1,69 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= frei0r -PORTVERSION= 1.5.0 +PORTVERSION= 1.6.1 DISTVERSIONPREFIX= plugins- CATEGORIES= graphics MASTER_SITES?= https://files.dyne.org/frei0r/releases/ MAINTAINER= jhale@FreeBSD.org COMMENT?= Minimalistic plugin API for video effects .if !defined(BUILDING_FREI0R_METAPORT) -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING.txt USES= cmake:outsource pkgconfig .if defined(BUILDING_FREI0R_OPENCV) && defined(BUILDING_FREI0R_GAVL) 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 USES+= localbase .endif .if defined(BUILDING_FREI0R_OPENCV) -PORTREVISION= 3 +PORTREVISION= 0 COMMENT= Frei0r OpenCV plugins PKGNAMESUFFIX= -plugins-opencv -LIB_DEPENDS+= libopencv_legacy.so:graphics/opencv +LIB_DEPENDS+= libopencv_core.so:graphics/opencv-core \ + libopencv_legacy.so:graphics/opencv FREI0R_PLUGINS= facebl0r facedetect CMAKE_ARGS+= -DWITHOUT_OPENCV:BOOL=OFF \ -DWITHOUT_GAVL:BOOL=ON .elif defined(BUILDING_FREI0R_GAVL) PORTREVISION= 0 COMMENT= Frei0r gavl plugins PKGNAMESUFFIX= -plugins-gavl LIB_DEPENDS+= libgavl.so:multimedia/gavl FREI0R_PLUGINS= rgbparade scale0tilt vectorscope CMAKE_ARGS+= -DWITHOUT_OPENCV:BOOL=ON \ -DWITHOUT_GAVL:BOOL=OFF .else EXTRA_PATCHES= ${PATCHDIR}/extra-patch-CMakeLists.txt USE_GNOME= cairo CMAKE_ARGS+= -DWITHOUT_OPENCV:BOOL=ON \ -DWITHOUT_GAVL:BOOL=ON .endif # !defined(BUILDING_FREI0R_OPENCV) && !defined(BUILDING_FREI0R_GAVL) .if defined(FREI0R_PLUGINS) PLIST= ${WRKSRC}/PLIST . for FILE in ${FREI0R_PLUGINS} PLIST_FILES+= lib/frei0r-1/${FILE}.so . endfor .endif .include .endif # !defined(BUILDING_FREI0R_METAPORT) Index: head/graphics/frei0r/distinfo =================================================================== --- head/graphics/frei0r/distinfo (revision 462007) +++ head/graphics/frei0r/distinfo (revision 462008) @@ -1,2 +1,3 @@ -SHA256 (frei0r-plugins-1.5.0.tar.gz) = 781cf84a6c2a9a3252f54d2967b57f6de75a31fc1684371e112638c981f72b60 -SIZE (frei0r-plugins-1.5.0.tar.gz) = 1519006 +TIMESTAMP = 1518779363 +SHA256 (frei0r-plugins-1.6.1.tar.gz) = e0c24630961195d9bd65aa8d43732469e8248e8918faa942cfb881769d11515e +SIZE (frei0r-plugins-1.6.1.tar.gz) = 1103969 Index: head/graphics/frei0r/files/extra-patch-frei0r-plugins =================================================================== --- head/graphics/frei0r/files/extra-patch-frei0r-plugins (revision 462007) +++ head/graphics/frei0r/files/extra-patch-frei0r-plugins (revision 462008) @@ -1,118 +1,121 @@ ---- CMakeLists.txt.orig 2016-04-02 00:29:38 UTC +--- CMakeLists.txt.orig 2017-05-31 05:57:25 UTC +++ CMakeLists.txt @@ -10,8 +10,6 @@ if (NOT WITHOUT_OPENCV) find_package (OpenCV) endif () -find_package (Cairo) - 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}/ +@@ -45,16 +43,8 @@ set (FREI0R_1_1_DEF ${CMAKE_SOURCE_DIR}/msvc/frei0r_1_ # --- 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) -- --add_subdirectory (doc) --add_subdirectory (src) +add_subdirectory (src/filter) +-add_subdirectory (doc) +-add_subdirectory (src) +- -# Generate frei0r.pc and install it. set (prefix "${CMAKE_INSTALL_PREFIX}") set (exec_prefix "${CMAKE_INSTALL_PREFIX}") set (libdir "${CMAKE_INSTALL_PREFIX}/lib") -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 2016-04-02 00:29:38 UTC +--- src/filter/CMakeLists.txt.orig 2017-05-31 05:57:25 UTC +++ src/filter/CMakeLists.txt -@@ -8,86 +8,3 @@ if (${OpenCV_FOUND}) +@@ -8,89 +8,3 @@ if (${OpenCV_FOUND}) add_subdirectory (facebl0r) add_subdirectory (facedetect) endif (${OpenCV_FOUND}) - -if (${Cairo_FOUND}) - add_subdirectory (cairoimagegrid) - add_subdirectory (cairogradient) -endif (${Cairo_FOUND}) - -add_subdirectory (3dflippo) -add_subdirectory (alpha0ps) -add_subdirectory (balanc0r) -add_subdirectory (baltan) -add_subdirectory (bluescreen0r) +-add_subdirectory (bgsubtract0r) -add_subdirectory (blur) -add_subdirectory (brightness) -add_subdirectory (bw0r) -add_subdirectory (cartoon) -add_subdirectory (cluster) -add_subdirectory (colgate) -add_subdirectory (coloradj) -add_subdirectory (colordistance) -add_subdirectory (colorize) -add_subdirectory (colorhalftone) -add_subdirectory (colortap) -add_subdirectory (contrast0r) -add_subdirectory (c0rners) -add_subdirectory (curves) -add_subdirectory (d90stairsteppingfix) -add_subdirectory (defish0r) -add_subdirectory (delay0r) -add_subdirectory (delaygrab) -add_subdirectory (denoise) -add_subdirectory (distort0r) -add_subdirectory (dither) -add_subdirectory (edgeglow) -add_subdirectory (emboss) -add_subdirectory (equaliz0r) -add_subdirectory (flippo) -add_subdirectory (gamma) -add_subdirectory (glow) +-add_subdirectory (glitch0r) -#add_subdirectory (host_param_test) -add_subdirectory (hueshift0r) -add_subdirectory (invert0r) -add_subdirectory (keyspillm0pup) -add_subdirectory (lenscorrection) -add_subdirectory (letterb0xed) -add_subdirectory (levels) -add_subdirectory (lightgraffiti) -add_subdirectory (luminance) -add_subdirectory (mask0mate) -add_subdirectory (medians) -if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - # clang 3.1 on OSX fails to compile this one - add_subdirectory (measure) -endif () -add_subdirectory (ndvi) -add_subdirectory (nervous) -add_subdirectory (nosync0r) -add_subdirectory (perspective) -add_subdirectory (pixeliz0r) -add_subdirectory (posterize) -add_subdirectory (primaries) -add_subdirectory (RGB) -add_subdirectory (rgbnoise) +-add_subdirectory (rgbsplit0r) -add_subdirectory (saturat0r) -add_subdirectory (scanline0r) -add_subdirectory (select0r) -add_subdirectory (sharpness) -add_subdirectory (sigmoidaltransfer) -add_subdirectory (sobel) -add_subdirectory (softglow) -add_subdirectory (sopsat) -add_subdirectory (spillsupress) -add_subdirectory (squareblur) -add_subdirectory (tehroxx0r) -add_subdirectory (three_point_balance) -add_subdirectory (threelay0r) -add_subdirectory (threshold0r) -add_subdirectory (timeout) -add_subdirectory (tint0r) -add_subdirectory (transparency) -add_subdirectory (tutorial) -add_subdirectory (twolay0r) -add_subdirectory (vertigo) -add_subdirectory (vignette) Index: head/graphics/frei0r/pkg-plist =================================================================== --- head/graphics/frei0r/pkg-plist (revision 462007) +++ head/graphics/frei0r/pkg-plist (revision 462008) @@ -1,126 +1,129 @@ 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/alpha0ps.so lib/frei0r-1/alphaatop.so lib/frei0r-1/alphagrad.so lib/frei0r-1/alphain.so lib/frei0r-1/alphainjection.so lib/frei0r-1/alphaout.so lib/frei0r-1/alphaover.so lib/frei0r-1/alphaspot.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/cairoaffineblend.so lib/frei0r-1/cairoblend.so lib/frei0r-1/cairogradient.so lib/frei0r-1/cairoimagegrid.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/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/emboss.so lib/frei0r-1/equaliz0r.so lib/frei0r-1/flippo.so lib/frei0r-1/gamma.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/hqdn3d.so lib/frei0r-1/hue.so lib/frei0r-1/hueshift0r.so lib/frei0r-1/invert0r.so lib/frei0r-1/ising0r.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/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/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/plasma.so lib/frei0r-1/posterize.so lib/frei0r-1/pr0be.so lib/frei0r-1/pr0file.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/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