commit 3c3c0652794277f2c7129962f94b5632d1302e55
Author: Jakub Bogusz <[email protected]>
Date: Sat Sep 14 21:57:41 2024 +0200
- updated to 4.0 (ABI 212), added vmaf linking fix and svt_hevc bcond
x265-vmaf.patch | 12 ++++++++++++
x265.spec | 15 ++++++++++-----
2 files changed, 22 insertions(+), 5 deletions(-)
---
diff --git a/x265.spec b/x265.spec
index d9e5f98..502c707 100644
--- a/x265.spec
+++ b/x265.spec
@@ -1,8 +1,9 @@
# TODO: vmaf
#
# Conditional build:
-%bcond_without asm # assembler
-%bcond_with vmaf # VMAF support [not ready for vmaf-1.3.x as of x265 3.2]
+%bcond_without asm # assembler
+%bcond_with svt_hevc # SVT-HEVC Encoder support
+%bcond_with vmaf # VMAF support
%ifarch %{arm}
%define with_asm 1
@@ -11,7 +12,7 @@
Summary: H.265/HEVC video encoder
Summary(pl.UTF-8): Koder obrazu H.265/HEVC
Name: x265
-Version: 3.6
+Version: 4.0
Release: 1
License: GPL v2+
Group: Libraries
@@ -19,10 +20,11 @@ Group: Libraries
#Source0:
https://download.videolan.org/videolan/x265/%{name}_%{version}.tar.gz
#Source0Download: https://bitbucket.org/multicoreware/x265_git/downloads/
Source0:
https://bitbucket.org/multicoreware/x265_git/downloads/%{name}_%{version}.tar.gz
-# Source0-md5: 99997ecc8ee4d3575ba7715c759ad3bb
+# Source0-md5: 44e0082a7635eab2488bebd18875a09a
Patch0: %{name}-opt.patch
Patch1: %{name}-x32.patch
Patch2: %{name}-arm_flags.patch
+Patch3: %{name}-vmaf.patch
URL: https://www.x265.org/
BuildRequires: cmake >= 2.8.11
BuildRequires: libstdc++-devel >= 6:4.8
@@ -33,6 +35,7 @@ BuildRequires: rpmbuild(macros) >= 2.007
BuildRequires: nasm >= 2.13.0
%endif
%endif
+%{?with_svt_hevc:BuildRequires: svt-hevc-devel}
%{?with_vmaf:BuildRequires: vmaf-devel}
Requires: libx265 = %{version}-%{release}
# see CMakeLists.txt, more is probably possible
@@ -91,6 +94,7 @@ Statyczna biblioteka x265.
%ifarch %{arm} aarch64
%patch2 -p1
%endif
+%patch3 -p1
%build
install -d source/build
@@ -112,6 +116,7 @@ export CXXFLAGS="$CXXFLAGS -flax-vector-conversions"
-DENABLE_HDR10_PLUS=ON \
%{?with_vmaf:-DENABLE_LIBVMAF=ON} \
-DENABLE_SHARED=ON \
+ %{?with_svt_hevc:-DENABLE_SVT_HEVC=ON} \
-DLIB_INSTALL_DIR=%{_lib}
%{__make}
@@ -136,7 +141,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n libx265
%defattr(644,root,root,755)
%doc doc/reST/introduction.rst
-%attr(755,root,root) %{_libdir}/libx265.so.209
+%attr(755,root,root) %{_libdir}/libx265.so.212
%attr(755,root,root) %{_libdir}/libhdr10plus.so
%files -n libx265-devel
diff --git a/x265-vmaf.patch b/x265-vmaf.patch
new file mode 100644
index 0000000..f1a6c2d
--- /dev/null
+++ b/x265-vmaf.patch
@@ -0,0 +1,12 @@
+--- x265_4.0/source/CMakeLists.txt.orig 2024-09-14 17:50:28.924483725
+0200
++++ x265_4.0/source/CMakeLists.txt 2024-09-14 19:01:16.141474576 +0200
+@@ -829,6 +829,9 @@ if(ENABLE_SHARED)
+ target_link_libraries(x265-shared ${EXTRA_LIB})
+ endif()
+ target_link_libraries(x265-shared ${PLATFORM_LIBS})
++ if(ENABLE_LIBVMAF)
++ target_link_libraries(x265-shared ${VMAF})
++ endif()
+ if(SVTHEVC_FOUND)
+ target_link_libraries(x265-shared ${SVT_HEVC_LIBRARY})
+ endif(SVTHEVC_FOUND)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/x265.git/commitdiff/3c3c0652794277f2c7129962f94b5632d1302e55
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
