From a5df7e2e115ed91eee56b5673049bfeabde4928f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ch=C3=AD-Thanh=20Christopher=20Nguy=E1=BB=85n?= Date: Mon, 5 Jul 2010 22:41:07 +0000 Subject: [PATCH] Add release candidate. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- www-plugins/lightspark/ChangeLog | 8 +- www-plugins/lightspark/Manifest | 5 +- .../files/lightspark-0.4.2-ndebug.patch | 138 ++++++++++++++++++ .../lightspark/lightspark-0.4.2_rc2.ebuild | 62 ++++++++ 4 files changed, 211 insertions(+), 2 deletions(-) create mode 100644 www-plugins/lightspark/files/lightspark-0.4.2-ndebug.patch create mode 100644 www-plugins/lightspark/lightspark-0.4.2_rc2.ebuild diff --git a/www-plugins/lightspark/ChangeLog b/www-plugins/lightspark/ChangeLog index 13538217d03d..b141918b4100 100644 --- a/www-plugins/lightspark/ChangeLog +++ b/www-plugins/lightspark/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-plugins/lightspark # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.6 2010/06/07 13:17:29 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.7 2010/07/05 22:41:07 chithanh Exp $ + +*lightspark-0.4.2_rc2 (05 Jul 2010) + + 05 Jul 2010; Chí-Thanh Christopher Nguyễn + +lightspark-0.4.2_rc2.ebuild, +files/lightspark-0.4.2-ndebug.patch: + Add release candidate. *lightspark-0.4.1 (07 Jun 2010) diff --git a/www-plugins/lightspark/Manifest b/www-plugins/lightspark/Manifest index 2fa210b1aede..16c6a05dc414 100644 --- a/www-plugins/lightspark/Manifest +++ b/www-plugins/lightspark/Manifest @@ -1,5 +1,8 @@ AUX lightspark-0.4.1-debug-defines.patch 420 RMD160 28efcc029f4395d85972aebb34567dcd0287d4b8 SHA1 c1af3267b539b8466aa0e0e160145e580bc74c78 SHA256 702d80d63e65bef5bee1b4e98a969cfb45c7b76e28d0bd2c69745c91e04a0736 +AUX lightspark-0.4.2-ndebug.patch 4315 RMD160 9ed1bdd8cbf63d862476f411dd953585b446587d SHA1 3bb77a8df8dab7268b46834cebd6f00e85594359 SHA256 3c6a9cef2faef7a42868d59ee63efd279de9831ec711a1d5bef892dd280b6b48 +DIST lightspark-0.4.2rc2.tar.gz 245264 RMD160 bd51fea6a36fdd0631f4944b8a5de5eeb8152391 SHA1 ae92d2ea47338cf98cae3155607bc155dcbf21dd SHA256 0aaa2bf4a05cb53d55dd85daa9a8d20bac047239655a81a3b5e82152c82a850c DIST lightspark_0.4.1.orig.tar.gz 222597 RMD160 1a330bf2b4aa747b82f87f44f5ae8d2f9edfda71 SHA1 f1890f6fa502e57ceb6873c18a9b0e782caeb58e SHA256 1f927fa59f2f0fbd8e0de9e3aa1c11e50b75eb0b7e4081a1277cfbcc58ba03f2 EBUILD lightspark-0.4.1.ebuild 1469 RMD160 2ed0a82cfac2a7989209fac3b07c6dc94e6e7132 SHA1 aab1fa37fe156c70f6019816163ff719ac2f6998 SHA256 cd130696724173201b4423523358c59336caeb7419b6690a891fad117359004d -MISC ChangeLog 1463 RMD160 2fae969f657128b97356e403acd2feb98ff0f7f0 SHA1 59c3853772fdfa07fac107593a7dba67e46f8ee8 SHA256 71e3914b334aac8f891d39ca2863983466fab4e91034041d4008b99888fe9e31 +EBUILD lightspark-0.4.2_rc2.ebuild 1550 RMD160 63ec02644a80802d08fd801111017d0ba7a551a1 SHA1 4c87ce61995d3f3f901773a5e4000acb5a76bb18 SHA256 13574bd8ec4c4482ffd30a4aa3687665915cd768c673e7424b0064ddc8fe33cd +MISC ChangeLog 1665 RMD160 269e65a40d96ccc97f2f23f59aaa0d2e938138ed SHA1 36a5dc7b847fd8e8d2fad5890f0d6b94e8436ad9 SHA256 48ea96c9023db25bba5fefba051ec800c6e616bdf1545bd7a3af772a8f5c0b9c MISC metadata.xml 275 RMD160 1b1d48ace7eb30ee16b7cd1c33dd9fa695817f08 SHA1 8e66ce36ba12401c927e1b7394b652962a979a52 SHA256 9fcd14bdea1cdbac9fa4d44a3c9728877d7b87266c3553f6519a7aaec9795009 diff --git a/www-plugins/lightspark/files/lightspark-0.4.2-ndebug.patch b/www-plugins/lightspark/files/lightspark-0.4.2-ndebug.patch new file mode 100644 index 000000000000..f0c593540f70 --- /dev/null +++ b/www-plugins/lightspark/files/lightspark-0.4.2-ndebug.patch @@ -0,0 +1,138 @@ +=== modified file 'CMakeLists.txt' +--- CMakeLists.txt 2010-07-01 01:24:10 +0000 ++++ CMakeLists.txt 2010-07-04 16:57:13 +0000 +@@ -123,9 +123,9 @@ + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wnon-virtual-dtor -Woverloaded-virtual -pipe -fvisibility=hidden") + SET(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -DEXPENSIVE_DEBUG") + SET(CMAKE_CXX_FLAGS_PROFILE "-g -pg -O2") +-SET(CMAKE_CXX_FLAGS_RELEASE "-O3") +-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -O2") +-SET(CMAKE_CXX_FLAGS_DEBIAN "-O2") ++SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") ++SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -O2 -DNDEBUG") ++SET(CMAKE_CXX_FLAGS_DEBIAN "-O2 -DNDEBUG") + + ADD_DEFINITIONS(-DDATADIR="${CMAKE_INSTALL_PREFIX}/share/lightspark") + + +=== modified file 'abc_opcodes.cpp' +--- abc_opcodes.cpp 2010-06-20 15:00:39 +0000 ++++ abc_opcodes.cpp 2010-07-04 16:57:13 +0000 +@@ -644,11 +644,15 @@ + ret=Class::getInstanceS(); + if(sf->mi->body) + { ++#ifndef NDEBUG + ret->initialized=false; ++#endif + LOG(LOG_CALLS,"Building method traits"); + for(unsigned int i=0;imi->body->trait_count;i++) + th->context->buildTrait(ret,&sf->mi->body->traits[i],false); ++#ifndef NDEBUG + ret->initialized=true; ++#endif + ret->incRef(); + assert_and_throw(sf->closure_this==NULL); + ASObject* ret2=sf->call(ret,args,m,0); +@@ -1913,11 +1917,15 @@ + ret=Class::getInstanceS(); + if(sf->mi->body) + { ++#ifndef NDEBUG + ret->initialized=false; ++#endif + LOG(LOG_CALLS,"Building method traits"); + for(unsigned int i=0;imi->body->trait_count;i++) + th->context->buildTrait(ret,&sf->mi->body->traits[i],false); ++#ifndef NDEBUG + ret->initialized=true; ++#endif + ret->incRef(); + assert_and_throw(sf->closure_this==NULL); + ASObject* ret2=sf->call(ret,args,m,0); +@@ -2181,10 +2189,14 @@ + //TODO: Should create a real activation object + //TODO: Should method traits be added to the activation context? + ASObject* act=Class::getInstanceS(); ++#ifndef NDEBUG + act->initialized=false; ++#endif + for(unsigned int i=0;ibody->trait_count;i++) + th->context->buildTrait(act,&info->body->traits[i],false); ++#ifndef NDEBUG + act->initialized=true; ++#endif + + return act; + } + +=== modified file 'asobjects.cpp' +--- asobjects.cpp 2010-06-30 01:41:37 +0000 ++++ asobjects.cpp 2010-07-04 16:57:13 +0000 +@@ -1727,7 +1727,9 @@ + }*/ + if(buildAndLink) + { ++ #ifndef NDEBUG + assert_and_throw(!target->initialized); ++ #endif + //HACK: suppress implementation handling of variables just now + bool bak=target->implEnable; + target->implEnable=false; + +=== modified file 'swf.cpp' +--- swf.cpp 2010-07-03 21:26:00 +0000 ++++ swf.cpp 2010-07-04 16:57:13 +0000 +@@ -653,7 +653,7 @@ + break; + case ButtonPress: + { +- cout << "Press" << endl; ++ //cout << "Press" << endl; + Locker locker(th->mutexListeners); + th->m_sys->renderThread->requestInput(); + float selected=th->m_sys->renderThread->getIdAt(xevent->xbutton.x,xevent->xbutton.y); +@@ -674,7 +674,7 @@ + } + case ButtonRelease: + { +- cout << "Release" << endl; ++ //cout << "Release" << endl; + Locker locker(th->mutexListeners); + sys->renderThread->requestInput(); + float selected=sys->renderThread->getIdAt(xevent->xbutton.x,xevent->xbutton.y); + +=== modified file 'swftypes.cpp' +--- swftypes.cpp 2010-06-30 01:23:30 +0000 ++++ swftypes.cpp 2010-07-04 16:57:13 +0000 +@@ -263,7 +263,9 @@ + void ASObject::setGetterByQName(const tiny_string& name, const tiny_string& ns, IFunction* o) + { + check(); ++#ifndef NDEBUG + assert_and_throw(!initialized); ++#endif + //Getters are inserted with the current level of the prototype chain + int level=cur_level; + obj_var* obj=Variables.findObjVar(name,ns,level,true,false); +@@ -279,7 +281,9 @@ + void ASObject::setSetterByQName(const tiny_string& name, const tiny_string& ns, IFunction* o) + { + check(); ++#ifndef NDEBUG + assert_and_throw(!initialized); ++#endif + //Setters are inserted with the current level of the prototype chain + int level=cur_level; + obj_var* obj=Variables.findObjVar(name,ns,level,true,false); +@@ -579,7 +583,9 @@ + void ASObject::initSlot(unsigned int n,const tiny_string& name, const tiny_string& ns) + { + //Should be correct to use the level on the prototype chain ++#ifndef NDEBUG + assert_and_throw(!initialized); ++#endif + Variables.initSlot(n,cur_level,name,ns); + } + + diff --git a/www-plugins/lightspark/lightspark-0.4.2_rc2.ebuild b/www-plugins/lightspark/lightspark-0.4.2_rc2.ebuild new file mode 100644 index 000000000000..dbc5dfd5bada --- /dev/null +++ b/www-plugins/lightspark/lightspark-0.4.2_rc2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.4.2_rc2.ebuild,v 1.1 2010/07/05 22:41:07 chithanh Exp $ + +EAPI=3 +inherit cmake-utils nsplugins multilib + +DESCRIPTION="High performance flash player" +HOMEPAGE="https://launchpad.net/lightspark/" +SRC_URI="http://launchpad.net/${PN}/trunk/${PN}-0.4.0/+download/${P/_/}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="nsplugin pulseaudio" + +RDEPEND="dev-libs/libpcre + media-fonts/liberation-fonts + media-video/ffmpeg + media-libs/ftgl + >=media-libs/glew-1.5.3 + media-libs/libsdl + net-misc/curl + >=sys-devel/llvm-2.7 + virtual/opengl + nsplugin? ( + dev-libs/nspr + net-libs/xulrunner + x11-libs/gtk+:2 + x11-libs/gtkglext + ) + x11-libs/libX11" +DEPEND="${RDEPEND} + dev-lang/nasm + dev-util/pkgconfig" + +S=${WORKDIR}/${P/_rc*/} + +src_prepare() { + # Fix gcc complaint about undefined debug variable + epatch "${FILESDIR}"/${PN}-0.4.2-ndebug.patch + + # Adjust plugin permissions + sed -i "s|FILES|PROGRAMS|" plugin-dir/CMakeLists.txt || die + + # Adjust font paths + sed -i "s|truetype/ttf-liberation|liberation-fonts|" swf.cpp || die +} + +src_configure() { + local mycmakeargs="$(cmake-utils_use nsplugin COMPILE_PLUGIN) + $(cmake-utils_use pulseaudio ENABLE_SOUND) + -DPLUGIN_DIRECTORY=/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 +} -- 2.26.2