Version bump, bug #337069

Package-Manager: portage-2.2_rc81/cvs/Linux x86_64

5 files changed, 50 insertions, 38 deletions

diff --git a/www-plugins/lightspark/ChangeLog b/www-plugins/lightspark/ChangeLog
index 445e116b8f29..b41e48fbcadc 100644
--- a/www-plugins/lightspark/ChangeLog
+++ b/www-plugins/lightspark/ChangeLog
@@ -1,6 +1,14 @@
 # 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.16 2010/09/03 10:42:12 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.17 2010/09/14 13:11:32 chithanh Exp $
+
+*lightspark-0.4.4.2 (14 Sep 2010)
+
+  14 Sep 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -lightspark-0.4.4.1.ebuild, +lightspark-0.4.4.2.ebuild,
+  +files/lightspark-0.4.4.2-cmakelists.patch,
+  -files/lightspark-0.4.4-cmakelists.patch:
+  Version bump, bug #337069
 
 *lightspark-0.4.4.1 (03 Sep 2010)
 
diff --git a/www-plugins/lightspark/Manifest b/www-plugins/lightspark/Manifest
index cebdbdfd1362..7320127f0b86 100644
--- a/www-plugins/lightspark/Manifest
+++ b/www-plugins/lightspark/Manifest
@@ -1,5 +1,5 @@
-AUX lightspark-0.4.4-cmakelists.patch 1763 RMD160 d998f6ae1a501eb0dde5bba803651d617e22d2a0 SHA1 1f96c06439c866d4a393ea7787703de208be267a SHA256 d63905c3ec2fb358062e3e89ee422047597d85914a81077c48fc86e74ac96531
-DIST lightspark-0.4.4.1.tar.gz 320410 RMD160 13cab6ea8e306c061984953d9ddaf6e2fc599d36 SHA1 246bb2da122a9f327b2ab24a815292625ec65520 SHA256 ea701dea6d6d759bc583bd339b6b831c3ff362ac79a1ccd12989d638ad9ac99d
-EBUILD lightspark-0.4.4.1.ebuild 1959 RMD160 de144511ca374985bc55bde03f3607d5d4a38895 SHA1 a4d42cc3fe1597f45ca5ab1da5f1c0ef0a65b94f SHA256 6ee995ae11f45c043c97c9fc6deb51ef204a28d0711e885ce96cd0c3eddac3ad
-MISC ChangeLog 3643 RMD160 5720b544676edc727b931a6e86e0fe36f08dcc2f SHA1 4d3332f5adf4d2af17d5441f64be6550ab5dd396 SHA256 de4ffecc69cdb288013766b2003be62c7303a4da1fb3842933364a45b2fcf2ae
+AUX lightspark-0.4.4.2-cmakelists.patch 1840 RMD160 42b9f9e0a71a734de7fdd10c59f5686bc9bf2ecd SHA1 f0a6d8f7c4e499eab1ababef4f683fbb0019336d SHA256 09d226c3dcab9e2568dccee413d5aa51f3237e226ec99d88df8eb88a937b482d
+DIST lightspark-0.4.4.2.tar.gz 352826 RMD160 f3c9dac4fa6ce19eda39498ea248aec444ce1ea5 SHA1 2d68ae56cffbe6a40f9e10cc95fd91b78ef1761a SHA256 ba736089ede2ff2ff13621df9a1450e2da584fd84318656257b73c17290fcc87
+EBUILD lightspark-0.4.4.2.ebuild 2056 RMD160 cf0f08053597a4a5616d5fb0caaad5e648747ca6 SHA1 55c802672b36e8e948f639b2b11c01679068601a SHA256 7dc970f4159c044c3251b908c1df0208359ce8230722b89461cc6e0a1c182acd
+MISC ChangeLog 3924 RMD160 55263da00c6932db4f1966369837d98c869b189a SHA1 93654dffd9133d5fabe72cba28cbaf9c22024a82 SHA256 b0e35c840d5450ac1d057438bb4033fe7b48c67a29e1a95f07a2392b0e729784
 MISC metadata.xml 275 RMD160 1b1d48ace7eb30ee16b7cd1c33dd9fa695817f08 SHA1 8e66ce36ba12401c927e1b7394b652962a979a52 SHA256 9fcd14bdea1cdbac9fa4d44a3c9728877d7b87266c3553f6519a7aaec9795009
