From ff66fac748fe63a4a2311c4fc19fdf0cbf3cee6d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Jun 07 2014 19:53:39 +0000 Subject: Fix aarch64 --- diff --git a/freerdp-aarch64.patch b/freerdp-aarch64.patch new file mode 100644 index 0000000..a131c2f --- /dev/null +++ b/freerdp-aarch64.patch @@ -0,0 +1,21 @@ +--- freerdp-1.1.0-beta+2013071101/cmake/ConfigOptions.cmake.orig 2014-06-07 20:34:55.607853558 +0100 ++++ freerdp-1.1.0-beta+2013071101/cmake/ConfigOptions.cmake 2014-06-07 20:36:29.987547540 +0100 +@@ -6,6 +6,8 @@ + elseif((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (CMAKE_SIZEOF_VOID_P EQUAL 8) AND (APPLE)) + # Mac is weird like that. + set(TARGET_ARCH "x64") ++elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64") ++ set(TARGET_ARCH "AARCH64") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm*") + set(TARGET_ARCH "ARM") + endif() +@@ -19,6 +21,9 @@ + option(WITH_SSE2 "Enable SSE2 optimization." OFF) + endif() + ++if(TARGET_ARCH MATCHES "AARCH64") ++endif() ++ + if(TARGET_ARCH MATCHES "ARM") + if (NOT DEFINED WITH_NEON) + option(WITH_NEON "Enable NEON optimization." ON) diff --git a/freerdp.spec b/freerdp.spec index 07902df..d0cdad2 100644 --- a/freerdp.spec +++ b/freerdp.spec @@ -1,12 +1,13 @@ Name: freerdp Version: 1.1.0 -Release: 0.11.beta.2013071101%{?dist} +Release: 0.12.beta.2013071101%{?dist} Epoch: 1 Summary: Remote Desktop Protocol client License: ASL 2.0 URL: http://www.freerdp.com/ Source0: http://pub.freerdp.com/releases/%{name}-%{version}-beta+2013071101.tar.gz +Patch0: freerdp-aarch64.patch BuildRequires: cmake BuildRequires: xmlto @@ -67,8 +68,8 @@ developing applications that use %{name} libs. %prep - %setup -q -n freerdp-1.1.0-beta+2013071101 +%patch0 -p1 -b .aarch64 cat << EOF > xfreerdp.desktop [Desktop Entry] @@ -101,7 +102,8 @@ EOF -DWITH_FFMPEG=OFF \ %ifarch x86_64 -DWITH_SSE2=ON \ -%else +%endif +%ifarch %{ix86} -DWITH_SSE2=OFF \ %endif %ifarch armv7hl @@ -116,6 +118,9 @@ EOF -DARM_FP_ABI=soft \ -DWITH_NEON=OFF \ %endif +%ifarch aarch64 + -DWITH_SSE2=OFF \ +%endif -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \ . @@ -173,6 +178,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Jun 7 2014 Peter Robinson 1:1.1.0-0.12.beta.2013071101 +- Fix aarch64 + * Sat Jun 07 2014 Fedora Release Engineering - 1:1.1.0-0.11.beta.2013071101 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild