From d3545a4b01f542f7a8974d5f520b889039dbd7cb Mon Sep 17 00:00:00 2001 From: Harald van Dijk Date: Wed, 2 Nov 2005 19:46:39 +0000 Subject: [PATCH] Some more potential 64-bit problems Package-Manager: portage-2.0.53_rc7 --- media-sound/sexypsf/ChangeLog | 6 +++- media-sound/sexypsf/Manifest | 10 +++--- .../sexypsf/files/sexypsf-0.4.7-misc.patch | 33 +++++++++++++++---- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/media-sound/sexypsf/ChangeLog b/media-sound/sexypsf/ChangeLog index 01231ef8d4da..37ba6d0199bf 100644 --- a/media-sound/sexypsf/ChangeLog +++ b/media-sound/sexypsf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/sexypsf # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/sexypsf/ChangeLog,v 1.9 2005/10/26 06:39:31 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/sexypsf/ChangeLog,v 1.10 2005/11/02 19:46:39 truedfx Exp $ + + 02 Nov 2005; Harald van Dijk + files/sexypsf-0.4.7-misc.patch: + Some more 64-bit problems *sexypsf-0.4.7 (26 Oct 2005) diff --git a/media-sound/sexypsf/Manifest b/media-sound/sexypsf/Manifest index 176b42b81003..2d2ff3b732e3 100644 --- a/media-sound/sexypsf/Manifest +++ b/media-sound/sexypsf/Manifest @@ -1,14 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 fed481011b1d339e6d4bb1b0b93c4cab ChangeLog 1325 +MD5 c8f434be0752b42f170ff2d8b1387537 ChangeLog 1441 MD5 41f230a0e2debf8b51025a2d796c6e31 files/digest-sexypsf-0.4.5 61 MD5 0ed9b80602e1c597dff882701ce72f64 files/digest-sexypsf-0.4.6 61 MD5 606adf6de0a88f73cd8dd5c087a2d727 files/digest-sexypsf-0.4.7 65 MD5 ec1912f27a7e4330699ef6addc03a8b0 files/sexypsf-0.4.5-gentoo.patch 1608 MD5 ff39a6a980f10f48a571b23c330a8951 files/sexypsf-0.4.6-gentoo.patch 1519 MD5 5e7f5501e9177b1f1c3d2cdc084ad6d1 files/sexypsf-0.4.6-xmms.patch 435 -MD5 42d54999ca76a0748d4d58f2fa294b15 files/sexypsf-0.4.7-misc.patch 4880 +MD5 aa6ef135f7fc2509354ec2f552af6364 files/sexypsf-0.4.7-misc.patch 5697 MD5 ffaa113215ddcecac79374633543e52d metadata.xml 248 MD5 16e48240eb45b3d014770cf1a4977226 sexypsf-0.4.5.ebuild 1365 MD5 718f9cbb34b957c7f1045b94c9225c7a sexypsf-0.4.6.ebuild 1402 @@ -16,7 +16,7 @@ MD5 500871540437fcf49ecbdbc168c2a155 sexypsf-0.4.7.ebuild 1274 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDXyTJwnQyISwouHwRAuxEAJ9FzSh8IWZsSLvPVUsRwxZg2luDVgCcCA1U -SGot00tPUdDZr0S5iEHnBl0= -=72a3 +iD8DBQFDaRexwnQyISwouHwRAgdQAJ9vdH+1Bh2YO4LtCxEQhlqvTEXvHQCgsYzC +laMpAac+ECsHA6Fom1sW6DE= +=xJ/W -----END PGP SIGNATURE----- diff --git a/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch b/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch index ec74766111d7..d092d698615c 100644 --- a/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch +++ b/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch @@ -135,29 +135,48 @@ writeok=1; - psxMemLUT = (u32*)malloc(0x10000 * 4); -- memset(psxMemLUT, 0, 0x10000 * 4); + psxMemLUT = malloc(0x10000 * sizeof *psxMemLUT); +- memset(psxMemLUT, 0, 0x10000 * 4); + memset(psxMemLUT, 0, 0x10000 * sizeof *psxMemLUT); psxM = (char*)malloc(0x00200000); psxP = (char*)malloc(0x00010000); -@@ -67,7 +67,7 @@ +@@ -67,10 +67,10 @@ printf("Error allocating memory"); return -1; } - for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = (u32)&psxM[(i & 0x1f) << 16]; + for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = &psxM[(i & 0x1f) << 16]; - memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * 4); - memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4); -@@ -222,7 +222,7 @@ +- memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * 4); ++ memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * sizeof *psxMemLUT); +- memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4); ++ memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * sizeof *psxMemLUT); + + for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f00] = (u32)&psxP[i << 16]; + +@@ -215,16 +215,16 @@ + case 0x800: case 0x804: + if (writeok == 0) break; + writeok = 0; +- memset(psxMemLUT + 0x0000, 0, 0x80 * 4); ++ memset(psxMemLUT + 0x0000, 0, 0x80 * sizeof *psxMemLUT); +- memset(psxMemLUT + 0x8000, 0, 0x80 * 4); ++ memset(psxMemLUT + 0x8000, 0, 0x80 * sizeof *psxMemLUT); +- memset(psxMemLUT + 0xa000, 0, 0x80 * 4); ++ memset(psxMemLUT + 0xa000, 0, 0x80 * sizeof *psxMemLUT); + break; case 0x1e988: if (writeok == 1) break; writeok = 1; - for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = (u32)&psxM[(i & 0x1f) << 16]; + for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = &psxM[(i & 0x1f) << 16]; - memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * 4); - memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4); +- memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * 4); ++ memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * sizeof *psxMemLUT); +- memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4); ++ memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * sizeof *psxMemLUT); + break; + default: break; --- sexypsf/PsxMem.h +++ sexypsf/PsxMem.h -- 2.26.2