diff --git a/www-plugins/lightspark/files/lightspark-0.4.4-cmakelists.patch b/www-plugins/lightspark/files/lightspark-0.4.4-cmakelists.patch
deleted file mode 100644
index ba1ea0218230..000000000000
--- a/www-plugins/lightspark/files/lightspark-0.4.4-cmakelists.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2010-08-29 16:50:40.000000000 +0200
-+++ b/CMakeLists.txt	2010-08-29 22:01:32.000000000 +0200
-@@ -303,7 +303,7 @@
-    ADD_LIBRARY(spark STATIC ${LIBSPARK_SOURCES})
- ENDIF (CMAKE_COMPILER_IS_GNUCC)
- 
--TARGET_LINK_LIBRARIES(spark ${SOUND_LIBS_LIBRARIES} ${EXTRA_LIBS_LIBRARIES} ${ZLIB_LIBRARIES} ${LLVM_LIBS_CORE} ${LLVM_LIBS_JIT} ${SDL_LIBRARY} ${OPTIONAL_LIBRARIES} ${GTK_LIBRARIES} ${FREETYPE_LIBRARIES} ${OPENGL_LIBRARIES} ${FTGL_LIBRARIES} ${GLEW_LIBRARIES} ${PCRECPP_LIBRARIES} ${Threads_LIBRARIES})
-+TARGET_LINK_LIBRARIES(spark ${CMAKE_MODULE_LINKER_FLAGS} ${SOUND_LIBS_LIBRARIES} ${EXTRA_LIBS_LIBRARIES} ${ZLIB_LIBRARIES} ${LLVM_LIBS_CORE} ${LLVM_LIBS_JIT} ${SDL_LIBRARY} ${OPTIONAL_LIBRARIES} ${GTK_LIBRARIES} ${FREETYPE_LIBRARIES} ${OPENGL_LIBRARIES} ${FTGL_LIBRARIES} ${GLEW_LIBRARIES} ${PCRECPP_LIBRARIES} ${Threads_LIBRARIES})
- SET_TARGET_PROPERTIES(spark PROPERTIES VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
- SET_TARGET_PROPERTIES(spark PROPERTIES SOVERSION "${MAJOR_VERSION}.${MINOR_VERSION}")
- 
-@@ -315,7 +315,7 @@
- IF(COMPILE_LIGHTSPARK)
- 	ADD_EXECUTABLE(lightspark main.cpp)
- 	TARGET_LINK_LIBRARIES(lightspark spark)
--	TARGET_LINK_LIBRARIES(lightspark ${SDL_LIBRARY})
-+	TARGET_LINK_LIBRARIES(lightspark ${SDL_LIBRARY} ${CMAKE_MODULE_LINKER_FLAGS})
- 
- 	IF(UNIX)
- 		INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lightspark.frag DESTINATION ${DATADIR}/lightspark)
-@@ -328,7 +328,7 @@
- # tightspark executable target
- IF(COMPILE_TIGHTSPARK)
- 	ADD_EXECUTABLE(tightspark tightspark.cpp)
--	TARGET_LINK_LIBRARIES(tightspark spark)
-+	TARGET_LINK_LIBRARIES(tightspark spark ${CMAKE_MODULE_LINKER_FLAGS})
- 
- 	IF(UNIX)
- 		INSTALL(TARGETS tightspark RUNTIME DESTINATION ${BINDIR})
diff --git a/www-plugins/lightspark/files/lightspark-0.4.4.2-cmakelists.patch b/www-plugins/lightspark/files/lightspark-0.4.4.2-cmakelists.patch
new file mode 100644
index 000000000000..19d881a07ec5
--- /dev/null
+++ b/www-plugins/lightspark/files/lightspark-0.4.4.2-cmakelists.patch
@@ -0,0 +1,30 @@
+diff -ur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2010-09-11 21:34:25.000000000 +0200
++++ b/CMakeLists.txt	2010-09-13 17:19:30.384369002 +0200
+@@ -310,7 +310,7 @@
+   ADD_LIBRARY(spark STATIC ${LIBSPARK_SOURCES})
+ ENDIF (CMAKE_COMPILER_IS_GNUCC)
+ 
+-TARGET_LINK_LIBRARIES(spark ${EXTRA_LIBS_LIBRARIES} ${ZLIB_LIBRARIES} ${Boost_LIBRARIES} ${LLVM_LIBS_CORE} ${LLVM_LIBS_JIT} ${SDL_LIBRARY} ${OPTIONAL_LIBRARIES} ${GTK_LIBRARIES} ${FREETYPE_LIBRARIES} ${OPENGL_LIBRARIES} ${FTGL_LIBRARIES} ${GLEW_LIBRARIES} ${PCRECPP_LIBRARIES} ${Threads_LIBRARIES})
++TARGET_LINK_LIBRARIES(spark ${CMAKE_MODULE_LINKER_FLAGS} ${EXTRA_LIBS_LIBRARIES} ${ZLIB_LIBRARIES} ${Boost_LIBRARIES} ${LLVM_LIBS_CORE} ${LLVM_LIBS_JIT} ${SDL_LIBRARY} ${OPTIONAL_LIBRARIES} ${GTK_LIBRARIES} ${FREETYPE_LIBRARIES} ${OPENGL_LIBRARIES} ${FTGL_LIBRARIES} ${GLEW_LIBRARIES} ${PCRECPP_LIBRARIES} ${Threads_LIBRARIES})
+ SET_TARGET_PROPERTIES(spark PROPERTIES VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
+ SET_TARGET_PROPERTIES(spark PROPERTIES SOVERSION "${MAJOR_VERSION}.${MINOR_VERSION}")
+ 
+@@ -322,7 +322,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)
+@@ -336,7 +336,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.4.1.ebuild b/www-plugins/lightspark/lightspark-0.4.4.2.ebuild
index 98b5793fe6cb..28486ee264a4 100644
--- a/www-plugins/lightspark/lightspark-0.4.4.1.ebuild
+++ b/www-plugins/lightspark/lightspark-0.4.4.2.ebuild
@@ -1,6 +1,6 @@
 # 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.4.1.ebuild,v 1.1 2010/09/03 10:42:12 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.4.4.2.ebuild,v 1.1 2010/09/14 13:11:32 chithanh Exp $
 
 EAPI=3
 inherit cmake-utils nsplugins multilib
@@ -42,13 +42,17 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P/_rc*/}
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.4-cmakelists.patch
+	"${FILESDIR}"/${PN}-0.4.4.2-cmakelists.patch
+	"${FILESDIR}"/${PN}-0.4.4.2-openal.patch
 )
 
 src_configure() {
+	local audiobackends
+	use pulseaudio && audiobackends=pulse
+
 	local mycmakeargs=(
 		$(cmake-utils_use nsplugin COMPILE_PLUGIN)
-		$(cmake-utils_use pulseaudio ENABLE_SOUND)
+		-DAUDIO_BACKEND="${audiobackends}"
 		-DPLUGIN_DIRECTORY=/usr/$(get_libdir)/${PN}/plugins
 	)