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
This commit is contained in:
Tomáš Chvátal 2019-02-18 09:50:29 +00:00 committed by Git OBS Bridge
parent fa5f3f49db
commit d220776634
8 changed files with 57 additions and 49 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ef8379f016e762e6ad8af636cc934a374aa14dfb598c52e7dfa815dc2fdbf7e3
size 15040014

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b4947559a66beca0280edc1b283a6e2e0281ae16c86ce227bda6d202a516be33
size 1643856

3
SVT-AV1-rpmlintrc Normal file
View File

@ -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")

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Feb 16 12:18:45 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- 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 <adrian@suse.de> Tue Feb 5 08:58:20 UTC 2019 - Adrian Schröter <adrian@suse.de>

View File

@ -1,5 +0,0 @@
name: SVT-AV1
version: 0.0~pre.1549319082.2a52193
mtime: 1549319082
commit: 2a52193fed7aa99211716c897943d811e14c76b1

View File

@ -16,16 +16,17 @@
# #
%define sover 0 %define sover suse0
Name: SVT-AV1 Name: SVT-AV1
Version: 0.0~pre.1549319082.2a52193 Version: 0.0~pre.1549319082.2a52193
Release: 0 Release: 0
Summary: SVT-AV1 Encoder Summary: The "Scalable Video Technology for AV1" Encoder
License: BSD-2-Clause-Patent License: BSD-2-Clause-Patent
Group: Productivity/Multimedia/Other Group: Productivity/Multimedia/Other
Url: https://github.com/OpenVisualCloud/SVT-AV1 URL: https://github.com/OpenVisualCloud/SVT-AV1
Source0: %{name}-%{version}.tar.xz Source0: %name-%version.tar.xz
Source1: svt-av1_encoder_user_guide.pdf Source1: svt-av1_encoder_user_guide.pdf
Source9: %name-rpmlintrc
Patch1: fix-build.patch Patch1: fix-build.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: pkg-config BuildRequires: pkg-config
@ -33,24 +34,29 @@ BuildRequires: yasm
ExclusiveArch: x86_64 ExclusiveArch: x86_64
%description %description
An AV1 encoder for video streams from Intel.
%package -n libSvtAv1Enc%{sover} %package -n libSvtAv1Enc-%sover
Summary: Library for the AV1 encoder Summary: The "Scalable Video Technology for AV1" Encoder
Group: System/Libraries Group: System/Libraries
%description -n libSvtAv1Enc%{sover} %description -n libSvtAv1Enc-%sover
An AV1 encoder for video streams from Intel.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %name
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libSvtAv1Enc%{sover} = %{version} Requires: libSvtAv1Enc-%sover = %version
%description devel %description devel
An AV1 encoder for video streams from Intel.
This package contains the header files for svt-av1.
%prep %prep
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%if 0%{suse_version} < 1500 %if 00%{?suse_version} < 1500
sed -i -e 's, -fstack-protector-strong , ,' CMakeLists.txt sed -i -e 's, -fstack-protector-strong , ,' CMakeLists.txt
%endif %endif
@ -64,16 +70,16 @@ cmake . \
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
DESTDIR=%{buildroot} make install %make_install
mkdir -p %buildroot%_docdir/%name mkdir -p %buildroot%_docdir/%name
install -m 0644 %{S:1} %buildroot%_docdir/%name install -m 0644 %{S:1} %buildroot%_docdir/%name
%post -n libSvtAv1Enc%{sover} -p /sbin/ldconfig %post -n libSvtAv1Enc-%sover -p /sbin/ldconfig
%postun -n libSvtAv1Enc%{sover} -p /sbin/ldconfig %postun -n libSvtAv1Enc-%sover -p /sbin/ldconfig
%files -n libSvtAv1Enc%{sover} %files -n libSvtAv1Enc-%sover
%license LICENSE.md %license LICENSE.md
%{_libdir}/libSvtAv1Enc.so.%{sover}* %_libdir/libSvtAv1Enc.so.%{sover}*
%files %files
%doc README.md NOTICES.md %doc README.md NOTICES.md
@ -81,7 +87,7 @@ install -m 0644 %{S:1} %buildroot%_docdir/%name
%_bindir/* %_bindir/*
%files devel %files devel
%{_libdir}/libSvtAv1Enc.so %_libdir/libSvtAv1Enc.so
%_libdir/pkgconfig %_libdir/pkgconfig
%_includedir/* %_includedir/*

View File

@ -1,19 +1,18 @@
<services> <services>
<service mode="disabled" name="obs_scm"> <service mode="disabled" name="tar_scm">
<param name="url">https://github.com/OpenVisualCloud/SVT-AV1.git</param> <param name="url">https://github.com/OpenVisualCloud/SVT-AV1.git</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="revision">2a52193fed7aa99211716c897943d811e14c76b1</param>
<param name="versionprefix">0.0~pre</param> <param name="versionprefix">0.0~pre</param>
</service> </service>
<service mode="disabled" name="set_version" /> <service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled"/>
<service mode="disabled" name="download_url"> <service mode="disabled" name="download_url">
<param name="protocol">https</param> <param name="protocol">https</param>
<param name="host">github.com</param> <param name="host">github.com</param>
<param name="path">/OpenVisualCloud/SVT-AV1/blob/master/Docs/svt-av1_encoder_user_guide.pdf</param> <param name="path">/OpenVisualCloud/SVT-AV1/blob/master/Docs/svt-av1_encoder_user_guide.pdf</param>
</service> </service>
<service mode="buildtime" name="tar" />
<service mode="buildtime" name="recompress">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
</services> </services>

View File

@ -1,7 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt ---
index f0c8fd2..c1a8092 100644 CMakeLists.txt | 4 ++--
--- a/CMakeLists.txt Source/Lib/Codec/CMakeLists.txt | 1 +
+++ b/CMakeLists.txt 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") @@ -8,8 +8,8 @@ set(project_name "svt-av1")
project(${project_name} C ASM_NASM) 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_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/bin)
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)
diff --git a/Source/Lib/Codec/CMakeLists.txt b/Source/Lib/Codec/CMakeLists.txt Index: SVT-AV1-0.0~pre.1549319082.2a52193/Source/Lib/Codec/CMakeLists.txt
index 8d48d0a..66cb431 100644 ===================================================================
--- a/Source/Lib/Codec/CMakeLists.txt --- SVT-AV1-0.0~pre.1549319082.2a52193.orig/Source/Lib/Codec/CMakeLists.txt
+++ b/Source/Lib/Codec/CMakeLists.txt +++ SVT-AV1-0.0~pre.1549319082.2a52193/Source/Lib/Codec/CMakeLists.txt
@@ -35,6 +35,14 @@ file(GLOB all_files @@ -35,6 +35,7 @@ file(GLOB all_files
add_library(SvtAv1Enc SHARED add_library(SvtAv1Enc SHARED
${all_files} ${all_files}
) )
+SET_TARGET_PROPERTIES( +SET_TARGET_PROPERTIES(SvtAv1Enc PROPERTIES SOVERSION suse0)
+ SvtAv1Enc
+ PROPERTIES
+ SOVERSION 0
+ VERSION 0.0.0
+ )
+
+
if(CMAKE_SYSTEM_NAME STREQUAL "Linux") if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
target_link_libraries(SvtAv1Enc target_link_libraries(SvtAv1Enc