graphics/libplacebo: update to 6.292.0

Changes: https://code.videolan.org/videolan/libplacebo/-/tags/v6.292.0 Reported by: Repology
freebsd · Jul 6, 2023 · eb0549e · eb0549e
1 parent 8a8c42b
commit eb0549e
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 9 deletions.
diff --git a/graphics/libplacebo/Makefile b/graphics/libplacebo/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libplacebo
 DISTVERSIONPREFIX=	v
-DISTVERSION=	5.264.1
+DISTVERSION=	6.292.0
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -35,7 +35,7 @@ LIBUNWIND_DESC=		Use libunwind for stacktraces
 LIBUNWIND_LIB_DEPENDS=	libunwind.so:devel/libunwind
 LIBUNWIND_MESON_ENABLED=	unwind
 
-OPENGL_GH_TUPLE=	Dav1dde:glad:v2.0.1:glad/3rdparty/glad
+OPENGL_GH_TUPLE=	Dav1dde:glad:v2.0.4:glad/3rdparty/glad
 OPENGL_MESON_ENABLED=	opengl
 
 SHADERC_DESC=		libshaderc SPIR-V compiler

diff --git a/graphics/libplacebo/distinfo b/graphics/libplacebo/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1679583180
-SHA256 (haasn-libplacebo-v5.264.1_GH0.tar.gz) = 1e8be260e104c0be061305e3c0f2099c79776528889d426c497da153e85f8b5c
-SIZE (haasn-libplacebo-v5.264.1_GH0.tar.gz) = 725091
-SHA256 (Dav1dde-glad-v2.0.1_GH0.tar.gz) = bbdfb8a2c8ea7fbad747dd91424fc9fc7bb22e1b95c7a5b451e68c3d9bd96d95
-SIZE (Dav1dde-glad-v2.0.1_GH0.tar.gz) = 581028
+TIMESTAMP = 1688589823
+SHA256 (haasn-libplacebo-v6.292.0_GH0.tar.gz) = cd9ecbea9b2cd61c4ea5816d262f620a3daff194399d2090e5a485c9adb294bb
+SIZE (haasn-libplacebo-v6.292.0_GH0.tar.gz) = 760277
+SHA256 (Dav1dde-glad-v2.0.4_GH0.tar.gz) = 02629644c242dcc27c58222bd2c001d5e2f3765dbbcfd796542308bddebab401
+SIZE (Dav1dde-glad-v2.0.4_GH0.tar.gz) = 599932
diff --git a/graphics/libplacebo/pkg-plist b/graphics/libplacebo/pkg-plist
@@ -6,6 +6,7 @@ include/libplacebo/dispatch.h
 include/libplacebo/dither.h
 include/libplacebo/dummy.h
 include/libplacebo/filters.h
+include/libplacebo/gamut_mapping.h
 include/libplacebo/gpu.h
 include/libplacebo/log.h
 include/libplacebo/opengl.h
@@ -30,5 +31,5 @@ include/libplacebo/utils/libav_internal.h
 include/libplacebo/utils/upload.h
 include/libplacebo/vulkan.h
 lib/libplacebo.so
-lib/libplacebo.so.264
+lib/libplacebo.so.292
 libdata/pkgconfig/libplacebo.pc
diff --git a/multimedia/dav1d/Makefile b/multimedia/dav1d/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	dav1d
 DISTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ffmpeg
 PORTVERSION=	6.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio net
 MASTER_SITES=	https://ffmpeg.org/releases/

diff --git a/multimedia/ffmpeg/files/patch-libplacebo-6.292 b/multimedia/ffmpeg/files/patch-libplacebo-6.292
@@ -0,0 +1,37 @@
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/1231003c3c6d
+
+libavfilter/vf_libplacebo.c:461:10: error: field designator 'force_icc_lut' does not refer to any field in type 'struct pl_render_params'
+        .force_icc_lut = s->force_icc_lut,
+         ^
+
+--- doc/filters.texi.orig	2023-02-27 20:43:45 UTC
++++ doc/filters.texi
+@@ -16242,9 +16242,6 @@ Disable built-in GPU sampling (forces LUT).
+ @item disable_builtin
+ Disable built-in GPU sampling (forces LUT).
+
+-@item force_icc_lut
+-Force the use of a full ICC 3DLUT for gamut mapping.
+-
+ @item disable_fbos
+ Forcibly disable FBOs, resulting in loss of almost all functionality, but
+ offering the maximum possible speed.
+--- libavfilter/vf_libplacebo.c.orig	2023-02-27 20:43:45 UTC
++++ libavfilter/vf_libplacebo.c
+@@ -458,7 +458,6 @@ static int process_frames(AVFilterContext *avctx, AVFr
+         .polar_cutoff = s->polar_cutoff,
+         .disable_linear_scaling = s->disable_linear,
+         .disable_builtin_scalers = s->disable_builtin,
+-        .force_icc_lut = s->force_icc_lut,
+         .force_dither = s->force_dither,
+         .disable_fbos = s->disable_fbos,
+     };
+@@ -847,7 +846,7 @@ static const AVOption libplacebo_options[] = {
+     { "polar_cutoff", "Polar LUT cutoff", OFFSET(polar_cutoff), AV_OPT_TYPE_FLOAT, {.dbl = 0}, 0.0, 1.0, DYNAMIC },
+     { "disable_linear", "Disable linear scaling", OFFSET(disable_linear), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
+     { "disable_builtin", "Disable built-in scalers", OFFSET(disable_builtin), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
+-    { "force_icc_lut", "Force the use of a full ICC 3DLUT for color mapping", OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
++    { "force_icc_lut", "Deprecated, does nothing", OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED },
+     { "force_dither", "Force dithering", OFFSET(force_dither), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
+     { "disable_fbos", "Force-disable FBOs", OFFSET(disable_fbos), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
+     { NULL },
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	mpv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.35.1
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	b95111dda879.patch:-p1 # https://github.com/mpv-player/mpv/pull/10871
 PATCHFILES+=	94c189dae76b.patch:-p1 # https://github.com/mpv-player/mpv/pull/11398
 PATCHFILES+=	362256edbc4f.patch:-p1 # https://github.com/mpv-player/mpv/pull/11398
+PATCHFILES+=	3a2f8d42ab20.patch:-p1 # https://github.com/mpv-player/mpv/pull/11447
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Free and open-source general-purpose video player

diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo
@@ -7,3 +7,5 @@ SHA256 (94c189dae76b.patch) = c6e2b219f448f0711033c5618854fc4c323f0860cdc268e01f
 SIZE (94c189dae76b.patch) = 1151
 SHA256 (362256edbc4f.patch) = 5e048085eb1ac3bf6f81c99daf471177a5cad1100be84fe2a5a7436687bc81e1
 SIZE (362256edbc4f.patch) = 1587
+SHA256 (3a2f8d42ab20.patch) = 6c0c25936b3aff93a1505e8de92d107fd49a096b441cc90492203893f5bad39e
+SIZE (3a2f8d42ab20.patch) = 2058