I spotted this one in portroach, haven't tested beyond build yet but
the patch merges are fiddly enough that I thought I'd send it out to
avoid anyone doing duplicate work. Runtime tests welcome!
Index: Makefile
===
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.97
diff -u -p -r1.97 Makefile
--- Makefile18 Jun 2023 04:46:33 - 1.97
+++ Makefile24 Jul 2023 07:57:41 -
@@ -2,8 +2,7 @@ COMMENT = movie player based on MPlayer
GH_ACCOUNT = mpv-player
GH_PROJECT = mpv
-GH_TAGNAME = v0.35.1
-REVISION = 5
+GH_TAGNAME = v0.36.0
USE_NOBTCFI = Yes
SHARED_LIBS += mpv 1.0 # 2.0
@@ -70,6 +69,7 @@ CONFIGURE_ARGS = -Dlua=lua${MODLUA_DEP_V
-Dd3d11=disabled \
-Dd3d-hwaccel=disabled \
-Ddirect3d=disabled \
+ -Ddmabuf-wayland=disabled \
-Degl-android=disabled \
-Degl-angle=disabled \
-Degl-angle-lib=disabled \
@@ -83,6 +83,7 @@ CONFIGURE_ARGS = -Dlua=lua${MODLUA_DEP_V
-Dios-gl=disabled \
-Djack=disabled \
-Djavascript=disabled \
+ -Dlibplacebo-next=disabled \
-Dmacos-10-11-features=disabled \
-Dmacos-10-12-2-features=disabled \
-Dmacos-10-14-features=disabled \
@@ -112,6 +113,7 @@ CONFIGURE_ARGS =-Dlua=lua${MODLUA_DEP_V
-Dvdpau-gl-x11=disabled \
-Dvideotoolbox-gl=disabled \
-Dvulkan=disabled \
+ -Dvulkan-interop=disabled \
-Dwayland=disabled \
-Dwin32-internal-pthreads=disabled \
-Dwasapi=disabled
Index: distinfo
===
RCS file: /cvs/ports/multimedia/mpv/distinfo,v
retrieving revision 1.33
diff -u -p -r1.33 distinfo
--- distinfo31 Jan 2023 10:19:28 - 1.33
+++ distinfo24 Jul 2023 07:57:41 -
@@ -1,2 +1,2 @@
-SHA256 (mpv-0.35.1.tar.gz) = Qd+YG3uE4zou9EeKr4HW9PXIuc0sDTN6wUL8ILOH0ak=
-SIZE (mpv-0.35.1.tar.gz) = 3367913
+SHA256 (mpv-0.36.0.tar.gz) = KavET46+4BO7L5/hTYCzDbGbU0xnkFbkhRzq31pei/Y=
+SIZE (mpv-0.36.0.tar.gz) = 3409178
Index: patches/patch-audio_decode_ad_lavc_c
===
RCS file: patches/patch-audio_decode_ad_lavc_c
diff -N patches/patch-audio_decode_ad_lavc_c
--- patches/patch-audio_decode_ad_lavc_c30 Jan 2023 16:53:55 -
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,43 +0,0 @@
-- ffmpeg: update to handle deprecation of `av_init_packet`
- 4574dd5dc6ff75b1fc693afceec59fbcd51ccd4c
-
-Index: audio/decode/ad_lavc.c
audio/decode/ad_lavc.c.orig
-+++ audio/decode/ad_lavc.c
-@@ -46,6 +46,7 @@
- struct priv {
- AVCodecContext *avctx;
- AVFrame *avframe;
-+AVPacket *avpkt;
- struct mp_chmap force_channel_map;
- uint32_t skip_samples, trim_samples;
- bool preroll_done;
-@@ -104,6 +105,7 @@ static bool init(struct mp_filter *da, struct mp_codec
- lavc_context = avcodec_alloc_context3(lavc_codec);
- ctx->avctx = lavc_context;
- ctx->avframe = av_frame_alloc();
-+ctx->avpkt = av_packet_alloc();
- lavc_context->codec_type = AVMEDIA_TYPE_AUDIO;
- lavc_context->codec_id = lavc_codec->id;
- lavc_context->pkt_timebase = ctx->codec_timebase;
-@@ -160,6 +162,7 @@ static void destroy(struct mp_filter *da)
-
- avcodec_free_context(&ctx->avctx);
- av_frame_free(&ctx->avframe);
-+mp_free_av_packet(&ctx->avpkt);
- }
-
- static void reset(struct mp_filter *da)
-@@ -185,10 +188,9 @@ static int send_packet(struct mp_filter *da, struct de
- if (mpkt && priv->next_pts == MP_NOPTS_VALUE)
- priv->next_pts = mpkt->pts;
-
--AVPacket pkt;
--mp_set_av_packet(&pkt, mpkt, &priv->codec_timebase);
-+mp_set_av_packet(priv->avpkt, mpkt, &priv->codec_timebase);
-
--int ret = avcodec_send_packet(avctx, mpkt ? &pkt : NULL);
-+int ret = avcodec_send_packet(avctx, mpkt ? priv->avpkt : NULL);
- if (ret < 0)
- MP_ERR(da, "Error decoding audio.\n");
- return ret;
Index: patches/patch-audio_decode_ad_spdif_c
===
RCS file: patches/patch-audio_decode_ad_spdif_c
diff -N patches/patch-audio_decode_ad_spdif_c
--- patches/patch-audio_decode_ad_spdif_c 30 Jan 2023 16:53:55 -
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,53 +0,0 @@
-- ffmpeg: update to handle deprecation of `av_init_packet`
- 4574dd5dc6ff75b1fc693afceec59fbcd51ccd4c
-
-Index: audio/decode/ad_spdif.c
audio/decode/ad_spdif.c.orig
-+++
