diff options
author | 2013-03-19 13:45:09 +0000 | |
---|---|---|
committer | 2013-03-19 13:45:09 +0000 | |
commit | 9598fdc675acbebb65a6e100fbad7d02478bf5ab (patch) | |
tree | a542e93900284f29212a0b3f50a3ad88f316301e /www-plugins/lightspark | |
parent | Version bump (bugfix release). Remove previous version. (diff) | |
download | historical-9598fdc675acbebb65a6e100fbad7d02478bf5ab.tar.gz historical-9598fdc675acbebb65a6e100fbad7d02478bf5ab.tar.bz2 historical-9598fdc675acbebb65a6e100fbad7d02478bf5ab.zip |
Version bump, restrict llvm version due to upstream #1157158.
Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Diffstat (limited to 'www-plugins/lightspark')
15 files changed, 26 insertions, 714 deletions
diff --git a/www-plugins/lightspark/ChangeLog b/www-plugins/lightspark/ChangeLog index a40e81f9dc1c..171948638f6c 100644 --- a/www-plugins/lightspark/ChangeLog +++ b/www-plugins/lightspark/ChangeLog @@ -1,6 +1,22 @@ # ChangeLog for www-plugins/lightspark # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.51 2013/03/04 17:29:26 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.52 2013/03/19 13:45:04 chithanh Exp $ + +*lightspark-0.7.2 (19 Mar 2013) + + 19 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + +lightspark-0.7.2.ebuild, -files/lightspark-0.5.7-llvm-3.1_0001.patch, + -files/lightspark-0.6.0.1-gcc-4.5_0000.patch, + -files/lightspark-0.6.0.1-gcc-4.5_0001.patch, + -files/lightspark-0.6.0.1-gcc-4.5_0002.patch, + -files/lightspark-0.6.0.1-gcc-4.5_0003.patch, + -files/lightspark-0.6.0.1-gcc-4.5_0004.patch, + -files/lightspark-0.6.0.1-gcc-4.5_0005.patch, + -files/lightspark-0.6.0.1-gcc-4.5_0006.patch, + -files/lightspark-0.7.0-libxmlpp-gles.patch, + -files/lightspark-0.7.0-llvm-3.2.patch, -lightspark-0.6.0.1.ebuild, + -lightspark-0.7.0.ebuild, lightspark-0.7.1.ebuild: + Version bump, restrict llvm version due to upstream #1157158. *lightspark-0.7.1 (04 Mar 2013) diff --git a/www-plugins/lightspark/Manifest b/www-plugins/lightspark/Manifest index b6479dd3938e..2cca7492b107 100644 --- a/www-plugins/lightspark/Manifest +++ b/www-plugins/lightspark/Manifest @@ -1,18 +1,6 @@ -AUX lightspark-0.5.7-llvm-3.1_0001.patch 825 SHA256 3c543fe44ed530cd83087af5b9bf4198f8d7c9b127efabf6057ea7782398ba0c SHA512 68423305629a12fd87c4188a6652db97c09c97379e1b0ba31b05b686c1efc8750b357d3eaa8399d3c27396b9a5c72bce41a2270785e6fad4c5a700c025b8a0ac WHIRLPOOL a5dde95a8a4eb097f3ba5e277a2f039460309e796bcc56aa6c05b8a0f406083afea9eca1689fad2e11ae75d5f8232f1cfba5a5dd6d31b3b1d93296705303d972 -AUX lightspark-0.6.0.1-gcc-4.5_0000.patch 702 SHA256 641287d79e3fec0c73b6a0dafdd197b795b8b884af5712738378df291d8f80c9 SHA512 41bd25e2636e514d8453cc50e9a4404823825bd1b2bfecc3de2e8ceef4823d4fdabbe437c77021f0b349a8dc76a5fc93a3c84ef1bd8bca7f2eb52c0af1effb34 WHIRLPOOL d8ec0e4a38c644562aa0926b8439a52c5318bc8adbe314b397cc5fb18249dec28b89e2285525152248aebda45a3596b8abe5064a12e532629aa8174e03da46b4 -AUX lightspark-0.6.0.1-gcc-4.5_0001.patch 1055 SHA256 936ffa129899ba14ea01ecb833f745c5a565779d5d740f7b418b284bfc2670e5 SHA512 aaed65ee1ea718559e6f22c27d7083a406a961b11eaa186685572f3d5b910ea8fb81937569e6750a4b10aea0360ae1e3c8a7a98748c99e5b06d91429a6cead76 WHIRLPOOL 8b16c72695dbbc913738ad0cf7e8be6659cdc06489b443b4d6b5ec0342c81db16574b6b3d079e30bc08b9f4cdc25797220382546c48c29abc19b2646ddc25102 -AUX lightspark-0.6.0.1-gcc-4.5_0002.patch 1790 SHA256 0b90da4f01c69af767d43a39908a1c4d8fb36aea54328771a2f516692dc24b69 SHA512 6167dd1beee335a78aa303fb704e1eed0f8fca2e3bff765e6c896f08b85cada9da1804bf649114f5994f4c681ec3b22e7725d432ae0ab4c981f41b2774ebc8c9 WHIRLPOOL 87c331afff976351b544ad8f40687c1650e8d63ff4774afa72da2ef8686944b07bf44024ea7604f0b2eda7cb50b2949807fbd1c9b36545942e92cb1df372e1ac -AUX lightspark-0.6.0.1-gcc-4.5_0003.patch 1305 SHA256 cbe192db459165e3fc9dc2e317290ed97a32c09006a8ecfbd484714a3aa6e9e8 SHA512 e8656afcef572aad1f68216c5107f709d4eff0389f5557003212ad3d1f3d0e33a9069e6ef33b9c2a90b8c728d8d276ca8424c7662dd7a8aac161623acaaa8401 WHIRLPOOL b7445256dbbb320c21eae46b62f9f12691369f1e1542efe0acc6ff60b68da62cdc17796a2e0b2b4e52f53ba1bed2c6ad77c905769c0f766b547f81bd905e9e5c -AUX lightspark-0.6.0.1-gcc-4.5_0004.patch 1290 SHA256 7fa43d388d476e8df395f794618ac5d04dec11b73446dc1ab7b366b23884bbb4 SHA512 4cc0013b57045e68e311716770f6f7542a7bedb7d95aa79a30d5563ad4f5e06f431cb864ec660b3d7ffa39560e4177f0ac968e68e0dfcfc87bcf42159f53d5d1 WHIRLPOOL df4d75df8d5945712c697997dd579ee0b3d9b813b1d653855ce9b993c37bbe1d7033601d41c6340cdbc9fde635607822e36301e931c4ccd300fcbfe5fdd1106d -AUX lightspark-0.6.0.1-gcc-4.5_0005.patch 857 SHA256 f5fb126000fe8367ee258cdd58b0ebd5a411ef53ff7fcb09debca5fbae00cf15 SHA512 5105d6470bb175e4a95d58871810d69329ea6d4bce6750d97e951aa7f84103f69008b3824f21face58bd19d3bfaea61f311caa0fa826fbb3858483c68be234c0 WHIRLPOOL e4f78314af85f16ba7d8e7afe99900b8e15c1d0834856edae21c7053386628224e1d61131fc6335f957d26b563f76df3cfee9864441066630fa859851f957813 -AUX lightspark-0.6.0.1-gcc-4.5_0006.patch 917 SHA256 c9bdf1e5d48307eade32bfda3f6474b572b2caa6f52974c1479a1cc8923bfd04 SHA512 4a629ca021c188c7199111ca67f91b4b2cc7233c1069c3d07747447d818f10703c5aedc95c4ae5b02181c36336617f8af76b600b6ebef4cf55fa8b3d106b5764 WHIRLPOOL 9bf5e69fce593c3eb3852ec8f1e7143d93e096523fd70bcfb2b0186c8cf0787bef02707429e57f67bb62e1111c7a65e60286c5816589ffdb24b6dc25c1b4f619 -AUX lightspark-0.7.0-libxmlpp-gles.patch 5622 SHA256 455650ec8665b1178d2a77dc55151cfca027a14b1cd22d62ba48205939b6f9f8 SHA512 240fee235e27deb3568f8782e4f175424a31b632958476430e0e2b9f19a3c56aba1ff52eba9b1360f5c8586f35e8f1709c883c7df23087a349ed5a80bdcfeafe WHIRLPOOL 265ec9c2e4e08701f2ab726c7503ba5025440e73050211f5d5ebcbe0b54e05de58a4952587b5c3204655f51b5bf5f23f8a6548bde0285d3017221a8f4ac5e5d0 -AUX lightspark-0.7.0-llvm-3.2.patch 3768 SHA256 a18a73f3514ff9adf2c320aac99412b21740b1b8bfa70c969f4fd62f6fa8aedb SHA512 6fe7e15e3f044b3a2855ee0201546d54a18f14b9ea5bfd7429133d8520677eaedce6ce402f0cbeacdb5133c177ff03dcd08075f4049b7acaa8ba6fae84f8fbf2 WHIRLPOOL 5a818f851cdc0bb070d9d98af4bc78667aef6a631e28a37709dd53af3cd83e4c8e3174bb294f3a701bb5a4861b0312384588f2cba67af33fb32ba84a404e3ccc -DIST lightspark-0.6.0.1.tar.gz 862495 SHA256 b9d638a45bb274da046e6fd7f7300547ba81c2480ce626158af2fd62312c5b86 SHA512 bd5db376ed4cf98caa053423f136022bc36ca36c490ff30033e35ccaf72b854cbc6dcc7a38834e938fd58037c5e1a60f652e0a225368fc9483f375800fff6412 WHIRLPOOL f03ae222bb194be95baff56b7983d93f1fdcecaa3ed02b690151f0d26ef2757f2fa5b805a9d4371966d1a25cb60e033aead0414ce563724606248190deaa8e7d -DIST lightspark-0.7.0.tar.gz 910146 SHA256 f3df63692ad8409888336a58f4db96b3344737d492df3a3f06c7359fdf26c85b SHA512 d4e25dbd60d7bc3a4a50eb0708fe8c7f5b940006f598b7a5939ff8d596e6618502793cfde62839343ac8403d76d62fc127c0262a595ff57b54932db6d50c8b70 WHIRLPOOL f124345deb5c93577b725e54f01589b97566d6d0424637c58b4c7b58c297fc95b2cdd6a69df84ec2de76b7fc9c57e022de93565dd4e39d3191ab6bad79a77b71 DIST lightspark-0.7.1.tar.gz 920218 SHA256 a6f9ef13ddf3ebd700d4daaeeb4e9497889c18697aeca1ddcb30ac8cdc20e931 SHA512 a8c10782f144cf4b9a39d32ca4c78f441957550f790161671fa52fec686672f22ab977b41c55b5e33d1e65eaa28e78bf48e729ce01f51b56ef24d2d09e62eeae WHIRLPOOL 0842b113070cc679d8e960e558bf4d7562f6796f60b923fc4fe41f3e20f4cb86da0340d8f27543d86c2cf6aefaf1232990c9ef51bcdcb765dc89befee16823cc -EBUILD lightspark-0.6.0.1.ebuild 2907 SHA256 fad6d027c3005d1d56954a1c04966dcdaf24371ea61aeb208da8d362d8427581 SHA512 aa659902b558d62498ac37dfe3180c2a61d8fc53d03c51e68338bd7a0cdcd79e59756d05f76f405e5038ae15e1183f13bfe99e964dc8d2e8d4749b2b030dbc44 WHIRLPOOL 343f2b30743964e62a918bceb08867ce11292974e28ed58e79997b1938d43beadb01c9cd2523bd55d73f37d16d2ab7abb9204c01bf4acfcade2103d43ef818e7 -EBUILD lightspark-0.7.0.ebuild 3020 SHA256 0cfed4f72572ace22ba35ec2fbab9e0ccffc8fc7ca8cb54de79578efe0935a16 SHA512 c1e1e8768ab8af4c45583958c24b606264d7049f617d413bcde4140a056b7123390d80262fd0f355b2a6d152d5690f5f8f71a1bcd32233da7508db4986eb771e WHIRLPOOL 64010bf703a91c5e271476b0d5b00235eba0935368993f9634cc81048707e720c73300c6d442e125dfa776c14077c2ad36c1d7847125c9e4a26df193837a4ca1 -EBUILD lightspark-0.7.1.ebuild 2932 SHA256 00e0f56d7d50260ccec1f5607e9ddbd159e262af73fc646a83ce5be324992e57 SHA512 17fe5827abc443497db747256d60d003a20ec8731908c7a0cf747333c8d5c623d48b70d525755adc2f294a5c0608f609e7cc786a29ce7035c04c0f34a3c30e4a WHIRLPOOL c173e03ac4749bec0e58fd3a3e1b37ae669582570a8ff1834f7dbe9fe63646463936b9b1800d839f4599651d90b7282fad19adfd04e30ccaaf561917946e8d2c -MISC ChangeLog 11237 SHA256 a4f250124a292c85ec5ac3f43c378e3fcb70e9a55e41e17542729c48361dde94 SHA512 fa70e22e8a10d706c26ead2a21b305fc84dd445f2216d264053a7f6106a0571eb3fe94c61f88c241a88042bb7efb1aaf5369951eab0b31b7329bdab7b5a2fe87 WHIRLPOOL 29cea2d79739b4f193a11ae2234706b4185f59d71e1f03724e3be301a2fea5e0be02eae40958c97b04cad80fdac62915a39f45abd3c187fbb635d94da0b876f9 +DIST lightspark-0.7.2.tar.gz 955952 SHA256 70479bac90f3455a5ff6d0aaf6bccaedfbaac3c70bd602680f68ce75eab2dd1b SHA512 90442d92b54bef18c20952aefd4dcd5cab446213cf9c186b340c9c8e0dd3ef28d034e888ca26f5b9ffe93d0cfd6e1a3c696fbd6f561aa21ff909d463abd27d29 WHIRLPOOL 9465424e2d8b46adb5aadc54239b6d58105703c519f5073ffbc3eb7a03dacca68cf64d57864de3c0aefd6d7cd4c3a88b0deb8417917980a8b60fa49397dc0631 +EBUILD lightspark-0.7.1.ebuild 2953 SHA256 50b71455dbd2da0f42d45a29b9c0cce4e99c98d1336bb10e9bccf31f49fef020 SHA512 530f6a7543e448e3f8f313620a55b48d7d2b33b0856bb412b3a2befabb2ee74f2722fc0e760434e5298e542e2a24f74d2b0bee58a26d28b632699dd510db37fd WHIRLPOOL 9be201b8d02b9a35d44f694a804775d5d0fe265692923941fe40b4767a6f263a43382ecb98d12da5a6017901de3b5a97d9092ed9b99c6ac7f74bf4bff402b6df +EBUILD lightspark-0.7.2.ebuild 2953 SHA256 718e1c24772211ce1958e45c5f0d92dfd159ad8cff0efbd4790107ac1fb328e0 SHA512 c54187908f76e1c5585250ed7ca2844f6b54371b1fe3abcce860e952f4974fbaef5d2cb90154fa0d850ef3340ddcfaca04b1eb18652e884b7365d18319ea6932 WHIRLPOOL 7c44d852576a9be81ab7998e2709b733e8b2199b59db11b49db4d3bf29ba274d14272c0d046456a90edfbee9f5af65238b42d3faa5a79e750cbdd5cda8e678b6 +MISC ChangeLog 11983 SHA256 ed3af95b5f922b5480c28d28693c4e00a4f09bcc59bd862328eddb9b50d4f88f SHA512 dd44dac6e5ed8aef06efd67e7c8408885e2f4f46b3dc6b3fb611e764b7ace1881c08483d21853a0527677f1ffa1eddbf8ca870b7e962d8e9877db87bf47ee07d WHIRLPOOL fc0beb4e285c3d330d3289df89b1e9a5aeb0cd7e9d1e79b546c6fe85a59e3e3606fec07af621b1e9c73b89e24bfff1d65fb5332ee3681b4f83c644387854b4f4 MISC metadata.xml 416 SHA256 1a4739e3ed47fd391141b1df084195435ad9cc1ac50650eb3b45d1fccb2f87e9 SHA512 d5181074005c87614f42ddfe267092a526acfe8f49b5f621141a026d23c3c7471b5254f0edb0b88af8d8689db8effb819fe08663a904b0984ea9bc2917fc394a WHIRLPOOL 0d2788c7f2af963e5038d71cef665a58b9e49095f90dc7b339c0343974fd40142a1005972a16cfb51fd45b42703b1f2ecbd5c59ba74c6bca60bdf54821d6b8c8 diff --git a/www-plugins/lightspark/files/lightspark-0.5.7-llvm-3.1_0001.patch b/www-plugins/lightspark/files/lightspark-0.5.7-llvm-3.1_0001.patch deleted file mode 100644 index 6b778c089e34..000000000000 --- a/www-plugins/lightspark/files/lightspark-0.5.7-llvm-3.1_0001.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 1d9004f0cc14bff0a4f35590fa94e51c4723174d Mon Sep 17 00:00:00 2001 -From: Alessandro Pignotti <a.pignotti@sssup.it> -Date: Sun, 27 May 2012 16:15:07 +0200 -Subject: [PATCH] Fix support for LLVM 3.1 - ---- - src/scripting/abc.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/scripting/abc.cpp b/src/scripting/abc.cpp -index 5fdae55..de7e0f3 100644 ---- a/src/scripting/abc.cpp -+++ b/src/scripting/abc.cpp -@@ -23,10 +23,10 @@ - #include <llvm/ExecutionEngine/JIT.h> - #include <llvm/LLVMContext.h> - #include <llvm/Target/TargetData.h> --#ifdef LLVM_30 --#include <llvm/Support/TargetSelect.h> --#else -+#ifdef LLVM_28 - #include <llvm/Target/TargetSelect.h> -+#else -+#include <llvm/Support/TargetSelect.h> - #endif - #include <llvm/Target/TargetOptions.h> - #include <llvm/Analysis/Verifier.h> --- -1.7.10 - diff --git a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0000.patch b/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0000.patch deleted file mode 100644 index be2e1ae813b3..000000000000 --- a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0000.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ef5b6b87f200a3cdf1cd9fd936724677e70c568d Mon Sep 17 00:00:00 2001 -From: Alessandro Pignotti <a.pignotti@sssup.it> -Date: Sun, 10 Jun 2012 18:57:48 +0200 -Subject: [PATCH] [Build] Avoid new for each syntax to keep GCC 4.5 - compatibility - ---- - src/swf.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/swf.cpp b/src/swf.cpp -index b735081..8501407 100644 ---- a/src/swf.cpp -+++ b/src/swf.cpp -@@ -83,8 +83,8 @@ ParseThread* lightspark::getParseThread() - - RootMovieClip::~RootMovieClip() - { -- for(DictionaryTag* it: dictionary) -- delete it; -+ for(auto it=dictionary.begin();it!=dictionary.end();++it) -+ delete *it; - } - - void RootMovieClip::parsingFailed() --- -1.7.10 - diff --git a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0001.patch b/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0001.patch deleted file mode 100644 index 7d409b5bfe6f..000000000000 --- a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0001.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 83f57ba569eab78581b3a682edca70592b2b2577 Mon Sep 17 00:00:00 2001 -From: Alessandro Pignotti <a.pignotti@sssup.it> -Date: Sun, 10 Jun 2012 19:32:22 +0200 -Subject: [PATCH] Restore NullRef instead of std::nullptr_t - -std::nullptr is ambiguos since it's acceptable also as Ref constructor - -This reverts commit 3d243ec18be069b27774b5cef10305b48156fc1c. ---- - src/smartrefs.h | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/smartrefs.h b/src/smartrefs.h -index d7f51bd..5087b2f 100644 ---- a/src/smartrefs.h -+++ b/src/smartrefs.h -@@ -119,15 +119,14 @@ class Ref - return Ref<T>(a); - } - --#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 6) -+//#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 6) - /* Fallback for gcc < 4.6 not supporting nullptr */ - class NullRef_t {}; - extern NullRef_t NullRef; --#else --/* This is needed for MSVC and can be used on gcc >= 4.6 */ -+/*#else - typedef std::nullptr_t NullRef_t; - #define NullRef (nullptr) --#endif -+#endif*/ - - template<class T> - class NullableRef --- -1.7.10 - diff --git a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0002.patch b/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0002.patch deleted file mode 100644 index dc7d165161f6..000000000000 --- a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0002.patch +++ /dev/null @@ -1,57 +0,0 @@ -From ea52ebb26e6b3923c6ac9b7492e67cfcc9039d4b Mon Sep 17 00:00:00 2001 -From: Alessandro Pignotti <a.pignotti@sssup.it> -Date: Sun, 10 Jun 2012 19:35:49 +0200 -Subject: [PATCH] Restore NullRef instead of std::nullptr_t - -std::nullptr is ambiguos since it's acceptable also as Ref constructor - -This reverts commit 95fc48d50e8ae28a43585d9aa4d275ec84e4a4cf. ---- - src/scripting/abc.cpp | 2 +- - src/smartrefs.h | 9 +-------- - 2 files changed, 2 insertions(+), 9 deletions(-) - -diff --git a/src/scripting/abc.cpp b/src/scripting/abc.cpp -index 0bad425..8110666 100644 ---- a/src/scripting/abc.cpp -+++ b/src/scripting/abc.cpp -@@ -170,7 +170,7 @@ void ScriptLimitsTag::execute(RootMovieClip* root) const - - void ABCVm::registerClasses() - { -- Global* builtin=Class<Global>::getInstanceS((ABCContext*)0, 0); -+ Global* builtin=Class<Global>::getInstanceS(nullptr, 0); - //Register predefined types, ASObject are enough for not implemented classes - builtin->registerBuiltin("Object","",Class<ASObject>::getRef()); - builtin->registerBuiltin("Class","",Class_object::getRef()); -diff --git a/src/smartrefs.h b/src/smartrefs.h -index 5087b2f..09ce760 100644 ---- a/src/smartrefs.h -+++ b/src/smartrefs.h -@@ -119,14 +119,7 @@ class Ref - return Ref<T>(a); - } - --//#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 6) --/* Fallback for gcc < 4.6 not supporting nullptr */ --class NullRef_t {}; --extern NullRef_t NullRef; --/*#else --typedef std::nullptr_t NullRef_t; - #define NullRef (nullptr) --#endif*/ - - template<class T> - class NullableRef -@@ -136,7 +129,7 @@ class NullableRef - public: - NullableRef(): m(NULL) {} - explicit NullableRef(T* o):m(o){} -- NullableRef(NullRef_t):m(NULL){} -+ NullableRef(std::nullptr_t):m(NULL){} - NullableRef(const NullableRef& r):m(r.m) - { - if(m) --- -1.7.10 - diff --git a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0003.patch b/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0003.patch deleted file mode 100644 index 9b3087e91284..000000000000 --- a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0003.patch +++ /dev/null @@ -1,42 +0,0 @@ -From bc81ca2f4330d2a287289317837b7ad8058cb591 Mon Sep 17 00:00:00 2001 -From: Alessandro Pignotti <a.pignotti@sssup.it> -Date: Sun, 10 Jun 2012 19:54:54 +0200 -Subject: [PATCH] [BitmapContainer] Add ::reset - ---- - src/scripting/flash/display/BitmapContainer.cpp | 9 +++++++++ - src/scripting/flash/display/BitmapContainer.h | 1 + - 2 files changed, 10 insertions(+) - -diff --git a/src/scripting/flash/display/BitmapContainer.cpp b/src/scripting/flash/display/BitmapContainer.cpp -index fa480a0..e057db2 100644 ---- a/src/scripting/flash/display/BitmapContainer.cpp -+++ b/src/scripting/flash/display/BitmapContainer.cpp -@@ -80,3 +80,12 @@ bool BitmapContainer::fromPNG(std::istream &s) - return fromRGB(rgb, (int32_t)w, (int32_t)h, false); - } - -+void BitmapContainer::reset() -+{ -+ data.clear(); -+ data.shrink_to_fit(); -+ stride=0; -+ dataSize=0; -+ width=0; -+ height=0; -+} -diff --git a/src/scripting/flash/display/BitmapContainer.h b/src/scripting/flash/display/BitmapContainer.h -index fb0912d..69a363d 100644 ---- a/src/scripting/flash/display/BitmapContainer.h -+++ b/src/scripting/flash/display/BitmapContainer.h -@@ -45,6 +45,7 @@ class BitmapContainer - bool fromPNG(std::istream& s); - int getWidth() const { return width; } - int getHeight() const { return height; } -+ void reset(); - }; - - }; --- -1.7.10 - diff --git a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0004.patch b/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0004.patch deleted file mode 100644 index 65d21d3ad934..000000000000 --- a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0004.patch +++ /dev/null @@ -1,60 +0,0 @@ -From eded7abeb7d70a5d8dd7454c64812c49721a96d6 Mon Sep 17 00:00:00 2001 -From: Alessandro Pignotti <a.pignotti@sssup.it> -Date: Sun, 10 Jun 2012 19:55:17 +0200 -Subject: [PATCH] Reintroduce NullRef and add comparison operators against it - ---- - src/smartrefs.h | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/src/smartrefs.h b/src/smartrefs.h -index 09ce760..85b7e06 100644 ---- a/src/smartrefs.h -+++ b/src/smartrefs.h -@@ -119,7 +119,11 @@ class Ref - return Ref<T>(a); - } - --#define NullRef (nullptr) -+class NullRef_t -+{ -+}; -+ -+extern NullRef_t NullRef; - - template<class T> - class NullableRef -@@ -129,7 +133,7 @@ class NullableRef - public: - NullableRef(): m(NULL) {} - explicit NullableRef(T* o):m(o){} -- NullableRef(std::nullptr_t):m(NULL){} -+ NullableRef(NullRef_t):m(NULL){} - NullableRef(const NullableRef& r):m(r.m) - { - if(m) -@@ -187,6 +191,10 @@ class NullableRef - { - return m==r; - } -+ bool operator==(NullRef_t) const -+ { -+ return m==NULL; -+ } - template<class D> bool operator!=(const NullableRef<D>& r) const - { - return m!=r.getPtr(); -@@ -199,6 +207,10 @@ class NullableRef - { - return m!=r; - } -+ bool operator!=(NullRef_t) const -+ { -+ return m!=NULL; -+ } - /*explicit*/ operator bool() const - { - return m != NULL; --- -1.7.10 - diff --git a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0005.patch b/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0005.patch deleted file mode 100644 index 4dcbf51baa4d..000000000000 --- a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0005.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 631cb37ae66c0150a148a29df7a3c3e26dc03fb4 Mon Sep 17 00:00:00 2001 -From: Alessandro Pignotti <a.pignotti@sssup.it> -Date: Sun, 10 Jun 2012 19:55:40 +0200 -Subject: [PATCH] Fix a couple of stale reference assignment - ---- - src/swftypes.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/swftypes.cpp b/src/swftypes.cpp -index 69de488..a2d05e9 100644 ---- a/src/swftypes.cpp -+++ b/src/swftypes.cpp -@@ -761,13 +761,13 @@ inline RGBA medianColor(const RGBA& a, const RGBA& b, float factor) - { - //Thrown if the bitmapId does not exists in dictionary - LOG(LOG_ERROR,"Exception in FillStyle parsing: " << e.what()); -- v.bitmap=NullRef; -+ v.bitmap.reset(); - } - } - else - { - //The bitmap might be invalid, the style should not be used -- v.bitmap=NullRef; -+ v.bitmap.reset(); - } - } - else --- -1.7.10 - diff --git a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0006.patch b/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0006.patch deleted file mode 100644 index 47ee6fb7f5d8..000000000000 --- a/www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0006.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2f54ea1ee730c8bb250d360949badb500d4e1687 Mon Sep 17 00:00:00 2001 -From: Alessandro Pignotti <a.pignotti@sssup.it> -Date: Sun, 10 Jun 2012 20:20:01 +0200 -Subject: [PATCH] Do not use nullptr for compatibility with GCC 4.5 - ---- - src/scripting/abc.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/scripting/abc.cpp b/src/scripting/abc.cpp -index 8110666..8c71a07 100644 ---- a/src/scripting/abc.cpp -+++ b/src/scripting/abc.cpp -@@ -170,7 +170,7 @@ void ScriptLimitsTag::execute(RootMovieClip* root) const - - void ABCVm::registerClasses() - { -- Global* builtin=Class<Global>::getInstanceS(nullptr, 0); -+ Global* builtin=Class<Global>::getInstanceS((ABCContext*)NULL, 0); - //Register predefined types, ASObject are enough for not implemented classes - builtin->registerBuiltin("Object","",Class<ASObject>::getRef()); - builtin->registerBuiltin("Class","",Class_object::getRef()); --- -1.7.10 - diff --git a/www-plugins/lightspark/files/lightspark-0.7.0-libxmlpp-gles.patch b/www-plugins/lightspark/files/lightspark-0.7.0-libxmlpp-gles.patch deleted file mode 100644 index 523f550b189e..000000000000 --- a/www-plugins/lightspark/files/lightspark-0.7.0-libxmlpp-gles.patch +++ /dev/null @@ -1,159 +0,0 @@ -diff -ur a/src/backends/netutils.cpp b/src/backends/netutils.cpp ---- a/src/backends/netutils.cpp 2012-10-28 16:49:04.000000000 +0100 -+++ b/src/backends/netutils.cpp 2012-10-30 01:05:26.947904601 +0100 -@@ -18,13 +18,13 @@ - along with this program. If not, see <http://www.gnu.org/licenses/>. - **************************************************************************/ - -+#include "backends/security.h" - #include "scripting/abc.h" - #include "swf.h" - #include "backends/config.h" - #include "backends/netutils.h" - #include "backends/rtmputils.h" - #include "compat.h" --#include "backends/security.h" - #include <string> - #include <algorithm> - #include <cctype> -diff -ur a/src/main.cpp b/src/main.cpp ---- a/src/main.cpp 2012-10-28 16:49:04.000000000 +0100 -+++ b/src/main.cpp 2012-10-30 01:29:12.446786100 +0100 -@@ -18,9 +18,9 @@ - **************************************************************************/ - - #include "version.h" -+#include "backends/security.h" - #include "swf.h" - #include "logger.h" --#include "backends/security.h" - #include "platforms/engineutils.h" - #ifndef _WIN32 - # include <sys/resource.h> -diff -ur a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp ---- a/src/plugin/plugin.cpp 2012-10-28 16:49:04.000000000 +0100 -+++ b/src/plugin/plugin.cpp 2012-10-30 01:29:26.328790120 +0100 -@@ -19,6 +19,7 @@ - **************************************************************************/ - - #include "version.h" -+#include "backends/security.h" - #include "plugin/plugin.h" - #include "logger.h" - #include "compat.h" -@@ -28,7 +29,6 @@ - # include <gdk/gdkwin32.h> - #endif - #include "backends/urlutils.h" --#include "backends/security.h" - - #include "plugin/npscriptobject.h" - -diff -ur a/src/scripting/flash/display/flashdisplay.cpp b/src/scripting/flash/display/flashdisplay.cpp ---- a/src/scripting/flash/display/flashdisplay.cpp 2012-10-28 16:49:04.000000000 +0100 -+++ b/src/scripting/flash/display/flashdisplay.cpp 2012-10-30 01:12:42.780140945 +0100 -@@ -19,6 +19,7 @@ - - #include <list> - -+#include "backends/security.h" - #include "scripting/abc.h" - #include "scripting/flash/display/flashdisplay.h" - #include "swf.h" -@@ -33,7 +34,6 @@ - #include "scripting/flash/display/BitmapData.h" - #include "scripting/argconv.h" - #include "scripting/toplevel/Vector.h" --#include "backends/security.h" - - using namespace std; - using namespace lightspark; -diff -ur a/src/scripting/flash/net/flashnet.cpp b/src/scripting/flash/net/flashnet.cpp ---- a/src/scripting/flash/net/flashnet.cpp 2012-10-28 16:49:04.000000000 +0100 -+++ b/src/scripting/flash/net/flashnet.cpp 2012-10-30 01:15:37.158273078 +0100 -@@ -18,6 +18,7 @@ - **************************************************************************/ - - #include <map> -+#include "backends/security.h" - #include "scripting/abc.h" - #include "scripting/flash/net/flashnet.h" - #include "scripting/flash/net/URLRequestHeader.h" -@@ -27,7 +28,6 @@ - #include "backends/audio.h" - #include "backends/builtindecoder.h" - #include "backends/rendering.h" --#include "backends/security.h" - #include "scripting/argconv.h" - - using namespace std; -diff -ur a/src/scripting/flash/net/URLStream.cpp b/src/scripting/flash/net/URLStream.cpp ---- a/src/scripting/flash/net/URLStream.cpp 2012-10-28 16:49:04.000000000 +0100 -+++ b/src/scripting/flash/net/URLStream.cpp 2012-10-30 01:20:27.202448798 +0100 -@@ -18,10 +18,10 @@ - **************************************************************************/ - - #include <map> -+#include "backends/security.h" - #include "scripting/abc.h" - #include "scripting/flash/net/URLStream.h" - #include "scripting/flash/net/flashnet.h" --#include "backends/security.h" - #include "scripting/argconv.h" - - /** -diff -ur a/src/scripting/flash/net/XMLSocket.cpp b/src/scripting/flash/net/XMLSocket.cpp ---- a/src/scripting/flash/net/XMLSocket.cpp 2012-10-28 16:49:04.000000000 +0100 -+++ b/src/scripting/flash/net/XMLSocket.cpp 2012-10-30 01:23:19.454574585 +0100 -@@ -18,13 +18,13 @@ - **************************************************************************/ - - #include "XMLSocket.h" -+#include "backends/security.h" - #include "abc.h" - #include "toplevel/Error.h" - #include "class.h" - #include "argconv.h" - #include "swf.h" - #include "flash/errors/flasherrors.h" --#include "backends/security.h" - #include <sys/types.h> - #ifdef _WIN32 - # define _WIN32_WINNT 0x0501 -diff -ur a/src/scripting/flash/sensors/flashsensors.cpp b/src/scripting/flash/sensors/flashsensors.cpp ---- a/src/scripting/flash/sensors/flashsensors.cpp 2012-10-28 16:49:04.000000000 +0100 -+++ b/src/scripting/flash/sensors/flashsensors.cpp 2012-10-30 01:20:46.299454329 +0100 -@@ -18,13 +18,13 @@ - **************************************************************************/ - - #include <map> -+#include "backends/security.h" - #include "scripting/abc.h" - #include "scripting/flash/sensors/flashsensors.h" - #include "scripting/class.h" - #include "scripting/flash/system/flashsystem.h" - #include "compat.h" - #include "backends/audio.h" --#include "backends/security.h" - - using namespace std; - using namespace lightspark; -diff -ur a/src/swf.cpp b/src/swf.cpp ---- a/src/swf.cpp 2012-10-28 16:49:04.000000000 +0100 -+++ b/src/swf.cpp 2012-10-30 01:02:34.015821784 +0100 -@@ -19,6 +19,7 @@ - - #include <string> - #include <algorithm> -+#include "backends/security.h" - #include "scripting/abc.h" - #include "scripting/flash/events/flashevents.h" - #include "scripting/flash/utils/flashutils.h" -@@ -31,7 +32,6 @@ - #include "backends/config.h" - #include "backends/pluginmanager.h" - #include "backends/rendering.h" --#include "backends/security.h" - #include "backends/image.h" - #include "backends/extscriptobject.h" - #include "memory_support.h" diff --git a/www-plugins/lightspark/files/lightspark-0.7.0-llvm-3.2.patch b/www-plugins/lightspark/files/lightspark-0.7.0-llvm-3.2.patch deleted file mode 100644 index 0db5901b0cc6..000000000000 --- a/www-plugins/lightspark/files/lightspark-0.7.0-llvm-3.2.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 9a9a270423820ae87d54935d60dcb35ac2bf9ea5 Mon Sep 17 00:00:00 2001 -From: Antti Ajanki <antti.ajanki@iki.fi> -Date: Tue, 20 Nov 2012 21:50:44 +0200 -Subject: [PATCH] Fix compilation on LLVM 3.2 - -LP #1080123 ---- - conf/FindLLVM.cmake | 17 +++++++++++++++++ - src/scripting/abc.cpp | 10 +++++++++- - src/scripting/abc_codesynt.cpp | 18 +++++++++++++++--- - 3 files changed, 41 insertions(+), 4 deletions(-) - -diff --git a/conf/FindLLVM.cmake b/conf/FindLLVM.cmake -index 32d32b4..7bd52e2 100644 ---- a/conf/FindLLVM.cmake -+++ b/conf/FindLLVM.cmake -@@ -156,6 +156,23 @@ else (LLVM_INCLUDE_DIR) - IF(HAVE_SUPPORT_TARGETSELECT_H) - ADD_DEFINITIONS(-DHAVE_SUPPORT_TARGETSELECT_H) - ENDIF(HAVE_SUPPORT_TARGETSELECT_H) -+ -+ set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR}) -+ set(CMAKE_REQUIRED_DEFINITIONS -D__STDC_LIMIT_MACROS=1 -D__STDC_CONSTANT_MACROS=1) -+ check_include_file_cxx("llvm/IRBuilder.h" HAVE_IRBUILDER_H) -+ unset(CMAKE_REQUIRED_INCLUDES) -+ MESSAGE(STATUS "HAVE_IRBUILDER_H: " ${HAVE_IRBUILDER_H}) -+ IF(HAVE_IRBUILDER_H) -+ ADD_DEFINITIONS(-DHAVE_IRBUILDER_H) -+ ENDIF(HAVE_IRBUILDER_H) -+ -+ set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR}) -+ check_include_file_cxx("llvm/DataLayout.h" HAVE_DATALAYOUT_H) -+ unset(CMAKE_REQUIRED_INCLUDES) -+ MESSAGE(STATUS "HAVE_DATALAYOUT_H: " ${HAVE_DATALAYOUT_H}) -+ IF(HAVE_DATALAYOUT_H) -+ ADD_DEFINITIONS(-DHAVE_DATALAYOUT_H) -+ ENDIF(HAVE_DATALAYOUT_H) - - exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --cxxflags OUTPUT_VARIABLE LLVM_COMPILE_FLAGS ) - MESSAGE(STATUS "LLVM CXX flags: " ${LLVM_COMPILE_FLAGS}) -diff --git a/src/scripting/abc.cpp b/src/scripting/abc.cpp -index 962cb0e..3fef0aa 100644 ---- a/src/scripting/abc.cpp -+++ b/src/scripting/abc.cpp -@@ -28,7 +28,11 @@ - #include <llvm/ExecutionEngine/JIT.h> - #include <llvm/PassManager.h> - #include <llvm/LLVMContext.h> --#include <llvm/Target/TargetData.h> -+#ifdef HAVE_DATALAYOUT_H -+# include <llvm/DataLayout.h> -+#else -+# include <llvm/Target/TargetData.h> -+#endif - #ifdef HAVE_SUPPORT_TARGETSELECT_H - #include <llvm/Support/TargetSelect.h> - #else -@@ -1459,7 +1463,11 @@ void ABCVm::Run(ABCVm* th) - assert_and_throw(th->ex); - - th->FPM=new llvm::FunctionPassManager(th->module); -+#ifdef HAVE_DATALAYOUT_H -+ th->FPM->add(new llvm::DataLayout(*th->ex->getDataLayout())); -+#else - th->FPM->add(new llvm::TargetData(*th->ex->getTargetData())); -+#endif - #ifdef EXPENSIVE_DEBUG - //This is pretty heavy, do not enable in release - th->FPM->add(llvm::createVerifierPass()); -diff --git a/src/scripting/abc_codesynt.cpp b/src/scripting/abc_codesynt.cpp -index d00521b..83c1d5f 100644 ---- a/src/scripting/abc_codesynt.cpp -+++ b/src/scripting/abc_codesynt.cpp -@@ -29,10 +29,18 @@ - #include <llvm/DerivedTypes.h> - #include <llvm/ExecutionEngine/ExecutionEngine.h> - #include <llvm/PassManager.h> --#include <llvm/Constants.h> --#include <llvm/Support/IRBuilder.h> -+#include <llvm/Constants.h> -+#ifdef HAVE_IRBUILDER_H -+# include <llvm/IRBuilder.h> -+#else -+# include <llvm/Support/IRBuilder.h> -+#endif - #include <llvm/LLVMContext.h> --#include <llvm/Target/TargetData.h> -+#ifdef HAVE_DATALAYOUT_H -+# include <llvm/DataLayout.h> -+#else -+# include <llvm/Target/TargetData.h> -+#endif - #include <sstream> - #include "scripting/abc.h" - #include "swftypes.h" -@@ -271,7 +279,11 @@ void ABCVm::registerFunctions() - llvm::FunctionType* FT=NULL; - - //Create types -+#ifdef HAVE_DATALAYOUT_H -+ ptr_type=ex->getDataLayout()->getIntPtrType(llvm_context()); -+#else - ptr_type=ex->getTargetData()->getIntPtrType(llvm_context()); -+#endif - //Pointer to 8 bit type, needed for pointer arithmetic - voidptr_type=llvm::IntegerType::get(getVm()->llvm_context(),8)->getPointerTo(); - number_type=llvm::Type::getDoubleTy(llvm_context()); --- -1.7.10 - diff --git a/www-plugins/lightspark/lightspark-0.6.0.1.ebuild b/www-plugins/lightspark/lightspark-0.6.0.1.ebuild deleted file mode 100644 index 77559ac3a953..000000000000 --- a/www-plugins/lightspark/lightspark-0.6.0.1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.6.0.1.ebuild,v 1.2 2012/08/14 13:51:17 chithanh Exp $ - -EAPI=4 -inherit cmake-utils nsplugins multilib - -DESCRIPTION="High performance flash player" -HOMEPAGE="http://lightspark.sourceforge.net/" -SRC_URI="http://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="curl ffmpeg gles nsplugin profile pulseaudio rtmp sdl" - -RDEPEND=">=dev-cpp/libxmlpp-2.33.1:2.6 - >=dev-libs/boost-1.42 - dev-libs/libpcre[cxx] - media-fonts/liberation-fonts - media-libs/libsdl - || ( - >=sys-devel/llvm-3 - =sys-devel/llvm-2.8* - ) - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/pango - curl? ( - net-misc/curl - ) - ffmpeg? ( - virtual/ffmpeg - ) - !gles? ( - >=media-libs/glew-1.5.3 - virtual/opengl - ) - gles? ( - media-libs/mesa[gles2] - ) - pulseaudio? ( - media-sound/pulseaudio - ) - rtmp? ( - media-video/rtmpdump - )" -DEPEND="${RDEPEND} - amd64? ( dev-lang/nasm ) - x86? ( dev-lang/nasm ) - virtual/pkgconfig" - -S=${WORKDIR}/${P/_rc*/} - -PATCHES=( - "${FILESDIR}"/${P}-gcc-4.5_0000.patch - "${FILESDIR}"/${P}-gcc-4.5_0001.patch - "${FILESDIR}"/${P}-gcc-4.5_0002.patch - "${FILESDIR}"/${P}-gcc-4.5_0003.patch - "${FILESDIR}"/${P}-gcc-4.5_0004.patch - "${FILESDIR}"/${P}-gcc-4.5_0005.patch - "${FILESDIR}"/${P}-gcc-4.5_0006.patch -) - -src_configure() { - local audiobackends - use pulseaudio && audiobackends+="pulse" - use sdl && audiobackends+="sdl" - - local mycmakeargs=( - $(cmake-utils_use curl ENABLE_CURL) - $(cmake-utils_use gles ENABLE_GLES2) - $(cmake-utils_use ffmpeg ENABLE_LIBAVCODEC) - $(cmake-utils_use nsplugin COMPILE_PLUGIN) - $(cmake-utils_use profile ENABLE_MEMORY_USAGE_PROFILING) - $(cmake-utils_use profile ENABLE_PROFILING) - $(cmake-utils_use rtmp ENABLE_RTMP) - -DAUDIO_BACKEND="${audiobackends}" - -DPLUGIN_DIRECTORY="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - use nsplugin && inst_plugin /usr/$(get_libdir)/${PN}/plugins/liblightsparkplugin.so - - # default to sdl audio if pulseaudio plugin is not built, bug #406197 - if use sdl && ! use pulseaudio; then - sed -i 's/backend = pulseaudio/backend = sdl/' "${ED}/etc/xdg/${PN}.conf" || die - fi -} - -pkg_postinst() { - if use nsplugin && ! has_version www-plugins/gnash; then - elog "Lightspark now supports gnash fallback for its browser plugin." - elog "Install www-plugins/gnash to take advantage of it." - fi - if use nsplugin && has_version www-plugins/gnash[nsplugin]; then - elog "Having two plugins installed for the same MIME type may confuse" - elog "Mozilla based browsers. It is recommended to disable the nsplugin" - elog "USE flag for either gnash or lightspark. For details, see" - elog "https://bugzilla.mozilla.org/show_bug.cgi?id=581848" - fi -} diff --git a/www-plugins/lightspark/lightspark-0.7.1.ebuild b/www-plugins/lightspark/lightspark-0.7.1.ebuild index 5b9cb7753624..95fbcb7a732d 100644 --- a/www-plugins/lightspark/lightspark-0.7.1.ebuild +++ b/www-plugins/lightspark/lightspark-0.7.1.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/www-plugins/lightspark/lightspark-0.7.1.ebuild,v 1.1 2013/03/04 17:29:26 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.7.1.ebuild,v 1.2 2013/03/19 13:45:04 chithanh Exp $ EAPI=4 inherit cmake-utils nsplugins multilib toolchain-funcs @@ -22,6 +22,7 @@ RDEPEND=">=dev-cpp/libxmlpp-2.33.1:2.6 media-libs/libsdl >=sys-devel/gcc-4.6.0[cxx] >=sys-devel/llvm-3 + <sys-devel/llvm-3.3 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 diff --git a/www-plugins/lightspark/lightspark-0.7.0.ebuild b/www-plugins/lightspark/lightspark-0.7.2.ebuild index afd09234b6a7..d38b9438aef8 100644 --- a/www-plugins/lightspark/lightspark-0.7.0.ebuild +++ b/www-plugins/lightspark/lightspark-0.7.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.7.0.ebuild,v 1.4 2012/12/22 21:15:39 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.7.2.ebuild,v 1.1 2013/03/19 13:45:04 chithanh Exp $ EAPI=4 inherit cmake-utils nsplugins multilib toolchain-funcs @@ -22,6 +22,7 @@ RDEPEND=">=dev-cpp/libxmlpp-2.33.1:2.6 media-libs/libsdl >=sys-devel/gcc-4.6.0[cxx] >=sys-devel/llvm-3 + <sys-devel/llvm-3.3 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 @@ -53,11 +54,6 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${P/_rc*/} -PATCHES=( - "${FILESDIR}"/${P}-libxmlpp-gles.patch - "${FILESDIR}"/${P}-llvm-3.2.patch -) - pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 6 || $(gcc-major-version) -lt 4 ]] ; then |