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 | 520610223857b92f5e9094859127dc91e08044d2 (patch) | |
| tree | a579227f3d469dc235972384f9dcfc32400923ba /www-plugins/gecko-mediaplayer | |
| parent | Version bump (diff) | |
| download | historical-520610223857b92f5e9094859127dc91e08044d2.tar.gz historical-520610223857b92f5e9094859127dc91e08044d2.tar.bz2 historical-520610223857b92f5e9094859127dc91e08044d2.zip | |
Use Firefox 8.x headers to build.
Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64
Diffstat (limited to 'www-plugins/gecko-mediaplayer')
4 files changed, 80 insertions, 13 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/Manifest b/www-plugins/gecko-mediaplayer/Manifest index d738c2b2797a..3b3b850d9569 100644 --- a/www-plugins/gecko-mediaplayer/Manifest +++ b/www-plugins/gecko-mediaplayer/Manifest @@ -1,20 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX gecko-mediaplayer-1.0.5_beta1-firefox-8.x.patch 1094 RMD160 e2002d17c1cd38ec248874e3c69dc9586bb885bc SHA1 346c0d12553668abc73e61833d3dd5eb66f344d6 SHA256 4e26297211728c0e16d050b9e2b1145b3e25bfcb8ff0c1b71f37eca9d7fc9daa DIST gecko-mediaplayer-1.0.4.tar.gz 275024 RMD160 163dd0363a8369c66fa04533791e1977c1fd0d7b SHA1 1ad7de0a3ac5a9fa4680228f1b5f58831a8079f9 SHA256 575f4dfe4c06013c4f4a7b45eae9d1127b6d3299e570ce3a1b603c8b75ef5aa1 DIST gecko-mediaplayer-1.0.5b1.tar.gz 260120 RMD160 30722136572f350400220d08ff58cd98f74aae15 SHA1 c5e8e927325b7503d8dc082407a89177ef93874e SHA256 1fb2dc17060e9748ead2e0ad2b37824e48c529af4718e939dbff5b8f5736f973 EBUILD gecko-mediaplayer-1.0.4.ebuild 1028 RMD160 1e0ed695f83e14dbfa8c5ff77ff9fe22426858a8 SHA1 79770fca19104ab946f60e8f299a5b6afb145599 SHA256 a9ea8edae70d82a1f1c6350756028c8184a14913577a00c86161094e82bf19b8 -EBUILD gecko-mediaplayer-1.0.5_beta1.ebuild 1047 RMD160 f699bce98a7ef20641b0972d33df42efc1ece70d SHA1 fb181be1dcc0af5b0a5f271f8c014116703e3ee0 SHA256 91e5795d505c892938eb7a6027e49f0efe81423c887445020748804edbb20110 -MISC ChangeLog 10555 RMD160 ed6b460cdf6ce29d04155333956acf0c9db21b2a SHA1 eda84fda9e2dbbea88dd9e182273f44ce404f715 SHA256 a23ce9be3320f7b95ec2a90f7263b4fe4b0e043818026c9dd3c78b2f758c9099 +EBUILD gecko-mediaplayer-1.0.5_beta1.ebuild 1392 RMD160 b4acab007d29b5e98b0abeb17f857812d4769006 SHA1 756b83d8561ad139abf098d0e457c54f745bdac0 SHA256 9c6fde8cdb9ce7c74773614835ce1d7819fdaa2217dc92620de4d6cd3457443a +MISC ChangeLog 10744 RMD160 fc85f34f6fd4e79a5b00888ec52d8ad908180983 SHA1 f809c77ef86efaccde20778d09e0e48968d79dd5 SHA256 0888b333714e6b54bcb5cf987bc23e100142a1e81a9ed7509660938e3074f4f4 MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJOxnrJAAoJEEdUh39IaPFNYGAH/0fh4wgtArimSvc6g501TiQC -o1gya+xgbzUfauydg/lhpoQfZLCmQEsQeThHyL6pZX4YQg4YMYuqdBiLYDffynZj -sdw89G9tJSDoeF0OxMaANRUtAy5r+IoAVIA9l/sEUeaLl4cwRXttaEM62e+e0L9V -rGsNX4Vm06geqTen+hvRDzKYLOPxhq9Dr35pHsx2l4JWefQuagGy1X08eZ8FpoIp -W4RZ0I/k7WsL+6XW9pQFTV1BZzXNCemPep9DNPr2aEpxxBAKYnKcUGnMhSQBblhy -/bsbaUdTRdi+dXGEISFA+512YoFAy4ST08rprAQLo0VSIfeBTxjoWhStmcO5WaI= -=bFAd +iQEcBAEBAgAGBQJOzrl4AAoJEEdUh39IaPFNpiwH/1tp2dqQrOXcjZNsVLA9mDAq +74QIRJ3zk2bZNjPOU09+GbIx9FoIAOXXLz6Q/3K1qI5LJCb0uTXYee2pTduvIRgi +gbZSUS3Wy/cz4/mWi/CyOxwr59pgNM41DPvKJgdmBChgn3/fLDtooBs/KY4YB4sU +OKFkPWVymGVS16+BTcDEX4t4xo8yhM2VO7A4PyRt7Ulk3l8UmNZroMW7AaM41EKu +s3BAJf3e5bgSqWG1dCk2CJHz8Jv64k+v+etrvx4hcEdbfhO4ZMn3HuKvdR+q0mYf +Z37lT9SiSzBRffnNNGLLdLlhZuxGoUbXWOS9TI/RiWigNsGewk3X2LoKJ7j4CY0= +=oMje -----END PGP SIGNATURE----- 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) |