new patch = new version

Package-Manager: portage-2.0.52-r1

5 files changed, 79 insertions, 7 deletions

diff --git a/media-video/cxfe/ChangeLog b/media-video/cxfe/ChangeLog
index 8a79c644978c..36ece62365a7 100644
--- a/media-video/cxfe/ChangeLog
+++ b/media-video/cxfe/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for media-video/cxfe
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/ChangeLog,v 1.11 2005/05/04 12:28:23 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/ChangeLog,v 1.12 2005/09/23 21:24:59 arj Exp $
 
+*cxfe-0.9.1-r2 (23 Sep 2005)
+
+  23 Sep 2005; Anders Rune Jensen <arj@gentoo.org> +cxfe-0.9.1-r2.ebuild:
+  Added new patch which makes the background of the window black instead
+  of whatever data was in the allocated memory from X.
+	
   04 May 2005; David Holm <dholm@gentoo.org> cxfe-0.9.1-r1.ebuild:
   Readded to ~ppc. Please don't remove it without filing a proper bugreport.
 
diff --git a/media-video/cxfe/Manifest b/media-video/cxfe/Manifest
index 94b76bae5b5f..14697a46bee6 100644
--- a/media-video/cxfe/Manifest
+++ b/media-video/cxfe/Manifest
@@ -1,14 +1,17 @@
-MD5 4503dcd3996e9acc278c5cf6c7493617 ChangeLog 1701
+MD5 89b6abbc559630b78316180bc2ac4898 ChangeLog 1933
 MD5 188a07f7158101735aab4f71ac18ee61 cxfe-0.7.5.ebuild 732
-MD5 5bf3ce68ed1923dc3a3996a58987a360 metadata.xml 247
-MD5 2cb0434e33ab18e72b127dee21def79b cxfe-0.9.1.ebuild 777
 MD5 cc9b2129ded7d7237e0a02793ef62120 cxfe-0.9.1-r1.ebuild 964
+MD5 2cb0434e33ab18e72b127dee21def79b cxfe-0.9.1.ebuild 777
+MD5 5bf3ce68ed1923dc3a3996a58987a360 metadata.xml 247
+MD5 40e7442830bf147b1626ad7b0284c817 cxfe-0.9.1-r2.ebuild 1005
 MD5 8b9e755c332942ee010472cb4db6a68f files/Makefile-fix.patch 1509
 MD5 d75978f6e55a95ec4a87ba6144aaea71 files/digest-cxfe-0.7.5 61
 MD5 d0c0290cd640b2146b22461991dcd224 files/digest-cxfe-0.9.1 61
-MD5 09a6bfee8d8313dd6ff3acb30b4dad33 files/gcc-2.95-fix.patch 583
-MD5 b7df88994713f7337645ce491f5d76d9 files/max-osd-fix.patch 728
-MD5 b3b0eb83642ffd1d2e89799f70169edb files/xv-default.patch 650
 MD5 d0c0290cd640b2146b22461991dcd224 files/digest-cxfe-0.9.1-r1 61
 MD5 0d403e10e19e0524e5687b7dcdc710c2 files/disable-dpms.patch 3277
+MD5 09a6bfee8d8313dd6ff3acb30b4dad33 files/gcc-2.95-fix.patch 583
+MD5 b7df88994713f7337645ce491f5d76d9 files/max-osd-fix.patch 728
 MD5 89258150099c21b29f6ba5c5f27cdb56 files/position-osd.patch 1784
+MD5 b3b0eb83642ffd1d2e89799f70169edb files/xv-default.patch 650
+MD5 d0c0290cd640b2146b22461991dcd224 files/digest-cxfe-0.9.1-r2 61
+MD5 f8e468cea0a41a9ed57857a1bb0436d7 files/black-background.patch 792
diff --git a/media-video/cxfe/cxfe-0.9.1-r2.ebuild b/media-video/cxfe/cxfe-0.9.1-r2.ebuild
new file mode 100644
index 000000000000..0670bdbd138e
--- /dev/null
+++ b/media-video/cxfe/cxfe-0.9.1-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/cxfe-0.9.1-r2.ebuild,v 1.1 2005/09/23 21:24:59 arj Exp $
+
+inherit eutils
+
+DESCRIPTION="A command line interface for xine."
+HOMEPAGE="http://www.rtwnetwork.com/cxfe/"
+
+SRC_URI="ftp://ftp.rtwnetwork.com/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="lirc"
+
+DEPEND=">=media-libs/xine-lib-1_rc1
+	   virtual/x11
+	   lirc? ( app-misc/lirc )
+	   sys-libs/ncurses"
+
+src_unpack() {
+	unpack ${A}
+	mv cxfe ${P}
+	cd ${P}
+	epatch ${FILESDIR}/gcc-2.95-fix.patch
+	epatch ${FILESDIR}/max-osd-fix.patch
+	epatch ${FILESDIR}/xv-default.patch
+	epatch ${FILESDIR}/disable-dpms.patch
+	epatch ${FILESDIR}/position-osd.patch
+	epatch ${FILESDIR}/black-background.patch
+
+	# add missing space, see #82684
+	sed -i -e 's/\-lXext\@LDFLAGS/\-lXext \@LDFLAGS/' Makefile.in
+}
+
+src_install() {
+	dobin cxfe
+	dodoc COPYING README TODO lircrc-example
+}
diff --git a/media-video/cxfe/files/black-background.patch b/media-video/cxfe/files/black-background.patch
new file mode 100644
index 000000000000..d44e33a69580
--- /dev/null
+++ b/media-video/cxfe/files/black-background.patch
@@ -0,0 +1,22 @@
+--- cxfe/cxfe.c	2004-11-27 03:07:59.000000000 +0100
++++ cxfe-mod/cxfe.c	2005-07-26 00:39:31.000000000 +0200
+@@ -1111,11 +1111,16 @@
+ 
+      XLockDisplay(display);
+      window[0] = XCreateSimpleWindow(display, XDefaultRootWindow(display),
+-				  xpos, ypos, width, height, 1, 0, 0);
++				     xpos, ypos, width, height, 1, 
++				     BlackPixel(display,0), 
++				     BlackPixel(display,0));
+ 
+      window[1] = XCreateSimpleWindow(display, XDefaultRootWindow(display),
+-				  0, 0, (DisplayWidth(display, screen)),
+-				  (DisplayHeight(display, screen)), 0, 0, 0);
++				     0, 0, (DisplayWidth(display, screen)),
++				     (DisplayHeight(display, screen)), 0, 
++				     BlackPixel(display,0), 
++				     BlackPixel(display,0));
++
+ 
+      XSelectInput(display, window[0], INPUT_MOTION);
+ 
diff --git a/media-video/cxfe/files/digest-cxfe-0.9.1-r2 b/media-video/cxfe/files/digest-cxfe-0.9.1-r2
new file mode 100644
index 000000000000..f1f0f36f2aeb
--- /dev/null
+++ b/media-video/cxfe/files/digest-cxfe-0.9.1-r2
@@ -0,0 +1 @@
+MD5 9c38ddaea38a5d330c3610e2f3d3afae cxfe-0.9.1.tar.gz 91650