From 00c1a1dd9b571fbf46c1359e9720e9fd4a09b032 Mon Sep 17 00:00:00 2001 From: mmnmnnmnmm Date: Sun, 27 Nov 2022 18:02:51 +0000 Subject: [PATCH 1/4] New package: python3-glad-2.0.2 --- srcpkgs/python3-glad/template | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 srcpkgs/python3-glad/template diff --git a/srcpkgs/python3-glad/template b/srcpkgs/python3-glad/template new file mode 100644 index 000000000000..bb92a62e5bf0 --- /dev/null +++ b/srcpkgs/python3-glad/template @@ -0,0 +1,23 @@ +# Template file for 'python3-glad' +pkgname=python3-glad +version=2.0.2 +revision=1 +build_style=python3-module +hostmakedepends="python3-setuptools" +checkdepends="python3-Jinja2 python3-mock python3-nose" +depends="python3-Jinja2" +short_desc="Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator" +maintainer="mmnmnnmnmm " +license="MIT" +homepage="https://glad.dav1d.de/" +distfiles="https://github.com/Dav1dde/glad/archive/refs/tags/v${version}.tar.gz" +checksum=0326d59b1ccf8ccae1fface5bfb71bec1bb41fbe2341e722b31f6acac3068aeb +make_check=no # Jinja2 raises exceptions + +do_check() { + nosetests +} + +post_install() { + vlicense LICENSE +} From 65586420aa4fab4502057c7097ad30b28fe1d0ad Mon Sep 17 00:00:00 2001 From: mmnmnnmnmm Date: Sun, 27 Nov 2022 18:03:49 +0000 Subject: [PATCH 2/4] libplacebo: update to 5.229.1 --- common/shlibs | 2 +- srcpkgs/libplacebo/template | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common/shlibs b/common/shlibs index 74ae97843d38..55ce4025c8c1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3446,7 +3446,7 @@ libSoapySDR.so.0.8 SoapySDR-0.8.1_1 libeditorconfig.so.0 editorconfig-0.12.2_1 libcfitsio.so.10 cfitsio-4.2.0_1 libapparmor.so.1 libapparmor-2.12.0_1 -libplacebo.so.192 libplacebo-4.192.1_1 +libplacebo.so.229 libplacebo-5.229.1_1 libw2xc.so waifu2x-converter-cpp-5.2_1 libnova-0.15.so.0 libnova-0.15.0_1 libcue.so.2 libcue-2.2.0_1 diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template index a88785bb18ed..c663d3758f1b 100644 --- a/srcpkgs/libplacebo/template +++ b/srcpkgs/libplacebo/template @@ -1,32 +1,32 @@ # Template file for 'libplacebo' pkgname=libplacebo -version=4.192.1 +version=5.229.1 revision=1 build_style=meson configure_args="-Dshaderc=enabled -Dvulkan=enabled - -Dlcms=$(vopt_if lcms en dis)abled -Dopengl=$(vopt_if opengl en dis)abled" -hostmakedepends="pkg-config python3-Mako Vulkan-Headers" -makedepends="shaderc Vulkan-Headers vulkan-loader $(vopt_if lcms lcms2-devel) - $(vopt_if opengl libepoxy-devel)" + -Dlcms=$(vopt_if lcms en dis)abled -Ddemos=false -Dtests=true" +hostmakedepends="pkg-config Vulkan-Headers python3-glad" +makedepends="shaderc Vulkan-Headers vulkan-loader python3-MarkupSafe + python3-Jinja2 $(vopt_if lcms lcms2-devel)" short_desc="Reusable library for GPU-accelerated video/image rendering" maintainer="Enrico Belleri " license="LGPL-2.1-or-later" homepage="https://code.videolan.org/videolan/libplacebo" distfiles="https://code.videolan.org/videolan/libplacebo/-/archive/v${version}/libplacebo-v${version}.tar.gz" -checksum=e6c5805cf4d955b5941dd12b00fe157b61e77995bc1786b9a86df0ca99a0edc4 +checksum=fc021fc68376b92511977b5bd32340fc575dc36af5c471cc095b5b7e3fa581d4 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi -build_options="lcms opengl" -build_options_default="lcms opengl" +build_options="lcms" +build_options_default="lcms" desc_option_lcms="Enable support for LittleCMS 2 engine" libplacebo-devel_package() { depends="${sourcepkg}>=${version}_${revision} vulkan-loader - $(vopt_if lcms lcms2-devel) $(vopt_if opengl libepoxy-devel)" + $(vopt_if lcms lcms2-devel)" short_desc+=" - development files" pkg_install() { vmove usr/include From 0c84338f4242be07a2493779da22122b86281f6a Mon Sep 17 00:00:00 2001 From: mmnmnnmnmm Date: Sun, 27 Nov 2022 18:04:20 +0000 Subject: [PATCH 3/4] mpv: revbump for libplacebo-5.229.1 --- srcpkgs/mpv/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index 0e3c3ed8f81c..5dcef38aa241 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -1,7 +1,7 @@ # Template file for 'mpv' pkgname=mpv version=0.35.0 -revision=1 +revision=2 build_style=meson configure_args="-Dcdda=enabled -Ddvbin=enabled -Ddvdnav=enabled -Dlibmpv=true -Dcplugins=enabled From 78721f2ec2811beafc3d97eff92c8c993fd75f17 Mon Sep 17 00:00:00 2001 From: mmnmnnmnmm Date: Sun, 27 Nov 2022 18:04:48 +0000 Subject: [PATCH 4/4] vlc: revbump for libplacebo-5.229.1 --- srcpkgs/vlc/patches/libplacebo-v5.patch | 113 ++++++++++++++++++++++++ srcpkgs/vlc/template | 2 +- 2 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/vlc/patches/libplacebo-v5.patch diff --git a/srcpkgs/vlc/patches/libplacebo-v5.patch b/srcpkgs/vlc/patches/libplacebo-v5.patch new file mode 100644 index 000000000000..3fa20249db7e --- /dev/null +++ b/srcpkgs/vlc/patches/libplacebo-v5.patch @@ -0,0 +1,113 @@ +Patch from Arch Linux +https://raw.githubusercontent.com/archlinux/svntogit-packages/e35c373bdfcafaabbdf6af9108090f130de66b14/trunk/libplacebo-5.patch + +--- + +patch vaguely ported from: https://code.videolan.org/videolan/vlc/-/merge_requests/2233 + +diff --git a/modules/video_output/opengl/converter.h b/modules/video_output/opengl/converter.h +index 7000e1f..49fa667 100644 +--- a/modules/video_output/opengl/converter.h ++++ b/modules/video_output/opengl/converter.h +@@ -26,6 +26,9 @@ + #include + #include + ++#include ++#include ++ + /* if USE_OPENGL_ES2 is defined, OpenGL ES version 2 will be used, otherwise + * normal OpenGL will be used */ + #ifdef __APPLE__ +@@ -253,10 +256,6 @@ static inline bool HasExtension(const char *apis, const char *api) + return false; + } + +-struct pl_context; +-struct pl_shader; +-struct pl_shader_res; +- + /* + * Structure that is filled by "glhw converter" module probe function + * The implementation should initialize every members of the struct that are +@@ -273,7 +272,7 @@ struct opengl_tex_converter_t + vlc_gl_t *gl; + + /* libplacebo context, created by the caller (optional) */ +- struct pl_context *pl_ctx; ++ pl_log pl_log; + + /* Function pointers to OpenGL functions, set by the caller */ + const opengl_vtable_t *vt; +@@ -337,7 +336,7 @@ struct opengl_tex_converter_t + bool yuv_color; + GLfloat yuv_coefficients[16]; + +- struct pl_shader *pl_sh; ++ pl_shader pl_sh; + const struct pl_shader_res *pl_sh_res; + + /* Private context */ +diff --git a/modules/video_output/opengl/fragment_shaders.c b/modules/video_output/opengl/fragment_shaders.c +index ecf7226..29f4148 100644 +--- a/modules/video_output/opengl/fragment_shaders.c ++++ b/modules/video_output/opengl/fragment_shaders.c +@@ -611,7 +611,7 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target, + + #ifdef HAVE_LIBPLACEBO + if (tc->pl_sh) { +- struct pl_shader *sh = tc->pl_sh; ++ pl_shader sh = tc->pl_sh; + struct pl_color_map_params color_params = pl_color_map_default_params; + color_params.intent = var_InheritInteger(tc->gl, "rendering-intent"); + color_params.tone_mapping_algo = var_InheritInteger(tc->gl, "tone-mapping"); +@@ -634,7 +634,7 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target, + pl_color_space_from_video_format(&tc->fmt), + dst_space, NULL, false); + +- struct pl_shader_obj *dither_state = NULL; ++ pl_shader_obj dither_state = NULL; + int method = var_InheritInteger(tc->gl, "dither-algo"); + if (method >= 0) { + +diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c +index 13d65e0..1ee99af 100644 +--- a/modules/video_output/opengl/vout_helper.c ++++ b/modules/video_output/opengl/vout_helper.c +@@ -570,8 +570,7 @@ opengl_deinit_program(vout_display_opengl_t *vgl, struct prgm *prgm) + + #ifdef HAVE_LIBPLACEBO + FREENULL(tc->uloc.pl_vars); +- if (tc->pl_ctx) +- pl_context_destroy(&tc->pl_ctx); ++ pl_log_destroy(&tc->pl_log); + #endif + + vlc_object_release(tc); +@@ -622,21 +621,21 @@ opengl_init_program(vout_display_opengl_t *vgl, struct prgm *prgm, + // create the main libplacebo context + if (!subpics) + { +- tc->pl_ctx = pl_context_create(PL_API_VER, &(struct pl_context_params) { ++ tc->pl_log = pl_log_create(PL_API_VER, &(struct pl_log_params) { + .log_cb = log_cb, + .log_priv = tc, + .log_level = PL_LOG_INFO, + }); +- if (tc->pl_ctx) { ++ if (tc->pl_log) { + # if PL_API_VER >= 20 +- tc->pl_sh = pl_shader_alloc(tc->pl_ctx, &(struct pl_shader_params) { ++ tc->pl_sh = pl_shader_alloc(tc->pl_log, &(struct pl_shader_params) { + .glsl.version = tc->glsl_version, + .glsl.gles = tc->is_gles, + }); + # elif PL_API_VER >= 6 +- tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0); ++ tc->pl_sh = pl_shader_alloc(tc->pl_log, NULL, 0); + # else +- tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0, 0); ++ tc->pl_sh = pl_shader_alloc(tc->pl_log, NULL, 0, 0); + # endif + } + } diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index e35a23e96bb6..25867af43440 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=3.0.18 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --enable-live555 --disable-fluidsynth --enable-dvdread