diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-11-24 21:41:09 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-11-24 21:41:09 +0000 |
| commit | 4dc3bff76a51a5ad1fb91b2e35dffde4332d1e2c (patch) | |
| tree | 0bb16026230e9cc48df30d997712cb4901fc42ba /www-plugins/gecko-mediaplayer | |
| parent | Version bump (diff) | |
| download | gentoo-2-4dc3bff76a51a5ad1fb91b2e35dffde4332d1e2c.tar.gz gentoo-2-4dc3bff76a51a5ad1fb91b2e35dffde4332d1e2c.tar.bz2 gentoo-2-4dc3bff76a51a5ad1fb91b2e35dffde4332d1e2c.zip | |
Use Firefox 8.x headers to build.
(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)
Diffstat (limited to 'www-plugins/gecko-mediaplayer')
3 files changed, 70 insertions, 4 deletions
diff --git a/www-plugins/gecko-mediaplayer/ChangeLog b/www-plugins/gecko-mediaplayer/ChangeLog index 4d12a7f2581a..a24ed4f47293 100644 --- a/www-plugins/gecko-mediaplayer/ChangeLog +++ b/www-plugins/gecko-mediaplayer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-plugins/gecko-mediaplayer # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.58 2011/11/18 15:35:03 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.59 2011/11/24 21:41:09 ssuominen Exp $ + + 24 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> + gecko-mediaplayer-1.0.5_beta1.ebuild, + +files/gecko-mediaplayer-1.0.5_beta1-firefox-8.x.patch: + Use Firefox 8.x headers to build. 18 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> gecko-mediaplayer-1.0.4.ebuild, -files/libxul.pc: diff --git a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-1.0.5_beta1-firefox-8.x.patch b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-1.0.5_beta1-firefox-8.x.patch new file mode 100644 index 000000000000..63f9233a8e60 --- /dev/null +++ b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-1.0.5_beta1-firefox-8.x.patch @@ -0,0 +1,45 @@ +--- src/np_entry.cpp ++++ src/np_entry.cpp +@@ -80,9 +80,9 @@ + + #endif /* XP_WIN */ + +-char *NPP_GetMIMEDescription(); ++const char *NPP_GetMIMEDescription(); + +-char *NP_GetMIMEDescription() ++const char *NP_GetMIMEDescription() + { + return NPP_GetMIMEDescription(); + } +--- src/npp_gate.cpp ++++ src/npp_gate.cpp +@@ -44,7 +44,7 @@ + #include "plugin_types.h" + #include "plugin_setup.h" + +-char *NPP_GetMIMEDescription(void) ++const char *NPP_GetMIMEDescription(void) + { + return GetMIMEDescription(); + } +--- src/npupp.h ++++ src/npupp.h +@@ -684,7 +684,7 @@ + + NPError OSCALL NP_Shutdown(); + +- char *NP_GetMIMEDescription(); ++ const char *NP_GetMIMEDescription(); + + #ifdef __cplusplus + } +@@ -700,7 +700,7 @@ + + /* plugin meta member functions */ + +- NP_EXPORT(char *) NP_GetMIMEDescription(void); ++ NP_EXPORT(const char *) NP_GetMIMEDescription(void); + NP_EXPORT(NPError) NP_Initialize(NPNetscapeFuncs *, NPPluginFuncs *); + NP_EXPORT(NPError) NP_Shutdown(void); + NP_EXPORT(NPError) NP_GetValue(void *future, NPPVariable aVariable, void *aValue); diff --git a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1.ebuild b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1.ebuild index 3b30c96dedbf..5878603b387c 100644 --- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1.ebuild +++ b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1.ebuild,v 1.1 2011/11/18 15:25:59 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.5_beta1.ebuild,v 1.2 2011/11/24 21:41:09 ssuominen Exp $ EAPI=4 -inherit multilib nsplugins +inherit eutils multilib nsplugins MY_P=${PN}-${PV/_beta/b} @@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.92 dev-libs/nspr >=media-libs/gmtk-${PV} >=media-video/gnome-mplayer-${PV}[dbus] - >=net-libs/xulrunner-1.9.2:1.9 + || ( >=www-client/firefox-8 >=net-libs/xulrunner-1.9.2:1.9 ) curl? ( net-misc/curl )" DEPEND="${RDEPEND} dev-util/pkgconfig @@ -31,7 +31,23 @@ DOCS="ChangeLog DOCS/tech/*.txt" S=${WORKDIR}/${MY_P} +src_prepare() { + if has_version ">=www-client/firefox-8"; then + epatch "${FILESDIR}"/${P}-firefox-8.x.patch + + cat <<-EOF > "${T}"/libxul.pc + Name: libxul + Description: Missing npapi-sdk support + Requires: nspr + Version: 8.0 + Cflags: -I/usr/include/firefox + EOF + fi +} + src_configure() { + export PKG_CONFIG_PATH="${T}" + econf \ --with-plugin-dir=/usr/$(get_libdir)/${PLUGINS_DIR} \ $(use_with curl libcurl) |