From d220776634ee474cc9e809ea0a01d5254807cd001a5e2cbf9313e7b7444da5c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 18 Feb 2019 09:50:29 +0000 Subject: [PATCH] Accepting request 676973 from home:jengelh:branches:multimedia:libs - Update descriptions, make it fit for Factory. - Use the same macro style everywhere. - Edit fix-build.patch to conform to SLPP. with rpmlintrc OBS-URL: https://build.opensuse.org/request/show/676973 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/SVT-AV1?expand=0&rev=11 --- SVT-AV1-0.0~pre.1549319082.2a52193.obscpio | 3 -- SVT-AV1-0.0~pre.1549319082.2a52193.tar.xz | 3 ++ SVT-AV1-rpmlintrc | 3 ++ SVT-AV1.changes | 7 ++++ SVT-AV1.obsinfo | 5 --- SVT-AV1.spec | 38 +++++++++++++--------- _service | 15 ++++----- fix-build.patch | 32 +++++++++--------- 8 files changed, 57 insertions(+), 49 deletions(-) delete mode 100644 SVT-AV1-0.0~pre.1549319082.2a52193.obscpio create mode 100644 SVT-AV1-0.0~pre.1549319082.2a52193.tar.xz create mode 100644 SVT-AV1-rpmlintrc delete mode 100644 SVT-AV1.obsinfo diff --git a/SVT-AV1-0.0~pre.1549319082.2a52193.obscpio b/SVT-AV1-0.0~pre.1549319082.2a52193.obscpio deleted file mode 100644 index cbc80cb..0000000 --- a/SVT-AV1-0.0~pre.1549319082.2a52193.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef8379f016e762e6ad8af636cc934a374aa14dfb598c52e7dfa815dc2fdbf7e3 -size 15040014 diff --git a/SVT-AV1-0.0~pre.1549319082.2a52193.tar.xz b/SVT-AV1-0.0~pre.1549319082.2a52193.tar.xz new file mode 100644 index 0000000..16fcfb6 --- /dev/null +++ b/SVT-AV1-0.0~pre.1549319082.2a52193.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4947559a66beca0280edc1b283a6e2e0281ae16c86ce227bda6d202a516be33 +size 1643856 diff --git a/SVT-AV1-rpmlintrc b/SVT-AV1-rpmlintrc new file mode 100644 index 0000000..c056ffc --- /dev/null +++ b/SVT-AV1-rpmlintrc @@ -0,0 +1,3 @@ +# [ 44s] libSvtAv1Enc-suse0.x86_64: E: shlib-policy-name-error (Badness: 10000) libSvtAv1Encsuse0 +# Go home rpmlint, you are drunk! +addFilter("shlib-policy-name-error") diff --git a/SVT-AV1.changes b/SVT-AV1.changes index fd4c513..07aab4e 100644 --- a/SVT-AV1.changes +++ b/SVT-AV1.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Feb 16 12:18:45 UTC 2019 - Jan Engelhardt + +- Update descriptions, make it fit for Factory. +- Use the same macro style everywhere. +- Edit fix-build.patch to conform to SLPP. + ------------------------------------------------------------------- Tue Feb 5 08:58:20 UTC 2019 - Adrian Schröter diff --git a/SVT-AV1.obsinfo b/SVT-AV1.obsinfo deleted file mode 100644 index e82ac80..0000000 --- a/SVT-AV1.obsinfo +++ /dev/null @@ -1,5 +0,0 @@ -name: SVT-AV1 -version: 0.0~pre.1549319082.2a52193 -mtime: 1549319082 -commit: 2a52193fed7aa99211716c897943d811e14c76b1 - diff --git a/SVT-AV1.spec b/SVT-AV1.spec index 1c2e9cc..05b3552 100644 --- a/SVT-AV1.spec +++ b/SVT-AV1.spec @@ -16,16 +16,17 @@ # -%define sover 0 +%define sover suse0 Name: SVT-AV1 Version: 0.0~pre.1549319082.2a52193 Release: 0 -Summary: SVT-AV1 Encoder +Summary: The "Scalable Video Technology for AV1" Encoder License: BSD-2-Clause-Patent Group: Productivity/Multimedia/Other -Url: https://github.com/OpenVisualCloud/SVT-AV1 -Source0: %{name}-%{version}.tar.xz +URL: https://github.com/OpenVisualCloud/SVT-AV1 +Source0: %name-%version.tar.xz Source1: svt-av1_encoder_user_guide.pdf +Source9: %name-rpmlintrc Patch1: fix-build.patch BuildRequires: cmake BuildRequires: pkg-config @@ -33,24 +34,29 @@ BuildRequires: yasm ExclusiveArch: x86_64 %description +An AV1 encoder for video streams from Intel. -%package -n libSvtAv1Enc%{sover} -Summary: Library for the AV1 encoder +%package -n libSvtAv1Enc-%sover +Summary: The "Scalable Video Technology for AV1" Encoder Group: System/Libraries -%description -n libSvtAv1Enc%{sover} +%description -n libSvtAv1Enc-%sover +An AV1 encoder for video streams from Intel. %package devel -Summary: Development files for %{name} +Summary: Development files for %name Group: Development/Libraries/C and C++ -Requires: libSvtAv1Enc%{sover} = %{version} +Requires: libSvtAv1Enc-%sover = %version %description devel +An AV1 encoder for video streams from Intel. + +This package contains the header files for svt-av1. %prep %setup -q %patch1 -p1 -%if 0%{suse_version} < 1500 +%if 00%{?suse_version} < 1500 sed -i -e 's, -fstack-protector-strong , ,' CMakeLists.txt %endif @@ -64,16 +70,16 @@ cmake . \ make %{?_smp_mflags} %install -DESTDIR=%{buildroot} make install +%make_install mkdir -p %buildroot%_docdir/%name install -m 0644 %{S:1} %buildroot%_docdir/%name -%post -n libSvtAv1Enc%{sover} -p /sbin/ldconfig -%postun -n libSvtAv1Enc%{sover} -p /sbin/ldconfig +%post -n libSvtAv1Enc-%sover -p /sbin/ldconfig +%postun -n libSvtAv1Enc-%sover -p /sbin/ldconfig -%files -n libSvtAv1Enc%{sover} +%files -n libSvtAv1Enc-%sover %license LICENSE.md -%{_libdir}/libSvtAv1Enc.so.%{sover}* +%_libdir/libSvtAv1Enc.so.%{sover}* %files %doc README.md NOTICES.md @@ -81,7 +87,7 @@ install -m 0644 %{S:1} %buildroot%_docdir/%name %_bindir/* %files devel -%{_libdir}/libSvtAv1Enc.so +%_libdir/libSvtAv1Enc.so %_libdir/pkgconfig %_includedir/* diff --git a/_service b/_service index afbc7ae..7945447 100644 --- a/_service +++ b/_service @@ -1,19 +1,18 @@ - + https://github.com/OpenVisualCloud/SVT-AV1.git git + 2a52193fed7aa99211716c897943d811e14c76b1 0.0~pre - + + *.tar + xz + + https github.com /OpenVisualCloud/SVT-AV1/blob/master/Docs/svt-av1_encoder_user_guide.pdf - - - - *.tar - xz - diff --git a/fix-build.patch b/fix-build.patch index 744fd8d..aba6c0a 100644 --- a/fix-build.patch +++ b/fix-build.patch @@ -1,7 +1,12 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f0c8fd2..c1a8092 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt +--- + CMakeLists.txt | 4 ++-- + Source/Lib/Codec/CMakeLists.txt | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +Index: SVT-AV1-0.0~pre.1549319082.2a52193/CMakeLists.txt +=================================================================== +--- SVT-AV1-0.0~pre.1549319082.2a52193.orig/CMakeLists.txt ++++ SVT-AV1-0.0~pre.1549319082.2a52193/CMakeLists.txt @@ -8,8 +8,8 @@ set(project_name "svt-av1") project(${project_name} C ASM_NASM) @@ -13,22 +18,15 @@ index f0c8fd2..c1a8092 100644 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/bin) set(CMAKE_POSITION_INDEPENDENT_CODE ON) -diff --git a/Source/Lib/Codec/CMakeLists.txt b/Source/Lib/Codec/CMakeLists.txt -index 8d48d0a..66cb431 100644 ---- a/Source/Lib/Codec/CMakeLists.txt -+++ b/Source/Lib/Codec/CMakeLists.txt -@@ -35,6 +35,14 @@ file(GLOB all_files +Index: SVT-AV1-0.0~pre.1549319082.2a52193/Source/Lib/Codec/CMakeLists.txt +=================================================================== +--- SVT-AV1-0.0~pre.1549319082.2a52193.orig/Source/Lib/Codec/CMakeLists.txt ++++ SVT-AV1-0.0~pre.1549319082.2a52193/Source/Lib/Codec/CMakeLists.txt +@@ -35,6 +35,7 @@ file(GLOB all_files add_library(SvtAv1Enc SHARED ${all_files} ) -+SET_TARGET_PROPERTIES( -+ SvtAv1Enc -+ PROPERTIES -+ SOVERSION 0 -+ VERSION 0.0.0 -+ ) -+ -+ ++SET_TARGET_PROPERTIES(SvtAv1Enc PROPERTIES SOVERSION suse0) if(CMAKE_SYSTEM_NAME STREQUAL "Linux") target_link_libraries(SvtAv1Enc