Backport removal of ARM_FP_ABI option, bug 547246.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 99 insertions, 10 deletions

diff --git a/net-misc/freerdp/ChangeLog b/net-misc/freerdp/ChangeLog
index 2e1fd10fa45c..e55422780d01 100644
--- a/net-misc/freerdp/ChangeLog
+++ b/net-misc/freerdp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/freerdp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.96 2015/07/15 18:29:43 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.97 2015/08/06 20:26:10 floppym Exp $
+
+  06 Aug 2015; Mike Gilbert <floppym@gentoo.org> +files/freerdp-armfp.patch,
+  freerdp-1.2.1_pre20150326.ebuild:
+  Backport removal of ARM_FP_ABI option, bug 547246.
 
   15 Jul 2015; Tobias Klausmann <klausman@gentoo.org>
   freerdp-1.2.1_pre20150326.ebuild:
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index d3538e42b5c6..04917442dbd6 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -7,6 +7,7 @@ AUX freerdp-1.1.0_beta1-avx.patch 1424 SHA256 6de8e333ae1b7defbfcd6af1189e33e647
 AUX freerdp-1.1.0_beta1_p20130710-cmake.patch 756 SHA256 1a3b20a0f4635be1d1805d2d8c33ab853cc108e3fb4d4896cece08d20c05d4a9 SHA512 c1fb1df37612adf7e60fabee055c07aea00d30665e4b3c771bc2511d5098b4e74179a58ede84935002bbe885ae03c5a6617fcbc909a75f27910808102f9c123d WHIRLPOOL f8f6a15e65023bf758287c504a1ac7b1e82c1630980f0fc07b1272d8f6eea1a93ba52a9598a0366428b5a364062ed737974d5e4254507d70e651b56e2e39c78d
 AUX freerdp-1.1.0_beta1_p20130710-ffmpeg.patch 4241 SHA256 8dbd70eb3c7fffb617cfd27b1dc58e71d70014b2720016d3f4f022638ad65ebd SHA512 f55c1ad33d947ba26b9222fa8ce600bbb13d91b136a04526d4118e2018be016ef4ce2fac35a5563c9b4100870ec784568e9f7509e2667d1c01d5a4ce72169819 WHIRLPOOL 2fe3ffa36c9491b55b7e0113f37bb1f6a2ba91e1b08ef2083b75d3e59dbf6ffc122b485408252945996bdf0353a656929a439aafbbb3b2509fd6bf629bc4ad5d
 AUX freerdp-1.1.0_beta1_p20130710-uclibc.patch 1921 SHA256 bd740b6c39200edd6979bd9c9d47ff2eb521ff55dedb25285a37fabf19c9ac85 SHA512 6324edec3be28e16291be88b24ce297111e8aa1744d4a1d8633f36f6633890e562e816c3b0cfe30d2792ca27bcedb6b87e9b7f68459d2c663d1b29e0cc5806fa WHIRLPOOL 53cb72c11a4f26d29b30dba3050f2aaae15309753fd827746ac155e52b90950b19662e97bdf92202a837d11c01496129b9ec9c01b490b17395778bfbf9d51098
+AUX freerdp-armfp.patch 2930 SHA256 c23833cf722098cc0f74a6c130c30e57ead3effd3a04a6b4206f2aa887ace6e7 SHA512 57dd03e82b822fed95a5379aa79ada99910ef6c2a9cfaab1dc721181f76aa249d839576d31aa83e3568a37abc5b81a3ff8c5c2d0d15e6a5e457d254660581a48 WHIRLPOOL 546448549b20e4a4b81c2cba4a4db92d9c971a070ff5d21ef9c6db22bd67157a6eb8b54901e038876926fa6a7d8f9208185580214132c91ce460b417be0b0af9
 AUX freerdp-cmake-3.1.patch 4047 SHA256 9a8257a6b08e302f093d075401cfd2e9a6c62bf10002f5aac3d9d0909d64c9d8 SHA512 523cbf5c298da61226cd666181b6d75ebe5303d87b9ed8b13ee724c5f4e88353e43fa013105866e440147b82c8286b6c959935f9f264f4a591e6ffa0f7bd25ca WHIRLPOOL fa6a5c76fa2b1e668154f1d80f4d8fb73cc110fc36dca0f709b0675e3734cd8ec04c3c3c8928ffcd328884bd35fff7a879675f36a5cff04db50025fd68ff9929
 DIST freerdp-1.1.0_beta1_p20130710.tar.gz 6682149 SHA256 0d0d2eec7e78b61458415ee98ad54379b31e9fc269b8bacf3e939bd048ac5e61 SHA512 89ec08acff5c9bbafe107cd079005146b6c4447fbe3172d8f774a20ab6b5e1f24abdeab2d7cb0d7694251aaea2924b0a10f1c0b4b660994cdfa51e8428b90440 WHIRLPOOL 2f7c04bde54293fc8fc85ba03baf7dc64e5da4cecdc87aaaa2ff316127abc43f0b56d70e14652f97f2e97a8f43bee8880837a94230448397dfad5f4ddbd055b1
 DIST freerdp-1.1.0_beta1_p20150312.tar.gz 6703421 SHA256 b8d439c00d39c7cd673781962c3b04d7bd501dcdb76af8be7051e4afb6d16f01 SHA512 293c6ad5827f0bd4c71e70571c1ca37916a6ef0193a55afe1a624a94ba1419501304d77584c739e7b9c624aee64475cd13e8f5e035d89404f7dded87c004261c WHIRLPOOL f560e98c54f526d6042b22b61ee45eb323796c4230cd22ec03aa8f55b5c76647318ba618198a25654e33912eb3394714704a5be9f2d48dd09a4f219701973899
