git: 7beae5bb0fa6 - main - multimedia/m{player|encoder}: switch to graphics/openjpeg (+)

From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Sun, 20 Feb 2022 14:08:42 UTC
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7beae5bb0fa6b7a5c35418ada41b5016a52157ba

commit 7beae5bb0fa6b7a5c35418ada41b5016a52157ba
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2022-02-20 14:05:04 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2022-02-20 14:05:04 +0000

    multimedia/m{player|encoder}: switch to graphics/openjpeg (+)
    
    Mplayer engine indeed require openjpeg >= 2.1.0.
    Depend on openjpeg15 is irrelevant, player even connot link with it.
    
    MFH:            2022Q1
    Approved by:    portmgr (fix build blanket)
    Sponsored by:   Netzkommune GmbH
---
 multimedia/mencoder/Makefile        | 1 +
 multimedia/mplayer/Makefile         | 2 +-
 multimedia/mplayer/Makefile.optvars | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 2df6b5c12581..5cce54e130c2 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
+PORTREVISION=	2
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index d9cb87a4df7d..62c25b154dbd 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars
index da9155ed0ce9..6beab30a82e3 100644
--- a/multimedia/mplayer/Makefile.optvars
+++ b/multimedia/mplayer/Makefile.optvars
@@ -87,9 +87,8 @@ OPENGL_USES=		gl
 OPENGL_CONFIGURE_OFF=	--disable-gl
 OPENGL_IMPLIES=		X11
 
-OPENJPEG_CFLAGS=	-I${LOCALBASE}/include/openjpeg-1.5
-OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15
-OPENJPEG_CONFIGURE_OFF=	--disable-libopenjpeg
+OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
+OPENJPEG_CONFIGURE_ENABLE=	libopenjpeg
 
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_CONFIGURE_OFF=	--disable-libopus