Fixed a compile failure if nspr is installed. Fixes bug 194548. Thanks to Arfrever Frehtes Taifersar Arahesis for providing a patch!

Package-Manager: portage-2.1.3.11

4 files changed, 69 insertions, 26 deletions

diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index 46e096487038..38d80672f1b7 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/kmplayer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.104 2007/10/02 17:27:51 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.105 2007/10/03 22:14:47 philantrop Exp $
+
+  03 Oct 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kmplayer-0.10.0-prtypes.patch, kmplayer-0.10.0.ebuild:
+  Fixed a compile failure if nspr is installed. Fixes bug 194548. Thanks to
+  Arfrever Frehtes Taifersar Arahesis for providing a patch!
 
 *kmplayer-0.10.0 (02 Oct 2007)
 
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index cc9aa4be2597..c5a7bab354c4 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -1,24 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX kmplayer-0.10.0-prtypes.patch 843 RMD160 3da261a5e254beaf20c340e06952d8065d20bf28 SHA1 4fbb734b2f0490b9adebd9a4e2553c0be9512230 SHA256 a192d8569abae303feb9c47842fde4bb2dd95cf535d318820c3017e538239c43
+MD5 92024a8a7fd5672033b8f248dd8f241c files/kmplayer-0.10.0-prtypes.patch 843
+RMD160 3da261a5e254beaf20c340e06952d8065d20bf28 files/kmplayer-0.10.0-prtypes.patch 843
+SHA256 a192d8569abae303feb9c47842fde4bb2dd95cf535d318820c3017e538239c43 files/kmplayer-0.10.0-prtypes.patch 843
 AUX kmplayer-0.9.4a-vop2vf.patch 3636 RMD160 9f435e2003ad0bc855a698964814fa90bb7ca88c SHA1 017911852e58dcd50772ae9cc8ebc45c84eeee4a SHA256 71b74ae6812912ab8f4c825cd0407236b5fc76c520974eb8677a1a2ebd258af3
 MD5 de0ac92eb8c1e40af6f75c67ebdf5928 files/kmplayer-0.9.4a-vop2vf.patch 3636
 RMD160 9f435e2003ad0bc855a698964814fa90bb7ca88c files/kmplayer-0.9.4a-vop2vf.patch 3636
 SHA256 71b74ae6812912ab8f4c825cd0407236b5fc76c520974eb8677a1a2ebd258af3 files/kmplayer-0.9.4a-vop2vf.patch 3636
 DIST kmplayer-0.10.0.tar.bz2 1046079 RMD160 79ffac84e28f719582233e1a72ceb61927a28056 SHA1 b99ecdff0c77b8db549579ef45538750aa0dc1d4 SHA256 94e8068c5a1b7205e01079213c025fc2f70f521c7d72e5d9ee8cd914325436c7
 DIST kmplayer-0.9.4a.tar.bz2 970527 RMD160 74d8fe2b2fd2c9e18518ff73b66b254b974291be SHA1 27d78793d6e9ac37a5810b8e742ffa0f55317488 SHA256 1c5d705818bca7cb00384991498fe020b70bc0f55622185e63905551793aaa9c
