git: c1612985deae - main - multimedia/{mplayer|mencoder} Update to upstream snapshot 2026-04-04

From: Thomas Zander <riggs_at_FreeBSD.org>
Date: Sun, 05 Apr 2026 08:54:43 UTC
The branch main has been updated by riggs:

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

commit c1612985deae93d91687a580ce75852bd7cdb897
Author:     Thomas Zander <riggs@FreeBSD.org>
AuthorDate: 2026-04-05 08:44:17 +0000
Commit:     Thomas Zander <riggs@FreeBSD.org>
CommitDate: 2026-04-05 08:48:36 +0000

    multimedia/{mplayer|mencoder} Update to upstream snapshot 2026-04-04
    
    This updates multimedia/mplayer and mencoder to an up-to-date
    snapshot as of 2026-04-04.
    * Due to upstream development slowing down, distfiles are now
      incremental diffs.
    * This marks the JACK option broken for now due to ffmpeg API
      retirements.
    PR:             292157
    MFH:            2026Q2
---
 multimedia/mencoder/Makefile        | 1 -
 multimedia/mencoder/distinfo        | 4 +++-
 multimedia/mplayer/Makefile         | 1 -
 multimedia/mplayer/Makefile.common  | 9 ++++++---
 multimedia/mplayer/Makefile.optvars | 1 +
 multimedia/mplayer/distinfo         | 4 +++-
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 0199ba34d192..c9b56b61a573 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-PORTREVISION=	2
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo
index ba43f761e481..d427684d6bcf 100644
--- a/multimedia/mencoder/distinfo
+++ b/multimedia/mencoder/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1755341246
+TIMESTAMP = 1775377057
 SHA256 (mplayer-1.5.0.20250816.tar.xz) = 418c4f58d1b62a3eafd6b493b017369613d8b01f01d88bc7b916f5d17f9efadb
 SIZE (mplayer-1.5.0.20250816.tar.xz) = 5216196
+SHA256 (mplayer-1.5.0.20250816-20260404.patch.xz) = e6fcce3b6f4ac12279e0ddd53ee4d27158f13cd48508e98d5a4ae7deb63d7063
+SIZE (mplayer-1.5.0.20250816-20260404.patch.xz) = 5480
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 49f25cfcdfe9..13f55d895652 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-PORTREVISION=	3
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index 490b12c41432..485f30c85ec0 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -3,10 +3,13 @@
 # before we include bsd.port.pre.mk
 
 MPLAYER_PORT_VERSION=	1.5.0
-MPLAYER_SNAPSHOT_DATE=	2025-08-16
+MPLAYER_BASE_SNAPSHOT_DATE=	2025-08-16
+MPLAYER_SNAPSHOT_DATE=	2026-04-04
 MASTER_SITES=	LOCAL/riggs/mplayer
-DISTNAME=	mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-WRKSRC=		${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	${DISTNAME}-${MPLAYER_SNAPSHOT_DATE:S/-//g}.patch.xz:-p1
+DISTNAME=	mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_BASE_SNAPSHOT_DATE:S/-//g}
+WRKSRC=		${WRKDIR}/mplayer-export-${MPLAYER_BASE_SNAPSHOT_DATE}
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars
index 95a9701766a0..5f00da765e95 100644
--- a/multimedia/mplayer/Makefile.optvars
+++ b/multimedia/mplayer/Makefile.optvars
@@ -62,6 +62,7 @@ IPV6_CONFIGURE_OFF=	--disable-inet6
 
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_OFF=	--disable-jack
+JACK_BROKEN=		does not compile with recent ffmpeg due to deprecated API
 
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_OFF=	--disable-jpeg
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index c4ef1cba6d6e..fdfd46971fe6 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1755326948
+TIMESTAMP = 1775312554
 SHA256 (mplayer-1.5.0.20250816.tar.xz) = 418c4f58d1b62a3eafd6b493b017369613d8b01f01d88bc7b916f5d17f9efadb
 SIZE (mplayer-1.5.0.20250816.tar.xz) = 5216196
+SHA256 (mplayer-1.5.0.20250816-20260404.patch.xz) = e6fcce3b6f4ac12279e0ddd53ee4d27158f13cd48508e98d5a4ae7deb63d7063
+SIZE (mplayer-1.5.0.20250816-20260404.patch.xz) = 5480