From owner-svn-ports-head@freebsd.org Sat Jan 16 16:13:44 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BDF4B4E3F11; Sat, 16 Jan 2021 16:13:44 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DJ35453WCz4V28; Sat, 16 Jan 2021 16:13:44 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A08D31211A; Sat, 16 Jan 2021 16:13:44 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10GGDiJJ068157; Sat, 16 Jan 2021 16:13:44 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10GGDhXs068150; Sat, 16 Jan 2021 16:13:43 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <202101161613.10GGDhXs068150@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Sat, 16 Jan 2021 16:13:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561731 - in head/graphics/frei0r: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jhale X-SVN-Commit-Paths: in head/graphics/frei0r: . files X-SVN-Commit-Revision: 561731 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jan 2021 16:13:44 -0000 Author: jhale Date: Sat Jan 16 16:13:43 2021 New Revision: 561731 URL: https://svnweb.freebsd.org/changeset/ports/561731 Log: graphics/frei0r*: Update to 1.7.0 Deleted: head/graphics/frei0r/files/extra-patch-src_filter_facebl0r_facebl0r.cpp head/graphics/frei0r/files/extra-patch-src_filter_facedetect_CMakeLists.txt Modified: head/graphics/frei0r/Makefile head/graphics/frei0r/distinfo head/graphics/frei0r/files/extra-patch-CMakeLists.txt head/graphics/frei0r/files/extra-patch-frei0r-plugins head/graphics/frei0r/pkg-plist Modified: head/graphics/frei0r/Makefile ============================================================================== --- head/graphics/frei0r/Makefile Sat Jan 16 16:11:30 2021 (r561730) +++ head/graphics/frei0r/Makefile Sat Jan 16 16:13:43 2021 (r561731) @@ -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 simultan .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 \ Modified: head/graphics/frei0r/distinfo ============================================================================== --- head/graphics/frei0r/distinfo Sat Jan 16 16:11:30 2021 (r561730) +++ head/graphics/frei0r/distinfo Sat Jan 16 16:13:43 2021 (r561731) @@ -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 Modified: head/graphics/frei0r/files/extra-patch-CMakeLists.txt ============================================================================== --- head/graphics/frei0r/files/extra-patch-CMakeLists.txt Sat Jan 16 16:11:30 2021 (r561730) +++ head/graphics/frei0r/files/extra-patch-CMakeLists.txt Sat Jan 16 16:13:43 2021 (r561731) @@ -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) Modified: head/graphics/frei0r/files/extra-patch-frei0r-plugins ============================================================================== --- head/graphics/frei0r/files/extra-patch-frei0r-plugins Sat Jan 16 16:11:30 2021 (r561730) +++ head/graphics/frei0r/files/extra-patch-frei0r-plugins Sat Jan 16 16:13:43 2021 (r561731) @@ -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) Modified: head/graphics/frei0r/pkg-plist ============================================================================== --- head/graphics/frei0r/pkg-plist Sat Jan 16 16:11:30 2021 (r561730) +++ head/graphics/frei0r/pkg-plist Sat Jan 16 16:13:43 2021 (r561731) @@ -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