Date: Thursday, February 26, 2015 @ 18:19:23
Author: spupykin
Revision: 128299
upgpkg: mingw-w64-headers 4.0rc2-1
upd
Modified:
mingw-w64-headers/trunk/PKGBUILD
Deleted:
mingw-w64-headers/trunk/30ad488eaf3b1b0d053ae6316dd5c9b478c92a6c.patch
+
30ad488eaf3b1b0d053ae6316dd5c9b478c92a6c.patch | 61 ---
PKGBUILD | 19 +++
2 files changed, 10 insertions(+), 70 deletions(-)
Deleted: 30ad488eaf3b1b0d053ae6316dd5c9b478c92a6c.patch
===
--- 30ad488eaf3b1b0d053ae6316dd5c9b478c92a6c.patch 2015-02-26 17:15:18 UTC
(rev 128298)
+++ 30ad488eaf3b1b0d053ae6316dd5c9b478c92a6c.patch 2015-02-26 17:19:23 UTC
(rev 128299)
@@ -1,61 +0,0 @@
-From 30ad488eaf3b1b0d053ae6316dd5c9b478c92a6c Mon Sep 17 00:00:00 2001
-From: cjacek cjacek@4407c894-4637-0410-b4f5-ada5f102cad1
-Date: Thu, 13 Mar 2014 14:51:52 +
-Subject: [PATCH] intrin.h: Fixed mm3dnow.h conflict with recent GCC trunk.
-
-git-svn-id: https://svn.code.sf.net/p/mingw-w64/code@6525
4407c894-4637-0410-b4f5-ada5f102cad1
- trunk/mingw-w64-headers/crt/intrin.h | 16 ++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/trunk/mingw-w64-headers/crt/intrin.h
b/trunk/mingw-w64-headers/crt/intrin.h
-index 2348e09..593b5f2 100644
a/trunk/mingw-w64-headers/crt/intrin.h
-+++ b/trunk/mingw-w64-headers/crt/intrin.h
-@@ -105,6 +105,16 @@ extern C {
- #endif
- #endif
-
-+#if defined(__3dNOW__) || defined(__MINGW_FORCE_SYS_INTRINS)
-+#if defined(__cplusplus)
-+extern C {
-+#endif
-+#include mm3dnow.h
-+#if defined(__cplusplus)
-+}
-+#endif
-+#endif
-+
- /* NOTE: it's not included by MS version, but we do it to try work around
C++/C linkage differences */
- #if defined(__SSE__) || defined(__MINGW_FORCE_SYS_INTRINS)
- #if defined(__cplusplus)
-@@ -642,8 +652,6 @@ extern C {
- __MACHINEX86X_NOX64(__m64 _m_pavgw(__m64,__m64))
- __MACHINEX86X_NOX64(__m64 _m_psadbw(__m64,__m64))
- #endif
--__MACHINEX86X_NOWIN64(__m64 _m_from_float(float))
--__MACHINEX86X_NOWIN64(float _m_to_float(__m64))
- #if !defined(__GNUC__) || (!defined(__SSE__)
!defined(__MINGW_FORCE_SYS_INTRINS))
- __MACHINEX86X_NOIA64(__m128 _mm_add_ss(__m128,__m128))
- __MACHINEX86X_NOIA64(__m128 _mm_add_ps(__m128,__m128))
-@@ -745,6 +753,9 @@ extern C {
- __MACHINEX86X_NOIA64(__m128 _mm_movelh_ps(__m128,__m128))
- __MACHINEX86X_NOIA64(__m128 _mm_movehl_ps(__m128,__m128))
- #endif
-+#if !defined(__GNUC__) || (!defined(__3dNOW__)
!defined(__MINGW_FORCE_SYS_INTRINS))
-+__MACHINEX86X_NOWIN64(__m64 _m_from_float(float))
-+__MACHINEX86X_NOWIN64(float _m_to_float(__m64))
- __MACHINEX86X_NOIA64(void _m_prefetch(void*))
- __MACHINEX86X_NOIA64(void _m_prefetchw(void*_Source))
- __MACHINEX86X_NOWIN64(void _m_femms(void))
-@@ -767,6 +778,7 @@ extern C {
- __MACHINEX86X_NOWIN64(__m64 _m_pfsubr(__m64,__m64))
- __MACHINEX86X_NOWIN64(__m64 _m_pi2fd(__m64))
- __MACHINEX86X_NOWIN64(__m64 _m_pmulhrw(__m64,__m64))
-+#endif
- __MACHINEX86X_NOWIN64(__m64 _m_pf2iw(__m64))
- __MACHINEX86X_NOWIN64(__m64 _m_pfnacc(__m64,__m64))
- __MACHINEX86X_NOWIN64(__m64 _m_pfpnacc(__m64,__m64))
---
-1.9.3
-
Modified: PKGBUILD
===
--- PKGBUILD2015-02-26 17:15:18 UTC (rev 128298)
+++ PKGBUILD2015-02-26 17:19:23 UTC (rev 128299)
@@ -5,7 +5,8 @@
_targets=i686-w64-mingw32 x86_64-w64-mingw32
pkgname='mingw-w64-headers'
-pkgver=3.3.0
+pkgver=4.0rc2
+_pkgver=4.0-rc2
pkgrel=1
pkgdesc=MinGW-w64 headers for Windows
arch=('any')
@@ -13,14 +14,14 @@
license=('custom')
groups=('mingw-w64-toolchain' 'mingw-w64')
options=('!strip' '!libtool' '!emptydirs')
-source=(http://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${pkgver}.tar.bz2)
-md5sums=('3c56901ca7be60beba6d58caff168240')
+source=(http://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${_pkgver}.tar.bz2)
+md5sums=('e08c4c0265c0e97f514695a1fa57af9e')
build() {
for _target in ${_targets}; do
msg Configuring ${_target} headers
mkdir -p ${srcdir}/headers-${_target} cd ${srcdir}/headers-${_target}
-${srcdir}/mingw-w64-v${pkgver}/mingw-w64-headers/configure
--prefix=/usr/${_target} --enable-sdk=all --enable-secure-api --host=${_target}
+${srcdir}/mingw-w64-v${_pkgver}/mingw-w64-headers/configure
--prefix=/usr/${_target} --enable-sdk=all --enable-secure-api --host=${_target}
done
}
@@ -35,9 +36,9 @@
done
msg Installing MinGW-w64 licenses
- install -Dm644
${srcdir}/mingw-w64-v${pkgver}/COPYING.MinGW-w64/COPYING.MinGW-w64.txt
${pkgdir}/usr/share/licenses/${pkgname}/COPYING.MinGW-w64.txt
- install -Dm644
${srcdir}/mingw-w64-v${pkgver}/COPYING.MinGW-w64-runtime/COPYING.MinGW-w64-runtime.txt
