diff --git a/abi_used_symbols b/abi_used_symbols --- a/abi_used_symbols +++ b/abi_used_symbols @@ -17,7 +17,6 @@ libEGL.so.1:eglSwapInterval libEGL.so.1:eglTerminate libGL.so.1:glXChooseFBConfig -libGL.so.1:glXCreateContext libGL.so.1:glXDestroyContext libGL.so.1:glXGetFBConfigAttrib libGL.so.1:glXGetProcAddressARB @@ -506,6 +505,8 @@ libc.so.6:fgets libc.so.6:fopen64 libc.so.6:fork +libc.so.6:fputc +libc.so.6:fputs libc.so.6:fread libc.so.6:free libc.so.6:freelocale @@ -625,11 +626,12 @@ libdl.so.2:dlerror libdl.so.2:dlopen libdl.so.2:dlsym -libdrm.so.2:drmFree +libdrm.so.2:drmDropMaster +libdrm.so.2:drmFreeDevices libdrm.so.2:drmFreeVersion libdrm.so.2:drmGetCap -libdrm.so.2:drmGetDeviceNameFromFd libdrm.so.2:drmGetDeviceNameFromFd2 +libdrm.so.2:drmGetDevices2 libdrm.so.2:drmGetRenderDeviceNameFromFd libdrm.so.2:drmGetVersion libdrm.so.2:drmHandleEvent @@ -665,6 +667,7 @@ libdrm.so.2:drmModeSetPlane libdrm.so.2:drmPrimeFDToHandle libdrm.so.2:drmSetClientCap +libdrm.so.2:drmSetMaster libdvdnav.so.4:dvdnav_angle_change libdvdnav.so.4:dvdnav_audio_stream_to_lang libdvdnav.so.4:dvdnav_close @@ -827,6 +830,7 @@ libplacebo.so.157:pl_timer_query libplacebo.so.157:pl_vk_inst_create libplacebo.so.157:pl_vk_inst_destroy +libplacebo.so.157:pl_vulkan_choose_device libplacebo.so.157:pl_vulkan_create libplacebo.so.157:pl_vulkan_create_swapchain libplacebo.so.157:pl_vulkan_destroy @@ -1027,11 +1031,17 @@ libvapoursynth-script.so.0:vsscript_init libvapoursynth-script.so.0:vsscript_setVariable libvdpau.so.1:vdp_device_create_x11 +libvulkan.so.1:vkCreateDisplayPlaneSurfaceKHR libvulkan.so.1:vkCreateInstance libvulkan.so.1:vkCreateWaylandSurfaceKHR libvulkan.so.1:vkCreateXlibSurfaceKHR +libvulkan.so.1:vkDestroyInstance libvulkan.so.1:vkDestroySurfaceKHR libvulkan.so.1:vkEnumeratePhysicalDevices +libvulkan.so.1:vkGetDisplayModePropertiesKHR +libvulkan.so.1:vkGetDisplayPlaneSupportedDisplaysKHR +libvulkan.so.1:vkGetPhysicalDeviceDisplayPlanePropertiesKHR +libvulkan.so.1:vkGetPhysicalDeviceDisplayPropertiesKHR libvulkan.so.1:vkGetPhysicalDeviceProperties libwayland-client.so.0:wl_buffer_interface libwayland-client.so.0:wl_callback_interface diff --git a/files/series b/files/series deleted file mode 100644 --- a/files/series +++ /dev/null @@ -1,3 +0,0 @@ -0001-Support-a-stateless-configuration-on-nix-systems.patch -vo-gpu-placebo-update-for-upstream-API-changes.patch -vo_gpu-vaapi-export-plane-pitch-properly.patch diff --git a/files/vo-gpu-placebo-update-for-upstream-API-changes.patch b/files/vo-gpu-placebo-update-for-upstream-API-changes.patch deleted file mode 100644 --- a/files/vo-gpu-placebo-update-for-upstream-API-changes.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 7c4465cefb27d4e0d07535d368febdf77b579566 Mon Sep 17 00:00:00 2001 -From: Niklas Haas -Date: Thu, 3 Dec 2020 08:25:23 +0100 -Subject: [PATCH] vo_gpu: placebo: update for upstream API changes - -The concept of sample/address modes was moved from `pl_tex` to -`pl_desc_binding`. - -The `pl_tex_blit()` function also underwent an API change. ---- - video/out/placebo/ra_pl.c | 31 +++++++++++++++++++++++++++++-- - 1 file changed, 29 insertions(+), 2 deletions(-) - -diff --git a/video/out/placebo/ra_pl.c b/video/out/placebo/ra_pl.c -index f8df590511..8244acff26 100644 ---- a/video/out/placebo/ra_pl.c -+++ b/video/out/placebo/ra_pl.c -@@ -144,8 +144,14 @@ bool mppl_wrap_tex(struct ra *ra, const struct pl_tex *pltex, - .blit_dst = pltex->params.blit_dst, - .host_mutable = pltex->params.host_writable, - .downloadable = pltex->params.host_readable, -+#if PL_API_VER >= 103 -+ // These don't exist upstream, so just pick something reasonable -+ .src_linear = pltex->params.format->caps & PL_FMT_CAP_LINEAR, -+ .src_repeat = false, -+#else - .src_linear = pltex->params.sample_mode == PL_TEX_SAMPLE_LINEAR, - .src_repeat = pltex->params.address_mode == PL_TEX_ADDRESS_REPEAT, -+#endif - }, - .priv = (void *) pltex, - }; -@@ -195,10 +201,12 @@ static struct ra_tex *tex_create_pl(struct ra *ra, - .blit_dst = params->blit_dst || params->render_dst, - .host_writable = params->host_mutable, - .host_readable = params->downloadable, -+#if PL_API_VER < 103 - .sample_mode = params->src_linear ? PL_TEX_SAMPLE_LINEAR - : PL_TEX_SAMPLE_NEAREST, - .address_mode = params->src_repeat ? PL_TEX_ADDRESS_REPEAT - : PL_TEX_ADDRESS_CLAMP, -+#endif - .initial_data = params->initial_data, - }); - -@@ -399,7 +407,18 @@ static void blit_pl(struct ra *ra, struct ra_tex *dst, struct ra_tex *src, - pldst.y1 = MPMIN(MPMAX(dst_rc->y1, 0), dst->params.h); - } - -+#if PL_API_VER >= 103 -+ pl_tex_blit(get_gpu(ra), &(struct pl_tex_blit_params) { -+ .src = src->priv, -+ .dst = dst->priv, -+ .src_rc = plsrc, -+ .dst_rc = pldst, -+ .sample_mode = src->params.src_linear ? PL_TEX_SAMPLE_LINEAR -+ : PL_TEX_SAMPLE_NEAREST, -+ }); -+#else - pl_tex_blit(get_gpu(ra), dst->priv, src->priv, pldst, plsrc); -+#endif - } - - static const enum pl_var_type var_type[RA_VARTYPE_COUNT] = { -@@ -627,9 +646,17 @@ static void renderpass_run_pl(struct ra *ra, - struct pl_desc_binding bind; - switch (inp->type) { - case RA_VARTYPE_TEX: -- case RA_VARTYPE_IMG_W: -- bind.object = (* (struct ra_tex **) val->data)->priv; -+ case RA_VARTYPE_IMG_W: { -+ struct ra_tex *tex = *((struct ra_tex **) val->data); -+ bind.object = tex->priv; -+#if PL_API_VER >= 103 -+ bind.sample_mode = tex->params.src_linear ? PL_TEX_SAMPLE_LINEAR -+ : PL_TEX_SAMPLE_NEAREST; -+ bind.address_mode = tex->params.src_repeat ? PL_TEX_ADDRESS_REPEAT -+ : PL_TEX_ADDRESS_CLAMP; -+#endif - break; -+ } - case RA_VARTYPE_BUF_RO: - case RA_VARTYPE_BUF_RW: - bind.object = (* (struct ra_buf **) val->data)->priv; diff --git a/files/vo_gpu-vaapi-export-plane-pitch-properly.patch b/files/vo_gpu-vaapi-export-plane-pitch-properly.patch deleted file mode 100644 --- a/files/vo_gpu-vaapi-export-plane-pitch-properly.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 968faef86723c895f5b19c948a43eb0fcf6179e5 Mon Sep 17 00:00:00 2001 -From: Niklas Haas -Date: Fri, 12 Feb 2021 23:31:03 +0100 -Subject: [PATCH] vo_gpu: vaapi: export plane pitch properly - ---- - video/out/hwdec/hwdec_vaapi_vk.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/video/out/hwdec/hwdec_vaapi_vk.c b/video/out/hwdec/hwdec_vaapi_vk.c -index 1cee9e86b95..afb81be82a3 100644 ---- a/video/out/hwdec/hwdec_vaapi_vk.c -+++ b/video/out/hwdec/hwdec_vaapi_vk.c -@@ -43,6 +43,7 @@ static bool vaapi_vk_map(struct ra_hwdec_mapper *mapper) - int fd = p->desc.objects[id].fd; - uint32_t size = p->desc.objects[id].size; - uint32_t offset = p->desc.layers[n].offset[0]; -+ uint32_t pitch = p->desc.layers[n].pitch[0]; - - #if PL_API_VER >= 88 - // AMD drivers do not return the size in the surface description, so we -@@ -84,6 +85,9 @@ static bool vaapi_vk_map(struct ra_hwdec_mapper *mapper) - .offset = offset, - #if PL_API_VER >= 88 - .drm_format_mod = p->desc.objects[id].drm_format_modifier, -+#endif -+#if PL_API_VER >= 106 -+ .stride_w = pitch, - #endif - }, - }; diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,10 +1,10 @@ name : mpv homepage : https://mpv.io/ -version : 0.33.1 -release : 95 +version : 0.34.0 +release : 96 source : - - https://github.com/mpv-player/mpv/archive/refs/tags/v0.33.1.tar.gz : 100a116b9f23bdcda3a596e9f26be3a69f166a4f1d00910d1789b6571c46f3a9 - - https://waf.io/waf-2.0.21 : 7cebf2c5efe53cbb9a4b5bdc4b49ae90ecd64a8fce7a3222d58e591b58215306 + - https://github.com/mpv-player/mpv/archive/refs/tags/v0.34.0.tar.gz : f654fb6275e5178f57e055d20918d7d34e19949bc98ebbf4a7371902e88ce309 + - https://waf.io/waf-2.0.22 : 0a09ad26a2cfc69fa26ab871cb558165b60374b5a653ff556a0c6aca63a00df1 license : - GPL-2.0-or-later - LGPL-2.1-or-later @@ -45,9 +45,9 @@ - python-docutils - vulkan-headers rundeps : - - youtube-dl + - yt-dlp - libs : - - youtube-dl + - yt-dlp patterns : - libs : - /usr/lib64/lib*.so.* @@ -60,7 +60,7 @@ environment: | export CFLAGS="$CFLAGS -DNDEBUG" setup : | - %apply_patches + %patch -p1 < $pkgfiles/0001-Support-a-stateless-configuration-on-nix-systems.patch install -m00755 $sources/waf-* ./waf python3 %waf_configure \ --confdir=/etc/mpv \ diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -3,8 +3,8 @@ mpv https://mpv.io/ - Joshua Strobl - joshua@getsol.us + Thomas Staudinger + Staudi.Kaos@gmail.com GPL-2.0-or-later LGPL-2.1-or-later @@ -61,7 +61,7 @@ programming.devel - mpv-libs + mpv-libs /usr/include/mpv/client.h @@ -77,12 +77,12 @@ - - 2021-10-15 - 0.33.1 + + 2021-11-06 + 0.34.0 Packaging update - Joshua Strobl - joshua@getsol.us + Thomas Staudinger + Staudi.Kaos@gmail.com \ No newline at end of file