@@ -16,16 +17,14 @@ EBUILD freerdp-1.1.0_beta1_p20130710-r1.ebuild 2676 SHA256 492c3011d30aa85417590
 EBUILD freerdp-1.1.0_beta1_p20130710-r2.ebuild 2862 SHA256 067d5981466ea7d567841e8457b08c2e9394e1ef9329b20260858c0706b95186 SHA512 562a1be45b063e26c61e66897bb9aafd12330457c865e108476d84c8e0c0dd69bee7b2a496e3ee05f65dcc5635d81f005e29090c2a2e76587d1420732de2908a WHIRLPOOL 079180fdca84f28dba3c5fbb0a6b37811f0320af1bd1366d17e2480d96d94edc6363857fdbb9251379b61e7ee8dd4f245fee218b108679089f247a919c8abf15
 EBUILD freerdp-1.1.0_beta1_p20150312.ebuild 2827 SHA256 51295f4ae044c63f743645b4c9c2bb67cf1d87146257094befad715d53705f72 SHA512 d310686160a141920fc3ef3a025f2339534e66c51f6e42d9e82f4ac44aa865b3d5e3f826566bc7dae18efda343135e779da6d6b786be64976e6469842bf03367 WHIRLPOOL b1a9f9e28224338ff057c613ecbd70909a0ddde458f78c5bc6d1c8dbaa3cc390c5fe138a9c73235e8509c192246de726eca8cc75ae8dcfd606d72dad128def94
 EBUILD freerdp-1.2.0_beta1_pre20141115.ebuild 2711 SHA256 a049203055f1206548ee35cd40395aa0999b4c7c6d7529f60072e9b92fac29ae SHA512 dd61cdf5ece8d4e2676c9ac47475915934012da01282b3543dc988350fea2320e44e3773b7708e8bd1bdb6bcff6a935ff1c98c81ae7f5fe31c823ad7f06f2f03 WHIRLPOOL 8c22e2e415cd6d5c966f0f1ebbb3ab36b13f6a1db97d5d32f71d3f689b7fe5ec15654676d41a4e52871956b2602ce4471eb582efe328cd9bdebfc36ce6b4c6e3
-EBUILD freerdp-1.2.1_pre20150326.ebuild 2709 SHA256 6f995fc5511aac0f9116e21b926c86525c1994d7506cebbd370c67b470e35759 SHA512 57bec04ff5557d65b5da66334dd382b8f0b5a0cab6d6a7e2938b2597aa691800e5a1597d4944bdb6d56a5168e30d82bb5c8ffe129710669feeb43cd1ce81d78d WHIRLPOOL 4750d047591981d9eb75abbde91a2082f8d5ec22a1898daf4f7779c142ea28474053a33e1bc82f2382e4eae1973d6a066ab6bd4f5cceb167a81c7dc1ff53a076
+EBUILD freerdp-1.2.1_pre20150326.ebuild 2756 SHA256 f509e552dc034eb04d9a78a6c748a069b11777483403e41c37fad5243140d961 SHA512 e0f78075e6355ee25a02907f0520f2cb2f9c9e49402caa7c9dfb47b533342f0bf30128ff9893fc02b60d2feb109265f1805abea4c86b73d956d5ee9d8e12370d WHIRLPOOL 3b03edccc757c38748dbbef902fa23cef9adb43c0402ed3507708ece820c86219cac634e9da79e9417d9102f8cf4137510c9ec530062adcb7fb5854e9e7608b1
 EBUILD freerdp-9999.1.ebuild 2704 SHA256 3fb8c812751f41fb22cc8b4abdadac146d5ddea57faa104ad52b555a9969e8e2 SHA512 b84913056f167f17e028f8e6db5ca919271d5804c30b97e70a5b7f92d29914255720bb5484a045921d7240f8e16d98c4acb6888e364147a88a86242c26c9cbf4 WHIRLPOOL 52a88921f1208de3e65d97c829133b4b4350e4cec4a6bd69ba4e2588b7cc341bb49c53ad95d5a93600829ae92fcef1f6732daf3d615bae4ec456da30589b9e6e
