diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest index 7ba6897..daa775c 100644 --- a/media-libs/opencollada/Manifest +++ b/media-libs/opencollada/Manifest @@ -2,6 +2,6 @@ AUX opencollada-0_p864-expat.patch 353 SHA256 e7d7f303921b09db1b92a0299ad464d618 AUX opencollada-1.2.2-libdir.patch 1258 SHA256 778d931d652275bd6b5425c3e75fcfa1c4330ef35238910020cb0514b7950708 SHA512 28798609b2ca3daef7fe657cd1d086953b6834612d6857696516f805977298fd2f67507d1288bfb3afef57a55828b11370d933e33e3857502c04b56b6fec5481 WHIRLPOOL 9a6a9da814848df74b7504de0f24e884c791ddf22b63ad114aebbfe09f6fc0c341613eaad0e2086a2722ecc95ca0d47320b663c020c86196bcd0f4e677fc148b AUX opencollada-1.2.2-no-undefined.patch 1361 SHA256 5d86f5c509518b85da59fb261fb0f1fb0cb74e6e8f5bda01c5a30f2bf6dc986d SHA512 7ca496722fb6c7734dc82c2bba9dff28753f4ecdf361f74bc5cc96c49ab1dacc7accc8e4834e1ecdbc9d7b2a8ccf236f5c606c6a7a670baed2c43cfd0afa8ea3 WHIRLPOOL 71313f93faf353e6f52f79a7a11df6dc32104a4c09a2d0c2d08cfd2b30fb5b877720ed777fc2be07d06d3d0251312135fb0542258b614fa9696f35c4ae26eb64 AUX opencollada-1.2.2-soversion.patch 753 SHA256 c18a4867f61ea9ab386818494c9249ada4e05bd27abd899849884ab8f9d15518 SHA512 891b0c63400c65929e72a2e78b331f5b94ef319c3a533b63194f52788bbc8f087a38589442b7a13c606db6188e381d036fb3d9241006fae9298f351012060a2c WHIRLPOOL 2d78e538c42750a08a4629b2949a27a7bea6422e31a71a51e59ad4ba8d1b992cc8855b76fa2235a8b714e2328c4ba5945029c54ce512cc4cde6f105d47517933 -AUX opencollada-1.6.18-clang.patch 768 SHA256 718f65bb0cf0e48a3058abb0fc423ef63f7baa0dcb3571e7e057512b0e5055ea SHA512 584a713370836a88e30fa38dc448b546a1a1c56475ad67950758573a05dddbe966d815b5ad1de4a1663d7c6a016ddb34dcbeb7ee4747ddaae5ce20a11fb2585b WHIRLPOOL 78c0fcd0e9804d0e103c71f4f71d77917a649c1598844bcfc66c60ee34e0b3c745d6bda93c3522513e81e6c7fdfce86e87043b688af099429dc59687b9dc4be5 +AUX opencollada-1.6.18-clang.patch 769 SHA256 8d0ec8c0f602c280c5780298af00d43325b9f706ddf287ede755590036d8c5df SHA512 3e76ecfca0aaa8baea36e418eaef6f595cca498027730b79cf99f4671196710b24ec991190a8ec85bef74be9c22f3fd0257cbcd27e1339e643f6a2ec032c0940 WHIRLPOOL 19de7af168bc43903702ffe9dd377751947b7d12d97438a74fa3d2cc842ad07536be25d60cccb90b400122ada4b7f103c94e678916e7bc2bc8bf6ff2c6ae9f8b DIST opencollada-1.6.18.tar.gz 11807970 SHA256 9835aa0b6efdb6602e58a84ee245a443002dc7196af3b7660e6888680d5d5990 SHA512 e4f72c41c8c619bbfb842517fb1217f616ebe6d9576ef0b7fd8bcb26443b66245107e8d04475c32946b7b73bf093977d1911d486f2d2ae92a165cfde55f67baa WHIRLPOOL 7d35758667c7a1293c376712d47cae0f87ea243e04de9fc526297805fa59f405510584ac6d79c13f77f80f1ef0e6cbea05692b3c65a09d88031dd220b4132ead EBUILD opencollada-1.6.18-r1.ebuild 1865 SHA256 cff1a2b9fcc850f29aef31340bd857f48c137d18f3a4a5602da06b257600927a SHA512 597652b3ca3cf44cdb1ad0408e0e47ce6bfc5a9d350e6127c12b81bb9c3d6997efc02023906895924f81a0ba3b48fc95d3fe451573a6a785d3a05cca7ec561ea WHIRLPOOL 28ae69fafb8aa1d08383362830c3f001686ab17627ec7f1cf4703cc96fcedf0b6427e2b9dd8fdf19eb6c57626116f95dd0dff482e5e3811f81c0b1e6c7e0d914 diff --git a/media-libs/opencollada/files/opencollada-1.6.18-clang.patch b/media-libs/opencollada/files/opencollada-1.6.18-clang.patch index f0d68dc..f2a6a5e 100644 --- a/media-libs/opencollada/files/opencollada-1.6.18-clang.patch +++ b/media-libs/opencollada/files/opencollada-1.6.18-clang.patch @@ -1,12 +1,12 @@ diff -uri OpenCOLLADA-1.6.18.orig/COLLADABaseUtils/include/COLLADABUhash_map.h OpenCOLLADA-1.6.18/COLLADABaseUtils/include/COLLADABUhash_map.h --- OpenCOLLADA-1.6.18.orig/COLLADABaseUtils/include/COLLADABUhash_map.h 2016-05-09 10:57:11.000000000 -0500 -+++ OpenCOLLADA-1.6.18/COLLADABaseUtils/include/COLLADABUhash_map.h 2016-07-08 18:41:59.000000000 -0500 ++++ OpenCOLLADA-1.6.18/COLLADABaseUtils/include/COLLADABUhash_map.h 2016-07-08 18:56:45.000000000 -0500 @@ -70,7 +70,7 @@ #define COLLADABU_HASH_NAMESPACE_CLOSE #define COLLADABU_HASH_FUN hash #else // Linux or Mac or FreeBSD with GCC - #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3) -+ #if !define(__clang__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)) ++ #if !defined(__clang__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)) #include #include #if !(defined(__APPLE__) && defined(__MACH__))