diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-07-14 14:12:28 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-07-14 14:12:28 +0000 |
| commit | a089e66e49d56e751591edd8a4c131390c8209e8 (patch) | |
| tree | e103203c85ec48b2451f7a7f277361ac2724c97a /net-misc | |
| parent | update metadata.xml (diff) | |
| download | gentoo-2-a089e66e49d56e751591edd8a4c131390c8209e8.tar.gz gentoo-2-a089e66e49d56e751591edd8a4c131390c8209e8.tar.bz2 gentoo-2-a089e66e49d56e751591edd8a4c131390c8209e8.zip | |
Fix build with -mavx, bug 476798 by Mirko Guenther.
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/freerdp/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/freerdp/files/freerdp-1.1.0_beta1-avx.patch | 61 | ||||
| -rw-r--r-- | net-misc/freerdp/freerdp-1.1.0_beta1.ebuild | 3 |
3 files changed, 68 insertions, 2 deletions
diff --git a/net-misc/freerdp/ChangeLog b/net-misc/freerdp/ChangeLog index 34e9036d8f3a..767de58d013b 100644 --- a/net-misc/freerdp/ChangeLog +++ b/net-misc/freerdp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/freerdp # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.47 2013/07/14 00:07:20 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.48 2013/07/14 14:12:28 floppym Exp $ + + 14 Jul 2013; Mike Gilbert <floppym@gentoo.org> + +files/freerdp-1.1.0_beta1-avx.patch, freerdp-1.1.0_beta1.ebuild: + Fix build with -mavx, bug 476798 by Mirko Guenther. 14 Jul 2013; Mike Gilbert <floppym@gentoo.org> -freerdp-1.0.1_p20120318.ebuild, -freerdp-1.1.0_alpha20121004-r1.ebuild: diff --git a/net-misc/freerdp/files/freerdp-1.1.0_beta1-avx.patch b/net-misc/freerdp/files/freerdp-1.1.0_beta1-avx.patch new file mode 100644 index 000000000000..8a07e8a6d30d --- /dev/null +++ b/net-misc/freerdp/files/freerdp-1.1.0_beta1-avx.patch @@ -0,0 +1,61 @@ +commit 81580f10d910a8e88bc09c1fc692a2e14161ffa1 +Author: Bernhard Miklautz <bernhard.miklautz@shacknet.at> +Date: Thu Mar 14 23:18:21 2013 +0100 + + winpr/sysinfo: fixed build and detection when build with AVX + +diff --git a/winpr/libwinpr/sysinfo/sysinfo.c b/winpr/libwinpr/sysinfo/sysinfo.c +index 947dc24..59200cc 100644 +--- a/winpr/libwinpr/sysinfo/sysinfo.c ++++ b/winpr/libwinpr/sysinfo/sysinfo.c +@@ -662,32 +662,29 @@ BOOL IsProcessorFeaturePresentEx(DWORD ProcessorFeature) + case PF_EX_AVX_AES: + { + if ((c & C_BITS_AVX) != C_BITS_AVX) +- ret = FALSE; ++ break; + +- int e, f; +- xgetbv(0, e, f); ++ int e, f; ++ xgetbv(0, e, f); + +- if ((e & E_BITS_AVX) == E_BITS_AVX) ++ if ((e & E_BITS_AVX) == E_BITS_AVX) ++ { ++ switch (ProcessorFeature) + { +- switch (ProcessorFeature) +- { +- case: PF_EX_AVX: +- ret = TRUE; +- break; +- case: PF_EX_FMA: +- if (c & C_BIT_FMA) +- ret = TRUE; +- break; +- case: PF_EX_AVX_AES: +- if (c & C_BIT_AVX_AES) +- ret = TRUE; +- break; +- { ++ case PF_EX_AVX: + ret = TRUE; + break; +- } +- } +- } ++ case PF_EX_FMA: ++ if (c & C_BIT_FMA) ++ ret = TRUE; ++ break; ++ case PF_EX_AVX_AES: ++ if (c & C_BIT_AVX_AES) ++ ret = TRUE; ++ break; ++ } ++ } ++ } + break; + #endif //__AVX__ + default: diff --git a/net-misc/freerdp/freerdp-1.1.0_beta1.ebuild b/net-misc/freerdp/freerdp-1.1.0_beta1.ebuild index 332ec2922558..32c0da5cf8b5 100644 --- a/net-misc/freerdp/freerdp-1.1.0_beta1.ebuild +++ b/net-misc/freerdp/freerdp-1.1.0_beta1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.1.0_beta1.ebuild,v 1.3 2013/07/13 21:25:48 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.1.0_beta1.ebuild,v 1.4 2013/07/14 14:12:28 floppym Exp $ EAPI="5" @@ -64,6 +64,7 @@ DEPEND="${RDEPEND} " DOCS=( README ) +PATCHES=( "${FILESDIR}/${P}-avx.patch" ) src_configure() { local mycmakeargs=( |