version bump

9 files changed, 103 insertions, 15 deletions

diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index 720a516a8dbe..09e780d16517 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/kmplayer
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.30 2004/12/30 17:02:28 carlo Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.31 2005/01/07 22:02:17 carlo Exp $
+
+*kmplayer-0.8.4_rc5 (07 Jan 2005)
+
+  07 Jan 2005; Carsten Lohrke <carlo@gentoo.org> +files/xine.diff,
+  +kmplayer-0.8.4_rc5.ebuild:
+  version bump
 
   30 Dec 2004; Carsten Lohrke <carlo@gentoo.org> kmplayer-0.8.3a.ebuild,
   kmplayer-0.8.4_rc2.ebuild:
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index 115a983a492c..07da58d968cb 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -1,11 +1,14 @@
-MD5 531eae2dded9ed01d7a9e4cbeee6a664 kmplayer-0.8.1.ebuild 509
-MD5 f95ae857f91e46b111037d91b61e9699 kmplayer-0.8.3a.ebuild 587
-MD5 dea24316686b5721f57e5219d9d2be9b kmplayer-0.8.2.ebuild 781
-MD5 2cc1da4930fff2952749d7c38be49f8a kmplayer-0.8.4_rc2.ebuild 592
-MD5 8588fdc1f29933ba4fe94ab3c9738c3c ChangeLog 3837
+MD5 ed308d87c5ac160a8e982bca1a0c5204 kmplayer-0.8.1.ebuild 509
+MD5 66bb914dd968bd02c0e5082d9a4f53c9 kmplayer-0.8.3a.ebuild 587
+MD5 3aba445a932037defdf060b3f43259b8 kmplayer-0.8.4_rc5.ebuild 794
+MD5 ab5f097a9aa6d75e5361ce5c6b734fc5 kmplayer-0.8.2.ebuild 781
+MD5 7224eb185332b2e21f2c35f6173f0026 kmplayer-0.8.4_rc2.ebuild 592
+MD5 c2bc21441f2579260c6db1f242527edb ChangeLog 3985
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
 MD5 fd1beafd4f708360fcb75cf1397e8844 files/digest-kmplayer-0.8.3a 68
 MD5 53e63d9cb0db59bedb5386345b274598 files/kmplayer-0.6.3-gentoo.diff 1352
+MD5 ff1b83e0f9f644291ed8f46af98a3110 files/xine.diff 1654
 MD5 b740f93ee62ddd21f2cd4b2278246133 files/digest-kmplayer-0.8.1 67
 MD5 53a47e655bf48f6682b93565e9fb4ebf files/digest-kmplayer-0.8.2 67
 MD5 bdff7373aa6548fdfda4ae8cfbca9729 files/digest-kmplayer-0.8.4_rc2 71
+MD5 c4b26c290af28c8095f359728eb639b0 files/digest-kmplayer-0.8.4_rc5 71
diff --git a/media-video/kmplayer/files/digest-kmplayer-0.8.4_rc5 b/media-video/kmplayer/files/digest-kmplayer-0.8.4_rc5
new file mode 100644
index 000000000000..019866713682
--- /dev/null
+++ b/media-video/kmplayer/files/digest-kmplayer-0.8.4_rc5
@@ -0,0 +1 @@
+MD5 c15d792dc40c81a015262bad6323b053 kmplayer-0.8.4-rc5.tar.bz2 577487
diff --git a/media-video/kmplayer/files/xine.diff b/media-video/kmplayer/files/xine.diff
new file mode 100644
index 000000000000..2979b11099c4
--- /dev/null
+++ b/media-video/kmplayer/files/xine.diff
@@ -0,0 +1,45 @@
+--- configure.in.in.orig	2004-12-17 22:29:28.000000000 +0100
++++ configure.in.in	2004-12-17 22:32:58.000000000 +0100
+@@ -81,19 +81,29 @@
+ AC_MSG_CHECKING([if kxineplayer can be compiled])
+ AC_MSG_RESULT($have_xine)
+ 
+-if test "$have_xine" = "yes"; then
+-  vers=`xine-config --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+-  if test -n "$vers" && test "$vers" -ge 1000000
+-  then
+-        AC_DEFINE(HAVE_XINE, 1, [If we have libxine installed])
+-        LIB_XINE="`xine-config --libs`"
+-        AC_SUBST(LIB_XINE)
+-        CFLAGS_XINE="`xine-config --cflags`"
+-        AC_SUBST(CFLAGS_XINE)
+-  else
+-       have_xine="no"
+-       AC_MSG_WARN([Your xine installation is too old (1.0.0 or later required)])
+-  fi
++AC_ARG_WITH(xine,
++    AC_HELP_STRING([--without-xine],[build KMPlayer without Xine [default=with]]),
++    [build_xine=$withval],
++    [build_xine=yes]
++)
++
++if test "$build_xine" != "no"; then
++    if test "$have_xine" = "yes"; then
++      vers=`xine-config --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
++      if test -n "$vers" && test "$vers" -ge 1000000
++      then
++            AC_DEFINE(HAVE_XINE, 1, [If we have libxine installed])
++            LIB_XINE="`xine-config --libs`"
++            AC_SUBST(LIB_XINE)
++            CFLAGS_XINE="`xine-config --cflags`"
++            AC_SUBST(CFLAGS_XINE)
++      else
++           have_xine="no"
++           AC_MSG_WARN([Your xine installation is too old (1.0.0 or later required)])
++      fi
++    fi
++else
++    have_xine="no"
+ fi
+ 
+ AM_CONDITIONAL(include_kxineplayer, test "$have_xine" = "yes")
diff --git a/media-video/kmplayer/kmplayer-0.8.1.ebuild b/media-video/kmplayer/kmplayer-0.8.1.ebuild
index 53691b31ff56..06d9ca2b6b9f 100644
--- a/media-video/kmplayer/kmplayer-0.8.1.ebuild
+++ b/media-video/kmplayer/kmplayer-0.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.8.1.ebuild,v 1.3 2004/06/29 11:20:16 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.8.1.ebuild,v 1.4 2005/01/07 22:02:17 carlo Exp $
 
 inherit kde
 