-EBUILD kmplayer-0.10.0.ebuild 2674 RMD160 8510e6bdfdcd5f79d1206ddcc3f06590fa506fe0 SHA1 d21d9f840f48eeb43efd06136677dfd530991e74 SHA256 0aa86b8d1917b4e073af7235b8d33a6578aa49458cce54500ea4d731cc50bda2
-MD5 724ae06cb603d0696d50e9abf156cf62 kmplayer-0.10.0.ebuild 2674
-RMD160 8510e6bdfdcd5f79d1206ddcc3f06590fa506fe0 kmplayer-0.10.0.ebuild 2674
-SHA256 0aa86b8d1917b4e073af7235b8d33a6578aa49458cce54500ea4d731cc50bda2 kmplayer-0.10.0.ebuild 2674
+EBUILD kmplayer-0.10.0.ebuild 2976 RMD160 b29fce5a03b7e441605288321e17badfb1012eb2 SHA1 89997e2d6c6c6cf8bf881b31ac5508c6ae88532f SHA256 2951e17f7a113e3c76037047eece85c6272f9ff99ee155d065aca734dd7cb5d0
+MD5 188d486e98d14fdc7cbf2b84c0204199 kmplayer-0.10.0.ebuild 2976
+RMD160 b29fce5a03b7e441605288321e17badfb1012eb2 kmplayer-0.10.0.ebuild 2976
+SHA256 2951e17f7a113e3c76037047eece85c6272f9ff99ee155d065aca734dd7cb5d0 kmplayer-0.10.0.ebuild 2976
 EBUILD kmplayer-0.9.4a-r1.ebuild 2395 RMD160 27ebfb0c0b048a097c448d561408115b1332620e SHA1 4c21f7881f149b4c8e8a7976eaeda0b29ed44dae SHA256 2e4260caf9081497a8e86a0bf8caf70a661ac703b1ce373569b824d5212c59db
 MD5 93989380fbc99eb2e1a23d90ebaf5745 kmplayer-0.9.4a-r1.ebuild 2395
 RMD160 27ebfb0c0b048a097c448d561408115b1332620e kmplayer-0.9.4a-r1.ebuild 2395
 SHA256 2e4260caf9081497a8e86a0bf8caf70a661ac703b1ce373569b824d5212c59db kmplayer-0.9.4a-r1.ebuild 2395
-MISC ChangeLog 14536 RMD160 907357d81d5e46f6367d84982e8907a54f4a07be SHA1 8d6dfca510256d1180b3d0e66a8b4d13c72229f8 SHA256 2bba6641764ce8af6e3d5036b4fa47d4a187a9e3589df54b337ef8eac055b5b3
-MD5 f9baf7ff40e566b498dcbd4a5ceb7706 ChangeLog 14536
-RMD160 907357d81d5e46f6367d84982e8907a54f4a07be ChangeLog 14536
-SHA256 2bba6641764ce8af6e3d5036b4fa47d4a187a9e3589df54b337ef8eac055b5b3 ChangeLog 14536
+MISC ChangeLog 14793 RMD160 22055f2670b0e44d69a030ee0c844a5125507da8 SHA1 b994be2f288f1ba7fa4886592a4c079f1a35b59f SHA256 ce91ec83df628f76a07c081ae93dd42075e74988a220b276a0f0c4c2c45b21d5
+MD5 f20cde1beacab0d961dd7270e15804ef ChangeLog 14793
+RMD160 22055f2670b0e44d69a030ee0c844a5125507da8 ChangeLog 14793
+SHA256 ce91ec83df628f76a07c081ae93dd42075e74988a220b276a0f0c4c2c45b21d5 ChangeLog 14793
 MISC metadata.xml 299 RMD160 04f079c7ddd3dd03985594b98ccd597c441b4936 SHA1 7fa98ecc59e4619ccfa94157248170c555cdf914 SHA256 98642d6f078488706652aee6d7606ae02aad82b7692df8ff4f0d19e0df6de596
 MD5 36350e881f2d74ede0c52302d621efe3 metadata.xml 299
 RMD160 04f079c7ddd3dd03985594b98ccd597c441b4936 metadata.xml 299
@@ -29,10 +30,3 @@ SHA256 921d346ac83a24ced87e48b18745c026b0d7687d7ea85c538d7ea64168cede17 files/di
 MD5 814020e3aad9b85bb2ac2a4f8064627e files/digest-kmplayer-0.9.4a-r1 250
 RMD160 630d1ab8dce8649b647230356a1d2f997a8590b0 files/digest-kmplayer-0.9.4a-r1 250
 SHA256 ada6d437825b9b2fdc0a2eff84e89c297e5b68903cafab096774301f2209019a files/digest-kmplayer-0.9.4a-r1 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHAn+mCkvF58q80IkRAuv7AJ4tqBK6cxjRWCpvTGyrnmIysEhvUQCbBzyg
