From owner-svn-ports-all@freebsd.org Sun Jan 31 15:42:28 2021 Return-Path: Delivered-To: svn-ports-all@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 438FE4FA61F; Sun, 31 Jan 2021 15:42:28 +0000 (UTC) (envelope-from rhurlin@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 4DTFh41Tftz3kpP; Sun, 31 Jan 2021 15:42:28 +0000 (UTC) (envelope-from rhurlin@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 261082BC2; Sun, 31 Jan 2021 15:42:28 +0000 (UTC) (envelope-from rhurlin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10VFgRE6002891; Sun, 31 Jan 2021 15:42:27 GMT (envelope-from rhurlin@FreeBSD.org) Received: (from rhurlin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10VFgR7u002886; Sun, 31 Jan 2021 15:42:27 GMT (envelope-from rhurlin@FreeBSD.org) Message-Id: <202101311542.10VFgR7u002886@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rhurlin set sender to rhurlin@FreeBSD.org using -f From: Rainer Hurling Date: Sun, 31 Jan 2021 15:42:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563493 - in head/graphics: frei0r frei0r-plugins frei0r/files X-SVN-Group: ports-head X-SVN-Commit-Author: rhurlin X-SVN-Commit-Paths: in head/graphics: frei0r frei0r-plugins frei0r/files X-SVN-Commit-Revision: 563493 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Jan 2021 15:42:28 -0000 Author: rhurlin Date: Sun Jan 31 15:42:26 2021 New Revision: 563493 URL: https://svnweb.freebsd.org/changeset/ports/563493 Log: graphics/frei0r: Fix build failure with OpenCV4 After the update of OpenCV to v4.5.1 the build was broken. Some important commits [1] after release v1.7.0 fixed the issues. [1] https://github.com/dyne/frei0r/compare/v1.7.0...master Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D28436 Modified: head/graphics/frei0r-plugins/Makefile head/graphics/frei0r/Makefile head/graphics/frei0r/distinfo head/graphics/frei0r/files/extra-patch-frei0r-plugins head/graphics/frei0r/pkg-plist Modified: head/graphics/frei0r-plugins/Makefile ============================================================================== --- head/graphics/frei0r-plugins/Makefile Sun Jan 31 15:02:50 2021 (r563492) +++ head/graphics/frei0r-plugins/Makefile Sun Jan 31 15:42:26 2021 (r563493) @@ -1,6 +1,5 @@ # $FreeBSD$ -PORTREVISION= 1 PKGNAMESUFFIX= -plugins COMMENT= Frei0r meta-port Modified: head/graphics/frei0r/Makefile ============================================================================== --- head/graphics/frei0r/Makefile Sun Jan 31 15:02:50 2021 (r563492) +++ head/graphics/frei0r/Makefile Sun Jan 31 15:42:26 2021 (r563493) @@ -2,21 +2,21 @@ # $FreeBSD$ PORTNAME= frei0r -PORTVERSION= 1.7.0 -DISTVERSIONPREFIX= plugins- -PORTREVISION?= 1 +DISTVERSIONPREFIX= v CATEGORIES= graphics -MASTER_SITES?= https://files.dyne.org/frei0r/releases/ - +DISTVERSION= 1.7.0-18 +DISTVERSIONSUFFIX= -g86475d3 MAINTAINER= jhale@FreeBSD.org COMMENT?= Minimalistic plugin API for video effects .if !defined(BUILDING_FREI0R_METAPORT) LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/COPYING.txt +LICENSE_FILE= ${WRKSRC}/COPYING USES= cmake compiler:c++11-lang pkgconfig +USE_GITHUB= yes +GH_ACCOUNT= dyne .if defined(BUILDING_FREI0R_OPENCV) && defined(BUILDING_FREI0R_GAVL) IGNORE= cannot build OpenCV and gavl plugins simultaneously Modified: head/graphics/frei0r/distinfo ============================================================================== --- head/graphics/frei0r/distinfo Sun Jan 31 15:02:50 2021 (r563492) +++ head/graphics/frei0r/distinfo Sun Jan 31 15:42:26 2021 (r563493) @@ -1,3 +1,3 @@ -TIMESTAMP = 1610463878 -SHA256 (frei0r-plugins-1.7.0.tar.gz) = 1b1ff8f0f9bc23eed724e94e9a7c1d8f0244bfe33424bb4fe68e6460c088523a -SIZE (frei0r-plugins-1.7.0.tar.gz) = 1214323 +TIMESTAMP = 1612101322 +SHA256 (dyne-frei0r-v1.7.0-18-g86475d3_GH0.tar.gz) = aa6c16361223923a6b6aada699f03afd2deb9de6a56f4840d42dde33b5fd52c4 +SIZE (dyne-frei0r-v1.7.0-18-g86475d3_GH0.tar.gz) = 817634 Modified: head/graphics/frei0r/files/extra-patch-frei0r-plugins ============================================================================== --- head/graphics/frei0r/files/extra-patch-frei0r-plugins Sun Jan 31 15:02:50 2021 (r563492) +++ head/graphics/frei0r/files/extra-patch-frei0r-plugins Sun Jan 31 15:42:26 2021 (r563493) @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2019-12-06 16:20:37 UTC +--- CMakeLists.txt.orig 2020-12-09 06:02:41 UTC +++ CMakeLists.txt @@ -11,8 +11,6 @@ if (NOT WITHOUT_OPENCV) find_package (OpenCV) @@ -27,9 +27,9 @@ -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") ---- src/filter/CMakeLists.txt.orig 2019-12-06 16:20:37 UTC +--- src/filter/CMakeLists.txt.orig 2020-12-09 06:02:41 UTC +++ src/filter/CMakeLists.txt -@@ -8,92 +8,3 @@ if (${OpenCV_FOUND}) +@@ -8,93 +8,3 @@ if (${OpenCV_FOUND}) add_subdirectory (facebl0r) add_subdirectory (facedetect) endif (${OpenCV_FOUND}) @@ -40,6 +40,7 @@ -endif (${Cairo_FOUND}) - -add_subdirectory (3dflippo) +-add_subdirectory (aech0r) -add_subdirectory (alpha0ps) -add_subdirectory (balanc0r) -add_subdirectory (baltan) Modified: head/graphics/frei0r/pkg-plist ============================================================================== --- head/graphics/frei0r/pkg-plist Sun Jan 31 15:02:50 2021 (r563492) +++ head/graphics/frei0r/pkg-plist Sun Jan 31 15:42:26 2021 (r563493) @@ -7,6 +7,7 @@ lib/frei0r-1/R.so lib/frei0r-1/RGB.so lib/frei0r-1/addition.so lib/frei0r-1/addition_alpha.so +lib/frei0r-1/aech0r.so lib/frei0r-1/alpha0ps.so lib/frei0r-1/alphaatop.so lib/frei0r-1/alphagrad.so