diff options
author | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2010-09-14 13:11:33 +0000 |
---|---|---|
committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2010-09-14 13:11:33 +0000 |
commit | bcbd2b05a90ff43a785812fe3752f9206f53759f (patch) | |
tree | e1f0dcbc36eb48ec653b07dfdc6993397ca70d2a /www-plugins/lightspark | |
parent | Fix up SELinux profile issues from #336692. Move maskings out of global pack... (diff) | |
download | gentoo-2-bcbd2b05a90ff43a785812fe3752f9206f53759f.tar.gz gentoo-2-bcbd2b05a90ff43a785812fe3752f9206f53759f.tar.bz2 gentoo-2-bcbd2b05a90ff43a785812fe3752f9206f53759f.zip |
Version bump, bug #337069
(Portage version: 2.2_rc81/cvs/Linux x86_64)
Diffstat (limited to 'www-plugins/lightspark')
-rw-r--r-- | www-plugins/lightspark/ChangeLog | 10 | ||||
-rw-r--r-- | www-plugins/lightspark/files/lightspark-0.4.4-cmakelists.patch | 30 | ||||
-rw-r--r-- | www-plugins/lightspark/files/lightspark-0.4.4.2-cmakelists.patch | 30 | ||||
-rw-r--r-- | www-plugins/lightspark/lightspark-0.4.4.2.ebuild (renamed from www-plugins/lightspark/lightspark-0.4.4.1.ebuild) | 10 |
4 files changed, 46 insertions, 34 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/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 ) |