-2YDVHHoonc6dDqjUBSXerbo=
-=xxZQ
------END PGP SIGNATURE-----
diff --git a/media-video/kmplayer/files/kmplayer-0.10.0-prtypes.patch b/media-video/kmplayer/files/kmplayer-0.10.0-prtypes.patch
new file mode 100644
index 000000000000..1b70dc3d9238
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.10.0-prtypes.patch
@@ -0,0 +1,33 @@
+--- src/moz-sdk/jni_md.h
++++ src/moz-sdk/jni_md.h
+@@ -57,7 +57,7 @@
+ #ifndef JNI_MD_H
+ #define JNI_MD_H
+ 
+-#include "prtypes.h" /* needed for _declspec */
++#include <nspr/prtypes.h> /* needed for _declspec */
+ 
+ /*******************************************************************************
+  * WHAT'S UP WITH THIS FILE?
+--- src/moz-sdk/jri_md.h
++++ src/moz-sdk/jri_md.h
+@@ -43,7 +43,7 @@
+ #define JRI_MD_H
+ 
+ #include <assert.h>
+-#include "prtypes.h" /* Needed for HAS_LONG_LONG ifdefs */
++#include <nspr/prtypes.h> /* Needed for HAS_LONG_LONG ifdefs */
+ 
+ #ifdef __cplusplus
+ extern "C" {
+--- src/moz-sdk/npapi.h
++++ src/moz-sdk/npapi.h
+@@ -48,7 +48,7 @@
+ #pragma pack(1)
+ #endif
+ 
+-#include "prtypes.h"
++#include <nspr/prtypes.h>
+ /* Copied from xp_core.h */
+ /* removed #ifdef for hpux defined in /usr/include/model.h */
+ #ifndef XP_MAC
diff --git a/media-video/kmplayer/kmplayer-0.10.0.ebuild b/media-video/kmplayer/kmplayer-0.10.0.ebuild
index 855f1090e507..68897189e9b0 100644
--- a/media-video/kmplayer/kmplayer-0.10.0.ebuild
+++ b/media-video/kmplayer/kmplayer-0.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.10.0.ebuild,v 1.1 2007/10/02 17:27:51 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.10.0.ebuild,v 1.2 2007/10/03 22:14:47 philantrop Exp $
 
 inherit kde eutils
 
@@ -14,13 +14,17 @@ SRC_URI="http://kmplayer.kde.org/pkgs/${MY_P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="mplayer xine cairo gstreamer"
+IUSE="mplayer xine cairo gstreamer npp"
 
 DEPEND="x11-libs/libXv
 		>=dev-libs/expat-2.0.1
 		xine? ( >=media-libs/xine-lib-1.1.1 )
 		cairo? ( x11-libs/cairo )
-		gstreamer? ( >=media-libs/gstreamer-0.10.11 )"
+		gstreamer? ( >=media-libs/gstreamer-0.10.11
+					npp? ( >=sys-apps/dbus-1.0.2-r2
+							>=dev-libs/dbus-glib-0.73
+							>=dev-libs/dbus-qt3-old-0.70 ) )
+		npp? ( >=dev-libs/nspr-4.6.7 )"
 RDEPEND="${DEPEND}
 		mplayer? ( || ( media-video/mplayer media-video/mplayer-bin ) )"
 
@@ -34,6 +38,8 @@ done
 
 need-kde 3.5
 
+PATCHES="${FILESDIR}/${P}-prtypes.patch"
+
 pkg_setup() {
 	if ! use mplayer && ! use xine && ! use cairo && ! use gstreamer ; then
 		echo
@@ -71,12 +77,17 @@ src_unpack() {
 }
 
 src_compile(){
-	local myconf="$(use_with gstreamer)
+	local myconf="--enable-expat
+				$(use_with gstreamer)
 				$(use_with xine)
 				$(use_with cairo)
-				--disable-koffice-plugin
-				--disable-npplayer
-				--enable-expat"
+				--disable-koffice-plugin"
+
+	if use npp ; then
+		myconf="${myconf} --enable-nspr --enable-npplayer"
+	else
+		myconf="${myconf} --disable-nspr --disable-npplayer"
+	fi
 	kde_src_compile
 }