From 52b2cf0163d8c6a1b0bbceb7a216c5a33477df34 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Wed, 23 Nov 2022 14:22:47 +0000 Subject: multimedia/mpv: unbreak --vo=gpu-next with LCMS2=off after bc9f898a9c83 $ mpv --vo=gpu-next foo.mp4 [...] Segmentation fault (lldb) bt * thread #10, name = 'mpv/vo', stop reason = signal SIGSEGV: invalid address (fault address: 0x0) * frame #0: 0x000000083b4c8e84 libc.so.7`strlen + 84 frame #1: 0x000000083b4996bd libc.so.7`vsscanf + 173 frame #2: 0x000000083b48c72d libc.so.7`sscanf + 141 frame #3: 0x00000000004c0dd4 mpv`gl_parse_3dlut_size(arg=0x0000000000000000, p1=0x000000088fcf7d3c, p2=0x000000088fcf7d38, p3=0x000000088fcf7d34) at lcms.h:45:9 frame #4: 0x00000000004c085b mpv`update_icc_opts(p=0x00000008792f9b10, opts=0x0000000891370050) at vo_gpu_next.c:1619:5 frame #5: 0x00000000004c00ef mpv`update_render_options(vo=0x0000000875b38910) at vo_gpu_next.c:1863:5 frame #6: 0x00000000004bde05 mpv`preinit(vo=0x0000000875b38910) at vo_gpu_next.c:1426:5 frame #7: 0x000000000048cc99 mpv`vo_thread(ptr=0x0000000875b38910) at vo.c:1088:13 frame #8: 0x000000083bc4783a libthr.so.3`___lldb_unnamed_symbol556 + 314 --- multimedia/mpv/Makefile | 4 +++- multimedia/mpv/distinfo | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'multimedia') diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index fa53abe23b89..a55071e98748 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -1,13 +1,15 @@ PORTNAME= mpv DISTVERSIONPREFIX= v DISTVERSION= 0.35.0 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= multimedia audio wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= b95111dda879.patch:-p1 # https://github.com/mpv-player/mpv/pull/10871 PATCHFILES+= f10b24e3c5c7.patch:-p1 # https://github.com/mpv-player/mpv/issues/10882 +PATCHFILES+= b9b3342369c3.patch:-p1 # https://github.com/mpv-player/mpv/pull/10895 +PATCHFILES+= e1a04cd8ac40.patch:-p1 # https://github.com/mpv-player/mpv/pull/10895 MAINTAINER= multimedia@FreeBSD.org COMMENT= Free and open-source general-purpose video player diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo index 25f1140d4e22..4bfe6d5a7961 100644 --- a/multimedia/mpv/distinfo +++ b/multimedia/mpv/distinfo @@ -5,3 +5,7 @@ SHA256 (b95111dda879.patch) = c70c62f01d65c701a161954ef480d60aa8cc19454f9e04c4c6 SIZE (b95111dda879.patch) = 1474 SHA256 (f10b24e3c5c7.patch) = d5c470fdfe4c17ad3a4cc87114b344a7af3a2f04e24198c2140c0d7cccbee596 SIZE (f10b24e3c5c7.patch) = 1615 +SHA256 (b9b3342369c3.patch) = dd3255a9b33a66da54975fbbf902dd5f9d29608cf3befab3c143f1da06fd047c +SIZE (b9b3342369c3.patch) = 4405 +SHA256 (e1a04cd8ac40.patch) = cdb342b454886ba6ab709b89b50ec1dadc7277f323f62438f7977fe6cbef3704 +SIZE (e1a04cd8ac40.patch) = 1119 -- cgit v1.2.3