Version bump, bug #375727. Allow enabling of individual audio backends, bug #342763.

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

5 files changed, 32 insertions, 38 deletions

diff --git a/www-plugins/lightspark/ChangeLog b/www-plugins/lightspark/ChangeLog
index 85d267161a29..2a04e495d327 100644
--- a/www-plugins/lightspark/ChangeLog
+++ b/www-plugins/lightspark/ChangeLog
@@ -1,6 +1,15 @@
 # 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.32 2011/07/16 13:30:16 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.33 2011/07/27 15:36:37 chithanh Exp $
+
+*lightspark-0.5.0 (27 Jul 2011)
+
+  27 Jul 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -lightspark-0.4.8.1.ebuild,
+  -files/lightspark-0.4.8.1-allow-disabling-pulseaudio.patch,
+  +lightspark-0.5.0.ebuild, metadata.xml:
+  Version bump, bug #375727. Allow enabling of individual audio backends, bug
+  #342763.
 
   16 Jul 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   lightspark-0.4.8.1.ebuild, -files/lightspark-0.4.8.1-cmakelists.patch:
diff --git a/www-plugins/lightspark/Manifest b/www-plugins/lightspark/Manifest
index 606ccbd3fec2..7f417263726d 100644
--- a/www-plugins/lightspark/Manifest
+++ b/www-plugins/lightspark/Manifest
@@ -1,5 +1,4 @@
-AUX lightspark-0.4.8.1-allow-disabling-pulseaudio.patch 1261 RMD160 f42aac2f79f8ee571713b3ac8b95a1234d67b240 SHA1 f85678cd6910673ad86762736f8c76c3c98c5382 SHA256 da34a4ca1b426f8352b1515c7c8e2999310a2803b24427f296a0c85fbf747b32
-DIST lightspark-0.4.8.1.tar.gz 531931 RMD160 53d96ccc9f171a581c6774b09a7b1e49375ea604 SHA1 fd3bd975a7a0b120897bab75a29e5129a00258d9 SHA256 4f25d08205c52f233ddd6d241bea105950133376d7c9607b50d331e3ef2d29c4
-EBUILD lightspark-0.4.8.1.ebuild 2125 RMD160 79ecc62133bac8c011f0a2507b67c3b1d863b8f1 SHA1 88eed37e581ef9a9034eb2a665d5be8c9d01fc95 SHA256 591175a51fcb07234fbe41514fa754ac9ab6bc375ba0f607ad1fddcfd2c7cbfa
-MISC ChangeLog 7181 RMD160 993167d9376f706f366201641cd10f88a6c79a01 SHA1 d1ea5a620c1d79d16e4b00820de1b95bfc637285 SHA256 94264988caa82ca4cf2216d09bf8b96d2ab34284bc9275dead66908a5175ebb5
-MISC metadata.xml 275 RMD160 1b1d48ace7eb30ee16b7cd1c33dd9fa695817f08 SHA1 8e66ce36ba12401c927e1b7394b652962a979a52 SHA256 9fcd14bdea1cdbac9fa4d44a3c9728877d7b87266c3553f6519a7aaec9795009
+DIST lightspark-0.5.0.tar.gz 554280 RMD160 25c54df4d116bbe98e8be8a4eea484ac6d553873 SHA1 01bd02baa297dc097ddb797b240c91f9ef3f627b SHA256 1b62bcdb69cc6e38abd15ac34db3152fb07cf96c0d69fb76a4cef7f2bfc18426
+EBUILD lightspark-0.5.0.ebuild 2338 RMD160 95c9334e1c37c4151a549983f4e095b02dc4e5ff SHA1 da849bc6b7513be9fe45d079fba34704e8e21218 SHA256 11c8cb059afbc19de610fb7edddf9b272b3e02c5082c17d5e560a5b0fbe2bb2f
+MISC ChangeLog 7507 RMD160 13c4a7acbf85cecbb15b6327fde8d64136603d47 SHA1 96fca9fbddb5cf5e5ddb7b57433bff80fe8e2781 SHA256 5ca0ab3338a0983f9532447bb6c036a4f3bdd2d136f83009b6d43c7120aabb53
+MISC metadata.xml 367 RMD160 965a4497633ca72162c9624406e71abcb5ec89c2 SHA1 a65e0c995c9ce9ef0cef8df6b56c15a56c40cd43 SHA256 d2db552fe6953e2857ddb5c687bc49894bbc6b52cece9210e74c8c62b2dcbb72
diff --git a/www-plugins/lightspark/files/lightspark-0.4.8.1-allow-disabling-pulseaudio.patch b/www-plugins/lightspark/files/lightspark-0.4.8.1-allow-disabling-pulseaudio.patch
deleted file mode 100644
index 9df28e873cf8..000000000000
--- a/www-plugins/lightspark/files/lightspark-0.4.8.1-allow-disabling-pulseaudio.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2011-05-27 14:02:19.000000000 +0200
-+++ b/CMakeLists.txt	2011-06-15 15:08:21.079714248 +0200
-@@ -122,6 +122,7 @@
- SET(COMPILE_LIGHTSPARK TRUE CACHE BOOL "Compile Lightspark?")
- SET(COMPILE_TIGHTSPARK TRUE CACHE BOOL "Compile Tightspark?")
- SET(COMPILE_PLUGIN TRUE CACHE BOOL "Compile the browser plugin?")
-+SET(AUDIO_BACKEND "pulse" CACHE STRING "Choose audio backend: none pulse alsa, default is pulse")
- SET(ENABLE_CURL TRUE CACHE BOOL "Enable CURL? (Required for Downloader functionality)")
- SET(ENABLE_LIBAVCODEC TRUE CACHE BOOL "Enable libavcodec and dependent functionality?")
- SET(ENABLE_RTMP FALSE CACHE BOOL "Enable librtmp and dependent functionality?")
-diff -ur a/src/CMakeLists.txt b/src/CMakeLists.txt
---- a/src/CMakeLists.txt	2011-06-15 15:07:47.375546914 +0200
-+++ b/src/CMakeLists.txt	2011-06-15 15:09:07.819945946 +0200
-@@ -140,6 +140,8 @@
-   ADD_SUBDIRECTORY(plugin)
- ENDIF(COMPILE_PLUGIN)
- 
--ADD_SUBDIRECTORY(backends/interfaces/audio/pulse)
-+IF(${AUDIO_BACKEND} MATCHES "pulse")
-+  ADD_SUBDIRECTORY(backends/interfaces/audio/pulse)
-+ENDIF(${AUDIO_BACKEND} MATCHES "pulse")
- #ADD_SUBDIRECTORY(backends/interfaces/audio/alsa)
- #ADD_SUBDIRECTORY(backends/interfaces/audio/openal)
diff --git a/www-plugins/lightspark/lightspark-0.4.8.1.ebuild b/www-plugins/lightspark/lightspark-0.5.0.ebuild
index 0ff04ede2b6a..07cfff473938 100644
--- a/www-plugins/lightspark/lightspark-0.4.8.1.ebuild
+++ b/www-plugins/lightspark/lightspark-0.5.0.ebuild
@@ -1,8 +1,8 @@
 # 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.8.1.ebuild,v 1.2 2011/07/16 13:30:16 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.5.0.ebuild,v 1.1 2011/07/27 15:36:36 chithanh Exp $
 
