From 9c0de1c530dd5286dacc47415cfa2e3b6a5a410a Mon Sep 17 00:00:00 2001 From: Chí-Thanh Christopher Nguyễn Date: Wed, 29 Feb 2012 19:03:58 +0000 Subject: Don't make pulseaudio default plugin when only sdl is built, bug #406197. (Portage version: 2.2.0_alpha89/cvs/Linux x86_64) --- www-plugins/lightspark/ChangeLog | 8 +- .../lightspark/lightspark-0.5.4.1-r1.ebuild | 90 ++++++++++++++++++++++ www-plugins/lightspark/lightspark-0.5.4.1.ebuild | 85 -------------------- 3 files changed, 97 insertions(+), 86 deletions(-) create mode 100644 www-plugins/lightspark/lightspark-0.5.4.1-r1.ebuild delete mode 100644 www-plugins/lightspark/lightspark-0.5.4.1.ebuild (limited to 'www-plugins') diff --git a/www-plugins/lightspark/ChangeLog b/www-plugins/lightspark/ChangeLog index ba13a3162781..8929f3bcfcb0 100644 --- a/www-plugins/lightspark/ChangeLog +++ b/www-plugins/lightspark/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-plugins/lightspark # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.37 2012/02/23 16:24:01 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.38 2012/02/29 19:03:58 chithanh Exp $ + +*lightspark-0.5.4.1-r1 (29 Feb 2012) + + 29 Feb 2012; Chí-Thanh Christopher Nguyễn + -lightspark-0.5.4.1.ebuild, +lightspark-0.5.4.1-r1.ebuild: + Don't make pulseaudio default plugin when only sdl is built, bug #406197. *lightspark-0.5.4.1 (23 Feb 2012) diff --git a/www-plugins/lightspark/lightspark-0.5.4.1-r1.ebuild b/www-plugins/lightspark/lightspark-0.5.4.1-r1.ebuild new file mode 100644 index 000000000000..d1dd11661b8c --- /dev/null +++ b/www-plugins/lightspark/lightspark-0.5.4.1-r1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.5.4.1-r1.ebuild,v 1.1 2012/02/29 19:03:58 chithanh Exp $ + +EAPI=4 +inherit cmake-utils nsplugins multilib versionator + +DESCRIPTION="High performance flash player" +HOMEPAGE="http://lightspark.sourceforge.net/" +SRC_URI="http://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="nsplugin profile pulseaudio rtmp sdl" + +RDEPEND=">=dev-cpp/libxmlpp-2.33.1:2.6 + >=dev-libs/boost-1.42 + dev-libs/libpcre[cxx] + media-fonts/liberation-fonts + virtual/ffmpeg + media-libs/fontconfig + media-libs/ftgl + >=media-libs/glew-1.5.3 + media-libs/libsdl + pulseaudio? ( + media-sound/pulseaudio + ) + rtmp? ( + media-video/rtmpdump + ) + net-misc/curl + >=sys-devel/gcc-4.4 + || ( + >=sys-devel/llvm-3 + =sys-devel/llvm-2.8* + ) + 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*/} + +src_configure() { + local audiobackends + 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 + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + use nsplugin && inst_plugin /usr/$(get_libdir)/${PN}/plugins/liblightsparkplugin.so + + # default to sdl audio if pulseaudio plugin is not built, bug #406197 + if use sdl && ! use pulseaudio; then + sed -i 's/backend = pulseaudio/backend = sdl/' "${ED}/etc/xdg/${PN}.conf" || die + fi +} + +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.5.4.1.ebuild b/www-plugins/lightspark/lightspark-0.5.4.1.ebuild deleted file mode 100644 index e04659354712..000000000000 --- a/www-plugins/lightspark/lightspark-0.5.4.1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.5.4.1.ebuild,v 1.1 2012/02/23 16:24:01 chithanh Exp $ - -EAPI=4 -inherit cmake-utils nsplugins multilib versionator - -DESCRIPTION="High performance flash player" -HOMEPAGE="http://lightspark.sourceforge.net/" -SRC_URI="http://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nsplugin profile pulseaudio rtmp sdl" - -RDEPEND=">=dev-cpp/libxmlpp-2.33.1:2.6 - >=dev-libs/boost-1.42 - dev-libs/libpcre[cxx] - media-fonts/liberation-fonts - virtual/ffmpeg - media-libs/fontconfig - media-libs/ftgl - >=media-libs/glew-1.5.3 - media-libs/libsdl - pulseaudio? ( - media-sound/pulseaudio - ) - rtmp? ( - media-video/rtmpdump - ) - net-misc/curl - >=sys-devel/gcc-4.4 - || ( - >=sys-devel/llvm-3 - =sys-devel/llvm-2.8* - ) - 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*/} - -src_configure() { - local audiobackends - 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 - ) - - 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