1 |
commit: dc334ab014eb05ab9b522b5e9933cb0aa9028852 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 5 02:28:44 2017 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 5 02:37:56 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc334ab0 |
7 |
|
8 |
x11-libs/pixman: Drop old version 0.32.8. |
9 |
|
10 |
x11-libs/pixman/Manifest | 1 - |
11 |
x11-libs/pixman/files/pixman-0.32.8-clang.patch | 93 ------------------------- |
12 |
x11-libs/pixman/pixman-0.32.8.ebuild | 36 ---------- |
13 |
3 files changed, 130 deletions(-) |
14 |
|
15 |
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest |
16 |
index d5a8bfb9ab4..2f4913eb330 100644 |
17 |
--- a/x11-libs/pixman/Manifest |
18 |
+++ b/x11-libs/pixman/Manifest |
19 |
@@ -1,2 +1 @@ |
20 |
-DIST pixman-0.32.8.tar.bz2 696038 SHA256 5c63dbb3523fc4d86ed4186677815918a941b7cb390d5eec4f55cb5d66b59fb1 SHA512 43924a92f0d3e03359bd74701cc2a27c000b24fc513e0f760389da7e6ee1acec666a734003ef193d45251cc9645c07caf91142c3ff9134b1429a38a9167332a2 WHIRLPOOL 0035c6e5713a79caeeb88e865204d708f9dc2fdc8881cc4468d64f1d31243b7399f1404d76c33f43b3c17daf46f7c5e33659a961f0847993cfd3d09015fa26eb |
21 |
DIST pixman-0.34.0.tar.bz2 739656 SHA256 39ba3438f3d17c464b0cb8be006dacbca0ab5aee97ebde69fec7ecdbf85794a0 SHA512 755a3f5596e7bd9710abc8e5bfd341adaf2177f5b21f7aaae7f85b8fb57580ea48df586ad32bf6adef6ce0430e7cadaa57754a2fa466bc4b15bf70ee64cd1418 WHIRLPOOL c5aa0abc6f09b667cbb91b926536ffa9c2d88ef61b7d4d2377bd57dd6844689db61a9ef1ef6282878bbfec1068454d3d4f188b1ff269e86e3b77d95b261c4c06 |
22 |
|
23 |
diff --git a/x11-libs/pixman/files/pixman-0.32.8-clang.patch b/x11-libs/pixman/files/pixman-0.32.8-clang.patch |
24 |
deleted file mode 100644 |
25 |
index d5319292fbd..00000000000 |
26 |
--- a/x11-libs/pixman/files/pixman-0.32.8-clang.patch |
27 |
+++ /dev/null |
28 |
@@ -1,93 +0,0 @@ |
29 |
-From d24b415f3e2753a588759d028b811e1ce38fea6c Mon Sep 17 00:00:00 2001 |
30 |
-From: Andrea Canciani <ranma42@×××××.com> |
31 |
-Date: Sun, 11 Oct 2015 09:45:57 +0200 |
32 |
-Subject: mmx: Improve detection of support for "K" constraint |
33 |
- |
34 |
-Older versions of clang emitted an error on the "K" constraint, but at |
35 |
-least since version 3.7 it is supported. Just like gcc, this |
36 |
-constraint is only allowed for constants, but apparently clang |
37 |
-requires them to be known before inlining. |
38 |
- |
39 |
-Using the macro definition _mm_shuffle_pi16(A, N) ensures that the "K" |
40 |
-constraint is always applied to a literal constant, independently from |
41 |
-the compiler optimizations and allows building pixman-mmx on modern |
42 |
-clang. |
43 |
- |
44 |
-Reviewed-by: Matt Turner <mattst88@×××××.com> |
45 |
-Signed-off-by: Andrea Canciani <ranma42@×××××.com> |
46 |
- |
47 |
-diff --git a/configure.ac b/configure.ac |
48 |
-index 2178126..3a66909 100644 |
49 |
---- a/configure.ac |
50 |
-+++ b/configure.ac |
51 |
-@@ -347,15 +347,27 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ |
52 |
- #error "Need GCC >= 3.4 for MMX intrinsics" |
53 |
- #endif |
54 |
- #include <mmintrin.h> |
55 |
-+#include <stdint.h> |
56 |
-+ |
57 |
-+/* Check support for block expressions */ |
58 |
-+#define _mm_shuffle_pi16(A, N) \ |
59 |
-+ ({ \ |
60 |
-+ __m64 ret; \ |
61 |
-+ \ |
62 |
-+ /* Some versions of clang will choke on K */ \ |
63 |
-+ asm ("pshufw %2, %1, %0\n\t" \ |
64 |
-+ : "=y" (ret) \ |
65 |
-+ : "y" (A), "K" ((const int8_t)N) \ |
66 |
-+ ); \ |
67 |
-+ \ |
68 |
-+ ret; \ |
69 |
-+ }) |
70 |
-+ |
71 |
- int main () { |
72 |
- __m64 v = _mm_cvtsi32_si64 (1); |
73 |
- __m64 w; |
74 |
- |
75 |
-- /* Some versions of clang will choke on K */ |
76 |
-- asm ("pshufw %2, %1, %0\n\t" |
77 |
-- : "=y" (w) |
78 |
-- : "y" (v), "K" (5) |
79 |
-- ); |
80 |
-+ w = _mm_shuffle_pi16(v, 5); |
81 |
- |
82 |
- /* Some versions of clang will choke on this */ |
83 |
- asm ("pmulhuw %1, %0\n\t" |
84 |
-diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c |
85 |
-index 05c48a4..dec3974 100644 |
86 |
---- a/pixman/pixman-mmx.c |
87 |
-+++ b/pixman/pixman-mmx.c |
88 |
-@@ -89,21 +89,7 @@ _mm_mulhi_pu16 (__m64 __A, __m64 __B) |
89 |
- return __A; |
90 |
- } |
91 |
- |
92 |
--# ifdef __OPTIMIZE__ |
93 |
--extern __inline __m64 __attribute__((__gnu_inline__, __always_inline__, __artificial__)) |
94 |
--_mm_shuffle_pi16 (__m64 __A, int8_t const __N) |
95 |
--{ |
96 |
-- __m64 ret; |
97 |
-- |
98 |
-- asm ("pshufw %2, %1, %0\n\t" |
99 |
-- : "=y" (ret) |
100 |
-- : "y" (__A), "K" (__N) |
101 |
-- ); |
102 |
-- |
103 |
-- return ret; |
104 |
--} |
105 |
--# else |
106 |
--# define _mm_shuffle_pi16(A, N) \ |
107 |
-+# define _mm_shuffle_pi16(A, N) \ |
108 |
- ({ \ |
109 |
- __m64 ret; \ |
110 |
- \ |
111 |
-@@ -114,7 +100,6 @@ _mm_shuffle_pi16 (__m64 __A, int8_t const __N) |
112 |
- \ |
113 |
- ret; \ |
114 |
- }) |
115 |
--# endif |
116 |
- # endif |
117 |
- #endif |
118 |
- |
119 |
--- |
120 |
-cgit v0.10.2 |
121 |
- |
122 |
|
123 |
diff --git a/x11-libs/pixman/pixman-0.32.8.ebuild b/x11-libs/pixman/pixman-0.32.8.ebuild |
124 |
deleted file mode 100644 |
125 |
index c82debe0530..00000000000 |
126 |
--- a/x11-libs/pixman/pixman-0.32.8.ebuild |
127 |
+++ /dev/null |
128 |
@@ -1,36 +0,0 @@ |
129 |
-# Copyright 1999-2017 Gentoo Foundation |
130 |
-# Distributed under the terms of the GNU General Public License v2 |
131 |
- |
132 |
-EAPI=5 |
133 |
-XORG_EAUTORECONF=yes |
134 |
-XORG_MULTILIB=yes |
135 |
-inherit xorg-2 toolchain-funcs versionator |
136 |
- |
137 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman" |
138 |
-DESCRIPTION="Low-level pixel manipulation routines" |
139 |
- |
140 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
141 |
-IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3" |
142 |
-RDEPEND="abi_x86_32? ( |
143 |
- !<=app-emulation/emul-linux-x86-gtklibs-20131008 |
144 |
- !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] |
145 |
- )" |
146 |
- |
147 |
-PATCHES=( |
148 |
- "${FILESDIR}/${P}-clang.patch" |
149 |
-) |
150 |
- |
151 |
-src_configure() { |
152 |
- XORG_CONFIGURE_OPTIONS=( |
153 |
- $(use_enable cpu_flags_x86_mmxext mmx) |
154 |
- $(use_enable cpu_flags_x86_sse2 sse2) |
155 |
- $(use_enable cpu_flags_x86_ssse3 ssse3) |
156 |
- $(use_enable altivec vmx) |
157 |
- $(use_enable neon arm-neon) |
158 |
- $(use_enable iwmmxt arm-iwmmxt) |
159 |
- $(use_enable loongson2f loongson-mmi) |
160 |
- --disable-gtk |
161 |
- --disable-libpng |
162 |
- ) |
163 |
- xorg-2_src_configure |
164 |
-} |