From 4e88e3be3e96aac97044b56e041a1a4fc85e85c7 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Thu, 8 May 2025 01:29:15 -0700 Subject: [PATCH] chore(lcevdec): Update spec and drop old patches (#4750) (#4753) (cherry picked from commit a1e2ff8e62d71bf45331e62901f8c6e6a1ffa738) Co-authored-by: Gilver --- anda/multimedia/lcevcdec/LCEVCdec-cstdint.patch | 11 ----------- anda/multimedia/lcevcdec/LCEVCdec-docs.patch | 14 -------------- anda/multimedia/lcevcdec/LCEVCdec.spec | 14 +++++++++----- 3 files changed, 9 insertions(+), 30 deletions(-) delete mode 100644 anda/multimedia/lcevcdec/LCEVCdec-cstdint.patch delete mode 100644 anda/multimedia/lcevcdec/LCEVCdec-docs.patch diff --git a/anda/multimedia/lcevcdec/LCEVCdec-cstdint.patch b/anda/multimedia/lcevcdec/LCEVCdec-cstdint.patch deleted file mode 100644 index b1a35ca845..0000000000 --- a/anda/multimedia/lcevcdec/LCEVCdec-cstdint.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur LCEVCdec-3.3.5.old/src/api/src/buffer_manager.h LCEVCdec-3.3.5/src/api/src/buffer_manager.h ---- LCEVCdec-3.3.5.old/src/api/src/buffer_manager.h 2025-03-22 11:46:05.946962992 +0100 -+++ LCEVCdec-3.3.5/src/api/src/buffer_manager.h 2025-03-22 11:46:36.029979290 +0100 -@@ -15,6 +15,7 @@ - #ifndef VN_API_BUFFER_MANAGER_H_ - #define VN_API_BUFFER_MANAGER_H_ - -+#include - #include - #include - #include diff --git a/anda/multimedia/lcevcdec/LCEVCdec-docs.patch b/anda/multimedia/lcevcdec/LCEVCdec-docs.patch deleted file mode 100644 index ec6e2146a9..0000000000 --- a/anda/multimedia/lcevcdec/LCEVCdec-docs.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur LCEVCdec-3.3.5.old/docs/sphinx/CMakeLists.txt LCEVCdec-3.3.5/docs/sphinx/CMakeLists.txt ---- LCEVCdec-3.3.5.old/docs/sphinx/CMakeLists.txt 2025-03-23 16:27:09.553289475 +0100 -+++ LCEVCdec-3.3.5/docs/sphinx/CMakeLists.txt 2025-03-24 08:54:32.562734384 +0100 -@@ -41,8 +41,8 @@ - documentation ALL - DEPENDS doxygen - COMMAND -- ${SPHINX_EXECUTABLE} -b html -W -n -a -Dversion=${GIT_SHORT_VERSION} -+ ${SPHINX_EXECUTABLE} ${SPHINX_SOURCE} ${SPHINX_BUILD} -+ -b html -W -n -a -Dversion=${GIT_SHORT_VERSION} - -Drelease=${GIT_VERSION} -Dbreathe_projects.LCEVC_DEC=${DOXYGEN_OUTPUT_DIR}/xml -- ${SPHINX_SOURCE} ${SPHINX_BUILD} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Generating docs with Sphinx") diff --git a/anda/multimedia/lcevcdec/LCEVCdec.spec b/anda/multimedia/lcevcdec/LCEVCdec.spec index ce1cc0a618..d9b3752b3a 100644 --- a/anda/multimedia/lcevcdec/LCEVCdec.spec +++ b/anda/multimedia/lcevcdec/LCEVCdec.spec @@ -23,9 +23,7 @@ License: BSD-3-Clause-Clear URL: https://docs.v-nova.com/v-nova/lcevc/lcevc-sdk-overview Source0: https://github.com/v-novaltd/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: %{name}-cstdint.patch -Patch1: %{name}-docs.patch -Patch2: %{name}-soversion.patch +Patch1: %{name}-soversion.patch BuildRequires: cmake BuildRequires: cmake(CLI11) @@ -72,7 +70,7 @@ Features: %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: plutovg-devel%{?_isa} +Requires: plutovg-devel%{?_isa} %description devel The %{name}-devel package contains libraries and header files for @@ -128,13 +126,14 @@ sed -i \ %install %cmake_install + %ifnarch %ix86 mv %{buildroot}%{_prefix}/lib/*.a %{buildroot}%{_libdir}/ rm -fr %{buildroot}%{_prefix}/lib %endif # Let RPM pick up docs in the files section -rm -fr %{buildroot}%{_docdir} +rm -fr %{buildroot}%{_docdir} %{buildroot}%{_prefix}/licenses %if %{with tests} %check @@ -151,13 +150,18 @@ python3 src/func_tests/run_tests.py %files devel %{_includedir}/LCEVC +%{_includedir}/lcevc_config.h %{_libdir}/liblcevc_dec_api.so %{_libdir}/liblcevc_dec_core.so %{_libdir}/pkgconfig/lcevc_dec.pc %files static +%{_libdir}/liblcevc_dec_api_static.a %{_libdir}/liblcevc_dec_api_utility.a %{_libdir}/liblcevc_dec_core_sequencing.a +%{_libdir}/liblcevc_dec_core_static.a +%{_libdir}/liblcevc_dec_enhancement_cpu.a +%{_libdir}/liblcevc_dec_overlay_images.a %{_libdir}/liblcevc_dec_unit_test_utilities.a %{_libdir}/liblcevc_dec_utility.a