version bump - bug #234043 with patches and ebuild submitted by Karl Aloritias

Package-Manager: portage-2.1.4.4

6 files changed, 180 insertions, 15 deletions

diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog
index adc8929cf73d..bd1efeb42af3 100644
--- a/app-emulation/vice/ChangeLog
+++ b/app-emulation/vice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/vice
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.59 2008/07/28 20:39:39 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.60 2008/08/11 19:30:00 mr_bones_ Exp $
+
+*vice-2.0 (11 Aug 2008)
+
+  11 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/vice-2.0-gnome-palemu.patch,
+  +files/vice-2.0-gtk-bigendian-fix.patch, +vice-2.0.ebuild:
+  version bump - bug #234043 with patches and ebuild submitted by Karl Aloritias
 
   28 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 7292cbb1047f..27f3cfffe1aa 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,14 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX vice-2.0-gnome-palemu.patch 723 RMD160 68dc407ceb4d282fef24221bc7dcb12cca5a217f SHA1 c4de57c1f1f2eccd6286ae7fbf3acbd0284a4aeb SHA256 a31d78f924b238106aa4ad8e24600e7dc89eebd520f0b0f59063390faae49cb3
+AUX vice-2.0-gtk-bigendian-fix.patch 1643 RMD160 3263c8394570f1058ee3fb98cccc08ae54d27d3f SHA1 375fe5e5edd2b7a6b60a66d005b38b76e2284e40 SHA256 e9f202e65f8d6cb55deacc6ae0cf0da37a98d33f43f4593d64fbf7459f87ee73
 DIST vice-1.22.tar.gz 6088483 RMD160 ca93fc424e617e38f27e288ebcdfbab2aa3659db SHA1 55e0047824f64173539e03ddd2d5ab51cd581fbb SHA256 cd45ce3eea98ce70ae03002a4d02bb3188c982ee7fb7435ac8777bc8a780ef01
+DIST vice-2.0.tar.gz 7442564 RMD160 84991407563fd8ee6d96951e39a370e0f3c0d430 SHA1 c0934f59caf573d60ca569cbe6fa0d814934255b SHA256 3f53e8fd9bb033df1c55bc045066b3a033000c887ce315fa07ce044078a8ee47
 EBUILD vice-1.22.ebuild 2203 RMD160 c361d57226b61d5bd0f528c8b4853a0166885ab4 SHA1 9b7d8468e0994f8a2602736506d75946ffa6987d SHA256 d40962622be962189de959c9133aa91c4441dc709e409524c11deb8e33dc39c1