-MISC ChangeLog 15272 SHA256 5a06d15804749c5f5e8a1b6afb563de37a514b9be041714e319e938ec8a5c06a SHA512 71801358ffb9d012272777d3daaaa7ea8899df3400a7ce0baff11ab320e1b318dee90f000c7a0fbb6f43a3ec68ebdcd49e81ef27cc7381f4c9b5d353e5c5f89f WHIRLPOOL 5fe322521a3105268fa5370b91e2470c6aacc76d233d8d7e2d264c17fc822ee733c757a834e1b4497ee84f8fac141d427346488d8fc604fcc13b0ec1277e9717
+MISC ChangeLog 15438 SHA256 441eb5b5de512e3a69e2d6534e6df2887eac0dc47442bbae9d9d38da4c8e6418 SHA512 860511c1522ab39ac87790071dcf3d184b482747c95c26262a0dda8e169c27ea543132f342e24f706acd4149e2e974070313244a900b457c6b9c8b083a7a34bf WHIRLPOOL a66bd0559152bb47bec372a8e90e5877d863f3fcf25ed22a04bf5bc87a45bdbb5b909dea6e3fcc25b11b301ee3857c609d6c15749c955cfd80da65cef532b01b
 MISC metadata.xml 508 SHA256 a5e6e91690b857974cb3f119123a8d128e4db307ae99c2a3f825aa906edfaff4 SHA512 5b33d5330f4f14bd0cb676b11ba85331e2f0b737e337d39a784d376d12709068f4b742e404bd6c5c6b89ec4768c0b87543d07db24e342249254c215d52923a41 WHIRLPOOL 6d21e8f89f2f71664f3efaa402343de17a465f7dbc64149654b8b236e82931c22968cdd42bcbc876cfa94eb0cad1a52221c3896ffbaa400137470b4d58abf39f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iKYEAREIAGYFAlWmpphfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
-RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOhOaACfYptuclMTwb2vXCwKd9zfjgG3
-W7EAn3KgFt/SSurW01FOaCXLq2QSGK92
-=7cLj
+iF4EAREIAAYFAlXDwuMACgkQRxvnM+8pGj+k2wD/e++VRnWMq2q2hX1LHOKLN7GV
+2kkHoR5OnoSO3kSFymQBAJBBVIooEpX0fcsFBABu1Q0TVZnktf3rDUqnsORCbqID
+=e8Me
 -----END PGP SIGNATURE-----
