graphics/frei0r*: Update to 2.3.0 [1]

Split cairo-dependent plugins out into graphics/frei0r-plugins-cairo.

Shift pkg-plist and several variables out into the slave ports for
easier maintainence, including PORTREVISION to facilitate usage of
PORTREVISION bump scripts.

Convert "extra" patches into regular patches for easier future
maintainence.

Ensure optional plugins are the same version as the frei0r base.

https://github.com/dyne/frei0r/releases/tag/v2.3.0

PR:		272045 [1]
Reported by:	Olivier Duchateau <duchateau.olivier@gmail.com> [1]

graphics/Makefile

@@ -225,6 +225,7 @@
     SUBDIR += freetype-gl
     SUBDIR += frei0r
     SUBDIR += frei0r-plugins
+    SUBDIR += frei0r-plugins-cairo
     SUBDIR += frei0r-plugins-gavl
     SUBDIR += frei0r-plugins-opencv
     SUBDIR += frogr

graphics/frei0r-plugins-cairo/Makefile

@@ -0,0 +1,11 @@
+PORTREVISION=	0
+PKGNAMESUFFIX=	-plugins-${SLAVE_PORT:tl}
+
+COMMENT=	Frei0r ${SLAVE_PORT} plugins
+
+MASTERDIR=	${.CURDIR}/../frei0r
+PLIST=		${.CURDIR}/pkg-plist
+
+SLAVE_PORT=	cairo
+
+.include "${MASTERDIR}/Makefile"

graphics/frei0r-plugins-cairo/pkg-plist

@@ -0,0 +1,4 @@
+lib/frei0r-1/cairoaffineblend.so
+lib/frei0r-1/cairoblend.so
+lib/frei0r-1/cairogradient.so
+lib/frei0r-1/cairoimagegrid.so

graphics/frei0r-plugins-gavl/Makefile

@@ -1,5 +1,11 @@
+PORTREVISION=	0
+PKGNAMESUFFIX=	-plugins-${SLAVE_PORT:tl}
+
+COMMENT=	Frei0r ${SLAVE_PORT} plugins
+
 MASTERDIR=	${.CURDIR}/../frei0r
+PLIST=		${.CURDIR}/pkg-plist
 
-BUILDING_FREI0R_GAVL=	yes
+SLAVE_PORT=	gavl
 
 .include "${MASTERDIR}/Makefile"

graphics/frei0r-plugins-gavl/pkg-plist

@@ -0,0 +1,3 @@
+lib/frei0r-1/rgbparade.so
+lib/frei0r-1/scale0tilt.so
+lib/frei0r-1/vectorscope.so

graphics/frei0r-plugins-opencv/Makefile

@@ -1,5 +1,11 @@
+PORTREVISION=	0
+PKGNAMESUFFIX=	-plugins-${SLAVE_PORT:tl}
+
+COMMENT=	Frei0r ${SLAVE_PORT} plugins
+
 MASTERDIR=	${.CURDIR}/../frei0r
+PLIST=		${.CURDIR}/pkg-plist
 
-BUILDING_FREI0R_OPENCV=	yes
+SLAVE_PORT=	OpenCV
 
 .include "${MASTERDIR}/Makefile"

graphics/frei0r-plugins-opencv/pkg-plist

@@ -0,0 +1,2 @@
+lib/frei0r-1/facebl0r.so
+lib/frei0r-1/facedetect.so

graphics/frei0r-plugins/Makefile

@@ -1,23 +1,27 @@
+PORTNAME=	frei0r
+PORTVERSION=	${FREI0R_VERSION}
+CATEGORIES=	graphics
 PKGNAMESUFFIX=	-plugins
 
-COMMENT=	Frei0r meta-port
+MAINTAINER=	jhale@FreeBSD.org
+COMMENT=	The "meta-port" for frei0r and additional plugins
+WWW=		https://frei0r.dyne.org/
 
-RUN_DEPENDS=	${LOCALBASE}/include/frei0r.h:graphics/frei0r
+RUN_DEPENDS=	frei0r>=${FREI0R_VERSION}:graphics/frei0r
 
-USES=	metaport
+USES=		metaport
 
-MASTERDIR=	${.CURDIR}/../frei0r
-PLIST=		${WRKDIR}/PLIST
+DESCR=		${.CURDIR}/../frei0r/pkg-descr
 
-BUILDING_FREI0R_METAPORT=	yes
+OPTIONS_DEFINE=		CAIRO GAVL OPENCV
+OPTIONS_DEFAULT=	CAIRO GAVL OPENCV
 
-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
-OPENCV_RUN_DEPENDS=	${LOCALBASE}/lib/frei0r-1/facedetect.so:graphics/frei0r-plugins-opencv
-
-.include "${MASTERDIR}/Makefile"
+CAIRO_DESC=		Install cairo plugins
+CAIRO_RUN_DEPENDS=	frei0r-plugins-cairo>=${FREI0R_VERSION}:graphics/frei0r-plugins-cairo
+GAVL_DESC=		Install gavl plugins
+GAVL_RUN_DEPENDS=	frei0r-plugins-gavl>=${FREI0R_VERSION}:graphics/frei0r-plugins-gavl
+OPENCV_DESC=		Install OpenCV plugins
+OPENCV_RUN_DEPENDS=	frei0r-plugins-opencv>=${FREI0R_VERSION}:graphics/frei0r-plugins-opencv
 
+.include "${.CURDIR}/../frei0r/version.mk"
 .include <bsd.port.mk>

graphics/frei0r/Makefile

@@ -1,68 +1,50 @@
 PORTNAME=	frei0r
-PORTVERSION=	1.8.0
-DISTVERSIONPREFIX=	plugins-
-PORTREVISION?=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	${FREI0R_VERSION}
+PORTREVISION?=	0
 CATEGORIES=	graphics
-MASTER_SITES?=	https://files.dyne.org/frei0r/releases/
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT?=	Minimalistic plugin API for video effects
 WWW=		https://frei0r.dyne.org/
 
-.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
-.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=	0
-COMMENT=	Frei0r OpenCV plugins
-PKGNAMESUFFIX=	-plugins-opencv
-LIB_DEPENDS+=	libopencv_core.so:graphics/opencv \
-		libopencv_video.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
-
+.if defined(SLAVE_PORT)
+RUN_DEPENDS=	frei0r>=${FREI0R_VERSION}:graphics/frei0r
+.  if ${SLAVE_PORT:tl} == "cairo"
 USES+=		gnome
-USE_GNOME=	cairo
+USE_GNOME+=	cairo
 
-CMAKE_ARGS+=	-DWITHOUT_OPENCV:BOOL=ON \
-		-DWITHOUT_GAVL:BOOL=ON
+CMAKE_ON=	WITHOUT_GAVL \
+		WITHOUT_OPENCV
+CMAKE_OFF=	WITHOUT_CAIRO
+.  elif ${SLAVE_PORT:tl} == "gavl"
+LIB_DEPENDS+=	libgavl.so:multimedia/gavl
 
-.endif # !defined(BUILDING_FREI0R_OPENCV) && !defined(BUILDING_FREI0R_GAVL)
+CMAKE_ON=	WITHOUT_CAIRO \
+		WITHOUT_OPENCV
+CMAKE_OFF=	WITHOUT_GAVL
+.  elif ${SLAVE_PORT:tl} == "opencv"
+LIB_DEPENDS+=	libopencv_core.so:graphics/opencv
 
-.if defined(FREI0R_PLUGINS)
-PLIST=		${WRKSRC}/PLIST
-. for FILE in ${FREI0R_PLUGINS}
-PLIST_FILES+=	lib/frei0r-1/${FILE}.so
-. endfor
+CMAKE_ON=	WITHOUT_CAIRO \
+		WITHOUT_GAVL
+CMAKE_OFF=	WITHOUT_OPENCV
+.  endif
+.else
+CMAKE_ON=	WITHOUT_CAIRO \
+		WITHOUT_GAVL \
+		WITHOUT_OPENCV
+CMAKE_OFF=	BUILD_EXTRA_PLUGINS
 .endif
 
+.include "version.mk"
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
@@ -73,5 +55,3 @@ CXXFLAGS+=	-Wno-error
 .endif
 
 .include <bsd.port.post.mk>
-
-.endif # !defined(BUILDING_FREI0R_METAPORT)

graphics/frei0r/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1648552795
-SHA256 (frei0r-plugins-1.8.0.tar.gz) = 45a28655caf057227b442b800ca3899e93490515c81e212d219fdf4a7613f5c4
-SIZE (frei0r-plugins-1.8.0.tar.gz) = 823119
+TIMESTAMP = 1685672354
+SHA256 (dyne-frei0r-v2.3.0_GH0.tar.gz) = 00aa65a887445c806b2a467abc3ccc4b0855f7eaf38ed2011a1ff41e74844fa0
+SIZE (dyne-frei0r-v2.3.0_GH0.tar.gz) = 820018