aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zander <riggs@FreeBSD.org>2023-03-25 20:22:15 +0000
committerThomas Zander <riggs@FreeBSD.org>2023-03-25 20:29:10 +0000
commitca40d3ceca50880b1c5cf9c34a673d54e2910379 (patch)
treeb6d7323220ada45f79f1b499e18c2607c900125b
parent9cfef36d8f97ea77b27dac67be5471367b2c7e26 (diff)
downloadports-ca40d3ceca50880b1c5cf9c34a673d54e2910379.tar.gz
ports-ca40d3ceca50880b1c5cf9c34a673d54e2910379.zip
multimedia/{mplayer|mencoder}: Update to newer upstream snapshot
Details: - Update to upstream snapshot as of 2023-03-21 - Preparation for the ffmpeg 6.0 update PR: 270294 Reported by: diizzy
-rw-r--r--multimedia/mencoder/distinfo6
-rw-r--r--multimedia/mplayer/Makefile1
-rw-r--r--multimedia/mplayer/Makefile.common2
-rw-r--r--multimedia/mplayer/distinfo6
-rw-r--r--multimedia/mplayer/files/patch-libmpcodecs_ve__lavc.c11
5 files changed, 7 insertions, 19 deletions
diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo
index 3de3df0e1f6b..d8ca11aa54c6 100644
--- a/multimedia/mencoder/distinfo
+++ b/multimedia/mencoder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1664013395
-SHA256 (mplayer-1.5.0.20220924.tar.xz) = ab4642ac9d3ca037e4ccab5d73b61a398bdbef041bbe509448602793f5bfd66a
-SIZE (mplayer-1.5.0.20220924.tar.xz) = 5196248
+TIMESTAMP = 1679560282
+SHA256 (mplayer-1.5.0.20230321.tar.xz) = f82e433a3c5d31b6a5154e605aab2df6a875d60e484a5bddb0a9d06ea9b87346
+SIZE (mplayer-1.5.0.20230321.tar.xz) = 5198052
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index c15f578ca228..d739a76c0a38 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= 1
CATEGORIES= multimedia audio
MAINTAINER= riggs@FreeBSD.org
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index eb6924c6986a..ec9ce778dea5 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -3,7 +3,7 @@
# before we include bsd.port.pre.mk
MPLAYER_PORT_VERSION= 1.5.0
-MPLAYER_SNAPSHOT_DATE= 2022-09-24
+MPLAYER_SNAPSHOT_DATE= 2023-03-21
MASTER_SITES= LOCAL/riggs/mplayer
DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index f05d47650c4a..fff6d30d8952 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1664013047
-SHA256 (mplayer-1.5.0.20220924.tar.xz) = ab4642ac9d3ca037e4ccab5d73b61a398bdbef041bbe509448602793f5bfd66a
-SIZE (mplayer-1.5.0.20220924.tar.xz) = 5196248
+TIMESTAMP = 1679487334
+SHA256 (mplayer-1.5.0.20230321.tar.xz) = f82e433a3c5d31b6a5154e605aab2df6a875d60e484a5bddb0a9d06ea9b87346
+SIZE (mplayer-1.5.0.20230321.tar.xz) = 5198052
diff --git a/multimedia/mplayer/files/patch-libmpcodecs_ve__lavc.c b/multimedia/mplayer/files/patch-libmpcodecs_ve__lavc.c
deleted file mode 100644
index e0bd7ef69167..000000000000
--- a/multimedia/mplayer/files/patch-libmpcodecs_ve__lavc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmpcodecs/ve_lavc.c.orig 2022-08-30 20:40:03 UTC
-+++ libmpcodecs/ve_lavc.c
-@@ -441,7 +441,7 @@ static int config(struct vf_instance *vf,
- mp_msg(MSGT_MENCODER,MSGL_ERR,"error parsing vrc_q\n");
- return 0;
- }
-- lavc_venc_context->rc_override=
-+ lavc_venc_context->rc_override=(struct RcOverride *)
- av_reallocp_array(lavc_venc_context->rc_override, i+1, sizeof(*lavc_venc_context->rc_override));
- lavc_venc_context->rc_override[i].start_frame= start;
- lavc_venc_context->rc_override[i].end_frame = end;