Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F10794901
D11255.id27169.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
7 KB
Referenced Files
None
Subscribers
None
D11255.id27169.diff
View Options
diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -27,10 +27,11 @@
liblcms2.so.2
libluajit-5.1.so.2
libm.so.6
-libplacebo.so.104
+libplacebo.so.120
libpthread.so.0
libpulse.so.0
librubberband.so.2
+libshaderc_shared.so.1
libswresample.so.3
libswscale.so.5
libuchardet.so.0
diff --git a/abi_used_symbols b/abi_used_symbols
--- a/abi_used_symbols
+++ b/abi_used_symbols
@@ -788,45 +788,45 @@
libm.so.6:roundf
libm.so.6:sin
libm.so.6:sincos
-libplacebo.so.104:pl_buf_create
-libplacebo.so.104:pl_buf_destroy
-libplacebo.so.104:pl_buf_poll
-libplacebo.so.104:pl_buf_write
-libplacebo.so.104:pl_context_create
-libplacebo.so.104:pl_context_destroy
-libplacebo.so.104:pl_context_update
-libplacebo.so.104:pl_desc_namespace
-libplacebo.so.104:pl_find_fmt
-libplacebo.so.104:pl_find_named_fmt
-libplacebo.so.104:pl_fmt_is_ordered
-libplacebo.so.104:pl_gpu_finish
-libplacebo.so.104:pl_pass_create
-libplacebo.so.104:pl_pass_destroy
-libplacebo.so.104:pl_pass_run
-libplacebo.so.104:pl_std140_layout
-libplacebo.so.104:pl_std430_layout
-libplacebo.so.104:pl_swapchain_destroy
-libplacebo.so.104:pl_swapchain_resize
-libplacebo.so.104:pl_swapchain_start_frame
-libplacebo.so.104:pl_swapchain_submit_frame
-libplacebo.so.104:pl_swapchain_swap_buffers
-libplacebo.so.104:pl_sync_create
-libplacebo.so.104:pl_sync_destroy
-libplacebo.so.104:pl_tex_blit
-libplacebo.so.104:pl_tex_clear
-libplacebo.so.104:pl_tex_create
-libplacebo.so.104:pl_tex_destroy
-libplacebo.so.104:pl_tex_download
-libplacebo.so.104:pl_tex_export
-libplacebo.so.104:pl_tex_upload
-libplacebo.so.104:pl_timer_create
-libplacebo.so.104:pl_timer_destroy
-libplacebo.so.104:pl_timer_query
-libplacebo.so.104:pl_vk_inst_create
-libplacebo.so.104:pl_vk_inst_destroy
-libplacebo.so.104:pl_vulkan_create
-libplacebo.so.104:pl_vulkan_create_swapchain
-libplacebo.so.104:pl_vulkan_destroy
+libplacebo.so.120:pl_buf_create
+libplacebo.so.120:pl_buf_destroy
+libplacebo.so.120:pl_buf_poll
+libplacebo.so.120:pl_buf_write
+libplacebo.so.120:pl_context_create
+libplacebo.so.120:pl_context_destroy
+libplacebo.so.120:pl_context_update
+libplacebo.so.120:pl_desc_namespace
+libplacebo.so.120:pl_find_fmt
+libplacebo.so.120:pl_find_named_fmt
+libplacebo.so.120:pl_fmt_is_ordered
+libplacebo.so.120:pl_gpu_finish
+libplacebo.so.120:pl_pass_create
+libplacebo.so.120:pl_pass_destroy
+libplacebo.so.120:pl_pass_run
+libplacebo.so.120:pl_std140_layout
+libplacebo.so.120:pl_std430_layout
+libplacebo.so.120:pl_swapchain_destroy
+libplacebo.so.120:pl_swapchain_resize
+libplacebo.so.120:pl_swapchain_start_frame
+libplacebo.so.120:pl_swapchain_submit_frame
+libplacebo.so.120:pl_swapchain_swap_buffers
+libplacebo.so.120:pl_sync_create
+libplacebo.so.120:pl_sync_destroy
+libplacebo.so.120:pl_tex_blit
+libplacebo.so.120:pl_tex_clear
+libplacebo.so.120:pl_tex_create
+libplacebo.so.120:pl_tex_destroy
+libplacebo.so.120:pl_tex_download
+libplacebo.so.120:pl_tex_export
+libplacebo.so.120:pl_tex_upload
+libplacebo.so.120:pl_timer_create
+libplacebo.so.120:pl_timer_destroy
+libplacebo.so.120:pl_timer_query
+libplacebo.so.120:pl_vk_inst_create
+libplacebo.so.120:pl_vk_inst_destroy
+libplacebo.so.120:pl_vulkan_create
+libplacebo.so.120:pl_vulkan_create_swapchain
+libplacebo.so.120:pl_vulkan_destroy
libpthread.so.0:__errno_location
libpthread.so.0:accept
libpthread.so.0:close
@@ -928,6 +928,22 @@
librubberband.so.2:rubberband_retrieve
librubberband.so.2:rubberband_set_pitch_scale
librubberband.so.2:rubberband_set_time_ratio
+libshaderc_shared.so.1:shaderc_compile_into_spv
+libshaderc_shared.so.1:shaderc_compile_into_spv_assembly
+libshaderc_shared.so.1:shaderc_compile_options_initialize
+libshaderc_shared.so.1:shaderc_compile_options_release
+libshaderc_shared.so.1:shaderc_compile_options_set_generate_debug_info
+libshaderc_shared.so.1:shaderc_compile_options_set_optimization_level
+libshaderc_shared.so.1:shaderc_compiler_initialize
+libshaderc_shared.so.1:shaderc_compiler_release
+libshaderc_shared.so.1:shaderc_get_spv_version
+libshaderc_shared.so.1:shaderc_result_get_bytes
+libshaderc_shared.so.1:shaderc_result_get_compilation_status
+libshaderc_shared.so.1:shaderc_result_get_error_message
+libshaderc_shared.so.1:shaderc_result_get_length
+libshaderc_shared.so.1:shaderc_result_get_num_errors
+libshaderc_shared.so.1:shaderc_result_get_num_warnings
+libshaderc_shared.so.1:shaderc_result_release
libswresample.so.3:swr_alloc
libswresample.so.3:swr_close
libswresample.so.3:swr_convert
diff --git a/files/series b/files/series
--- a/files/series
+++ b/files/series
@@ -1,2 +1,3 @@
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-vaapi-export-plane-pitch-properly.patch b/files/vo_gpu-vaapi-export-plane-pitch-properly.patch
new file mode 100644
--- /dev/null
+++ b/files/vo_gpu-vaapi-export-plane-pitch-properly.patch
@@ -0,0 +1,31 @@
+From 968faef86723c895f5b19c948a43eb0fcf6179e5 Mon Sep 17 00:00:00 2001
+From: Niklas Haas <git@haasn.xyz>
+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,7 +1,7 @@
name : mpv
homepage : https://mpv.io/
version : 0.33.1
-release : 88
+release : 89
source :
- https://github.com/mpv-player/mpv/archive/refs/tags/v0.33.1.tar.gz : 100a116b9f23bdcda3a596e9f26be3a69f166a4f1d00910d1789b6571c46f3a9
- https://waf.io/waf-2.0.21 : 7cebf2c5efe53cbb9a4b5bdc4b49ae90ecd64a8fce7a3222d58e591b58215306
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -61,7 +61,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="87">mpv-libs</Dependency>
+ <Dependency release="89">mpv-libs</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/mpv/client.h</Path>
@@ -77,8 +77,8 @@
</Replaces>
</Package>
<History>
- <Update release="87">
- <Date>2021-04-05</Date>
+ <Update release="89">
+ <Date>2021-06-10</Date>
<Version>0.33.1</Version>
<Comment>Packaging update</Comment>
<Name>Alexander Vorobyev</Name>
File Metadata
Details
Attached
Mime Type
text/plain
Expires
May 28 2023, 6:09 PM (10 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5839692
Default Alt Text
D11255.id27169.diff (7 KB)
Attached To
Mode
D11255: mpv: backport fix for zero-copy VAAPI/Vulkan interop
Attached
Detach File
Event Timeline
Log In to Comment