-EAPI=3
+EAPI=4
 inherit cmake-utils nsplugins multilib versionator
 
 DESCRIPTION="High performance flash player"
@@ -12,7 +12,7 @@ SRC_URI="http://launchpad.net/${PN}/trunk/${PN}-$(get_version_component_range 1-
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="nsplugin pulseaudio"
+IUSE="nsplugin openal profile pulseaudio rtmp sdl"
 
 RDEPEND=">=dev-cpp/libxmlpp-2.33.1:2.6
 	>=dev-libs/boost-1.42
@@ -23,9 +23,15 @@ RDEPEND=">=dev-cpp/libxmlpp-2.33.1:2.6
 	media-libs/ftgl
 	>=media-libs/glew-1.5.3
 	media-libs/libsdl
+	openal? (
+		media-libs/openal
+	)
 	pulseaudio? (
 		media-sound/pulseaudio
 	)
+	rtmp? (
+		media-video/rtmpdump
+	)
 	net-misc/curl
 	>=sys-devel/gcc-4.4
 	>=sys-devel/llvm-2.8-r2
@@ -40,19 +46,20 @@ RDEPEND=">=dev-cpp/libxmlpp-2.33.1:2.6
 DEPEND="${RDEPEND}
 	dev-lang/nasm
 	dev-util/pkgconfig"
+REQUIRED_USE="openal? ( pulseaudio )"
 
 S=${WORKDIR}/${P/_rc*/}
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.8.1-allow-disabling-pulseaudio.patch
-)
-
 src_configure() {
 	local audiobackends
-	use pulseaudio && audiobackends=pulse
+	use openal && audiobackends+="openal"
+	use pulseaudio && audiobackends+="pulse"
+	use sdl && audiobackends+="sdl"
 
 	local mycmakeargs=(
 		$(cmake-utils_use nsplugin COMPILE_PLUGIN)
+		$(cmake-utils_use profile ENABLE_PROFILING)
+		$(cmake-utils_use rtmp ENABLE_RTMP)
 		-DAUDIO_BACKEND="${audiobackends}"
 		-DPLUGIN_DIRECTORY=/usr/$(get_libdir)/${PN}/plugins
 	)
diff --git a/www-plugins/lightspark/metadata.xml b/www-plugins/lightspark/metadata.xml
index 8fe9668040a6..81b683180fbd 100644
--- a/www-plugins/lightspark/metadata.xml
+++ b/www-plugins/lightspark/metadata.xml
@@ -6,5 +6,8 @@
 		<email>chithanh@gentoo.org</email>
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
+	<use>
+		<flag name='rtmp'>Enable Real Time Messaging Protocol using librtmp</flag>
+	</use>
 </pkgmetadata>