3:47 p.m.
Author: rathann
Update of /cvs/free/rpms/x265/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16663
Modified Files:
x265-pic.patch x265.spec
Added Files:
x265-detect_cpu_armhfp.patch
Log Message:
- fix build on armv7l arch (partially fix rfbz#3361, patch by Nicolas Chauvet)
- don't run tests on ARM for now (rfbz#3361)
x265-detect_cpu_armhfp.patch:
CMakeLists.txt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- NEW FILE x265-detect_cpu_armhfp.patch ---
diff -up multicoreware-x265-d6257335c537/source/CMakeLists.txt.armhfp
multicoreware-x265-d6257335c537/source/CMakeLists.txt
--- multicoreware-x265-d6257335c537/source/CMakeLists.txt.armhfp 2014-09-28
11:09:31.472787489 -0400
+++ multicoreware-x265-d6257335c537/source/CMakeLists.txt 2014-09-28 11:14:12.970136458
-0400
@@ -45,9 +45,13 @@ if("${SYSPROC}" STREQUAL "" OR X86MATCH
add_definitions(-DX86_64=1)
endif()
elseif(${SYSPROC} STREQUAL "armv6l")
- message(STATUS "Detected ARM system processor")
+ message(STATUS "Detected ARMv6 system processor")
set(ARM 1)
add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1)
+elseif(${SYSPROC} STREQUAL "armv7l")
+ message(STATUS "Detected ARMv7 system processor")
+ set(ARM 1)
+ add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV7=1)
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}")
x265-pic.patch:
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: x265-pic.patch
===================================================================
RCS file: /cvs/free/rpms/x265/devel/x265-pic.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x265-pic.patch 4 Sep 2014 10:54:39 -0000 1.1
+++ x265-pic.patch 18 Dec 2014 15:47:41 -0000 1.2
@@ -10,7 +10,7 @@
endif()
if(ARM)
- add_definitions(-march=armv6 -mfloat-abi=hard -mfpu=vfp)
-+ add_definitions(-march=armv6 -mfloat-abi=hard -mfpu=vfp -fPIC)
++ add_definitions(-fPIC)
endif()
check_cxx_compiler_flag(-Wno-narrowing CC_HAS_NO_NARROWING)
check_cxx_compiler_flag(-ffast-math CC_HAS_FAST_MATH)
Index: x265.spec
===================================================================
RCS file: /cvs/free/rpms/x265/devel/x265.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x265.spec 4 Sep 2014 10:54:39 -0000 1.1
+++ x265.spec 18 Dec 2014 15:47:41 -0000 1.2
@@ -3,7 +3,7 @@
Summary: H.265/HEVC encoder
Name: x265
Version: 1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
URL: http://x265.org/
Source0: https://bitbucket.org/multicoreware/x265/get/%{version}.tar.bz2
# fix pkgconfig file installation path
@@ -14,6 +14,7 @@
Patch2: x265-pic.patch
# don't create bogus soname
(https://bitbucket.org/multicoreware/x265/issue/62/linux-incorrect-symboli...)
Patch3: x265-fix-soname.patch
+Patch4: x265-detect_cpu_armhfp.patch
# source/Lib/TLibCommon - BSD
# source/Lib/TLibEncoder - BSD
# everything else - GPLv2+
@@ -58,6 +59,7 @@
%endif
%patch2 -p1 -b .pic
%patch3 -p1 -b .soname
+%patch4 -p1 -b .armhfp
f=doc/uncrustify/drag-uncrustify.bat
tr -d '\r' < ${f} > ${f}.unix && \
touch -r ${f} ${f}.unix && \
@@ -75,9 +77,11 @@
rm %{buildroot}%{_libdir}/libx265.a
install -Dpm644 COPYING %{buildroot}%{_pkgdocdir}/COPYING
+%ifnarch %{arm}
%check
LD_LIBRARY_PATH=$(pwd) test/PoolTest
LD_LIBRARY_PATH=$(pwd) test/TestBench
+%endif
%post libs -p /sbin/ldconfig
@@ -99,6 +103,10 @@
%{_libdir}/pkgconfig/x265.pc
%changelog
+* Thu Dec 18 2014 Dominik Mierzejewski <rpm(a)greysector.net> 1.2-6
+- fix build on armv7l arch (partially fix rfbz#3361, patch by Nicolas Chauvet)
+- don't run tests on ARM for now (rfbz#3361)
+
* Sun Aug 17 2014 Dominik Mierzejewski <rpm(a)greysector.net> 1.2-5
- don't include contributor agreement in doc
- make sure /usr/share/doc/x265 is owned