diff --git a/media-video/kmplayer/kmplayer-0.8.2.ebuild b/media-video/kmplayer/kmplayer-0.8.2.ebuild
index 786ee2d74189..1ca5a7409fac 100644
--- a/media-video/kmplayer/kmplayer-0.8.2.ebuild
+++ b/media-video/kmplayer/kmplayer-0.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.8.2.ebuild,v 1.6 2004/06/29 11:20:16 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.8.2.ebuild,v 1.7 2005/01/07 22:02:17 carlo Exp $
 
 inherit kde
 
diff --git a/media-video/kmplayer/kmplayer-0.8.3a.ebuild b/media-video/kmplayer/kmplayer-0.8.3a.ebuild
index b731e9627f89..3aa4bd60b285 100644
--- a/media-video/kmplayer/kmplayer-0.8.3a.ebuild
+++ b/media-video/kmplayer/kmplayer-0.8.3a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.8.3a.ebuild,v 1.2 2004/12/30 17:02:28 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.8.3a.ebuild,v 1.3 2005/01/07 22:02:17 carlo Exp $
 
 inherit kde
 
diff --git a/media-video/kmplayer/kmplayer-0.8.4_rc2.ebuild b/media-video/kmplayer/kmplayer-0.8.4_rc2.ebuild
index 9c298cc4185e..be4dc8fda207 100644
--- a/media-video/kmplayer/kmplayer-0.8.4_rc2.ebuild
+++ b/media-video/kmplayer/kmplayer-0.8.4_rc2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.8.4_rc2.ebuild,v 1.2 2004/12/30 17:02:28 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.8.4_rc2.ebuild,v 1.3 2005/01/07 22:02:17 carlo Exp $
 
 inherit kde
 
diff --git a/media-video/kmplayer/kmplayer-0.8.4_rc5.ebuild b/media-video/kmplayer/kmplayer-0.8.4_rc5.ebuild
new file mode 100644
index 000000000000..888ec3109cce
--- /dev/null
+++ b/media-video/kmplayer/kmplayer-0.8.4_rc5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.8.4_rc5.ebuild,v 1.1 2005/01/07 22:02:17 carlo Exp $
+
+inherit kde eutils
+
+MY_P="${P/_rc/-rc}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="MPlayer frontend for KDE"
+HOMEPAGE="http://www.xs4all.nl/~jjvrieze/kmplayer.html"
+SRC_URI="http://www.xs4all.nl/~jjvrieze/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="gstreamer xine"
+
+# Removed koffice plugin, since compilation fails and its not supported upstream.
+DEPEND=">=media-video/mplayer-0.90
+	xine? ( >=media-libs/xine-lib-1_beta12 )
+	gstreamer? ( media-libs/gstreamer )"
+need-kde 3.1
+
+src_unpack(){
+	kde_src_unpack
+	epatch ${FILESDIR}/xine.diff
+	rm -f $S/configure
+}
+src_compile(){
+	local myconf="$(use_with gstreamer) $(use_with xine)"
+	kde_src_compile
+}