First try to get pointer-handling sane.

Package-Manager: portage-2.1.2_rc2

diff --git a/media-tv/kvdr/ChangeLog b/media-tv/kvdr/ChangeLog
index 681d11b1c7bdc538a44488fbda1191a7f92ecbc0..d9cf71b9c935d5437a9fc36c1d17ee43a988888c 100644 (file)
--- 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/Manifest b/media-tv/kvdr/Manifest
index be0c43398c179a2d42f5749bdb8a3fad688de36c..7eeed47a349340ab76f5b71073e45c784c933d6d 100644 (file)
--- a/media-tv/kvdr/Manifest
+++ b/media-tv/kvdr/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX kvdr-0.64-pointer-casting.patch 4350 RMD160 38eb7fd995ddbd88db16aa8b37f33760dbb6f712 SHA1 f7ad8b5c80bdcdbd220817cc3846b6cce5bc4bdc SHA256 9dbab0aed89d913c5ef8f1b3ebb6c56f2312b6c9b32a6a37beefac17c139764d
+MD5 d7f1d91e2e5aeebebf64273777e6aae3 files/kvdr-0.64-pointer-casting.patch 4350
+RMD160 38eb7fd995ddbd88db16aa8b37f33760dbb6f712 files/kvdr-0.64-pointer-casting.patch 4350
+SHA256 9dbab0aed89d913c5ef8f1b3ebb6c56f2312b6c9b32a6a37beefac17c139764d files/kvdr-0.64-pointer-casting.patch 4350
 DIST kvdr-0.63.tgz 560569 RMD160 2ed0eb2e5da7f6ddbb5ab6b593c95e37bbc61cc8 SHA1 db442dc1f293567762bc3ed23425a2076987c369 SHA256 ddf691dc40f1578ce05a41c5ecfdc11df8a8836fe54457ad5488fa7a2b2216b6
 DIST kvdr-0.64-gentoo.tar.gz 714071 RMD160 68b420c3459b4b6bfbe690f24ab1200032f8c44f SHA1 ac3ab4e6bfd2820bb2ff3653c47d601e47825406 SHA256 4b1a264478251ebb7108d6188e86bcc2bcbadfbce47c250d422f15ef94a49e2c
 EBUILD kvdr-0.63.ebuild 737 RMD160 3a8036f23ab46892e6bb768dbd3022814f527d32 SHA1 91a22104a3e88fa3a8945d8205a267c0a6418bdb SHA256 380a7f4c09bec2f1974aadbaa01b94dc5f12402bcfce4d8683b918fde99983a0
 MD5 b25d4e9b4ac9e7ddb7b7d9658207de61 kvdr-0.63.ebuild 737
 RMD160 3a8036f23ab46892e6bb768dbd3022814f527d32 kvdr-0.63.ebuild 737
 SHA256 380a7f4c09bec2f1974aadbaa01b94dc5f12402bcfce4d8683b918fde99983a0 kvdr-0.63.ebuild 737
+EBUILD kvdr-0.64-r1.ebuild 744 RMD160 4c095665bfb12cc497601111bce7aea93f300535 SHA1 7701ff97ed5fc2813b8c9d030730c26fc16c8d0c SHA256 3d7960e634fb3e51ef2f4255a11fc9c874922cb98e7732217a78ccb71e783d4c
+MD5 952d42cfac88bb95bbf0f0c2b4f45f73 kvdr-0.64-r1.ebuild 744
+RMD160 4c095665bfb12cc497601111bce7aea93f300535 kvdr-0.64-r1.ebuild 744
+SHA256 3d7960e634fb3e51ef2f4255a11fc9c874922cb98e7732217a78ccb71e783d4c kvdr-0.64-r1.ebuild 744
 EBUILD kvdr-0.64.ebuild 648 RMD160 ce696e7eab9f4390db707f37d74b90c58946df39 SHA1 6cec0c39c1d40949126cfe23a8bcea941e9aa9df SHA256 f6c21fa48b29ce8c5ffeb9bf46ed7c29745b6a59675d3770a6f4115ff3294e8b
 MD5 8f350a76dbfe2767235c5d26a4aff9e8 kvdr-0.64.ebuild 648
 RMD160 ce696e7eab9f4390db707f37d74b90c58946df39 kvdr-0.64.ebuild 648
 SHA256 f6c21fa48b29ce8c5ffeb9bf46ed7c29745b6a59675d3770a6f4115ff3294e8b kvdr-0.64.ebuild 648
-MISC ChangeLog 1403 RMD160 7cdee71e41ed1cc728b94c235ba2bb92410c988e SHA1 80a38d136477e0ffbbf124d0192dd3180425c69a SHA256 9de485af70f07a852b2c349a6784811ab814e8d97e32865358f735e4273a304b
-MD5 3819ab39b8e7e4b2a479c208a973aff6 ChangeLog 1403
-RMD160 7cdee71e41ed1cc728b94c235ba2bb92410c988e ChangeLog 1403
-SHA256 9de485af70f07a852b2c349a6784811ab814e8d97e32865358f735e4273a304b ChangeLog 1403
+MISC ChangeLog 1593 RMD160 93628d41332360987878fff8fe79fe489e823f00 SHA1 14286da501d7d271ae7396a9efd14c783295a035 SHA256 5cda8f9fa788da35652e17e29e32c9ff6b09fb45a4521b2f264d4fb4b70bc4f7
+MD5 832969b565c366d89689680e7e8bfe2b ChangeLog 1593
+RMD160 93628d41332360987878fff8fe79fe489e823f00 ChangeLog 1593
+SHA256 5cda8f9fa788da35652e17e29e32c9ff6b09fb45a4521b2f264d4fb4b70bc4f7 ChangeLog 1593
 MISC metadata.xml 225 RMD160 b71cde62bd3570d3cb54b16d552be0219749515f SHA1 cce09b038a512f48d2106c4b81317dedd3f4098c SHA256 592a8bbb575ce5cdb914f70320e266f745b6211c422ad48fd60e4796942337bb
 MD5 81d399b55522e5bbb43378a21469a3bf metadata.xml 225
 RMD160 b71cde62bd3570d3cb54b16d552be0219749515f metadata.xml 225
@@ -25,10 +33,13 @@ SHA256 6c8ff3ade9ac7875f929b0870453d27f019eddecc42402933e4332ab71d613e7 files/di
 MD5 a3255d6b212665479ab8b70cb574e05a files/digest-kvdr-0.64 250
 RMD160 ec4a0d24993cd05b2df8bd138a6271fe1590ea0e files/digest-kvdr-0.64 250
 SHA256 0fe98619432bb6e0bbb9bd0f94f4fc320e566ba9b4e40494b1e55b62f1c7e764 files/digest-kvdr-0.64 250
+MD5 a3255d6b212665479ab8b70cb574e05a files/digest-kvdr-0.64-r1 250
+RMD160 ec4a0d24993cd05b2df8bd138a6271fe1590ea0e files/digest-kvdr-0.64-r1 250
+SHA256 0fe98619432bb6e0bbb9bd0f94f4fc320e566ba9b4e40494b1e55b62f1c7e764 files/digest-kvdr-0.64-r1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD4DBQFEym8dt2vP6XvVdOcRApTJAJiSWL5TiVbqUf8EwT9kjZ18fAKoAKCW4cX9
-bv2/SUHkPsYqeKcmC0sePQ==
-=x+jW
+iD8DBQFFYKs4t2vP6XvVdOcRAnNpAJ4su20gitM17U1qgya/AV95CiPssQCeKnmV
+DQexxEH782MS6VaXsgaro2Y=
+=f/mU
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..fb8fb0a
--- /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 (file)
index 0000000..393d134
--- /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 (file)
index 0000000..3fedea0
--- /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
+}
+