@@ -1,4 +1,10 @@

 -------------------------------------------------------------------

+Thu Jun  5 14:55:45 UTC 2014 - guillaume@opensuse.org

+

+- Fix ARM build with arm.patch from Arch Linux:

+  https://github.com/archlinuxarm/PKGBUILDs/blob/master/extra/x265/arm.patch

+

+-------------------------------------------------------------------

 Thu May 08 00:00:00 UTC 2014 - Manfred.Tremmel@iiv.de

 - added baselibs.conf

​

@@ -12,6 +12,7 @@

 Url:            https://bitbucket.org/multicoreware/x265/wiki/Home

 Group:          Productivity/Multimedia/Video/Editors and Convertors

 Source0:        %{name}-hg%{hgdate}.tar.bz2

+Patch0:         arm.patch

 BuildRequires:  gcc gcc-c++

 BuildRequires:  cmake >= 2.8.8

 BuildRequires:  pkg-config

@@ -44,6 +45,9 @@

 %prep

 %setup -q -n "%{name}/build/linux"

+cd ../..

+%patch0 -p1

+cd -

 %define FAKE_BUILDDATE %(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')

 sed -i -e "s/0.0/%{soname}.0/g" ../../source/cmake/version.cmake

 cmake  -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_TESTS=ON -G "Unix Makefiles" ../../source

​

@@ -0,0 +1,65 @@

+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 @@

+         set(X64 1)

+         add_definitions(-DX86_64=1)

+     endif()

++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)

++    message(STATUS "Detected ARMV6 system processor")

++    set(ARMV6 1)

++    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1 -DHAVE_NEON=0)

++elseif(${SYSPROC} STREQUAL "armv7l")

++    message(STATUS "Detected ARMV7 system processor")

++    set(ARMV7 1)

++    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1 -DHAVE_NEON=0)

+ 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 @@

+     if(X86 AND NOT X64)

+         add_definitions(-march=i686)

+     endif()

+-    if(ARM)

+-        add_definitions(-march=armv6 -mfloat-abi=hard -mfpu=vfp)

++    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

+@@ -37,7 +37,7 @@

+ #include <machine/cpu.h>

+ #endif

+ 

+-#if X265_ARCH_ARM && !defined(HAVE_NEON)

++#if X265_ARCH_ARM && (!defined(HAVE_NEON) || HAVE_NEON==0)

+ #include <signal.h>

+ #include <setjmp.h>

+ static sigjmp_buf jmpbuf;

+@@ -340,7 +340,6 @@

+     }

+ 

+     canjump = 1;

+-    x265_cpu_neon_test();

+     canjump = 0;

+     signal(SIGILL, oldsig);

+ #endif // if !HAVE_NEON

+@@ -356,7 +355,7 @@

+     // which may result in incorrect detection and the counters stuck enabled.

+     // right now Apple does not seem to support performance counters for this test

+ #ifndef __MACH__

+-    flags |= x265_cpu_fast_neon_mrc_test() ? X265_CPU_FAST_NEON_MRC : 0;

++    //flags |= x265_cpu_fast_neon_mrc_test() ? X265_CPU_FAST_NEON_MRC : 0;

+ #endif

+     // TODO: write dual issue test? currently it's A8 (dual issue) vs. A9 (fast mrc)

+ #endif // if HAVE_ARMV6

​