| 1 |
commit: b879c88f4a0b0de9d58d693f363bd0be05cdf537 |
| 2 |
Author: Markus Meier <maekke <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 2 10:44:10 2014 +0000 |
| 4 |
Commit: Markus Meier <maekke <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 2 10:44:10 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=b879c88f |
| 7 |
|
| 8 |
fix building on x32 by Torsten Bronger, bug #466220 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.7 |
| 11 |
Manifest-Sign-Key: 072AD062 |
| 12 |
|
| 13 |
--- |
| 14 |
media-libs/lensfun/Manifest | 9 +++--- |
| 15 |
media-libs/lensfun/files/lensfun-0.2.8-x32.patch | 40 ++++++++++++++++++++++++ |
| 16 |
media-libs/lensfun/lensfun-0.2.8.ebuild | 3 +- |
| 17 |
3 files changed, 47 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest |
| 20 |
index bacb8b0..a2bef12 100644 |
| 21 |
--- a/media-libs/lensfun/Manifest |
| 22 |
+++ b/media-libs/lensfun/Manifest |
| 23 |
@@ -8,6 +8,7 @@ AUX lensfun-0.2.6-auxfun.patch 500 SHA256 173cd284ba1b4ba61137e09327fae25725f892 |
| 24 |
AUX lensfun-0.2.7-build.patch 2425 SHA256 9678f9fdc90e2930913eb386b8e0d5809c06dab389b95fd65261e431557c9202 SHA512 f4fa88816e0ac4f52c0f927bd5cfec93e3a97aab395c12aa38cc2e6cf1156c9d7e59ac145310e1e0c3b40180cfee30cff4a6ef5ab46df2ff076337aaeb01a26e WHIRLPOOL 2829c6c9ab752ab90f0f04f8d9aeadc106f71cb752daad6d540a33c60dea7ea9fc3f3af13d02e2685fb139b7361dcd804062aad2f7d43f45983c52d1fae431fa |
| 25 |
AUX lensfun-0.2.7-memset.patch 377 SHA256 4d893f17f65d919f14d16b46e7c0d51e31cce8149da4a60755d0e75b8d141cc6 SHA512 92936cbc414b7f0f00bc0060a1c6c2c701c1f7c649039c81155626db16aa701286b33017121be5b7d853207b3d28a05f1d5b1cf48f1d58b6934f615f9ee366ff WHIRLPOOL 222a8ce4913a1668fabbb40ea288a72270ddf75839d611e33495d47d99814e701c112d96d9c0fba9c7d2de3e62a180cd075291cc8eb40f5a7ba920d0b3bed136 |
| 26 |
AUX lensfun-0.2.8-build.patch 1898 SHA256 ca4b4c4431f10b3ec54a97a02b582f558c135d921d9667e6f40998bae56336dd SHA512 1794a5313f06feeec5d2bcd86338f5a2c500bf80d34d6cd92db3402272b0c385965b4c36cc0fe7ce6aa54bd7f523a868f52b9d61919fb05d7eb2b343adf532c6 WHIRLPOOL e7eeb1581ee56a6db95c8fc908309a379a96af33d9a26d2b916801c8a680174beb4385405a51df8eb37001bdd91cc92a75172bcf8012faa7eec6961e5840860e |
| 27 |
+AUX lensfun-0.2.8-x32.patch 944 SHA256 54d7b5413d39d25776e1a9a87171de132814652d08b0b122de41cad95110b9a7 SHA512 6b21eb3cf3f84892b27eb76bf6af39767cca061d3762f019280961157349bb5829f6a61de8b6879e886471db3b47d3395bafdf043b4829428092f9eb90514a2f WHIRLPOOL 1b1010acfceeddf4532af5e7b8a12d7702f6c503a972638547ba4d84ce607c2a2d1264c93f5433efa0567f3d486549f0951e48814c6810bbc2cd1c2cfaf4332b |
| 28 |
DIST lensfun-0.2.5.tar.bz2 470733 SHA256 c21498eb1889714af25e4e08474d9faa1e45132c89a8c1ac97340233e988fb87 SHA512 a90292fd53fc12d82ccfd0211b8e544b18e2bd712010bf4c1cad5ad1d18f82145c399371f3699fe004571a845420f8e17f3237b45f861cb58c7ac8df8e503baa WHIRLPOOL 6e85477234988e1a060eb97810ad856360ee81eea15978ac7d9fd93a864ece5a6b3b64f81fa506a50c999ae281a283a269fa59ffb854089ad638ce6d3ce8cbed |
| 29 |
DIST lensfun-0.2.5_p153.tar.xz 466656 SHA256 7677d2cf217ab71985eba82889886784a3466c4435a98b6a996580bc166876ff SHA512 7263ea69d89e710f84e6f1c3c9287f8f54efe3823fd9babe2c3e191c38a8e17664ed3e330771f2c2579c65cbadb56eaa277362860ee39549238d0926a8d9d23d WHIRLPOOL 86f8e0f4f4a43c41d5965aeb9941d1e8b1068dd3a182c9954b4a0600600dcc55a4eef1049d9e19aa5a3e5d0e02201325774cbb5cc47cecd88b2608069a257c96 |
| 30 |
DIST lensfun-0.2.6.tar.bz2 505690 SHA256 eebf35851f6d40ecf007578b859f9ecb66af417c1895d1fc0c5776d5d9bdb26e SHA512 209ef807d0cc43dcc021709ab0f5e460fed9192a4f617c8e4e07fd6e3b0ad3863d1e1b716c38025ec5cc8b22f62708ec64b4e02f14b35f25c5767b5db1defbb1 WHIRLPOOL 198a2834d6966c83fdd293b52a3a3b289c932989b123484394dddd9550c9a6ac41d14017894e1288debe2865d5f3bafb34f714040a3523b76335c563bad6ae47 |
| 31 |
@@ -17,12 +18,12 @@ EBUILD lensfun-0.2.5-r2.ebuild 1441 SHA256 33062b3bdffdb3397cd73d6c2409d7f263e7d |
| 32 |
EBUILD lensfun-0.2.5_p153-r1.ebuild 987 SHA256 b3709a3ecdf9aa08f7feae60c62f57025e0721a83f048c9117be946273e7c93e SHA512 4f0c9c9222d2a76b0d2f81e9dfe3fb5109ab2e8d51badc3f0f68c0b971d5f61cf09e930346740f1d44623b10168d4df1099dd052329062adb28edf30c57326ec WHIRLPOOL 1d855e9fb5369557e0bc3b70c52e628cade1c4463260edb14b89e5bb86013f0a20fd110be2f87c898a59d0735695ad3392e3c5ad5664fb89fa8dc9e950a97b9f |
| 33 |
EBUILD lensfun-0.2.6.ebuild 1330 SHA256 8a514917ef1757f4f445eb1d4266a67f9451763aa65be743068bdafedc0d3434 SHA512 39c15eaeb4216bf7c775c3cb79b2980c176d608cd16675790a9b98458b8b9728419bc06d0bb7c8d8cd777e8dfc1d335e6cc812bfedbb0a5c33012c58e86dcfe0 WHIRLPOOL 85cee200a8a91cac828d565fb3596bd27d4009089e6bcc7d4678173a05690a78a81d5a99e928138730631f08703b943dd5461d9a70584265e81a01b4ab7983a6 |
| 34 |
EBUILD lensfun-0.2.7.ebuild 1309 SHA256 cdce1dc32822e55954c6025cf39bf7d6b7d14f69c905c83a3b81b9b0cbe9ceaa SHA512 0496dda19467bb343dec23d2a359358df6f5c021a2311fa5cdc163764a23387229da365432bcf3d9603397cbf33bcd7a7921eab297a5cd48647682a49e2eff98 WHIRLPOOL 34802f132d5375b14e985fe1e41b9cc9858e5a8f147e683b06fb71d823efa73e4a862f6c77d431721c61f03739102ef3f2180ef7494d20de5570c4dd4766b1c6 |
| 35 |
-EBUILD lensfun-0.2.8.ebuild 1241 SHA256 b7bc338314863280e017d7a3492f5946b0cc3389fba248cceaf1ede4e45aab4b SHA512 20ff9acfbdf698d8b2d884a0a9802376bf60431e3de9cd93a54150011f6795ecee4030fbbeb2bfb747a9c814235c76c867f1ac37a98cd9dbd953917adc32e1b3 WHIRLPOOL 2074da3aa9ca576fcf7a90f79fbf1c04e182e9db881262c1333d6b35ff53b47f3557a1d887924c31c7494ee543144f4b1c35f2f583e263153c4ef875aaa108cf |
| 36 |
+EBUILD lensfun-0.2.8.ebuild 1271 SHA256 fafee6e973edd5790fce4182af5ec55fa183682daacc6a28ab1ecc4caa052ac0 SHA512 a55bce03e503d6c3ddff8104eaa7a7a4d7f94fde4dfd97a1b3fb131eefd7653f7bd1dfffe8c05dbc0ae9a5a66a6cf2892ff2a3d89e23c99ce5d50d340522a20d WHIRLPOOL e0f5cad10c0a24c02deb4988f5b9f931d83e9f490322de552c9b4049096c05f65ef53ce54fc3768107902a1d8e82e8707ec03b2cfa2bde56e5f3531639252594 |
| 37 |
MISC metadata.xml 434 SHA256 cdad31489c1592f642177d2c6c152262fc5bba1e6322098a95cbe496d03c3c2f SHA512 3735e2c7fd32e4b2309ebbfb2f8e3107698a5d722fbbb712bddda7dc665af5d994e8f213c06e247ff0fa04f09f209be2cd4fdac4ef218c5b60c99a65334944bf WHIRLPOOL 21bc12855f7bbcd67f885b6a3e022372d5f55524ec305a9e405b2e7d09f76a571236da65d15e81c631c23fa4e914ff1e5ef68fa26f7a51249d5f0837035cd7ef |
| 38 |
-----BEGIN PGP SIGNATURE----- |
| 39 |
Version: GnuPG v2.0.22 (GNU/Linux) |
| 40 |
|
| 41 |
-iEYEAREIAAYFAlLFQZYACgkQkKaRLQcq0GK63ACfV7nWn/yLVkdRsc+E2r+poMea |
| 42 |
-y7UAnjJcPbzyAfq8I9BwF0EuwuDPL2M0 |
| 43 |
-=WHCt |
| 44 |
+iEYEAREIAAYFAlLFQvoACgkQkKaRLQcq0GKvwgCgkILOvo6MoZ/v4BpKYvUs4gHh |
| 45 |
+a+8An3BssnCEMBURbakxlHdhy/tLVITz |
| 46 |
+=viVq |
| 47 |
-----END PGP SIGNATURE----- |
| 48 |
|
| 49 |
diff --git a/media-libs/lensfun/files/lensfun-0.2.8-x32.patch b/media-libs/lensfun/files/lensfun-0.2.8-x32.patch |
| 50 |
new file mode 100644 |
| 51 |
index 0000000..90cc956 |
| 52 |
--- /dev/null |
| 53 |
+++ b/media-libs/lensfun/files/lensfun-0.2.8-x32.patch |
| 54 |
@@ -0,0 +1,40 @@ |
| 55 |
+Index: libs/lensfun/cpuid.cpp |
| 56 |
+=================================================================== |
| 57 |
+--- libs/lensfun/cpuid.cpp (revision 380) |
| 58 |
++++ libs/lensfun/cpuid.cpp (working copy) |
| 59 |
+@@ -65,16 +65,16 @@ |
| 60 |
+ #else |
| 61 |
+ #if defined (__i386__) || defined (__x86_64__) |
| 62 |
+ |
| 63 |
+-#if defined (__i386__) |
| 64 |
++#ifdef __x86_64__ |
| 65 |
++# define R_AX "rax" |
| 66 |
++# define R_BX "rbx" |
| 67 |
++# define R_CX "rcx" |
| 68 |
++# define R_DX "rdx" |
| 69 |
++#else |
| 70 |
+ # define R_AX "eax" |
| 71 |
+ # define R_BX "ebx" |
| 72 |
+ # define R_CX "ecx" |
| 73 |
+ # define R_DX "edx" |
| 74 |
+-#elif defined (__x86_64__) |
| 75 |
+-# define R_AX "rax" |
| 76 |
+-# define R_BX "rbx" |
| 77 |
+-# define R_CX "rcx" |
| 78 |
+-# define R_DX "rdx" |
| 79 |
+ #endif |
| 80 |
+ |
| 81 |
+ // Borrowed from RawStudio |
| 82 |
+@@ -88,7 +88,11 @@ |
| 83 |
+ : "=a" (ax), "=c" (cx), "=d" (dx) \ |
| 84 |
+ : "0" (cmd)) |
| 85 |
+ |
| 86 |
+- __SIZE_TYPE__ ax, cx, dx, tmp; |
| 87 |
++#ifdef __x86_64__ |
| 88 |
++ guint64 ax, cx, dx, tmp; |
| 89 |
++#else |
| 90 |
++ guint32 ax, cx, dx, tmp; |
| 91 |
++#endif |
| 92 |
+ static GStaticMutex lock = G_STATIC_MUTEX_INIT; |
| 93 |
+ static guint cpuflags = -1; |
| 94 |
+ |
| 95 |
|
| 96 |
diff --git a/media-libs/lensfun/lensfun-0.2.8.ebuild b/media-libs/lensfun/lensfun-0.2.8.ebuild |
| 97 |
index 025699e..47c2f09 100644 |
| 98 |
--- a/media-libs/lensfun/lensfun-0.2.8.ebuild |
| 99 |
+++ b/media-libs/lensfun/lensfun-0.2.8.ebuild |
| 100 |
@@ -1,4 +1,4 @@ |
| 101 |
-# Copyright 1999-2013 Gentoo Foundation |
| 102 |
+# Copyright 1999-2014 Gentoo Foundation |
| 103 |
# Distributed under the terms of the GNU General Public License v2 |
| 104 |
# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.8.ebuild,v 1.2 2013/12/30 09:12:23 mgorny Exp $ |
| 105 |
|
| 106 |
@@ -27,6 +27,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 107 |
|
| 108 |
PATCHES=( |
| 109 |
"${FILESDIR}"/${P}-build.patch |
| 110 |
+ "${FILESDIR}"/${P}-x32.patch |
| 111 |
) |
| 112 |
|
| 113 |
DOCS=( README docs/mounts.txt ) |
Archives