From 6a9263db97b02f20ac7962bf83f8b8d84b1cb7a9 Mon Sep 17 00:00:00 2001 From: Chí-Thanh Christopher Nguyễn Date: Sun, 29 Aug 2010 20:11:42 +0000 Subject: Version bump. (Portage version: 2.2_rc67/cvs/Linux x86_64) --- www-plugins/lightspark/ChangeLog | 9 ++- .../files/lightspark-0.4.3-cmakelists.patch | 44 ------------- .../files/lightspark-0.4.4-cmakelists.patch | 30 +++++++++ www-plugins/lightspark/lightspark-0.4.3.ebuild | 75 ---------------------- www-plugins/lightspark/lightspark-0.4.4.ebuild | 75 ++++++++++++++++++++++ 5 files changed, 113 insertions(+), 120 deletions(-) delete mode 100644 www-plugins/lightspark/files/lightspark-0.4.3-cmakelists.patch create mode 100644 www-plugins/lightspark/files/lightspark-0.4.4-cmakelists.patch delete mode 100644 www-plugins/lightspark/lightspark-0.4.3.ebuild create mode 100644 www-plugins/lightspark/lightspark-0.4.4.ebuild 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 + -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 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.3.ebuild deleted file mode 100644 index 695161c4f4a0..000000000000 --- a/www-plugins/lightspark/lightspark-0.4.3.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# 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 $ - -EAPI=3 -inherit cmake-utils nsplugins multilib - -DESCRIPTION="High performance flash player" -HOMEPAGE="https://launchpad.net/lightspark/" -SRC_URI="http://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nsplugin pulseaudio" - -RDEPEND="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.7 - 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}"/${P}-cmakelists.patch -) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use nsplugin COMPILE_PLUGIN) - $(cmake-utils_use pulseaudio ENABLE_SOUND) - -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 -} diff --git a/www-plugins/lightspark/lightspark-0.4.4.ebuild b/www-plugins/lightspark/lightspark-0.4.4.ebuild new file mode 100644 index 000000000000..e2c5e01ff6e3 --- /dev/null +++ b/www-plugins/lightspark/lightspark-0.4.4.ebuild @@ -0,0 +1,75 @@ +# 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.ebuild,v 1.1 2010/08/29 20:11:42 chithanh Exp $ + +EAPI=3 +inherit cmake-utils nsplugins multilib + +DESCRIPTION="High performance flash player" +HOMEPAGE="https://launchpad.net/lightspark/" +SRC_URI="http://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="nsplugin pulseaudio" + +RDEPEND="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.7 + 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}"/${P}-cmakelists.patch +) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use nsplugin COMPILE_PLUGIN) + $(cmake-utils_use pulseaudio ENABLE_SOUND) + -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 +} -- cgit v1.2.3-65-gdbad