diff --git a/graphics/libplacebo/Makefile b/graphics/libplacebo/Makefile index 47a502b7c419..73c0ac531184 100644 --- a/graphics/libplacebo/Makefile +++ b/graphics/libplacebo/Makefile @@ -1,67 +1,63 @@ PORTNAME= libplacebo DISTVERSIONPREFIX= v -DISTVERSION= 5.229.2 -PORTREVISION= 1 +DISTVERSION= 5.264.0 CATEGORIES= graphics -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= baec0e53c959.patch:-p1 # https://code.videolan.org/videolan/libplacebo/-/issues/249 - MAINTAINER= jbeich@FreeBSD.org COMMENT= Reusable library for GPU-accelerated video/image rendering WWW= https://code.videolan.org/videolan/libplacebo LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler:c11 localbase:ldflags meson pkgconfig python:3.6+,build USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= haasn MESON_ARGS= -Ddemos=false OPTIONS_DEFINE= LCMS2 LIBUNWIND OPENGL TEST VULKAN OPTIONS_DEFAULT=LCMS2 LIBUNWIND OPENGL SHADERC OPTIONS_SINGLE= VULKAN OPTIONS_SINGLE_VULKAN= GLSLANG SHADERC OPTIONS_EXCLUDE+= ${ARCH:Naarch64:Namd64:Narmv[67]:Ni386:Npowerpc64:Npowerpc64le:Nx86_64:C/.+/LIBUNWIND/} OPTIONS_SUB= yes GLSLANG_DESC= glslang SPIR-V compiler GLSLANG_BUILD_DEPENDS= glslang>0:graphics/glslang GLSLANG_MESON_ENABLED= glslang GLSLANG_IMPLIES= VULKAN LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS2_MESON_ENABLED= lcms 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_MESON_ENABLED= opengl SHADERC_DESC= libshaderc SPIR-V compiler SHADERC_LIB_DEPENDS= libshaderc_shared.so:graphics/shaderc SHADERC_MESON_ENABLED= shaderc SHADERC_IMPLIES= VULKAN TEST_MESON_TRUE= tests VULKAN_DESC= Vulkan-based renderer VULKAN_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_MESON_ENABLED= vulkan post-patch: @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \ ${WRKSRC}/src/vulkan/utils_gen.py # Extract (snapshot) version from port version instead of meson.build @${REINPLACE_CMD} "s/version_pretty/'${DISTVERSIONFULL}'/" \ ${WRKSRC}/src/meson.build pre-install-TEST-on: do-test .include diff --git a/graphics/libplacebo/distinfo b/graphics/libplacebo/distinfo index 9a7627c28d76..7cfc89e1de33 100644 --- a/graphics/libplacebo/distinfo +++ b/graphics/libplacebo/distinfo @@ -1,7 +1,5 @@ -TIMESTAMP = 1672849094 -SHA256 (haasn-libplacebo-v5.229.2_GH0.tar.gz) = 1c67bec76832c7a42242570798cc96a3f58a70be79daa84ade628d5bce749c84 -SIZE (haasn-libplacebo-v5.229.2_GH0.tar.gz) = 673761 +TIMESTAMP = 1678709243 +SHA256 (haasn-libplacebo-v5.264.0_GH0.tar.gz) = 780e1c5d304a2c407b6709ac66e811bd1be03a769601f1dab41cf77c8519c668 +SIZE (haasn-libplacebo-v5.264.0_GH0.tar.gz) = 725098 SHA256 (Dav1dde-glad-v2.0.1_GH0.tar.gz) = bbdfb8a2c8ea7fbad747dd91424fc9fc7bb22e1b95c7a5b451e68c3d9bd96d95 SIZE (Dav1dde-glad-v2.0.1_GH0.tar.gz) = 581028 -SHA256 (baec0e53c959.patch) = 9a76a9f79658fef0bc41c3633cda2238c7ea7ea4606a21cd57c8745bc49a720b -SIZE (baec0e53c959.patch) = 5828 diff --git a/graphics/libplacebo/files/patch-meson.build b/graphics/libplacebo/files/patch-meson.build index 2b64ece9f49e..078bd7a32638 100644 --- a/graphics/libplacebo/files/patch-meson.build +++ b/graphics/libplacebo/files/patch-meson.build @@ -1,37 +1,29 @@ -../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 - ^ +../src/log.c:213:9: error: use of undeclared identifier 'Dl_info' + Dl_info info = { + ^ +../src/log.c:219:9: error: implicit declaration of function 'dladdr' is invalid in C99 [-Werror,-Wimplicit-function-declaration] + dladdr((void *) (uintptr_t) ip, &info); + ^ +../src/log.c:219:42: error: use of undeclared identifier 'info' + dladdr((void *) (uintptr_t) ip, &info); + ^ +../src/log.c:221:75: error: use of undeclared identifier 'info'; did you mean 'int'? + depth++, ip, symbol, off, info.dli_fname, ip - (uintptr_t) info.dli_fbase); + ^~~~ + int +../src/log.c:221:75: error: expected expression +../src/log.c:221:42: error: use of undeclared identifier 'info' + depth++, ip, symbol, off, info.dli_fname, ip - (uintptr_t) info.dli_fbase); + ^ ---- meson.build.orig 2022-01-16 12:36:07 UTC +--- meson.build.orig 2023-03-13 12:07:23 UTC +++ meson.build -@@ -71,7 +71,7 @@ cc = meson.get_compiler('c') +@@ -312,7 +312,7 @@ c_opts = [ 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', + '-U__STRICT_ANSI__', '-Wmissing-prototypes', # Warnings to ignore diff --git a/graphics/libplacebo/pkg-plist b/graphics/libplacebo/pkg-plist index f280b962aae6..44d18901eb70 100644 --- a/graphics/libplacebo/pkg-plist +++ b/graphics/libplacebo/pkg-plist @@ -1,33 +1,34 @@ include/libplacebo/colorspace.h include/libplacebo/common.h include/libplacebo/config.h include/libplacebo/d3d11.h include/libplacebo/dispatch.h include/libplacebo/dither.h include/libplacebo/dummy.h include/libplacebo/filters.h include/libplacebo/gpu.h include/libplacebo/log.h include/libplacebo/opengl.h include/libplacebo/renderer.h include/libplacebo/shaders.h include/libplacebo/shaders/colorspace.h include/libplacebo/shaders/custom.h include/libplacebo/shaders/deinterlacing.h include/libplacebo/shaders/dithering.h include/libplacebo/shaders/film_grain.h 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/dolbyvision.h include/libplacebo/utils/frame_queue.h include/libplacebo/utils/libav.h include/libplacebo/utils/libav_internal.h include/libplacebo/utils/upload.h include/libplacebo/vulkan.h lib/libplacebo.so -lib/libplacebo.so.229 +lib/libplacebo.so.264 libdata/pkgconfig/libplacebo.pc diff --git a/multimedia/dav1d/Makefile b/multimedia/dav1d/Makefile index d312d2b7c566..43a050e99823 100644 --- a/multimedia/dav1d/Makefile +++ b/multimedia/dav1d/Makefile @@ -1,50 +1,51 @@ PORTNAME= dav1d DISTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org COMMENT= Small and fast AV1 decoder WWW= https://code.videolan.org/videolan/dav1d LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_amd64= nasm:devel/nasm BUILD_DEPENDS_i386= nasm:devel/nasm USES= compiler:c11 meson USE_GITLAB= yes USE_LDCONFIG= yes GL_SITE= https://code.videolan.org GL_ACCOUNT= videolan GL_COMMIT= 9593e625b75d498d1edea544da21ea764b98d507 LDFLAGS_i386= -Wl,-z,notext OPTIONS_DEFINE= SDL TEST OPTIONS_SUB= yes SDL_USES= pkgconfig sdl SDL_USE= SDL=sdl2 SDL_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers SDL_LIB_DEPENDS= libplacebo.so:graphics/libplacebo \ libvulkan.so:graphics/vulkan-loader SDL_MESON_TRUE= enable_examples TEST_GL_TUPLE= videolan:dav1d-test-data:b1bb21f24d1c97e6bcbbc2db9c39155c4354c4bc:testdata/tests/dav1d-test-data TEST_MESON_TRUE=enable_tests testdata_tests .if make(makesum) # for optional distfiles .MAKEFLAGS: WITH="${OPTIONS_DEFINE}" .endif # https://github.com/llvm/llvm-project/issues/39981 .if !empty(CFLAGS:M-flto*) MESON_ARGS+= ${MESON_ARGS_${CHOSEN_COMPILER_TYPE}_${ARCH}} MESON_ARGS_clang_amd64= -Dstack_alignment=16 MESON_ARGS_clang_i386= -Dstack_alignment=4 .endif pre-install-TEST-on: do-test .include diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index 4520682de98a..7adada462107 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -1,198 +1,199 @@ PORTNAME= mpv DISTVERSIONPREFIX= v DISTVERSION= 0.35.1 +PORTREVISION= 1 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 MAINTAINER= multimedia@FreeBSD.org COMMENT= Free and open-source general-purpose video player WWW= https://mpv.io LICENSE= GPLv2+ LGPL21+ LICENSE_COMB= multi LICENSE_FILE_GPLv2+ = ${WRKSRC}/LICENSE.GPL LICENSE_FILE_LGPL21+ = ${WRKSRC}/LICENSE.LGPL BUILD_DEPENDS= ffmpeg>=4.0.2,1:multimedia/ffmpeg LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libass.so:multimedia/libass USES= compiler:c11 cpe desktop-file-utils iconv jpeg \ meson pkgconfig python:build shebangfix tar:bz2 USE_LDCONFIG= yes SHEBANG_FILES= *.py TOOLS/*.py USE_GITHUB= yes GH_ACCOUNT= mpv-player MESON_ARGS= -Dshaderc=disabled \ -Dlibmpv=true OPTIONS_DEFINE= ARCHIVE DOCS LCMS2 MANPAGES MUJS RUBBERBAND TEST UCHARDET EXAMPLES ZIMG OPTIONS_DEFAULT= ARCHIVE DVDNAV LCMS2 LUAJIT MANPAGES NVDEC OPENGL UCHARDET \ V4L VAAPI VDPAU VULKAN WAYLAND X11 YTDLP OPTIONS_GROUP= IN VO AO OPTIONS_GROUP_IN= CDIO DVDNAV LIBBLURAY V4L VAPOURSYNTH OPTIONS_GROUP_VO= CACA NVDEC OPENGL SIXEL VAAPI VDPAU VULKAN WAYLAND X11 OPTIONS_GROUP_AO= ALSA JACK OPENAL PIPEWIRE PULSEAUDIO SDL SNDIO OPTIONS_RADIO= YOUTUBE OPTIONS_RADIO_YOUTUBE= YTDL YTDLP OPTIONS_SINGLE= LUA OPTIONS_SINGLE_LUA= LUA LUAJIT LUA_NONE OPTIONS_SUB= yes DVDNAV_DESC= DVD menu navigation LUA_NONE_DESC= Disable Lua scripting language support LUAJIT_DESC= Use LuaJIT instead of Lua scripting language support MUJS_DESC= Use MuJS for Javascript language support NVDEC_DESC= NVIDIA decoder with CUDA support PIPEWIRE_DESC= Pipewire sound server support RUBBERBAND_DESC= High quality pitch correction with librubberband SIXEL_DESC= Sixel graphics support UCHARDET_DESC= Guess subtitle encoding via uchardet VAPOURSYNTH_DESC= VapourSynth filter bridge VULKAN_DESC= Vulkan output support YTDLP_DESC= Install yt-dlp (youtube-dl fork) YTDL_DESC= Install youtube-dl ZIMG_DESC= High quality software scaling via "z" library IN_DESC= Input VO_DESC= Video Output AO_DESC= Audio Output ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_MESON_ENABLED= alsa ARCHIVE_USES= libarchive ARCHIVE_MESON_ENABLED= libarchive CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca CACA_MESON_ENABLED= caca CDIO_LIB_DEPENDS= libcdio_paranoia.so:sysutils/libcdio-paranoia CDIO_MESON_ENABLED= cdda DOCS_BUILD_DEPENDS= rst2html:textproc/py-docutils DOCS_MESON_ENABLED= html-build DVDNAV_LIB_DEPENDS= libdvdnav.so:multimedia/libdvdnav DVDNAV_MESON_ENABLED= dvdnav JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_MESON_ENABLED= jack LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS2_MESON_ENABLED= lcms2 LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray LIBBLURAY_MESON_ENABLED= libbluray LUA_USES= lua:51-52 LUA_MESON_ON= -Dlua=lua-${LUA_VER} LUAJIT_USES= luajit LUAJIT_MESON_ON= -Dlua=luajit LUA_NONE_MESON_ON= -Dlua=disabled MANPAGES_BUILD_DEPENDS= rst2man:textproc/py-docutils MANPAGES_MESON_ENABLED= manpage-build MUJS_LIB_DEPENDS= libmujs.so:lang/mujs MUJS_MESON_ENABLED= javascript NVDEC_BUILD_DEPENDS= ${LOCALBASE}/include/ffnvcodec/dynlink_loader.h:multimedia/ffnvcodec-headers NVDEC_RUN_DEPENDS= ${LOCALBASE}/include/ffnvcodec/dynlink_loader.h:multimedia/ffnvcodec-headers NVDEC_MESON_ENABLED= cuda-hwaccel OPENAL_USES= openal OPENAL_MESON_ENABLED= openal OPENAL_LDFLAGS= ${_OPENAL_LDFLAGS_${ARCH}} _OPENAL_LDFLAGS_i386= -Wl,-znotext OPENGL_USES= gl OPENGL_USE= GL=egl,gbm OPENGL_MESON_ENABLED= gl PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire PIPEWIRE_MESON_ENABLED= pipewire PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_MESON_ENABLED= pulse RUBBERBAND_LIB_DEPENDS= librubberband.so:audio/rubberband RUBBERBAND_MESON_ENABLED= rubberband SDL_USES= sdl SDL_USE= SDL=sdl2 SDL_MESON_ENABLED= sdl2 SIXEL_LIB_DEPENDS= libsixel.so:graphics/libsixel SIXEL_MESON_ENABLED= sixel SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_MESON_ENABLED= sndio TEST_MESON_TRUE= tests UCHARDET_LIB_DEPENDS= libuchardet.so:textproc/uchardet UCHARDET_MESON_ENABLED= uchardet V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/dvb/dmx.h:multimedia/v4l_compat V4L_MESON_ENABLED= dvbin VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VAAPI_MESON_ENABLED= vaapi VAPOURSYNTH_LIB_DEPENDS= libvapoursynth-script.so:multimedia/vapoursynth VAPOURSYNTH_MESON_ENABLED= vapoursynth VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_MESON_ENABLED= vdpau VDPAU_IMPLIES= X11 VULKAN_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers VULKAN_LIB_DEPENDS= libplacebo.so:graphics/libplacebo \ libvulkan.so:graphics/vulkan-loader VULKAN_MESON_ENABLED= vulkan libplacebo WAYLAND_CATEGORIES= wayland WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.15:graphics/wayland-protocols \ ${LOCALBASE}/include/linux/input-event-codes.h:devel/evdev-proto WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libwayland-cursor.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon WAYLAND_RUN_DEPENDS= wayland-protocols>=1.15:graphics/wayland-protocols # pkg-config WAYLAND_MESON_ENABLED= wayland WAYLAND_IMPLIES= OPENGL X11_USES= gnome xorg X11_USE= XORG=x11,xext,xinerama,xorgproto,xpresent,xrandr,xscrnsaver,xv,xxf86vm X11_MESON_ENABLED= x11 YTDLP_RUN_DEPENDS= yt-dlp:www/yt-dlp YTDL_RUN_DEPENDS= youtube-dl:www/youtube_dl ZIMG_LIB_DEPENDS= libzimg.so:graphics/sekrit-twc-zimg ZIMG_MESON_ENABLED= zimg .include .if ${PORT_OPTIONS:MVAAPI} && ${PORT_OPTIONS:MWAYLAND} MESON_ARGS+= -Dvaapi-wayland=enabled LIB_DEPENDS+= libva-wayland.so:multimedia/libva .else MESON_ARGS+= -Dvaapi-wayland=disabled .endif post-patch-MANPAGES-on: @${FIND} ${WRKSRC}/DOCS/man -name '*.rst' | ${XARGS} ${REINPLACE_CMD} \ -e 's|/usr/local|${PREFIX}|g' pre-install-TEST-on: @(cd ${WRKSRC} && ${SETENV} ${TEST_ENV} \ ${MESON_BUILD_DIR}/${PORTNAME} --unittest=all-simple) .include