Added patches to build with recent directfb versions and with GCC4. Thanks to Richard Juckes in bugs #114842 and #114843.

Package-Manager: portage-2.1_pre1

6 files changed, 148 insertions, 5 deletions

diff --git a/media-video/dfbsee/ChangeLog b/media-video/dfbsee/ChangeLog
index 3104ece0daea..f826d8e61329 100644
--- a/media-video/dfbsee/ChangeLog
+++ b/media-video/dfbsee/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/dfbsee
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dfbsee/ChangeLog,v 1.6 2005/10/31 11:16:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dfbsee/ChangeLog,v 1.7 2005/12/17 13:53:52 flameeyes Exp $
+
+*dfbsee-0.7.4-r1 (17 Dec 2005)
+
+  17 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/dfbsee-0.7.4-direcfb-0.9.24.patch, +files/dfbsee-0.7.4-gcc4.patch,
+  +dfbsee-0.7.4-r1.ebuild:
+  Added patches to build with recent directfb versions and with GCC4. Thanks
+  to Richard Juckes in bugs #114842 and #114843.
 
   31 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> dfbsee-0.7.4.ebuild:
   Don't append -Wl,-z,now; use $(bindnow-flags) instead.
diff --git a/media-video/dfbsee/Manifest b/media-video/dfbsee/Manifest
index 376cfd2aa4af..ad5a1aa4d9e7 100644
--- a/media-video/dfbsee/Manifest
+++ b/media-video/dfbsee/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fb9d667456b6e732e86070b7380684b3 ChangeLog 1919
+MD5 ddaaf740d7b6a2fec033e1c7dcd1e7d2 ChangeLog 2234
+MD5 d7e2ccc28d2bd514bc9ef6ffe8e0443b dfbsee-0.7.4-r1.ebuild 924
 MD5 e10c0e6461a0109b5655701842238f1c dfbsee-0.7.4.ebuild 783
+MD5 8423cbb1ac402ba1ac3e227bc603e056 files/dfbsee-0.7.4-direcfb-0.9.24.patch 732
+MD5 bee0daacade74e22f21b35b4ba4ac927 files/dfbsee-0.7.4-gcc4.patch 1748
 MD5 3f38d255bd61645e0aba8a013bb4a35a files/digest-dfbsee-0.7.4 64
+MD5 3f38d255bd61645e0aba8a013bb4a35a files/digest-dfbsee-0.7.4-r1 64
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDZf0Cj5H05b2HAEkRAqE8AJ4hscDYlVqI3vKlg0LZIe5u+irseACePshD
-J02n/RAPCrzq8o/y8KGjX9w=
-=h+sM
+iD8DBQFDpBiDAiZjviIA2XgRAs7kAKDp78urm2Mcvns5FCdL7qQ2JA28PACgscjq
+Ih/reh1E/txmnOcT7kSa+gI=
+=mJRN
 -----END PGP SIGNATURE-----