diff --git a/net-misc/freerdp/files/freerdp-armfp.patch b/net-misc/freerdp/files/freerdp-armfp.patch
new file mode 100644
index 000000000000..1a367d5600c3
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-armfp.patch
@@ -0,0 +1,84 @@
+From 2355b54f8516a6e1c600df8f26ac7d56916bfd99 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 1 May 2015 17:35:21 -0400
+Subject: [PATCH] Remove the ARM_FP_ABI option
+
+It's unclear why this option would be necessary, and it causes problems
+when people do not match it to their toolchain and CFLAGS.
+
+To set the float abi, either use a toolchain with an appropriate default
+or set the float-abi option in the CFLAGS environment variable.
+
+This should resolve #2586.
+---
+ cmake/ConfigOptions.cmake           | 6 ------
+ libfreerdp/CMakeLists.txt           | 4 ++--
+ packaging/deb/freerdp-nightly/rules | 7 -------
+ 3 files changed, 2 insertions(+), 15 deletions(-)
+
+diff --git a/cmake/ConfigOptions.cmake b/cmake/ConfigOptions.cmake
+index b51a46b..cef6ba6 100644
+--- a/cmake/ConfigOptions.cmake
++++ b/cmake/ConfigOptions.cmake
+@@ -29,12 +29,6 @@ if(TARGET_ARCH MATCHES "ARM")
+ 	else()
+ 		option(WITH_NEON "Enable NEON optimization." OFF)
+ 	endif()
+-	if (NOT DEFINED ARM_FP_ABI)
+-		set(ARM_FP_ABI "softfp" CACHE STRING "Floating point ABI to use on arm")
+-	else()
+-		set(ARM_FP_ABI ${ARM_FP_API} CACHE STRING "Floating point ABI to use on arm")
+-	endif()
+-	mark_as_advanced(ARM_FP_ABI)
+ else()
+ 	if(NOT APPLE)
+ 		option(WITH_IPP "Use Intel Performance Primitives." OFF)
+diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
+index a1cbd9d..112b75a 100644
+--- a/libfreerdp/CMakeLists.txt
++++ b/libfreerdp/CMakeLists.txt
+@@ -156,7 +156,7 @@ if(WITH_SSE2)
+ endif()
+ 
+ if(WITH_NEON)
+-	set_source_files_properties(${CODEC_NEON_SRCS} PROPERTIES COMPILE_FLAGS "-mfpu=neon -mfloat-abi=${ARM_FP_ABI} -Wno-unused-variable" )
++	set_source_files_properties(${CODEC_NEON_SRCS} PROPERTIES COMPILE_FLAGS "-mfpu=neon -Wno-unused-variable" )
+ 	set(CODEC_SRCS ${CODEC_SRCS} ${CODEC_NEON_SRCS})
+ endif()
+ 
+@@ -236,7 +236,7 @@ if(WITH_SSE2)
+ 	endif()
+ elseif(WITH_NEON)
+ 	if(CMAKE_COMPILER_IS_GNUCC)
+-	    set(OPTIMIZATION "${OPTIMIZATION} -mfpu=neon -mfloat-abi=${ARM_FP_ABI}")
++	    set(OPTIMIZATION "${OPTIMIZATION} -mfpu=neon")
+ 	endif()
+ 	# TODO: Add MSVC equivalent
+ endif()
+diff --git a/packaging/deb/freerdp-nightly/rules b/packaging/deb/freerdp-nightly/rules
+index 4366f63..44ceb56 100755
+--- a/packaging/deb/freerdp-nightly/rules
++++ b/packaging/deb/freerdp-nightly/rules
+@@ -1,11 +1,5 @@
+ #!/usr/bin/make -f
+ 
+-DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+-ifneq (,$(filter armhf,$(DEB_HOST_ARCH)))
+-ARM_FLOAT_ABI = -DARM_FP_ABI=hard
+-else
+-ARM_FLOAT_ABI =
+-endif
+ NULL =
+ 
+ DEB_CMAKE_EXTRA_FLAGS :=  -DCMAKE_SKIP_RPATH=FALSE \
+@@ -26,7 +20,6 @@ DEB_CMAKE_EXTRA_FLAGS :=  -DCMAKE_SKIP_RPATH=FALSE \
+                           -DCMAKE_INSTALL_PREFIX=/opt/freerdp-nightly/ \
+                           -DCMAKE_INSTALL_INCLUDEDIR=include \
+                           -DCMAKE_INSTALL_LIBDIR=lib \
+-                          $(ARM_FLOAT_ABI) \
+                           $(NULL)
+ 
+ %:
+-- 
+2.5.0
+
diff --git a/net-misc/freerdp/freerdp-1.2.1_pre20150326.ebuild b/net-misc/freerdp/freerdp-1.2.1_pre20150326.ebuild
index bece77196e39..f20307b1a997 100644
--- a/net-misc/freerdp/freerdp-1.2.1_pre20150326.ebuild
+++ b/net-misc/freerdp/freerdp-1.2.1_pre20150326.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.2.1_pre20150326.ebuild,v 1.9 2015/07/15 18:29:43 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.2.1_pre20150326.ebuild,v 1.10 2015/08/06 20:26:10 floppym Exp $
 
 EAPI="5"
 
@@ -80,6 +80,8 @@ DEPEND="${RDEPEND}
 
 DOCS=( README )
 
+PATCHES=( "${FILESDIR}/freerdp-armfp.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with alsa ALSA)