git: ed6dfa7816a5 - main - graphics/libplacebo: update to 4.192.0.r1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 18 Jan 2022 10:17:52 UTC
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ed6dfa7816a51b2e7e0468d8b351640019c82afb commit ed6dfa7816a51b2e7e0468d8b351640019c82afb Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2022-01-16 12:36:07 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2022-01-18 10:17:40 +0000 graphics/libplacebo: update to 4.192.0.r1 Changes: https://code.videolan.org/videolan/libplacebo/-/tags/v4.192.0-rc1 --- graphics/libplacebo/Makefile | 2 +- graphics/libplacebo/distinfo | 6 ++-- graphics/libplacebo/files/patch-meson.build | 37 +++++++++++++++++++++++++ graphics/libplacebo/files/patch-src_meson.build | 19 +++++++++++++ graphics/libplacebo/pkg-plist | 5 ++-- multimedia/dav1d/Makefile | 1 + multimedia/mpv/Makefile | 1 + multimedia/vlc/Makefile | 2 +- 8 files changed, 66 insertions(+), 7 deletions(-) diff --git a/graphics/libplacebo/Makefile b/graphics/libplacebo/Makefile index bea5c693e855..498ba4cb9101 100644 --- a/graphics/libplacebo/Makefile +++ b/graphics/libplacebo/Makefile @@ -1,6 +1,6 @@ PORTNAME= libplacebo DISTVERSIONPREFIX= v -DISTVERSION= 4.157.0 +DISTVERSION= 4.192.0-rc1 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/libplacebo/distinfo b/graphics/libplacebo/distinfo index 4e3d95ea12b6..d3b40fc0b6d7 100644 --- a/graphics/libplacebo/distinfo +++ b/graphics/libplacebo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1630768785 -SHA256 (haasn-libplacebo-v4.157.0_GH0.tar.gz) = c6881083fe63f0fea9898a81e12b384f07d6b7c394c52f6d0cfb8b3bea657e8a -SIZE (haasn-libplacebo-v4.157.0_GH0.tar.gz) = 590747 +TIMESTAMP = 1642336567 +SHA256 (haasn-libplacebo-v4.192.0-rc1_GH0.tar.gz) = 13eead97c0c8da080e128679e86b60a23d6b10fa0b2214c36c6a5460ff10f64a +SIZE (haasn-libplacebo-v4.192.0-rc1_GH0.tar.gz) = 632101 diff --git a/graphics/libplacebo/files/patch-meson.build b/graphics/libplacebo/files/patch-meson.build new file mode 100644 index 000000000000..2b64ece9f49e --- /dev/null +++ b/graphics/libplacebo/files/patch-meson.build @@ -0,0 +1,37 @@ +../src/colorspace.c:545:5: error: implicit declaration of function 'static_assert' is invalid in C99 [-Werror,-Wimplicit-function-declaration] + pl_static_assert(sizeof(*pa) == sizeof(*orig)); + ^ +../src/pl_assert.h:37:32: note: expanded from macro 'pl_static_assert' +#define pl_static_assert(expr) static_assert(expr, #expr) + ^ +../src/dummy.c:35:26: error: use of undeclared identifier 'max_align_t' + struct pl_gpu *gpu = pl_zalloc_obj(NULL, gpu, struct priv); + ^ +../src/pl_alloc.h:96:41: note: expanded from macro 'pl_zalloc_obj' + (__typeof__(ptr)) pl_zalloc(parent, PL_ALIGN_MEM(sizeof(*(ptr))) + sizeof(priv)) + ^ +../src/pl_alloc.h:87:24: note: expanded from macro 'PL_ALIGN_MEM' + (((size) + alignof(max_align_t) - 1) & ~(alignof(max_align_t) - 1)) + ^ +../src/dummy.c:35:26: warning: '_Alignof' applied to an expression is a GNU extension [-Wgnu-alignof-expression] +../src/pl_alloc.h:96:41: note: expanded from macro 'pl_zalloc_obj' + (__typeof__(ptr)) pl_zalloc(parent, PL_ALIGN_MEM(sizeof(*(ptr))) + sizeof(priv)) + ^ +../src/pl_alloc.h:87:16: note: expanded from macro 'PL_ALIGN_MEM' + (((size) + alignof(max_align_t) - 1) & ~(alignof(max_align_t) - 1)) + ^ +/usr/include/stdalign.h:46:19: note: expanded from macro 'alignof' +#define alignof _Alignof + ^ + +--- meson.build.orig 2022-01-16 12:36:07 UTC ++++ meson.build +@@ -71,7 +71,7 @@ cc = meson.get_compiler('c') + cxx = meson.get_compiler('cpp') + + c_opts = [ +- '-D_ISOC99_SOURCE', '-D_ISOC11_SOURCE', '-D_GNU_SOURCE', '-D_XOPEN_SOURCE=700', ++ '-D_ISOC99_SOURCE', '-D_ISOC11_SOURCE', '-D_GNU_SOURCE', + '-U__STRICT_ANSI__', '-fvisibility=hidden', '-Wmissing-prototypes', + + # Warnings to ignore diff --git a/graphics/libplacebo/files/patch-src_meson.build b/graphics/libplacebo/files/patch-src_meson.build new file mode 100644 index 000000000000..443927e99855 --- /dev/null +++ b/graphics/libplacebo/files/patch-src_meson.build @@ -0,0 +1,19 @@ +ld: error: undefined symbol: backtrace +>>> referenced by log.c +>>> src/libplacebo.so.192.p/log.c.o:(pl_log_stack_trace) + +ld: error: undefined symbol: backtrace_symbols +>>> referenced by log.c +>>> src/libplacebo.so.192.p/log.c.o:(pl_log_stack_trace) + +--- src/meson.build.orig 2022-01-16 12:36:07 UTC ++++ src/meson.build +@@ -73,6 +73,8 @@ conf_internal.set('PL_HAVE_UNWIND', unwind.found()) + conf_internal.set('PL_HAVE_EXECINFO', cc.has_header('execinfo.h')) + if unwind.found() + build_deps += [unwind, cc.find_library('dl', required : false)] ++else ++ build_deps += [cc.find_library('execinfo', required : false)] + endif + + # work-arounds for glslang braindeath diff --git a/graphics/libplacebo/pkg-plist b/graphics/libplacebo/pkg-plist index 0f05b44dfe76..4969c5fce9b8 100644 --- a/graphics/libplacebo/pkg-plist +++ b/graphics/libplacebo/pkg-plist @@ -11,13 +11,14 @@ include/libplacebo/log.h %%OPENGL%%include/libplacebo/opengl.h include/libplacebo/renderer.h include/libplacebo/shaders.h -include/libplacebo/shaders/av1.h include/libplacebo/shaders/colorspace.h include/libplacebo/shaders/custom.h +include/libplacebo/shaders/film_grain.h %%LCMS2%%include/libplacebo/shaders/icc.h include/libplacebo/shaders/lut.h include/libplacebo/shaders/sampling.h include/libplacebo/swapchain.h +include/libplacebo/tone_mapping.h include/libplacebo/utils/dav1d.h include/libplacebo/utils/dav1d_internal.h include/libplacebo/utils/frame_queue.h @@ -26,5 +27,5 @@ include/libplacebo/utils/libav_internal.h include/libplacebo/utils/upload.h %%VULKAN%%include/libplacebo/vulkan.h lib/libplacebo.so -lib/libplacebo.so.157 +lib/libplacebo.so.192 libdata/pkgconfig/libplacebo.pc diff --git a/multimedia/dav1d/Makefile b/multimedia/dav1d/Makefile index 8b2f8d3aa6b8..44934923c438 100644 --- a/multimedia/dav1d/Makefile +++ b/multimedia/dav1d/Makefile @@ -1,5 +1,6 @@ PORTNAME= dav1d DISTVERSION= 0.9.2 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index beec0438bac4..0fae703132f2 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -3,6 +3,7 @@ PORTNAME= mpv DISTVERSIONPREFIX= v DISTVERSION= 0.34.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio MASTER_SITES= https://waf.io/:waf diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 59693e01c440..251009c51fce 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -2,7 +2,7 @@ PORTNAME= vlc DISTVERSION= 3.0.16 -PORTREVISION= 8 +PORTREVISION= 9 PORTEPOCH= 4 CATEGORIES= multimedia audio net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \