Version bump, bug #359291

Package-Manager: portage-2.2.0_alpha27/cvs/Linux x86_64

4 files changed, 122 insertions, 2 deletions

diff --git a/www-plugins/lightspark/ChangeLog b/www-plugins/lightspark/ChangeLog
index 15c4f88ebe0d..76f7f846d25f 100644
--- a/www-plugins/lightspark/ChangeLog
+++ b/www-plugins/lightspark/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-plugins/lightspark
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.25 2011/02/13 15:16:22 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.26 2011/03/20 22:08:23 chithanh Exp $
+
+*lightspark-0.4.6.1 (20 Mar 2011)
+
+  20 Mar 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +lightspark-0.4.6.1.ebuild, +files/lightspark-0.4.6.1-cmakelists.patch:
+  Version bump, bug #359291
 
 *lightspark-0.4.5.2 (13 Feb 2011)
 
diff --git a/www-plugins/lightspark/Manifest b/www-plugins/lightspark/Manifest
index a2ba71416c83..a6405352263c 100644
--- a/www-plugins/lightspark/Manifest
+++ b/www-plugins/lightspark/Manifest
@@ -1,6 +1,9 @@
 AUX lightspark-0.4.5-allow-disabling-pulseaudio.patch 1163 RMD160 1b28a590198b737914450e4dd30044ea22b04801 SHA1 8e4ebfaa96d47738683b51efc61bb90502425b4d SHA256 74db9388a411ba480a1b688be1ede8f11ba119c5deb48e02b775bf0e94ddf460
 AUX lightspark-0.4.5.1-cmakelists.patch 1489 RMD160 32e85eddcd390cc8ab2d4477b27e415667a6531e SHA1 382596f6d9d47a5fef62bad928388bd9a64eddeb SHA256 521b4cc9eacd8425f7e51ace6ab1c2d3bc61f3f4b87d19aa4a65fc55893cccae
+AUX lightspark-0.4.6.1-cmakelists.patch 1486 RMD160 fbf26fac7a72fb4fcd7f01e9593eafe3ce0566cc SHA1 c87ba077d9641639d8fe20fd9e0ff858077b1714 SHA256 20014f05d87dcc7d22a515ee237a1d4f9e22a45627e5b29fc732ce3a99f82259
 DIST lightspark-0.4.5.2.tar.gz 476724 RMD160 fe76325c9661f9eafcea5907bbe62d89d99523e1 SHA1 472b1241a5ff86275b196b3b230aab3bcc7d2185 SHA256 30246492fde490f70f80689b7a4621020416e64f1060e64abf1f1b60d79bbc07
+DIST lightspark-0.4.6.1.tar.gz 514612 RMD160 354df0f25a346f743e6c1a6850e2907a860547dc SHA1 2f955d85c8041886a50ab083c10dd703dd4ea692 SHA256 20532be2c6fafe6e340decc0ca39419b1d61a1146e50c527851caf8f2f163224
 EBUILD lightspark-0.4.5.2.ebuild 2164 RMD160 e6066de073a30bcd3a62d71246db29bcd50954a0 SHA1 99c71eaf1f3c4fca295ff717036ac63a5d307e8f SHA256 dc2d4d35003968aec212a2704ebc44d1e95d338828e01d67078d7c580b8b956a
-MISC ChangeLog 5577 RMD160 dc9d89302292275606791d42ed5d4e64aa6e5c8e SHA1 cd34af679973a2efe582938a3c0042d4100db160 SHA256 5e0a5749893be7dd8083b98ed0d3e696853defe6db9cca0d77a8dfc197bfb422
+EBUILD lightspark-0.4.6.1.ebuild 2173 RMD160 d4a7fd9a5db6856e7736c613e8c2e6aa7b5ac0fe SHA1 3b3b6afdddd76bdd98860c2f59dc3686087e2d80 SHA256 a1ab6d25790cbec59659af4ae186a9e5e216a56100e89011e8e768b98df2cbc6
+MISC ChangeLog 5784 RMD160 7b3f4d55a7668d03b707bb938f8e1c2fe3cad3ea SHA1 c69c7a2b36ffc2405610dff91c6544e4f480bcd8 SHA256 aea14277cbd2f03825a5182b81394f84dbdea453c0cc3a90d0ba62bf13668478
 MISC metadata.xml 275 RMD160 1b1d48ace7eb30ee16b7cd1c33dd9fa695817f08 SHA1 8e66ce36ba12401c927e1b7394b652962a979a52 SHA256 9fcd14bdea1cdbac9fa4d44a3c9728877d7b87266c3553f6519a7aaec9795009