diff --git a/media-video/dfbsee/dfbsee-0.7.4-r1.ebuild b/media-video/dfbsee/dfbsee-0.7.4-r1.ebuild
new file mode 100644
index 000000000000..11d1391614dc
--- /dev/null
+++ b/media-video/dfbsee/dfbsee-0.7.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dfbsee/dfbsee-0.7.4-r1.ebuild,v 1.1 2005/12/17 13:53:52 flameeyes Exp $
+
+inherit flag-o-matic eutils
+
+MY_PN="DFBSee"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="DFBSee is image viewer and video player based on DirectFB"
+SRC_URI="http://www.directfb.org/download/${MY_P}.tar.gz"
+HOMEPAGE="http://www.directfb.org/dfbsee.xml"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 -sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/DirectFB-0.9.24"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-direcfb-0.9.24.patch"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+}
+
+src_compile() {
+	append-ldflags $(bindnow-flags)
+
+	econf
+	emake || die "make failed"
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	dodoc README AUTHORS
+}
diff --git a/media-video/dfbsee/files/dfbsee-0.7.4-direcfb-0.9.24.patch b/media-video/dfbsee/files/dfbsee-0.7.4-direcfb-0.9.24.patch
new file mode 100644
index 000000000000..8a8d0cf4d3fa
--- /dev/null
+++ b/media-video/dfbsee/files/dfbsee-0.7.4-direcfb-0.9.24.patch
@@ -0,0 +1,21 @@
+diff -Nru orig-DFBSee-0.7.4/src/main.c DFBSee-0.7.4/src/main.c
+--- orig-DFBSee-0.7.4/src/main.c	2005-12-05 15:12:38.000000000 +0800
++++ DFBSee-0.7.4/src/main.c	2005-12-05 15:14:14.000000000 +0800
+@@ -53,7 +53,7 @@
+ main (int    argc, 
+       char **argv)
+ {
+-  DFBCardCapabilities    caps;
++  DFBGraphicsDeviceDescription    caps;
+   DFBSurfaceDescription  dsc;
+   IDirectFBEventBuffer  *buffer;
+   IDirectFBSurface      *image_area;
+@@ -78,7 +78,7 @@
+   /* create the super interface */
+   DFBCHECK (DirectFBCreate (&dfb));
+ 
+-  dfb->GetCardCapabilities (dfb, &caps);
++  dfb->GetDeviceDescription (dfb, &caps);
+   hw_stretchblit = caps.acceleration_mask & DFXL_STRETCHBLIT;
+   
+   dfb->SetCooperativeLevel (dfb, DFSCL_FULLSCREEN);
diff --git a/media-video/dfbsee/files/dfbsee-0.7.4-gcc4.patch b/media-video/dfbsee/files/dfbsee-0.7.4-gcc4.patch
new file mode 100644
index 000000000000..5f17937b85e3
--- /dev/null
+++ b/media-video/dfbsee/files/dfbsee-0.7.4-gcc4.patch
@@ -0,0 +1,65 @@
+diff -Nru orig-DFBSee-0.7.4/src/rotate.c DFBSee-0.7.4/src/rotate.c
+--- orig-DFBSee-0.7.4/src/rotate.c	2005-12-05 15:37:52.000000000 +0800
++++ DFBSee-0.7.4/src/rotate.c	2005-12-05 15:38:10.000000000 +0800
+@@ -43,9 +43,9 @@
+         {\
+           *d = *s;\
+           s++;\
+-          (__u8*)d += dest_pitch;\
++          d = ((void*) d) + dest_pitch;\
+         }\
+-      (__u8*)src += src_pitch;\
++      src = ((void*) src) + src_pitch;\
+     }\
+ }\
+ 
+@@ -53,7 +53,7 @@
+ {\
+   type d;\
+   type s;\
+-  (__u8 *) dest += (height - 1) * dest_pitch;\
++  dest = ((void*) dest) + (height - 1) * dest_pitch;\
+   for (w = 0; w < width; w++)\
+     {\
+       h = height;\
+@@ -63,9 +63,9 @@
+         {\
+           *d = *s;\
+           s++;\
+-          (__u8*)d -= dest_pitch;\
++          d = ((void*) d) - dest_pitch;\
+         }\
+-      (__u8*)src += src_pitch;\
++      src = ((void*) src) + src_pitch;\
+     }\
+ }\
+ 
+@@ -73,7 +73,7 @@
+ {\
+   type d;\
+   type s;\
+-  (__u8 *) dest += (height - 1) * dest_pitch;\
++  dest = ((void*) dest) + (height - 1) * dest_pitch;\
+   while (--height)\
+     {\
+       d = (type) dest + width - 1;\
+@@ -85,8 +85,8 @@
+           s++;\
+           d--;\
+         }\
+-      (__u8*)src += src_pitch;\
+-      (__u8*)dest -= dest_pitch;\
++      src  = ((void*) src)  - src_pitch;\
++      dest = ((void*) dest) + dest_pitch;\
+     }\
+ }\
+ 
+@@ -172,7 +172,7 @@
+   source->Lock (source, DSLF_READ, &src, &src_pitch);
+   destination->Lock (destination, DSLF_READ, &dest, &dest_pitch);
+ 
+-  (__u8 *) dest += dest_pitch * y + DFB_BYTES_PER_PIXEL (pixelformat) * x;
++  dest += dest_pitch * y + DFB_BYTES_PER_PIXEL (pixelformat) * x;
+ 
+   rotate (dest, dest_pitch,
+           src, src_pitch, width, height, DFB_BYTES_PER_PIXEL (pixelformat),
diff --git a/media-video/dfbsee/files/digest-dfbsee-0.7.4-r1 b/media-video/dfbsee/files/digest-dfbsee-0.7.4-r1
new file mode 100644
index 000000000000..2bb84de12561
--- /dev/null
+++ b/media-video/dfbsee/files/digest-dfbsee-0.7.4-r1
@@ -0,0 +1 @@
+MD5 3320a976457d3b3e9eaef530fdf56b37 DFBSee-0.7.4.tar.gz 147346