From e7fafd748dd5e751ecaebdf3b5d6caa4ada1595f952b98368fa294f4c9fdf84b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 8 Jul 2019 06:37:46 +0000 Subject: [PATCH] - OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/SVT-AV1?expand=0&rev=20 --- SVT-AV1-0.0~pre.1549319082.2a52193.tar.xz | 3 -- SVT-AV1-0.0~pre.1556042178.b4ca700.tar.xz | 3 ++ SVT-AV1.changes | 18 ++++++++ SVT-AV1.spec | 28 +++++++++--- _service | 7 +-- fix-build.patch | 52 +++++++++++++++-------- svt-av1_encoder_user_guide.pdf | 3 -- 7 files changed, 79 insertions(+), 35 deletions(-) delete mode 100644 SVT-AV1-0.0~pre.1549319082.2a52193.tar.xz create mode 100644 SVT-AV1-0.0~pre.1556042178.b4ca700.tar.xz delete mode 100644 svt-av1_encoder_user_guide.pdf diff --git a/SVT-AV1-0.0~pre.1549319082.2a52193.tar.xz b/SVT-AV1-0.0~pre.1549319082.2a52193.tar.xz deleted file mode 100644 index 16fcfb6..0000000 --- a/SVT-AV1-0.0~pre.1549319082.2a52193.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4947559a66beca0280edc1b283a6e2e0281ae16c86ce227bda6d202a516be33 -size 1643856 diff --git a/SVT-AV1-0.0~pre.1556042178.b4ca700.tar.xz b/SVT-AV1-0.0~pre.1556042178.b4ca700.tar.xz new file mode 100644 index 0000000..7d5589e --- /dev/null +++ b/SVT-AV1-0.0~pre.1556042178.b4ca700.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a0aaea7e7f899ba89ee82c724459bb2d2098b921c43a4a9f5717b60b77f0145 +size 1450132 diff --git a/SVT-AV1.changes b/SVT-AV1.changes index 0e783bf..77a9ae3 100644 --- a/SVT-AV1.changes +++ b/SVT-AV1.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed May 1 09:09:48 UTC 2019 - Jan Engelhardt + +- Go back to tar_scm; obs_scm does not work with quilt. +- Bump SO version for change from Apr 25/29 2019. + +------------------------------------------------------------------- +Tue Apr 30 20:56:41 UTC 2019 - Hans-Peter Jansen + +- fix missing parts for decode lib + +------------------------------------------------------------------- +Thu Apr 25 08:47:09 UTC 2019 - Adrian Schröter + +- update to b4ca700d36c9655e37e9f091bfe983a23ec0c1bd + * new decode sub package +- use obs_scm again (it is on purpose for git snapshots) + ------------------------------------------------------------------- Mon Feb 18 11:59:38 UTC 2019 - Jan Engelhardt diff --git a/SVT-AV1.spec b/SVT-AV1.spec index a913323..8f7f540 100644 --- a/SVT-AV1.spec +++ b/SVT-AV1.spec @@ -16,19 +16,19 @@ # -%define sover suse0 +%define sover suse1 Name: SVT-AV1 -Version: 0.0~pre.1549319082.2a52193 +Version: 0.0~pre.1556042178.b4ca700 Release: 0 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 -Source1: svt-av1_encoder_user_guide.pdf Source9: %name-rpmlintrc Patch1: fix-build.patch BuildRequires: cmake +BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: yasm ExclusiveArch: x86_64 @@ -36,6 +36,13 @@ ExclusiveArch: x86_64 %description An AV1 encoder for video streams from Intel. +%package -n libSvtAv1Dec-%sover +Summary: The "Scalable Video Technology for AV1" Decoder +Group: System/Libraries + +%description -n libSvtAv1Dec-%sover +An AV1 decoder for video streams from Intel. + %package -n libSvtAv1Enc-%sover Summary: The "Scalable Video Technology for AV1" Encoder Group: System/Libraries @@ -46,6 +53,7 @@ An AV1 encoder for video streams from Intel. %package devel Summary: Development files for %name Group: Development/Libraries/C and C++ +Requires: libSvtAv1Dec-%sover = %version Requires: libSvtAv1Enc-%sover = %version %description devel @@ -69,22 +77,30 @@ make %{?_smp_mflags} %install %cmake_install -mkdir -p %buildroot%_docdir/%name -install -m 0644 %{S:1} %buildroot%_docdir/%name +# drop internal test lib +rm %buildroot%_libdir/libgtest_all.so + +%post -n libSvtAv1Dec-%sover -p /sbin/ldconfig +%postun -n libSvtAv1Dec-%sover -p /sbin/ldconfig %post -n libSvtAv1Enc-%sover -p /sbin/ldconfig %postun -n libSvtAv1Enc-%sover -p /sbin/ldconfig +%files -n libSvtAv1Dec-%sover +%license LICENSE.md +%_libdir/libSvtAv1Dec.so.%{sover}* + %files -n libSvtAv1Enc-%sover %license LICENSE.md %_libdir/libSvtAv1Enc.so.%{sover}* %files %doc README.md NOTICES.md -%doc %_docdir/%name/svt-av1_encoder_user_guide.pdf +%doc Docs %_bindir/* %files devel +%_libdir/libSvtAv1Dec.so %_libdir/libSvtAv1Enc.so %_libdir/pkgconfig %_includedir/* diff --git a/_service b/_service index 7945447..1ada3db 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ https://github.com/OpenVisualCloud/SVT-AV1.git git - 2a52193fed7aa99211716c897943d811e14c76b1 + b4ca700 0.0~pre @@ -10,9 +10,4 @@ xz - - https - github.com - /OpenVisualCloud/SVT-AV1/blob/master/Docs/svt-av1_encoder_user_guide.pdf - diff --git a/fix-build.patch b/fix-build.patch index aba6c0a..2fd2235 100644 --- a/fix-build.patch +++ b/fix-build.patch @@ -1,15 +1,10 @@ ---- - 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 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1855a5b..505060d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -8,8 +8,8 @@ set(project_name "svt-av1") - project(${project_name} C ASM_NASM) + project(${project_name} C CXX ASM_NASM) -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/lib) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/lib) @@ -18,15 +13,38 @@ Index: SVT-AV1-0.0~pre.1549319082.2a52193/CMakeLists.txt set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/bin) set(CMAKE_POSITION_INDEPENDENT_CODE ON) -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 +diff --git a/Source/Lib/Decoder/Codec/CMakeLists.txt b/Source/Lib/Decoder/Codec/CMakeLists.txt +index 70ddbd0..88b4a5c 100644 +--- a/Source/Lib/Decoder/Codec/CMakeLists.txt ++++ b/Source/Lib/Decoder/Codec/CMakeLists.txt +@@ -38,6 +38,8 @@ file(GLOB all_files + add_library(SvtAv1Dec SHARED + ${all_files} + ) ++ ++SET_TARGET_PROPERTIES(SvtAv1Dec PROPERTIES SOVERSION suse1) + + if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + target_link_libraries(SvtAv1Dec +@@ -69,4 +71,4 @@ endif() + configure_file(../pkg-config.pc.in ${CMAKE_BINARY_DIR}/SvtAv1Dec.pc @ONLY) + install(FILES ${CMAKE_BINARY_DIR}/SvtAv1Dec.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + install(TARGETS SvtAv1Dec DESTINATION "${CMAKE_INSTALL_LIBDIR}") +-install(DIRECTORY ../../../API/ DESTINATION "${CMAKE_INSTALL_PREFIX}/include/svt-av1" FILES_MATCHING PATTERN "*.h") +\ No newline at end of file ++install(DIRECTORY ../../../API/ DESTINATION "${CMAKE_INSTALL_PREFIX}/include/svt-av1" FILES_MATCHING PATTERN "*.h") +diff --git a/Source/Lib/Encoder/Codec/CMakeLists.txt b/Source/Lib/Encoder/Codec/CMakeLists.txt +index 018f1f6..e51e11c 100644 +--- a/Source/Lib/Encoder/Codec/CMakeLists.txt ++++ b/Source/Lib/Encoder/Codec/CMakeLists.txt +@@ -38,7 +38,9 @@ file(GLOB all_files add_library(SvtAv1Enc SHARED ${all_files} ) -+SET_TARGET_PROPERTIES(SvtAv1Enc PROPERTIES SOVERSION suse0) - +- ++ ++SET_TARGET_PROPERTIES(SvtAv1Enc PROPERTIES SOVERSION suse1) ++ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") target_link_libraries(SvtAv1Enc + COMMON_CODEC diff --git a/svt-av1_encoder_user_guide.pdf b/svt-av1_encoder_user_guide.pdf deleted file mode 100644 index 46a6dd2..0000000 --- a/svt-av1_encoder_user_guide.pdf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0c5b9138ddb701454cc4324a8f4b4433fc01ad3e9e80a4f823acbdd91d06049 -size 55422