First try to get pointer-handling sane.

(Portage version: 2.1.2_rc2)

4 files changed, 132 insertions, 1 deletions

diff --git a/media-tv/kvdr/ChangeLog b/media-tv/kvdr/ChangeLog
index 681d11b1c7bd..d9cf71b9c935 100644
--- a/media-tv/kvdr/ChangeLog
+++ b/media-tv/kvdr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/kvdr
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kvdr/ChangeLog,v 1.9 2006/07/28 20:09:55 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kvdr/ChangeLog,v 1.10 2006/11/19 19:06:13 zzam Exp $
+
+*kvdr-0.64-r1 (19 Nov 2006)
+
+  19 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/kvdr-0.64-pointer-casting.patch, +kvdr-0.64-r1.ebuild:
+  First try to get pointer-handling sane.
 
 *kvdr-0.64 (28 Jul 2006)
 
diff --git a/media-tv/kvdr/files/digest-kvdr-0.64-r1 b/media-tv/kvdr/files/digest-kvdr-0.64-r1
new file mode 100644
index 000000000000..fb8fb0a032c9
--- /dev/null
+++ b/media-tv/kvdr/files/digest-kvdr-0.64-r1
@@ -0,0 +1,3 @@
+MD5 ec3eb79c712d7d71f0a5de6e5df5e588 kvdr-0.64-gentoo.tar.gz 714071
+RMD160 68b420c3459b4b6bfbe690f24ab1200032f8c44f kvdr-0.64-gentoo.tar.gz 714071
+SHA256 4b1a264478251ebb7108d6188e86bcc2bcbadfbce47c250d422f15ef94a49e2c kvdr-0.64-gentoo.tar.gz 714071
diff --git a/media-tv/kvdr/files/kvdr-0.64-pointer-casting.patch b/media-tv/kvdr/files/kvdr-0.64-pointer-casting.patch
new file mode 100644
index 000000000000..393d1343ff46
--- /dev/null
+++ b/media-tv/kvdr/files/kvdr-0.64-pointer-casting.patch
@@ -0,0 +1,90 @@
+diff -ru kvdr-0.64-gentoo/kvdr/ckvdrcfg.cpp kvdr-0.64-gentoo-pointer-casting/kvdr/ckvdrcfg.cpp
+--- kvdr-0.64-gentoo/kvdr/ckvdrcfg.cpp	2004-09-02 18:29:54.000000000 +0200
++++ kvdr-0.64-gentoo-pointer-casting/kvdr/ckvdrcfg.cpp	2006-11-19 19:54:22.000000000 +0100
+@@ -417,7 +417,7 @@
+  if(-1!=((Kvdr*)p)->video_fd.handle())
+  {
+     ((Kvdr*)p)->OvlF(((Kvdr*)p)->display_width,((Kvdr*)p)->display_height,
+-                     (int)((Kvdr*)p)->base,((Kvdr*)p)->bpp,((Kvdr*)p)->palette);
++                     ((Kvdr*)p)->base,((Kvdr*)p)->bpp,((Kvdr*)p)->palette);
+     ((Kvdr*)p)->OvlP(((Kvdr*)p)->brightness,((Kvdr*)p)->colour,
+                             ((Kvdr*)p)->hue,((Kvdr*)p)->contrast);
+ 		((Kvdr*)p)->OverlayOnOffSLOT(1);
+diff -ru kvdr-0.64-gentoo/kvdr/kvdr.cpp kvdr-0.64-gentoo-pointer-casting/kvdr/kvdr.cpp
+--- kvdr-0.64-gentoo/kvdr/kvdr.cpp	2006-01-21 12:45:12.000000000 +0100
++++ kvdr-0.64-gentoo-pointer-casting/kvdr/kvdr.cpp	2006-11-19 20:00:03.000000000 +0100
+@@ -343,7 +343,7 @@
+   //Set the Frambuffer and Image properties:
+ 	if (!(args->isSet("x")))
+ 	{
+-    OvlF(display_width,display_height,(int)base,bpp,palette);
++    OvlF(display_width,display_height,base,bpp,palette);
+     OvlP(brightness,colour,hue,contrast);
+     ovlstat=true;
+     setMaximumSize(f_size_x,f_size_y);
+@@ -420,7 +420,7 @@
+   ExitMixer();
+ }
+ 
+-bool Kvdr::OvlF(int SizeX, int SizeY, int FbAddr, int Bpp, int Palette)
++bool Kvdr::OvlF(int SizeX, int SizeY, void* FbAddr, int Bpp, int Palette)
+ {
+   // this is the problematic part!
+   struct video_buffer vb;
+@@ -429,7 +429,7 @@
+     int result = 0;
+     if (video_fd.handle() < 0)
+       return false;
+-    if (SizeX <= 0 || SizeY <= 0 || FbAddr == 0 || Bpp / 8 > 4 ||
++    if (SizeX <= 0 || SizeY <= 0 || FbAddr == NULL || Bpp / 8 > 4 ||
+         Bpp / 8 <= 0 || Palette <= 0 || Palette > 13 || ovlClipCount < 0 ||
+         SizeX > 4096 || SizeY > 4096)
+     {
+@@ -439,14 +439,14 @@
+     }
+     result |= ioctl(video_fd.handle(), VIDIOCGFBUF, &vb);
+     if (result) perror("VIDIOCGFBUF");
+-    if (vb.base!=(void*)FbAddr || vb.depth!=Bpp || vb.height!=SizeY ||
++    if (vb.base!=FbAddr || vb.depth!=Bpp || vb.height!=SizeY ||
+         vb.width!=SizeX
+         //test appearantly misleading and not required: || vb.bytesperline!=((vb.depth + 1) / 8) * vb.width
+        )
+     {
+     	 fprintf(stderr,"kvdr and v4l-conf disagree about the framebuffer geometry\noverlay will not be shown\n");
+-       fprintf(stderr,"kvdr: FbAddr=%x Bpp=%d height=%d width=%d bps=%d\n",(unsigned int)vb.base,vb.depth,vb.height,vb.width,vb.bytesperline);
+-       fprintf(stderr,"v4l : FbAddr=%x Bpp=%d height=%d width=%d bps=%d\n",FbAddr,Bpp,SizeY,SizeX,(vb.depth+1)/8*vb.width);
++       fprintf(stderr,"kvdr: FbAddr=%p Bpp=%d height=%d width=%d bps=%d\n",vb.base,vb.depth,vb.height,vb.width,vb.bytesperline);
++       fprintf(stderr,"v4l : FbAddr=%p Bpp=%d height=%d width=%d bps=%d\n",FbAddr,Bpp,SizeY,SizeX,(vb.depth+1)/8*vb.width);
+        ovlFbSet = ovlGeoSet = false;
+        ovlClipCount = 0;
+        OvlO(false);
+@@ -1587,7 +1587,7 @@
+ 	  	return;//should never happen anyway: vid_dev taken away below kvdr
+ 	  }
+ 	}
+-  OvlF(display_width,display_height,(int)base,bpp,palette);
++  OvlF(display_width,display_height,base,bpp,palette);
+   OvlP(brightness,colour,hue,contrast);
+ 	OverlayOnOffSLOT(1);
+ 	usleep(20000);//not to fast...
+@@ -2011,7 +2011,7 @@
+       	video_fd.open(IO_ReadWrite);
+       	if( !(args->isSet("x")) )
+       	{
+-          OvlF(display_width,display_height,(int)base,bpp,palette);
++          OvlF(display_width,display_height,base,bpp,palette);
+           OvlP(brightness,colour,hue,contrast);
+       		OverlayOnOffSLOT(1);
+         }
+diff -ru kvdr-0.64-gentoo/kvdr/kvdr.h kvdr-0.64-gentoo-pointer-casting/kvdr/kvdr.h
+--- kvdr-0.64-gentoo/kvdr/kvdr.h	2006-01-21 09:17:06.000000000 +0100
++++ kvdr-0.64-gentoo-pointer-casting/kvdr/kvdr.h	2006-11-19 19:49:04.000000000 +0100
+@@ -175,7 +175,7 @@
+     void SetMixer(const char *device, int FrontVolume, int RearVolume);
+     void ExitMixer(void);
+ public: //for the configuration dialog only:
+-    bool OvlF(int SizeX, int SizeY, int FbAddr, int Bpp, int Palette);
++    bool OvlF(int SizeX, int SizeY, void* FbAddr, int Bpp, int Palette);
+     bool OvlP(int Brightness, int Colour, int Hue, int Contrast);
+ protected:
+     bool x11Event( XEvent *event );
diff --git a/media-tv/kvdr/kvdr-0.64-r1.ebuild b/media-tv/kvdr/kvdr-0.64-r1.ebuild
new file mode 100644
index 000000000000..3fedea06df07
--- /dev/null
+++ b/media-tv/kvdr/kvdr-0.64-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kvdr/kvdr-0.64-r1.ebuild,v 1.1 2006/11/19 19:06:13 zzam Exp $
+
+inherit kde
+
+DESCRIPTION="A KDE GUI for VDR (Video Disk Recorder)."
+HOMEPAGE="http://www.s.netic.de/gfiala/"
+#SRC_URI="http://www.s.netic.de/gfiala/${P}.tgz"
+SRC_URI="mirror://gentoo/${P}-gentoo.tar.gz
+	http://dev.gentoo.org/~zzam/distfiles/${P}-gentoo.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=">=media-tv/xawtv-3.86
+	media-tv/linuxtv-dvb-headers
+	>=media-video/vdr-1.2.0"
+
+need-kde 3
+
+S=${WORKDIR}/${P}-gentoo
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/kvdr-0.64-pointer-casting.patch
+}
+