From 180164d70fedaa170d45e4ecd41240c1e5d076e5 Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 4 Aug 2025 23:03:34 -0500 Subject: [PATCH] fix(LCEVdec): Drop patch, Git clone source, update files (#5997) * fix(LCEVdec): Drop patch Signed-off-by: Gilver * chore: Update spec too Signed-off-by: Gilver * chore: Files Signed-off-by: Gilver * fix: Update script Signed-off-by: Gilver * Update update.rhai Signed-off-by: Gilver * fix: Spec stuff Signed-off-by: Gilver * fix: More files Signed-off-by: Gilver * fix: ??? Signed-off-by: Gilver * fix: A Signed-off-by: Gilver * ...? Signed-off-by: Gilver * Confusion? Signed-off-by: Gilver * Update LCEVCdec.spec Signed-off-by: Gilver * fix: Ifnarch? Signed-off-by: Gilver * fix: Tired Signed-off-by: Gilver * fix: Only package devel on i*86 Signed-off-by: Gilver * Why does this even have an i*86 build if it barely builds anything Signed-off-by: Gilver * Wow I'm tired Signed-off-by: Gilver * Update LCEVCdec.spec Signed-off-by: Gilver --------- Signed-off-by: Gilver --- .../lcevcdec/LCEVCdec-soversion.patch | 22 ------ anda/multimedia/lcevcdec/LCEVCdec.spec | 79 ++++++++----------- 2 files changed, 34 insertions(+), 67 deletions(-) delete mode 100644 anda/multimedia/lcevcdec/LCEVCdec-soversion.patch diff --git a/anda/multimedia/lcevcdec/LCEVCdec-soversion.patch b/anda/multimedia/lcevcdec/LCEVCdec-soversion.patch deleted file mode 100644 index f4533e882f..0000000000 --- a/anda/multimedia/lcevcdec/LCEVCdec-soversion.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur LCEVCdec-3.3.5.old/src/api/CMakeLists.txt LCEVCdec-3.3.5/src/api/CMakeLists.txt ---- LCEVCdec-3.3.5.old/src/api/CMakeLists.txt 2025-03-23 16:27:09.553851133 +0100 -+++ LCEVCdec-3.3.5/src/api/CMakeLists.txt 2025-03-26 16:53:24.642189905 +0100 -@@ -57,6 +57,7 @@ - - include(GNUInstallDirs) - -+set_target_properties(lcevc_dec_api PROPERTIES SOVERSION ${GIT_SHORT_VERSION} VERSION ${GIT_VERSION}) - get_target_property(IS_APPLE_FRAMEWORK lcevc_dec_api FRAMEWORK) - if (IS_APPLE_FRAMEWORK) - install(TARGETS lcevc_dec_api DESTINATION lib) -diff -Naur LCEVCdec-3.3.5.old/src/core/decoder/CMakeLists.txt LCEVCdec-3.3.5/src/core/decoder/CMakeLists.txt ---- LCEVCdec-3.3.5.old/src/core/decoder/CMakeLists.txt 2025-03-23 16:27:09.556081884 +0100 -+++ LCEVCdec-3.3.5/src/core/decoder/CMakeLists.txt 2025-03-26 16:53:10.698019829 +0100 -@@ -170,6 +170,7 @@ - - # ------------------------------------------------------------------------------- - -+set_target_properties(lcevc_dec_core PROPERTIES SOVERSION ${GIT_SHORT_VERSION} VERSION ${GIT_VERSION}) - get_target_property(IS_APPLE_FRAMEWORK lcevc_dec_core FRAMEWORK) - if (IS_APPLE_FRAMEWORK) - install(TARGETS lcevc_dec_core DESTINATION lib) diff --git a/anda/multimedia/lcevcdec/LCEVCdec.spec b/anda/multimedia/lcevcdec/LCEVCdec.spec index 3da2813bcb..e36f9be71f 100644 --- a/anda/multimedia/lcevcdec/LCEVCdec.spec +++ b/anda/multimedia/lcevcdec/LCEVCdec.spec @@ -1,10 +1,3 @@ -# This information is required if not building from a GIT checkout. -# See cmake/modules/VNovaSetup.cmake: -%global gitlonghash bf7e0d91c969502e90a925942510a1ca8088afec -%global gitdate 20250320 -%global githash %(c=%{gitlonghash}; echo ${c:0:7}) -%global gitbranch main - # Tests require network, as described in src/func_tests/README.md, and each test type # (Qualcomm dev kit, Ubuntu, etc.) requires the download of a few gigabytes of videos # from https://lcevcdec.nbg1.your-objectstorage.com. The videos used for testing @@ -22,9 +15,7 @@ Summary: MPEG-5 LCEVC Decoder 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 -Patch1: %{name}-soversion.patch - +BuildRequires: anda-srpm-macros BuildRequires: cmake BuildRequires: cmake(CLI11) BuildRequires: cmake(fmt) @@ -69,20 +60,15 @@ Features: %package devel Summary: Development files for %{name} +Provides: %{name}-static = %{version}-%{release} +Obsoletes: %{name}-static < %{version}-%{release} 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 developing applications that use %{name}. -%package static -Summary: Static libraries for %{name} -Requires: %{name}-devel%{?_isa} = %{version}-%{release} - -%description static -Static library files for %{name}. - %package samples Summary: Sample programs for %{name} @@ -90,16 +76,7 @@ Summary: Sample programs for %{name} Sample programs that use %{name}. %prep -%autosetup -p1 - -# This information is required if not building from a GIT checkout. -# See cmake/modules/VNovaSetup.cmake: -echo -n %{gitlonghash} > .gitlonghash -echo -n %{gitdate} | date +%Y-%m-%d > .gitdate -echo -n %{githash} > .githash -echo -n %{gitbranch} > .gitbranch -echo -n %{version} > .gitversion -echo -n %(echo %version | cut -d. -f1) > .gitshortversion +%git_clone https://github.com/v-novaltd/%{name}.git %{version} %if %{with tests} # Adjust configuration file for tests: @@ -127,8 +104,8 @@ sed -i \ %install %cmake_install -%ifnarch %ix86 -mv %{buildroot}%{_prefix}/lib/*.a %{buildroot}%{_libdir}/ +%ifnarch %{ix86} +#mv %{buildroot}%{_prefix}/lib/*.a %{buildroot}%{_libdir}/ rm -fr %{buildroot}%{_prefix}/lib %endif @@ -140,38 +117,50 @@ rm -fr %{buildroot}%{_docdir} %{buildroot}%{_prefix}/licenses python3 src/func_tests/run_tests.py %endif + %files %license LICENSE.md COPYING %doc README.md -%{_libdir}/liblcevc_dec_api.so.3 +%{_libdir}/liblcevc_dec_api.so.4 %{_libdir}/liblcevc_dec_api.so.%{version} -%{_libdir}/liblcevc_dec_core.so.3 -%{_libdir}/liblcevc_dec_core.so.%{version} +%{_libdir}/liblcevc_dec_legacy.so.1 +%{_libdir}/liblcevc_dec_pipeline_cpu.so.1 +%{_libdir}/liblcevc_dec_pipeline_legacy.so.1 %files devel +%license LICENSE.md COPYING +%doc README.md %{_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_legacy.so +%{_libdir}/liblcevc_dec_pipeline_cpu.so +%{_libdir}/liblcevc_dec_pipeline_legacy.so +# Static: %{_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_common.a +%{_libdir}/liblcevc_dec_enhancement.a +%{_libdir}/liblcevc_dec_extract.a +%{_libdir}/liblcevc_dec_pipeline.a +%{_libdir}/liblcevc_dec_pixel_processing.a +%{_libdir}/liblcevc_dec_sequencer.a %{_libdir}/liblcevc_dec_unit_test_utilities.a %{_libdir}/liblcevc_dec_utility.a +%{_libdir}/pkgconfig/lcevc_dec.pc %files samples +%{_bindir}/lcevc_dec_common_test_unit +%{_bindir}/lcevc_dec_enhancement_sample +%{_bindir}/lcevc_dec_enhancement_test_unit +%{_bindir}/lcevc_dec_legacy_test_unit +%{_bindir}/lcevc_dec_pipeline_cpu_test_unit +%{_bindir}/lcevc_dec_pipeline_legacy_test_unit +%{_bindir}/lcevc_dec_pipeline_test_unit +%{_bindir}/lcevc_dec_pixel_processing_test_unit %{_bindir}/lcevc_dec_sample %{_bindir}/lcevc_dec_test_harness %{_bindir}/lcevc_dec_test_unit %{_bindir}/lcevc_dec_utility_test_unit -%{_bindir}/lcevc_core_test_unit -%{_bindir}/lcevc_core_sequencing_test_unit +%{_bindir}/lcevc_sequencer_test_unit %changelog %autochangelog