-MISC ChangeLog 7381 RMD160 7a1adf82c0378859250517e857efe33760aa5804 SHA1 fbf9eb896231b0f3fd7d5fc9e5400c22c26ef380 SHA256 aa117efbd4655cfdf26a5ef3397da8d89f66c872a09e0e731cc4fc371f5d21ba
-MISC metadata.xml 253 RMD160 183bcb377e0d87aff26637dae66b18e7ed65ae41 SHA1 225009e65256643b220bfdd7045a905d3cf07f1e SHA256 3685c02e53a910ef5e5ac3c879a75694b00114b10477152eec0cbfbbfd75cdcf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiOLpEACgkQoeSe8B0zEfwHpgCbBzgOFoHhMsUYxA8Go9qq5ejL
-He8An2WIf/jX9untFgT7E2plet/xn/+g
-=1b3D
------END PGP SIGNATURE-----
+EBUILD vice-2.0.ebuild 2283 RMD160 8ad2941ec2f5f0ffc909d56b3b35f902360ae65f SHA1 d9bb64068fa2f14b67850d699c6c4b763ed3e167 SHA256 8daaa81f518b3fd59dbdbb963886c09906e07bc908074b4fe7732bd6702229e4
+MISC ChangeLog 7645 RMD160 80a87a8055b005143b20c569c075d8c2aa4e7c34 SHA1 2f6ab2c42998a19ddb2de631c8dbaae0f33a901d SHA256 7d89618c1c0643aba20ced7a3327657bc992b0a075d4fe9be37956f241c76593
+MISC metadata.xml 321 RMD160 6709c07341536778184c86e920569d23e00f94b3 SHA1 c482881ba2599e5a49fec4f34acb13856b4eb2da SHA256 7c918d9c1645188c60a72a4e8f0dd0a7fde2b553400c79e748d0d4a24b702393
diff --git a/app-emulation/vice/files/vice-2.0-gnome-palemu.patch b/app-emulation/vice/files/vice-2.0-gnome-palemu.patch
new file mode 100644
index 000000000000..1f8a4a9ceb28
--- /dev/null
+++ b/app-emulation/vice/files/vice-2.0-gnome-palemu.patch
@@ -0,0 +1,13 @@
+Index: src/video/video-resources-pal.c
+===================================================================
+--- src/video/video-resources-pal.c	(revision 19048)
++++ src/video/video-resources-pal.c	(working copy)
+@@ -180,7 +180,7 @@
+       &video_resources.pal_scanlineshade, set_pal_scanlineshade, NULL },
+     { "PALBlur", 500, RES_EVENT_NO, NULL,
+       &video_resources.pal_blur, set_pal_blur, NULL },
+-    { "PALMode", VIDEO_RESOURCE_PAL_MODE_TRUE, RES_EVENT_NO, NULL,
++    { "PALMode", VIDEO_RESOURCE_PAL_MODE_FAST, RES_EVENT_NO, NULL,
+       &video_resources.pal_mode, set_pal_mode, NULL },
+     { "PALOddLinePhase", 1250, RES_EVENT_NO, NULL,
+       &video_resources.pal_oddlines_phase, set_pal_oddlinesphase, NULL },
diff --git a/app-emulation/vice/files/vice-2.0-gtk-bigendian-fix.patch b/app-emulation/vice/files/vice-2.0-gtk-bigendian-fix.patch
new file mode 100644
index 000000000000..e83b92439dbe
--- /dev/null
+++ b/app-emulation/vice/files/vice-2.0-gtk-bigendian-fix.patch
@@ -0,0 +1,57 @@
+Index: src/arch/unix/x11/gnome/uicolor.c
+===================================================================
+--- src/arch/unix/x11/gnome/uicolor.c	(revision 19058)
++++ src/arch/unix/x11/gnome/uicolor.c	(working copy)
+@@ -101,14 +101,12 @@
+ 
+     for (i = 0; i < palette->num_entries; i++) {
+         palette_entry_t color = palette->entries[i];
+-        DWORD color_pixel;
+-	
+-	unsigned char *col = (unsigned char *)&color_pixel;
+-	col[0] = color.red  ;
+-	col[1] = color.green;
+-	col[2] = color.blue ;
+-	video_render_setphysicalcolor(((video_canvas_t*)c)->videoconfig, i,
+-				      color_pixel, 24);
++        DWORD color_pixel = 
++            (DWORD)color.red |
++            (DWORD)color.green << 8 |
++            (DWORD)color.blue << 16;
++	    video_render_setphysicalcolor(((video_canvas_t*)c)->videoconfig, i,
++            color_pixel, 24);
+     }
+     return 0;
+ }
+@@ -116,27 +114,11 @@
+ static void uicolor_init_video_colors()
+ {
+     short i;
+-    DWORD pixelr, pixelg, pixelb;
+     
+-    for (i = 0; i < 256; i++)
+-    {
+-	unsigned char* pixelrbyte = (unsigned char*)&pixelr;
+-	unsigned char* pixelgbyte = (unsigned char*)&pixelg;
+-	unsigned char* pixelbbyte = (unsigned char*)&pixelb;
+-	pixelrbyte[0] = i;
+-	pixelrbyte[1] = 0;
+-	pixelrbyte[2] = 0;
+-	pixelgbyte[0] = 0;
+-	pixelgbyte[1] = i;
+-	pixelgbyte[2] = 0;
+-	pixelbbyte[0] = 0;
+-	pixelbbyte[1] = 0;
+-	pixelbbyte[2] = i;
+-       
+-	video_render_setrawrgb(i, 
+-			       pixelr,
+-			       pixelg,
+-			       pixelb);
++    for (i = 0; i < 256; i++) {
++	    video_render_setrawrgb(i, 
++		    (DWORD)i, (DWORD)i << 8, (DWORD)i << 16
++	    );
+     }
+     
+     video_render_initraw();
diff --git a/app-emulation/vice/metadata.xml b/app-emulation/vice/metadata.xml
index a7086570f9a6..3ae153091e68 100644
--- a/app-emulation/vice/metadata.xml
+++ b/app-emulation/vice/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>games</herd>
 <use>
-	<flag name='resid'>Enable support for ReSID
-		<pkg>media-libs/resid</pkg></flag>
+	<flag name='resid'>Enable support for ReSID <pkg>media-libs/resid</pkg></flag>
+	<flag name='xrandr'>Enable support for the X xrandr extension</flag>
 </use>
 </pkgmetadata>
diff --git a/app-emulation/vice/vice-2.0.ebuild b/app-emulation/vice/vice-2.0.ebuild
new file mode 100644
index 000000000000..e40b79ee8d63
--- /dev/null
+++ b/app-emulation/vice/vice-2.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.0.ebuild,v 1.1 2008/08/11 19:30:00 mr_bones_ Exp $
+
+EAPI=1
+inherit eutils games
+
+DESCRIPTION="The Versatile Commodore 8-bit Emulator"
+HOMEPAGE="http://www.viceteam.org/"
+SRC_URI="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="Xaw3d alsa arts esd gnome nls png readline resid sdl ffmpeg ipv6 mmap oss zlib X gif jpeg xv dga xrandr"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+	x11-apps/xset
+	Xaw3d? ( x11-libs/Xaw3d )
+	!Xaw3d? ( !gnome? ( x11-libs/libXaw ) )
+	alsa? ( media-libs/alsa-lib )
+	arts? ( kde-base/arts )
+	esd? ( media-sound/esound )
+	gnome? (
+		x11-libs/gtk+:2
+		dev-libs/atk
+		x11-libs/pango
+	)
+	nls? ( virtual/libintl )
+	png? ( media-libs/libpng )
+	readline? ( sys-libs/readline )
+	resid? ( media-libs/resid )
+	sdl? ( media-libs/libsdl )
+	gif? ( media-libs/giflib )
+	jpeg? ( media-libs/jpeg )
+	xv? ( x11-libs/libXv )
+	dga? ( x11-libs/libXxf86dga )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	x11-apps/bdftopcf
+	x11-apps/mkfontdir
+	x11-proto/xproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xextproto
+	dga? ( x11-proto/xf86dgaproto )
+	xv? ( x11-proto/videoproto )
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch \
+		"${FILESDIR}"/${P}-gnome-palemu.patch \
+		"${FILESDIR}"/${P}-gtk-bigendian-fix.patch
+}
+
+src_compile() {
+	egamesconf \
+		--disable-dependency-tracking \
+		--enable-fullscreen \
+		--enable-parsid \
+		--without-midas \
+		$(use_enable gnome gnomeui) \
+		$(use_enable nls) \
+		$(use_with Xaw3d xaw3d) \
+		$(use_with alsa) \
+		$(use_with arts) \
+		$(use_with esd) \
+		$(use_with png) \
+		$(use_with readline) \
+		$(use_with resid) \
+		$(use_with sdl) \
+		$(use_enable ffmpeg) \
+		$(use_enable ipv6) \
+		$(use_enable oss) \
+		$(use_enable mmap memmap) \
+		$(use_with zlib) \
+		$(use_with X x) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog FEEDBACK README
+	prepgamesdirs
+}