summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-08-29 20:11:42 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-08-29 20:11:42 +0000
commit6a9263db97b02f20ac7962bf83f8b8d84b1cb7a9 (patch)
tree279b0ee16d622204c165add75c1b286972cb2003 /www-plugins
parentFixed 'Unquoted Variable' QA issues. (diff)
downloadgentoo-2-6a9263db97b02f20ac7962bf83f8b8d84b1cb7a9.tar.gz
gentoo-2-6a9263db97b02f20ac7962bf83f8b8d84b1cb7a9.tar.bz2
gentoo-2-6a9263db97b02f20ac7962bf83f8b8d84b1cb7a9.zip
Version bump.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'www-plugins')
-rw-r--r--www-plugins/lightspark/ChangeLog9
-rw-r--r--www-plugins/lightspark/files/lightspark-0.4.3-cmakelists.patch44
-rw-r--r--www-plugins/lightspark/files/lightspark-0.4.4-cmakelists.patch30
-rw-r--r--www-plugins/lightspark/lightspark-0.4.4.ebuild (renamed from www-plugins/lightspark/lightspark-0.4.3.ebuild)2
4 files changed, 39 insertions, 46 deletions
diff --git a/www-plugins/lightspark/ChangeLog b/www-plugins/lightspark/ChangeLog
index 16627bce9160..c09ef0648eac 100644
--- a/www-plugins/lightspark/ChangeLog
+++ b/www-plugins/lightspark/ChangeLog
@@ -1,6 +1,13 @@
# 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.14 2010/08/13 19:47:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.15 2010/08/29 20:11:42 chithanh Exp $
+
+*lightspark-0.4.4 (29 Aug 2010)
+
+ 29 Aug 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ -lightspark-0.4.3.ebuild, -files/lightspark-0.4.3-cmakelists.patch,
+ +lightspark-0.4.4.ebuild, +files/lightspark-0.4.4-cmakelists.patch:
+ Version bump.
13 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
lightspark-0.4.3.ebuild, +files/lightspark-0.4.3-cmakelists.patch:
diff --git a/www-plugins/lightspark/files/lightspark-0.4.3-cmakelists.patch b/www-plugins/lightspark/files/lightspark-0.4.3-cmakelists.patch
deleted file mode 100644
index f0f585dd580b..000000000000
--- a/www-plugins/lightspark/files/lightspark-0.4.3-cmakelists.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: lightspark-0.4.3/CMakeLists.txt
-===================================================================
---- lightspark-0.4.3.orig/CMakeLists.txt
-+++ lightspark-0.4.3/CMakeLists.txt
-@@ -199,7 +199,7 @@ ENDIF(${i386})
- # liblightspark.so target
- ADD_LIBRARY(spark SHARED ${LIBSPARK_SOURCES})
- SET_TARGET_PROPERTIES(spark PROPERTIES OUTPUT_NAME lightspark)
--TARGET_LINK_LIBRARIES(spark ${SOUND_LIBS_LIBRARIES} ${EXTRA_LIBS_LIBRARIES} ${ZLIB_LIBRARIES} ${LLVM_LIBS_CORE} ${LLVM_LIBS_JIT} ${SDL_LIBRARY} ${OPTIONAL_LIBRARIES} ${GTK_LIBRARIES} ${lib_glew})
-+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} ${lib_glew})
- SET_TARGET_PROPERTIES(spark PROPERTIES LINK_FLAGS "${LLVM_LDFLAGS} -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/lightspark.expmap")
- SET_TARGET_PROPERTIES(spark PROPERTIES LINK_INTERFACE_LIBRARIES "")
-
-@@ -214,7 +214,7 @@ ENDIF(UNIX)
- 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)
-@@ -227,7 +227,7 @@ ENDIF(COMPILE_LIGHTSPARK)
- # 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})
-Index: lightspark-0.4.3/plugin-dir/CMakeLists.txt
-===================================================================
---- lightspark-0.4.3.orig/plugin-dir/CMakeLists.txt
-+++ lightspark-0.4.3/plugin-dir/CMakeLists.txt
-@@ -31,7 +31,7 @@ ENDIF(UNIX)
-
- # Firefox plugin target
- ADD_LIBRARY(lightsparkplugin SHARED np_entry.cpp npn_gate.cpp npp_gate.cpp plugin.cpp)
--TARGET_LINK_LIBRARIES(lightsparkplugin spark ${MOZ_PLUGIN_LIBRARIES} ${GTK_LIBRARIES})
-+TARGET_LINK_LIBRARIES(lightsparkplugin spark ${CMAKE_MODULE_LINKER_FLAGS} ${MOZ_PLUGIN_LIBRARIES} ${GTK_LIBRARIES})
-
- IF(UNIX)
- INSTALL(TARGETS lightsparkplugin LIBRARY DESTINATION ${PLUGIN_DIRECTORY})
diff --git a/www-plugins/lightspark/files/lightspark-0.4.4-cmakelists.patch b/www-plugins/lightspark/files/lightspark-0.4.4-cmakelists.patch
new file mode 100644
index 000000000000..ba1ea0218230
--- /dev/null
+++ b/www-plugins/lightspark/files/lightspark-0.4.4-cmakelists.patch
@@ -0,0 +1,30 @@
+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/lightspark-0.4.3.ebuild b/www-plugins/lightspark/lightspark-0.4.4.ebuild
index 695161c4f4a0..e2c5e01ff6e3 100644
--- a/www-plugins/lightspark/lightspark-0.4.3.ebuild
+++ b/www-plugins/lightspark/lightspark-0.4.4.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.3.ebuild,v 1.2 2010/08/13 19:47:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.4.4.ebuild,v 1.1 2010/08/29 20:11:42 chithanh Exp $
EAPI=3
inherit cmake-utils nsplugins multilib