diff --git a/www-plugins/lightspark/files/lightspark-0.4.6.1-cmakelists.patch b/www-plugins/lightspark/files/lightspark-0.4.6.1-cmakelists.patch
new file mode 100644
index 000000000000..cc260b626c72
--- /dev/null
+++ b/www-plugins/lightspark/files/lightspark-0.4.6.1-cmakelists.patch
@@ -0,0 +1,30 @@
+diff -ur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2010-12-16 06:28:01.000000000 +0100
++++ b/CMakeLists.txt	2010-12-21 14:59:17.500027007 +0100
+@@ -332,7 +332,7 @@
+ 	${Boost_LIBRARIES} ${LLVM_LIBS_CORE} ${LLVM_LIBS_JIT} ${SDL_LIBRARY}
+ 	${OPTIONAL_LIBRARIES} ${GTK_LIBRARIES} ${FREETYPE_LIBRARIES}
+ 	${OPENGL_LIBRARIES} ${FTGL_LIBRARIES} ${GLEW_LIBRARIES} ${PCRE_LIBRARIES}
+-	${Threads_LIBRARIES} ${XMLPP_LIBRARIES} ${CMAKE_DL_LIBS})
++	${Threads_LIBRARIES} ${XMLPP_LIBRARIES} ${CMAKE_DL_LIBS} ${CMAKE_MODULE_LINKER_FLAGS})
+ SET_TARGET_PROPERTIES(spark PROPERTIES VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
+ SET_TARGET_PROPERTIES(spark PROPERTIES SOVERSION "${MAJOR_VERSION}.${MINOR_VERSION}")
+ 
+@@ -344,7 +344,7 @@
+ IF(COMPILE_LIGHTSPARK)
+   ADD_EXECUTABLE(lightspark main.cpp)
+   TARGET_LINK_LIBRARIES(lightspark spark)
+-  TARGET_LINK_LIBRARIES(lightspark ${SDL_LIBRARY} ${Boost_LIBRARIES})
++  TARGET_LINK_LIBRARIES(lightspark ${SDL_LIBRARY} ${Boost_LIBRARIES} ${CMAKE_MODULE_LINKER_FLAGS})
+ 
+   IF(UNIX)
+     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lightspark.frag DESTINATION ${DATADIR}/lightspark)
+@@ -359,7 +359,7 @@
+ IF(COMPILE_TIGHTSPARK)
+   ADD_EXECUTABLE(tightspark tightspark.cpp)
+   TARGET_LINK_LIBRARIES(tightspark spark)
+-  TARGET_LINK_LIBRARIES(tightspark ${Boost_LIBRARIES})
++  TARGET_LINK_LIBRARIES(tightspark ${Boost_LIBRARIES} ${CMAKE_MODULE_LINKER_FLAGS})
+ 
+   IF(UNIX)
+     INSTALL(TARGETS tightspark RUNTIME DESTINATION ${BINDIR})
diff --git a/www-plugins/lightspark/lightspark-0.4.6.1.ebuild b/www-plugins/lightspark/lightspark-0.4.6.1.ebuild
new file mode 100644
index 000000000000..de796606530c
--- /dev/null
+++ b/www-plugins/lightspark/lightspark-0.4.6.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.4.6.1.ebuild,v 1.1 2011/03/20 22:08:23 chithanh Exp $
+
+EAPI=3
+inherit cmake-utils nsplugins multilib versionator
+
+DESCRIPTION="High performance flash player"
+HOMEPAGE="http://lightspark.sourceforge.net/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PN}-$(get_version_component_range 1-3)/+download/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nsplugin pulseaudio"
+
+RDEPEND=">=dev-cpp/libxmlpp-2.33.1:2.6
+	>=dev-libs/boost-1.42
+	dev-libs/libpcre[cxx]
+	media-fonts/liberation-fonts
+	media-video/ffmpeg
+	media-libs/fontconfig
+	media-libs/ftgl
+	>=media-libs/glew-1.5.3
+	media-libs/libsdl
+	pulseaudio? (
+		media-sound/pulseaudio
+	)
+	net-misc/curl
+	>=sys-devel/gcc-4.4
+	>=sys-devel/llvm-2.8-r2
+	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*/}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.6.1-cmakelists.patch
+	"${FILESDIR}"/${PN}-0.4.5-allow-disabling-pulseaudio.patch
+)
+
+src_configure() {
+	local audiobackends
+	use pulseaudio && audiobackends=pulse
+
+	local mycmakeargs=(
+		$(cmake-utils_use nsplugin COMPILE_PLUGIN)
+		-DAUDIO_BACKEND="${audiobackends}"
+		-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
+}
+
+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
+}