- updated to 2.9 (note: new soname)

- updated x32 patch

diff --git a/x265-x32.patch b/x265-x32.patch
index b3ac9c2f5d3f91c806fb06e90c7d6abc78d631e1..96f8cacf2070c0b23793b0654febecba1e6db8f9 100644 (file)
--- a/x265-x32.patch
+++ b/x265-x32.patch
@@ -1,37 +1,25 @@
---- x265_1.8/source/cmake/CMakeASM_YASMInformation.cmake.orig  2015-09-22 10:10:07.000000000 +0200
-+++ x265_1.8/source/cmake/CMakeASM_YASMInformation.cmake       2015-10-15 19:39:50.517926648 +0200
+--- x265_2.9/source/cmake/CMakeASM_NASMInformation.cmake.orig  2018-10-05 14:14:40.000000000 +0200
++++ x265_2.9/source/cmake/CMakeASM_NASMInformation.cmake       2018-10-29 17:47:25.033029663 +0100
 @@ -9,7 +9,11 @@
      if(APPLE)
-         set(ARGS -f macho64 -m amd64 -DPREFIX)
+         set(ARGS -f macho64 -DPREFIX)
      elseif(UNIX AND NOT CYGWIN)
-+      if("${LIB_SUFFIX}" STREQUAL "x32")
-+        set(ARGS -f elfx32)
-+      else()
-         set(ARGS -f elf64 -m amd64)
-+      endif()
++        if("${CMAKE_SIZEOF_VOID_P}" MATCHES 4)
++            set(ARGS -f elfx32)
++        else()
+         set(ARGS -f elf64)
++        endif()
      else()
-         set(ARGS -f win64 -m amd64)
+         set(ARGS -f win64)
      endif()
-@@ -18,7 +22,11 @@
-     if(APPLE)
-         set(ARGS -f macho -DPREFIX)
-     elseif(UNIX AND NOT CYGWIN)
-+      if("${LIB_SUFFIX}" STREQUAL "x32")
-+        set(ARGS -f elfx32)
-+      else()
-         set(ARGS -f elf32)
-+      endif()
-     else()
-         set(ARGS -f win32 -DPREFIX)
-     endif()
---- x265_1.8/source/CMakeLists.txt.orig        2015-10-15 19:40:25.743090176 +0200
-+++ x265_1.8/source/CMakeLists.txt     2015-10-15 19:49:47.715621913 +0200
-@@ -48,7 +48,7 @@
-     message(STATUS "Detected x86 target processor")
-     set(X86 1)
+--- x265_2.9/source/CMakeLists.txt.orig        2018-10-29 17:47:51.806362689 +0100
++++ x265_2.9/source/CMakeLists.txt     2018-10-29 17:53:08.726359072 +0100
+@@ -50,7 +50,7 @@
      add_definitions(-DX265_ARCH_X86=1)
--    if("${CMAKE_SIZEOF_VOID_P}" MATCHES 8)
-+    if("${CMAKE_SIZEOF_VOID_P}" MATCHES 8 OR "${LIB_SUFFIX}" STREQUAL "x32")
+     if(CMAKE_CXX_FLAGS STREQUAL "-m32")
+         message(STATUS "Detected x86 target processor")
+-    elseif("${CMAKE_SIZEOF_VOID_P}" MATCHES 8)
++    elseif("${CMAKE_SIZEOF_VOID_P}" MATCHES 8 OR "${LIB_SUFFIX}" STREQUAL "x32")
          set(X64 1)
          add_definitions(-DX86_64=1)
-     endif()
+         message(STATUS "Detected x86_64 target processor")

diff --git a/x265.spec b/x265.spec
index 002d44fe0be4166d21b5555bbca1ac025828b546..af05a9cfd6b3644a76d4384d91bdd67f18f0f0dd 100644 (file)
--- a/x265.spec
+++ b/x265.spec
@@ -1,6 +1,8 @@
+# TODO: vmaf
 #
 # Conditional build:
 %bcond_without asm     # x86 assembler
+%bcond_with    vmaf    # VMAF support [not ready for 1.3.9]
 
 %ifnarch %{ix86} %{x8664} x32
 %undefine      with_asm
@@ -9,13 +11,13 @@
 Summary:       H.265/HEVC video encoder
 Summary(pl.UTF-8):     Koder obrazu H.265/HEVC
 Name:          x265
-Version:       2.6
+Version:       2.9
 Release:       1
 License:       GPL v2+
 Group:         Libraries
 # also at https://bitbucket.org/multicoreware/x265/downloads
 Source0:       http://ftp.videolan.org/pub/videolan/x265/%{name}_%{version}.tar.gz
-# Source0-md5: 4d318be1f19b58985432a144bd054572
+# Source0-md5: 693ee4ce7929a59735f441107310f0bb
 Patch0:                %{name}-opt.patch
 Patch1:                %{name}-x32.patch
 URL:           http://x265.org/
@@ -23,7 +25,8 @@ BuildRequires:        cmake >= 2.8.11
 BuildRequires: libstdc++-devel >= 6:4.8
 BuildRequires: numactl-devel >= 2
 BuildRequires: rpmbuild(macros) >= 1.605
-%{?with_asm:BuildRequires:     yasm >= 1.2.0}
+%{?with_asm:BuildRequires:     nasm >= 2.13.0}
+%{?with_vmaf:BuildRequires:    vmaf-devel}
 Requires:      libx265 = %{version}-%{release}
 # see CMakeLists.txt, more is probably possible
 ExclusiveArch: %{ix86} %{x8664} x32 %{arm} ppc64 ppc64le
@@ -75,7 +78,7 @@ Static x265 library.
 Statyczna biblioteka x265.
 
 %prep
-%setup -q -n %{name}_v%{version}
+%setup -q -n %{name}_%{version}
 %patch0 -p1
 %patch1 -p1
 
@@ -85,6 +88,7 @@ cd source/build
 %cmake .. \
        -DENABLE_ASSEMBLY=%{!?with_asm:OFF}%{?with_asm:ON} \
        -DENABLE_HDR10_PLUS=ON \
+       %{?with_vmaf:-DENABLE_LIBVMAF=ON} \
        -DENABLE_SHARED=ON \
        -DLIB_INSTALL_DIR=%{_lib}
 
@@ -109,7 +113,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.146
+%attr(755,root,root) %{_libdir}/libx265.so.165
 %attr(755,root,root) %{_libdir}/libhdr10plus.so
 
 %files -n libx265-devel