5 Commits

3 changed files with 60 additions and 43 deletions

View File

@@ -0,0 +1,31 @@
From 12509c0f1ee8c22ae163017f0a5e7b8a9d983a17 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Tue, 29 Jul 2025 11:42:35 +0200
Subject: [PATCH] vulkan/utils_gen: fix for python 3.14
Python 3.14+ has added more type checking. This patch fixes usage
Fixes: https://github.com/haasn/libplacebo/issues/335
Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
---
src/vulkan/utils_gen.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/vulkan/utils_gen.py b/src/vulkan/utils_gen.py
index 9a97d35f3..9b803d82b 100644
--- a/src/vulkan/utils_gen.py
+++ b/src/vulkan/utils_gen.py
@@ -202,7 +202,8 @@ if __name__ == '__main__':
if not xmlfile or xmlfile == '':
xmlfile = find_registry_xml(datadir)
- registry = VkXML(ET.parse(xmlfile))
+ tree = ET.parse(xmlfile)
+ registry = VkXML(tree.getroot())
with open(outfile, 'w') as f:
f.write(TEMPLATE.render(
vkresults = get_vkenum(registry, 'VkResult'),
--
GitLab

View File

@@ -1,3 +1,22 @@
-------------------------------------------------------------------
Mon Oct 20 16:16:20 UTC 2025 - Mia Herkt <mia@0x0.st>
- Grab 12509c0f1ee8c22ae163017f0a5e7b8a9d983a17.patch from upstream
repository
Drops 12509c0f.patch
-------------------------------------------------------------------
Sun Oct 19 13:06:10 UTC 2025 - Mia Herkt <mia@0x0.st>
- Drop Leap < 16 (does not meet libplacebo build requirements)
- Use RPM 4.20 BuildSystem declaration
- Clean up spec file
-------------------------------------------------------------------
Tue Aug 12 15:18:22 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
- Add 12509c0f.patch: Fix build on python 3.13.6.
-------------------------------------------------------------------
Wed May 21 22:46:00 UTC 2025 - llyyr <llyyr@yukari.in>

View File

@@ -1,7 +1,7 @@
#
# spec file for package libplacebo
#
# Copyright (c) 2025 SUSE LLC
# Copyright (c) 2025 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,30 +17,22 @@
%define sover 351
%if 0%{?suse_version} < 1600
%define py_min_ver 11
%endif
Name: libplacebo
Version: 7.351.0
Release: 0
Summary: Library for GPU-accelerated video/image rendering primitives
License: LGPL-2.1-or-later
Group: Development/Libraries/C and C++
URL: https://code.videolan.org/videolan/libplacebo
Source0: https://code.videolan.org/videolan/libplacebo/-/archive/v%{version}/libplacebo-v%{version}.tar.bz2
Source1: https://github.com/Immediate-Mode-UI/Nuklear/raw/c512ac886425f6b6b6c816d67f4cb1385cd4cc53/nuklear.h
Source9: baselibs.conf
%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150200
BuildRequires: gcc13
BuildRequires: gcc13-c++
%else
Patch0: https://code.videolan.org/videolan/libplacebo/-/commit/12509c0f1ee8c22ae163017f0a5e7b8a9d983a17.patch
BuildRequires: c++_compiler
BuildRequires: c_compiler
%endif
BuildRequires: meson >= 0.63.0
BuildRequires: pkgconfig
BuildRequires: python3%{?py_min_ver}-Jinja2
BuildRequires: python3%{?py_min_ver}-glad2
BuildRequires: python3-Jinja2
BuildRequires: python3-glad2
BuildRequires: pkgconfig(dav1d)
BuildRequires: pkgconfig(dovi)
BuildRequires: pkgconfig(glfw3)
@@ -53,6 +45,11 @@ BuildRequires: pkgconfig(libxxhash)
BuildRequires: pkgconfig(sdl2)
BuildRequires: pkgconfig(shaderc)
BuildRequires: pkgconfig(vulkan)
BuildSystem: meson
BuildOption: -Dglslang=disabled
BuildOption: -Dd3d11=disabled
BuildOption: -Dtests=true
BuildOption: -Ddemos=true
%description
This library contains GPU-accelerated video/image rendering
@@ -62,7 +59,6 @@ of mpv.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries/C and C++
Requires: %{name}%{sover} = %{version}
%description devel
@@ -71,7 +67,6 @@ developing applications that use %{name}.
%package -n %{name}%{sover}
Summary: Library for GPU-accelerated video/image rendering primitives
Group: System/Libraries
%description -n %{name}%{sover}
This library contains GPU-accelerated video/image rendering
@@ -79,44 +74,18 @@ primitives, as well as a standalone vulkan-based image/video
renderer. It is based on the core rendering algorithms and ideas
of mpv.
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} > 150400
%package -n plplay
Summary: Example video player based on %{name}
Group: Productivity/Multimedia/Video/Players
%description -n plplay
A small example video player based on %{name} and FFmpeg. This provides little
more than the ability to display video files, and rather serves as a tool to
help understand and demonstrate the various options provided by %{name}.
%endif
%prep
%setup -q -n %{name}-v%{version}
%autosetup -p1 -n %{name}-v%{version}
cp %{SOURCE1} ./demos/3rdparty/nuklear/
%build
%if 0%{?suse_version} < 1600
export PYTHON=%{_bindir}/python3.%{py_min_ver}
%endif
%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150200
export CC=gcc-13
export CXX=g++-13
%endif
%meson -Dglslang=disabled -Dd3d11=disabled -Dtests=true \
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} > 150400
-Ddemos=true \
%else
-Ddemos=false \
%endif
%meson_build
%install
%meson_install
%check
%meson_test
%ldconfig_scriptlets -n %{name}%{sover}
%files -n %{name}%{sover}
@@ -131,9 +100,7 @@ export CXX=g++-13
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} > 150400
%files -n plplay
%{_bindir}/plplay
%endif
%changelog