Request 1219 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 1219 (accepted)

No description set

Created by Aloysius over 9 years ago
In state accepted

Submit x265

Submit package home:Aloysius:branches:Essentials / x265 to package Essentials / x265

x265.changes Changed

x265.spec Changed

arm.patch Changed

@@ -1,18 +1,18 @@
-diff -urN a/source/CMakeLists.txt b/source/CMakeLists.txt
---- a/source/CMakeLists.txt	2014-04-03 00:00:44.000000000 -0600
-+++ b/source/CMakeLists.txt	2014-04-10 07:32:36.022010974 -0600
-@@ -39,10 +39,18 @@
+--- source/CMakeLists.txt.orig	2014-10-04 17:02:08.482815493 +0200
++++ source/CMakeLists.txt	2014-10-04 17:11:52.536865262 +0200
+@@ -46,10 +46,18 @@
          set(X64 1)
          add_definitions(-DX86_64=1)
      endif()
+-elseif(${SYSPROC} STREQUAL "armv6l")
+-    message(STATUS "Detected ARM target processor")
+-    set(ARM 1)
+-    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1)
 +elseif(${SYSPROC} MATCHES "armv5.*")
 +    message(STATUS "Detected ARMV5 system processor")
 +    set(ARMV5 1)
 +    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=0 -DHAVE_NEON=0)
- elseif(${SYSPROC} STREQUAL "armv6l")
--    message(STATUS "Detected ARM system processor")
--    set(ARM 1)
--    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1)
++	elseif(${SYSPROC} STREQUAL "armv6l")
 +    message(STATUS "Detected ARMV6 system processor")
 +    set(ARMV6 1)
 +    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1 -DHAVE_NEON=0)
@@ -23,7 +23,7 @@
  else()
      message(STATUS "CMAKE_SYSTEM_PROCESSOR value `${CMAKE_SYSTEM_PROCESSOR}` is unknown")
      message(STATUS "Please add this value near ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}")
-@@ -122,8 +130,8 @@
+@@ -127,8 +135,8 @@
      if(X86 AND NOT X64)
          add_definitions(-march=i686)
      endif()
@@ -32,11 +32,10 @@
 +    if(ARMV7)
 +        add_definitions(-fPIC)
      endif()
- endif(GCC)
- 
-diff -urN a/source/common/cpu.cpp b/source/common/cpu.cpp
---- a/source/common/cpu.cpp	2014-04-03 00:00:44.000000000 -0600
-+++ b/source/common/cpu.cpp	2014-04-10 07:28:51.937129997 -0600
+     check_cxx_compiler_flag(-Wno-narrowing CC_HAS_NO_NARROWING) 
+     check_cxx_compiler_flag(-ffast-math CC_HAS_FAST_MATH) 
+--- source/common/cpu.cpp.orig	2014-10-04 17:13:58.507875996 +0200
++++ source/common/cpu.cpp	2014-10-04 17:21:11.170912864 +0200
 @@ -37,7 +37,7 @@
  #include <machine/cpu.h>
  #endif

x265-hg20140324.tar.bz2 -> x265-hg20140928.tar.bz2 Changed

Build Results
RPM Lint

Refresh

Comments for request 1219 0

Request History

Aloysius created request over 9 years ago

olh accepted request over 9 years ago