Date: Tue, 26 Jul 2016 19:03:57 +0000 (UTC) From: Olivier Duchateau <olivierd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419145 - in head/graphics: frei0r frei0r-plugins frei0r/files Message-ID: <201607261903.u6QJ3v84017934@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivierd Date: Tue Jul 26 19:03:57 2016 New Revision: 419145 URL: https://svnweb.freebsd.org/changeset/ports/419145 Log: - graphics/frei0r [2] * Update to 1.5.0 * Update MASTER_SITES * Switch to CMake, rewrite some parts of graphics/frei0r's Makefile and patches * Remove APIDOC, DOCS and MMX options (MMX is not available in CMakeLists.txt) - graphics/frei0r-plugins * Switch to USES= metaport [1] PR: (based on) 201636 [1], 209291 [2] Submitted by: Andriy Voskoboinyk [1], myself [2] Approved by: jhale@ (maintainer, timeout > 2 months) Added: head/graphics/frei0r/files/extra-patch-CMakeLists.txt (contents, props changed) head/graphics/frei0r/files/extra-patch-frei0r-plugins (contents, props changed) Deleted: head/graphics/frei0r/files/patch-doc__Makefile.in Modified: head/graphics/frei0r-plugins/Makefile head/graphics/frei0r/Makefile head/graphics/frei0r/distinfo head/graphics/frei0r/pkg-plist Modified: head/graphics/frei0r-plugins/Makefile ============================================================================== --- head/graphics/frei0r-plugins/Makefile Tue Jul 26 18:57:23 2016 (r419144) +++ head/graphics/frei0r-plugins/Makefile Tue Jul 26 19:03:57 2016 (r419145) @@ -2,40 +2,25 @@ PORTREVISION= 0 PKGNAMESUFFIX= -plugins -MASTER_SITES= # empty -DISTFILES= # empty -EXTRACT_ONLY= # empty COMMENT= Frei0r meta-port RUN_DEPENDS= ${LOCALBASE}/include/frei0r.h:graphics/frei0r +USES= metaport + MASTERDIR= ${.CURDIR}/../frei0r -NO_BUILD= yes PLIST= ${WRKDIR}/PLIST - BUILDING_FREI0R_METAPORT= yes OPTIONS_DEFINE= GAVL OPENCV OPTIONS_DEFAULT= GAVL OPENCV GAVL_DESC= Install gavl plugins +GAVL_RUN_DEPENDS= ${LOCALBASE}/lib/frei0r-1/rgbparade.so:graphics/frei0r-plugins-gavl OPENCV_DESC= Install OpenCV plugins -PATCHDIR= ${.CURDIR}/files +OPENCV_RUN_DEPENDS= ${LOCALBASE}/lib/frei0r-1/facedetect.so:graphics/frei0r-plugins-opencv .include "${MASTERDIR}/Makefile" -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MGAVL} -RUN_DEPENDS+= ${LOCALBASE}/lib/frei0r-1/rgbparade.so:graphics/frei0r-plugins-gavl -.endif - -.if ${PORT_OPTIONS:MOPENCV} -RUN_DEPENDS+= ${LOCALBASE}/lib/frei0r-1/facedetect.so:graphics/frei0r-plugins-opencv -.endif - -do-install: - @${DO_NADA} - .include <bsd.port.mk> Modified: head/graphics/frei0r/Makefile ============================================================================== --- head/graphics/frei0r/Makefile Tue Jul 26 18:57:23 2016 (r419144) +++ head/graphics/frei0r/Makefile Tue Jul 26 19:03:57 2016 (r419145) @@ -2,105 +2,66 @@ # $FreeBSD$ PORTNAME= frei0r -PORTVERSION= 1.3 +PORTVERSION= 1.5.0 DISTVERSIONPREFIX= plugins- -PORTREVISION?= 1 CATEGORIES= graphics -MASTER_SITES?= http://piksel.no/${PORTNAME}/releases/ \ - ftp://ftp.dyne.org/${PORTNAME}/releases/ \ - http://distfiles.macports.org/${PORTNAME}-plugins/ +MASTER_SITES?= https://files.dyne.org/frei0r/releases/ MAINTAINER= jhale@FreeBSD.org COMMENT?= Minimalistic plugin API for video effects .if !defined(BUILDING_FREI0R_METAPORT) -GNU_CONFIGURE= yes -USES= pathfix pkgconfig LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +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 + +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 FREI0R_PLUGINS= facebl0r facedetect + +CMAKE_ARGS+= -DWITHOUT_OPENCV:BOOL=OFF \ + -DWITHOUT_GAVL:BOOL=ON .elif defined(BUILDING_FREI0R_GAVL) -PORTREVISION= 2 +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 -PORTDOCS= * +USE_GNOME= cairo -OPTIONS_DEFINE= APIDOC DOCS -OPTIONS_DEFINE_amd64= MMX -APIDOC_DESC= Install full documentation (requires doxygen) -MMX_DESC= MMX CPU instructions - -.include <bsd.port.options.mk> - -. if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MAPIDOC} -BUILD_DEPENDS+= doxygen:devel/doxygen -. endif +CMAKE_ARGS+= -DWITHOUT_OPENCV:BOOL=ON \ + -DWITHOUT_GAVL:BOOL=ON .endif # !defined(BUILDING_FREI0R_OPENCV) && !defined(BUILDING_FREI0R_GAVL) .if defined(FREI0R_PLUGINS) -CPPFLAGS+= "-I${LOCALBASE}/include" -LDFLAGS+= -L${LOCALBASE}/lib -PLIST= ${WRKSRC}/PLIST -ALL_TARGET= -BUILD_WRKSRC= ${WRKSRC}/src +PLIST= ${WRKSRC}/PLIST . for FILE in ${FREI0R_PLUGINS} -ALL_TARGET+= ${FILE}.la PLIST_FILES+= lib/frei0r-1/${FILE}.so . endfor .endif -post-patch: -.if !defined(BUILDING_FREI0R_GAVL) - @${REINPLACE_CMD} -e 's/HAVE_GAVL=true/HAVE_GAVL=false/g' \ - ${WRKSRC}/configure -.endif -.if !defined(BUILDING_FREI0R_OPENCV) - @${REINPLACE_CMD} -e 's/HAVE_OPENCV=true/HAVE_OPENCV=false/g' \ - ${WRKSRC}/configure -.endif -.if !defined(FREI0R_PLUGINS) -. if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MAPIDOC} - @${REINPLACE_CMD} -e '/^SUBDIRS/s|include|include doc|' ${WRKSRC}/Makefile.in -. endif -. if ! ${PORT_OPTIONS:MDOCS} - @${REINPLACE_CMD} -e '/^install-data-am/s| install-docsDATA||' \ - ${WRKSRC}/Makefile.in -. endif - @${REINPLACE_CMD} -e 's|^docsdir.*|docsdir = ${DOCSDIR}|' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|^htmldocsdir.*|htmldocsdir = ${DOCSDIR}|' \ - ${WRKSRC}/doc/Makefile.in -.else -do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/frei0r-1 -. for FILE in ${FREI0R_PLUGINS} - @${INSTALL_LIB} ${BUILD_WRKSRC}/.libs/${FILE}.so \ - ${STAGEDIR}${PREFIX}/lib/frei0r-1/${FILE}.so -. endfor -.endif #!defined(FREI0R_PLUGINS) - -pre-build: - @${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in \ - ${WRKSRC}/configure ${WRKSRC}/config.h.in - .include <bsd.port.mk> .endif # !defined(BUILDING_FREI0R_METAPORT) Modified: head/graphics/frei0r/distinfo ============================================================================== --- head/graphics/frei0r/distinfo Tue Jul 26 18:57:23 2016 (r419144) +++ head/graphics/frei0r/distinfo Tue Jul 26 19:03:57 2016 (r419145) @@ -1,2 +1,2 @@ -SHA256 (frei0r-plugins-1.3.tar.gz) = b25da901115aa7f960cf5e541057266fddf132a7521d628e6cb344c9f16c0236 -SIZE (frei0r-plugins-1.3.tar.gz) = 1092809 +SHA256 (frei0r-plugins-1.5.0.tar.gz) = 781cf84a6c2a9a3252f54d2967b57f6de75a31fc1684371e112638c981f72b60 +SIZE (frei0r-plugins-1.5.0.tar.gz) = 1519006 Added: head/graphics/frei0r/files/extra-patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/frei0r/files/extra-patch-CMakeLists.txt Tue Jul 26 19:03:57 2016 (r419145) @@ -0,0 +1,17 @@ +--- CMakeLists.txt.orig 2016-04-02 00:29:38 UTC ++++ CMakeLists.txt +@@ -48,7 +48,7 @@ INCLUDE( cmake/modules/TargetDistclean.c + # 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 (doc) + 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") + 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 libdata/pkgconfig) Added: head/graphics/frei0r/files/extra-patch-frei0r-plugins ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/frei0r/files/extra-patch-frei0r-plugins Tue Jul 26 19:03:57 2016 (r419145) @@ -0,0 +1,118 @@ +--- CMakeLists.txt.orig 2016-04-02 00:29:38 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}/ + # --- 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) + +-# 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 +@@ -8,86 +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 (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 (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 (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) Modified: head/graphics/frei0r/pkg-plist ============================================================================== --- head/graphics/frei0r/pkg-plist Tue Jul 26 18:57:23 2016 (r419144) +++ head/graphics/frei0r/pkg-plist Tue Jul 26 19:03:57 2016 (r419145) @@ -2,6 +2,7 @@ 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 @@ -23,11 +24,19 @@ 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 @@ -38,9 +47,11 @@ 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 @@ -53,6 +64,7 @@ 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 @@ -61,7 +73,9 @@ 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 @@ -71,21 +85,26 @@ 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/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/tehRoxx0r.so lib/frei0r-1/test_pat_B.so lib/frei0r-1/test_pat_C.so lib/frei0r-1/test_pat_G.so @@ -95,11 +114,13 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607261903.u6QJ3v84017934>