From: Tristan Heaven Date: Sat, 3 Feb 2007 06:54:35 +0000 (+0000) Subject: cleanup X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=51d48721baa283850b7f4b2af68a40ffc250e055;p=gentoo.git cleanup Package-Manager: portage-2.1.2-r6 --- diff --git a/games-emulation/mupen64/Manifest b/games-emulation/mupen64/Manifest index 47e6f623887c..60c131712204 100644 --- a/games-emulation/mupen64/Manifest +++ b/games-emulation/mupen64/Manifest @@ -1,30 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 0.3-gcc3.patch 3662 RMD160 abfd065daeb743679117b78b2053b6787e63dbb2 SHA1 520f2b25a89d842b11e4b64dfb64372ae404ad6a SHA256 91267d3061814fc67c2d6aa2f52aab50d911d4a702095a17c36d33fb3cd98d80 -MD5 e2b006764c1bac03ac2667ad60a66101 files/0.3-gcc3.patch 3662 -RMD160 abfd065daeb743679117b78b2053b6787e63dbb2 files/0.3-gcc3.patch 3662 -SHA256 91267d3061814fc67c2d6aa2f52aab50d911d4a702095a17c36d33fb3cd98d80 files/0.3-gcc3.patch 3662 AUX mupen64 751 RMD160 bf3d2411176a8d6b086a3c65139f076f0426a0e7 SHA1 66b3d1a3ecd799e5715c661f480bfdb665c08c76 SHA256 04313e794db8792f6be7d8489e0d9c25c2bd64eebb1ccef9e00b1db7ac0ceb3e MD5 a7ebb16b1b250e889d5acd49537a9ece files/mupen64 751 RMD160 bf3d2411176a8d6b086a3c65139f076f0426a0e7 files/mupen64 751 SHA256 04313e794db8792f6be7d8489e0d9c25c2bd64eebb1ccef9e00b1db7ac0ceb3e files/mupen64 751 -AUX mupen64-SDL_ttf.patch 353 RMD160 dcfedabfe86f11b9d34413e1de95a20c0472edaa SHA1 570b93421f611777edf7b80fc32f84c6c8e2d6b4 SHA256 5e883272c1666275e80da1a0d23ff844797a3a170bfe39c28409e4ab89a46568 -MD5 f63e1260b9d35674f21fdcfff3be5c16 files/mupen64-SDL_ttf.patch 353 -RMD160 dcfedabfe86f11b9d34413e1de95a20c0472edaa files/mupen64-SDL_ttf.patch 353 -SHA256 5e883272c1666275e80da1a0d23ff844797a3a170bfe39c28409e4ab89a46568 files/mupen64-SDL_ttf.patch 353 AUX mupen64-confdir.patch 171 RMD160 c5a2f34d4c5449b179a349f7f69af7d0a283fbd0 SHA1 ebf415370bccccfbbfca1d5a33236d18775d1ce2 SHA256 7fefee300002c1b9a5453c2c59d34cf86762a2c1fe3c62b123597d930f135e95 MD5 72f9db08fce1cb715c16d28c11f1cf9a files/mupen64-confdir.patch 171 RMD160 c5a2f34d4c5449b179a349f7f69af7d0a283fbd0 files/mupen64-confdir.patch 171 SHA256 7fefee300002c1b9a5453c2c59d34cf86762a2c1fe3c62b123597d930f135e95 files/mupen64-confdir.patch 171 -AUX mupen64-gcc3.patch 3662 RMD160 abfd065daeb743679117b78b2053b6787e63dbb2 SHA1 520f2b25a89d842b11e4b64dfb64372ae404ad6a SHA256 91267d3061814fc67c2d6aa2f52aab50d911d4a702095a17c36d33fb3cd98d80 -MD5 e2b006764c1bac03ac2667ad60a66101 files/mupen64-gcc3.patch 3662 -RMD160 abfd065daeb743679117b78b2053b6787e63dbb2 files/mupen64-gcc3.patch 3662 -SHA256 91267d3061814fc67c2d6aa2f52aab50d911d4a702095a17c36d33fb3cd98d80 files/mupen64-gcc3.patch 3662 -AUX mupen64-gentoo-sdl.patch 1558 RMD160 04defc850d2cf94fb632bb2e0dc031951647330a SHA1 aae61c737c79b2c17d622f6d778741f98e87d2d8 SHA256 5730dd19980cd6fc5ec72b6820552546142c3ee613a80a659db2b8a7011fc409 -MD5 623f09fd7f622d43901a028d7069ac04 files/mupen64-gentoo-sdl.patch 1558 -RMD160 04defc850d2cf94fb632bb2e0dc031951647330a files/mupen64-gentoo-sdl.patch 1558 -SHA256 5730dd19980cd6fc5ec72b6820552546142c3ee613a80a659db2b8a7011fc409 files/mupen64-gentoo-sdl.patch 1558 AUX mupen64-gentoo.patch 4733 RMD160 16e5c6c53c5390530d7c2df4b56f8c231c28f937 SHA1 42df47e17a15895e216bc7622e1a55962935aa86 SHA256 a643f0e20e1b5716e9b807d0545d81173a8d6c9fd6291ea7fea1da3cce675351 MD5 b381211a271e1298be2393f4d329d51f files/mupen64-gentoo.patch 4733 RMD160 16e5c6c53c5390530d7c2df4b56f8c231c28f937 files/mupen64-gentoo.patch 4733 @@ -41,27 +25,19 @@ AUX mupen64-noasm.patch 229 RMD160 a07517e6c95cd0193ce3e5c879728c39f8862a8b SHA1 MD5 638046a5841774d744611e9f38751bcc files/mupen64-noasm.patch 229 RMD160 a07517e6c95cd0193ce3e5c879728c39f8862a8b files/mupen64-noasm.patch 229 SHA256 8b8b874b892ded7f8168885944ea541cb6f6cd0c4cfdf9f2bd7105c02a2a357f files/mupen64-noasm.patch 229 -AUX mupen64-rice-confdir.patch 1208 RMD160 cabdbd785b38f247fb236ccc151eb9fe2aefe523 SHA1 e4455e8c876f27afbcbcd5604039a1b3fb449e58 SHA256 0351b819ca0f65b58d02e6df90cc197d3f9af433443fffb9bea6195f4e8b085a -MD5 87053b50f759d8d4b65a2369fe42338a files/mupen64-rice-confdir.patch 1208 -RMD160 cabdbd785b38f247fb236ccc151eb9fe2aefe523 files/mupen64-rice-confdir.patch 1208 -SHA256 0351b819ca0f65b58d02e6df90cc197d3f9af433443fffb9bea6195f4e8b085a files/mupen64-rice-confdir.patch 1208 -DIST hack_azi_rsp_hle.tar.bz2 38268 -DIST mupen64_input.tar.bz2 4438 -DIST mupen64_sound.tar.bz2 5932 -DIST mupen64_src-0.4.tar.bz2 1871148 +DIST hack_azi_rsp_hle.tar.bz2 38268 RMD160 284cb9ffe4157d580d1c9924cbf40ea34bfee752 SHA1 9ba4a945c1b13d6a239bdc1d81f0c7fd92742d9e SHA256 cf9a2c0340f5eb3c06580e44af645fa3a06bc4c7e64c33e51b7a146c703d4aae +DIST mupen64_input.tar.bz2 4438 RMD160 8e2d9b278ff8988c5fc171b25bd1a279fb44b994 SHA1 691bdb0e238b659e1db93fb50723892d8f2411c6 SHA256 d4eac5e204e094f32c46230aacb206468a0f8d3a62b2b654d17b00e86d20500d +DIST mupen64_sound.tar.bz2 5932 RMD160 618773689a1cd5a70082bd619584f5df03f05575 SHA1 7d930175051ca8fcba4b85d9ae6eeaf7fe09fe87 SHA256 df53df36a416dad22db87325dae8dc14174f5b7ef6a7e8680b2ff855eb31581a +DIST mupen64_src-0.4.tar.bz2 1871148 RMD160 dbae6b939129c4867ade445ddd8676fb645608f4 SHA1 b42ff1eb2b896bf38986522bbd341e0ba94e7532 SHA256 12958fa185c8a851f31ea007a1bb4df2bb6eeed582bc6af234ae5b9d57a8f3ae DIST mupen64_src-0.5.tar.bz2 1981046 RMD160 da916bc77f2f06ed92630332545dc3ee5ae1ff51 SHA1 fe1c9999fca780f2f8243d36ea7d8c42eca5659b SHA256 1b8e4188ab7a94d8125b77aed8725ee348c24818622b881adfe16be510487dfd EBUILD mupen64-0.4-r2.ebuild 2410 RMD160 878c0b7dc0dfd91d5a3b0e440339f188e5a45a0d SHA1 0d33afd80f371b66a17ae7f80bff1d1d0fb73965 SHA256 a4f10e27b2514aec593fb15dcd0970440c472876091ba921fc78190f5cd4a66a MD5 49a7654deda668a03424e9b35090ba40 mupen64-0.4-r2.ebuild 2410 RMD160 878c0b7dc0dfd91d5a3b0e440339f188e5a45a0d mupen64-0.4-r2.ebuild 2410 SHA256 a4f10e27b2514aec593fb15dcd0970440c472876091ba921fc78190f5cd4a66a mupen64-0.4-r2.ebuild 2410 -EBUILD mupen64-0.5-r1.ebuild 2615 RMD160 0a3501b75228ad78fb911f3c0fb372f0b8f032da SHA1 717be36964f9caeac0fe9c3191947b30a65cabe9 SHA256 5a98618bfa7dfceb36414f6f64c18863ee59d7299f6ba186a6f1db0f86eaf529 -MD5 280001c3c00ae475ca4ec4f2da651f5b mupen64-0.5-r1.ebuild 2615 -RMD160 0a3501b75228ad78fb911f3c0fb372f0b8f032da mupen64-0.5-r1.ebuild 2615 -SHA256 5a98618bfa7dfceb36414f6f64c18863ee59d7299f6ba186a6f1db0f86eaf529 mupen64-0.5-r1.ebuild 2615 -EBUILD mupen64-0.5.ebuild 2047 RMD160 177e5a55fbf7f43915e64240c54b8516ae8a4f0f SHA1 b01b9fbfe3fc3d1817d72b8bc1d5a1b68c2ad459 SHA256 6402c17c9cfaccb47024fc9695cdd309efae697af288985b8a2aa8fd28cb6638 -MD5 b89aea4170ee6f144016ec2cacdca5c2 mupen64-0.5.ebuild 2047 -RMD160 177e5a55fbf7f43915e64240c54b8516ae8a4f0f mupen64-0.5.ebuild 2047 -SHA256 6402c17c9cfaccb47024fc9695cdd309efae697af288985b8a2aa8fd28cb6638 mupen64-0.5.ebuild 2047 +EBUILD mupen64-0.5-r1.ebuild 2441 RMD160 15801e63ef4c64bc3cbc1a003aad894324a65513 SHA1 0c5ac540da14d87adb41153d3a7cf4c5027092b9 SHA256 10326dfc0e7814bbc06b6ffaf9670306348af883fedfdea4dd06f30dae6c2eb8 +MD5 f9e665c01f1b1f9074e32f2541467285 mupen64-0.5-r1.ebuild 2441 +RMD160 15801e63ef4c64bc3cbc1a003aad894324a65513 mupen64-0.5-r1.ebuild 2441 +SHA256 10326dfc0e7814bbc06b6ffaf9670306348af883fedfdea4dd06f30dae6c2eb8 mupen64-0.5-r1.ebuild 2441 MISC ChangeLog 3843 RMD160 c09b73fbf271f6109e5ec85fa90f926f07e6ddfd SHA1 8f1a87ec5c649d7fb32ca3d4282c1b9825ceec69 SHA256 d7aad162e0222e22c0715df5e857ae335b4a7cb45677abc1946e5eaf47bbca7d MD5 19f67066d936ef969f17682014f0c7c8 ChangeLog 3843 RMD160 c09b73fbf271f6109e5ec85fa90f926f07e6ddfd ChangeLog 3843 @@ -70,19 +46,16 @@ MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be525 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 -MD5 b21462ab51b383d28ca9d83f6531c664 files/digest-mupen64-0.4-r2 265 -RMD160 0f064cb61504fef33dd89b83975f02ae22d733f8 files/digest-mupen64-0.4-r2 265 -SHA256 e1d9b66b80871e5055e51a66e99881cdeff968ea9e2da9ace323c8c888d979e7 files/digest-mupen64-0.4-r2 265 -MD5 0cdd256b3d2df86cac038aa9d538aedf files/digest-mupen64-0.5 253 -RMD160 f626935bb3e16eb360edde7e315583121ad7652c files/digest-mupen64-0.5 253 -SHA256 d3dbd70b6d9bca726be6e4b697f985cd7a83e1bd494f7074e11052da1f3b07d9 files/digest-mupen64-0.5 253 +MD5 505759ccda3199fe238cd6900af59425 files/digest-mupen64-0.4-r2 979 +RMD160 43d1544497b771934518bc16369860adc626205a files/digest-mupen64-0.4-r2 979 +SHA256 aee927f62051c0dbe1cd820473d131f24134c988cd187af19b7a7d9599d3e6b3 files/digest-mupen64-0.4-r2 979 MD5 0cdd256b3d2df86cac038aa9d538aedf files/digest-mupen64-0.5-r1 253 RMD160 f626935bb3e16eb360edde7e315583121ad7652c files/digest-mupen64-0.5-r1 253 SHA256 d3dbd70b6d9bca726be6e4b697f985cd7a83e1bd494f7074e11052da1f3b07d9 files/digest-mupen64-0.5-r1 253 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFNqoddz7hIScOURERAksMAJ4276f+A40l8waC/7sq9sFxTkayOgCfV0L3 -J9fod0/P2OdWxE8sBkAPDTE= -=lNlM +iD8DBQFFxDGydz7hIScOURERAh4bAJ9fyHpcLWIkH5jqjBrMf11AviSi7ACgnd06 +vMDF+5S5eU8KiKmqKaF11II= +=SzNX -----END PGP SIGNATURE----- diff --git a/games-emulation/mupen64/files/0.3-gcc3.patch b/games-emulation/mupen64/files/0.3-gcc3.patch deleted file mode 100644 index 28a018e22e48..000000000000 --- a/games-emulation/mupen64/files/0.3-gcc3.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff -ur riceplugin.orig/DaedalusGraphics.cpp riceplugin/DaedalusGraphics.cpp ---- riceplugin.orig/DaedalusGraphics.cpp 2003-09-19 01:22:36.335328472 -0400 -+++ riceplugin/DaedalusGraphics.cpp 2003-09-19 01:22:36.470307952 -0400 -@@ -18,6 +18,7 @@ - */ - #include "stdafx.h" - #include "_BldNum.h" -+#include - - #ifndef _WIN32 - #include -diff -ur riceplugin.orig/DecodedMux.cpp riceplugin/DecodedMux.cpp ---- riceplugin.orig/DecodedMux.cpp 2003-09-19 01:22:36.366323760 -0400 -+++ riceplugin/DecodedMux.cpp 2003-09-19 01:22:48.379497480 -0400 -@@ -760,7 +760,7 @@ - ShadeConstMergeMapType MergeShadeWithConstantsMaps[] = - { - 0, SHADE_DO_NOTHING, -- 0x0007000600070006, SHADE_MOD_ENV, // SHADE * ENV -+ SHADE_DO_NOTHING, SHADE_MOD_ENV, // SHADE * ENV - }; - - // 0x05070501, 0x00070006 //(1 - PRIM) * ENV + PRIM -diff -ur riceplugin.orig/OGLCombinerTNT2.cpp riceplugin/OGLCombinerTNT2.cpp ---- riceplugin.orig/OGLCombinerTNT2.cpp 2003-09-19 01:22:36.340327712 -0400 -+++ riceplugin/OGLCombinerTNT2.cpp 2003-09-19 01:25:36.859884568 -0400 -@@ -120,22 +120,22 @@ - - GLenum COGLColorCombinerTNT2::RGBArgsMap[] = - { -- {GL_ZERO, }, //MUX_0 -- {GL_ZERO, }, //MUX_1 -- {GL_PREVIOUS_EXT, }, //MUX_COMBINED, -- {GL_TEXTURE0_ARB, }, //MUX_TEXEL0, -- {GL_TEXTURE1_ARB, }, //MUX_TEXEL1, -- {GL_CONSTANT_EXT, }, //MUX_PRIM, -- {GL_PRIMARY_COLOR_EXT, }, //MUX_SHADE, -- {GL_CONSTANT_EXT, }, //MUX_ENV, -- {GL_PREVIOUS_EXT, }, //MUX_COMBALPHA, -- {GL_TEXTURE0_ARB, }, //MUX_T0_ALPHA, -- {GL_TEXTURE1_ARB, }, //MUX_T1_ALPHA, -- {GL_CONSTANT_EXT, }, //MUX_PRIM_ALPHA, -- {GL_PRIMARY_COLOR_EXT, }, //MUX_SHADE_ALPHA, -- {GL_CONSTANT_EXT, }, //MUX_ENV_ALPHA, -- {GL_CONSTANT_EXT, }, //MUX_LODFRAC, -- {GL_CONSTANT_EXT, }, //MUX_PRIMLODFRAC, -+ GL_ZERO, -+ GL_ZERO, -+ GL_PREVIOUS_EXT, -+ GL_TEXTURE0_ARB, -+ GL_TEXTURE1_ARB, -+ GL_CONSTANT_EXT, -+ GL_PRIMARY_COLOR_EXT, -+ GL_CONSTANT_EXT, -+ GL_PREVIOUS_EXT, -+ GL_TEXTURE0_ARB, -+ GL_TEXTURE1_ARB, -+ GL_CONSTANT_EXT, -+ GL_PRIMARY_COLOR_EXT, -+ GL_CONSTANT_EXT, -+ GL_CONSTANT_EXT, -+ GL_CONSTANT_EXT, - }; - - -diff -ur riceplugin.orig/OGLExtCombiner.cpp riceplugin/OGLExtCombiner.cpp ---- riceplugin.orig/OGLExtCombiner.cpp 2003-09-19 01:22:36.371323000 -0400 -+++ riceplugin/OGLExtCombiner.cpp 2003-09-19 01:24:56.994944960 -0400 -@@ -474,22 +474,22 @@ - - GLenum COGLExtColorCombiner::RGBArgsMap[] = - { -- {GL_PRIMARY_COLOR_ARB, }, //MUX_0 -- {GL_PRIMARY_COLOR_ARB, }, //MUX_1 -- {GL_PREVIOUS_ARB, }, //MUX_COMBINED, -- {GL_TEXTURE0_ARB, }, //MUX_TEXEL0, -- {GL_TEXTURE1_ARB, }, //MUX_TEXEL1, -- {GL_CONSTANT_ARB, }, //MUX_PRIM, -- {GL_PRIMARY_COLOR_ARB, }, //MUX_SHADE, -- {GL_CONSTANT_ARB, }, //MUX_ENV, -- {GL_PREVIOUS_ARB, }, //MUX_COMBALPHA, -- {GL_TEXTURE0_ARB, }, //MUX_T0_ALPHA, -- {GL_TEXTURE1_ARB, }, //MUX_T1_ALPHA, -- {GL_CONSTANT_ARB, }, //MUX_PRIM_ALPHA, -- {GL_PRIMARY_COLOR_ARB, }, //MUX_SHADE_ALPHA, -- {GL_CONSTANT_ARB, }, //MUX_ENV_ALPHA, -- {GL_CONSTANT_ARB, }, //MUX_LODFRAC, -- {GL_CONSTANT_ARB, }, //MUX_PRIMLODFRAC, -+ GL_PRIMARY_COLOR_ARB, -+ GL_PRIMARY_COLOR_ARB, -+ GL_PREVIOUS_ARB, -+ GL_TEXTURE0_ARB, -+ GL_TEXTURE1_ARB, -+ GL_CONSTANT_ARB, -+ GL_PRIMARY_COLOR_ARB, -+ GL_CONSTANT_ARB, -+ GL_PREVIOUS_ARB, -+ GL_TEXTURE0_ARB, -+ GL_TEXTURE1_ARB, -+ GL_CONSTANT_ARB, -+ GL_PRIMARY_COLOR_ARB, -+ GL_CONSTANT_ARB, -+ GL_CONSTANT_ARB, -+ GL_CONSTANT_ARB, - }; - - -diff -ur riceplugin.orig/unique.h riceplugin/unique.h ---- riceplugin.orig/unique.h 2003-09-19 01:22:36.336328320 -0400 -+++ riceplugin/unique.h 2003-09-19 01:22:36.473307496 -0400 -@@ -39,6 +39,7 @@ - // - // - -+#include - #ifdef _MSC_VER - #include - #endif diff --git a/games-emulation/mupen64/files/digest-mupen64-0.4-r2 b/games-emulation/mupen64/files/digest-mupen64-0.4-r2 index 235e4ebb6a71..4007c6a32525 100644 --- a/games-emulation/mupen64/files/digest-mupen64-0.4-r2 +++ b/games-emulation/mupen64/files/digest-mupen64-0.4-r2 @@ -1,4 +1,12 @@ -MD5 322f2226f4f67e24868592c6b441e76a mupen64_src-0.4.tar.bz2 1871148 +MD5 9eb823e0f4a62c8ef0428dabf3f01370 hack_azi_rsp_hle.tar.bz2 38268 +RMD160 284cb9ffe4157d580d1c9924cbf40ea34bfee752 hack_azi_rsp_hle.tar.bz2 38268 +SHA256 cf9a2c0340f5eb3c06580e44af645fa3a06bc4c7e64c33e51b7a146c703d4aae hack_azi_rsp_hle.tar.bz2 38268 MD5 14fc6075a19bb567afebedd5ab2ea6c1 mupen64_input.tar.bz2 4438 +RMD160 8e2d9b278ff8988c5fc171b25bd1a279fb44b994 mupen64_input.tar.bz2 4438 +SHA256 d4eac5e204e094f32c46230aacb206468a0f8d3a62b2b654d17b00e86d20500d mupen64_input.tar.bz2 4438 MD5 88dfa0045794db7f1fc100b4c7b23125 mupen64_sound.tar.bz2 5932 -MD5 9eb823e0f4a62c8ef0428dabf3f01370 hack_azi_rsp_hle.tar.bz2 38268 +RMD160 618773689a1cd5a70082bd619584f5df03f05575 mupen64_sound.tar.bz2 5932 +SHA256 df53df36a416dad22db87325dae8dc14174f5b7ef6a7e8680b2ff855eb31581a mupen64_sound.tar.bz2 5932 +MD5 322f2226f4f67e24868592c6b441e76a mupen64_src-0.4.tar.bz2 1871148 +RMD160 dbae6b939129c4867ade445ddd8676fb645608f4 mupen64_src-0.4.tar.bz2 1871148 +SHA256 12958fa185c8a851f31ea007a1bb4df2bb6eeed582bc6af234ae5b9d57a8f3ae mupen64_src-0.4.tar.bz2 1871148 diff --git a/games-emulation/mupen64/files/digest-mupen64-0.5 b/games-emulation/mupen64/files/digest-mupen64-0.5 deleted file mode 100644 index f5e4ac023a01..000000000000 --- a/games-emulation/mupen64/files/digest-mupen64-0.5 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 11f994bed40e00fad5b82333b553e421 mupen64_src-0.5.tar.bz2 1981046 -RMD160 da916bc77f2f06ed92630332545dc3ee5ae1ff51 mupen64_src-0.5.tar.bz2 1981046 -SHA256 1b8e4188ab7a94d8125b77aed8725ee348c24818622b881adfe16be510487dfd mupen64_src-0.5.tar.bz2 1981046 diff --git a/games-emulation/mupen64/files/mupen64-SDL_ttf.patch b/games-emulation/mupen64/files/mupen64-SDL_ttf.patch deleted file mode 100644 index 24c246d049bc..000000000000 --- a/games-emulation/mupen64/files/mupen64-SDL_ttf.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- blight_input-0.0.8-b/src/SDL_ttf.c.orig 2005-01-01 00:34:42.153211968 -0600 -+++ blight_input-0.0.8-b/src/SDL_ttf.c 2005-01-01 00:31:41.263711352 -0600 -@@ -39,6 +39,9 @@ - #define FREEA(p) free(p) - #endif - -+#include -+#include FT_FREETYPE_H -+ - #include - #include - #include diff --git a/games-emulation/mupen64/files/mupen64-gcc3.patch b/games-emulation/mupen64/files/mupen64-gcc3.patch deleted file mode 100644 index 28a018e22e48..000000000000 --- a/games-emulation/mupen64/files/mupen64-gcc3.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff -ur riceplugin.orig/DaedalusGraphics.cpp riceplugin/DaedalusGraphics.cpp ---- riceplugin.orig/DaedalusGraphics.cpp 2003-09-19 01:22:36.335328472 -0400 -+++ riceplugin/DaedalusGraphics.cpp 2003-09-19 01:22:36.470307952 -0400 -@@ -18,6 +18,7 @@ - */ - #include "stdafx.h" - #include "_BldNum.h" -+#include - - #ifndef _WIN32 - #include -diff -ur riceplugin.orig/DecodedMux.cpp riceplugin/DecodedMux.cpp ---- riceplugin.orig/DecodedMux.cpp 2003-09-19 01:22:36.366323760 -0400 -+++ riceplugin/DecodedMux.cpp 2003-09-19 01:22:48.379497480 -0400 -@@ -760,7 +760,7 @@ - ShadeConstMergeMapType MergeShadeWithConstantsMaps[] = - { - 0, SHADE_DO_NOTHING, -- 0x0007000600070006, SHADE_MOD_ENV, // SHADE * ENV -+ SHADE_DO_NOTHING, SHADE_MOD_ENV, // SHADE * ENV - }; - - // 0x05070501, 0x00070006 //(1 - PRIM) * ENV + PRIM -diff -ur riceplugin.orig/OGLCombinerTNT2.cpp riceplugin/OGLCombinerTNT2.cpp ---- riceplugin.orig/OGLCombinerTNT2.cpp 2003-09-19 01:22:36.340327712 -0400 -+++ riceplugin/OGLCombinerTNT2.cpp 2003-09-19 01:25:36.859884568 -0400 -@@ -120,22 +120,22 @@ - - GLenum COGLColorCombinerTNT2::RGBArgsMap[] = - { -- {GL_ZERO, }, //MUX_0 -- {GL_ZERO, }, //MUX_1 -- {GL_PREVIOUS_EXT, }, //MUX_COMBINED, -- {GL_TEXTURE0_ARB, }, //MUX_TEXEL0, -- {GL_TEXTURE1_ARB, }, //MUX_TEXEL1, -- {GL_CONSTANT_EXT, }, //MUX_PRIM, -- {GL_PRIMARY_COLOR_EXT, }, //MUX_SHADE, -- {GL_CONSTANT_EXT, }, //MUX_ENV, -- {GL_PREVIOUS_EXT, }, //MUX_COMBALPHA, -- {GL_TEXTURE0_ARB, }, //MUX_T0_ALPHA, -- {GL_TEXTURE1_ARB, }, //MUX_T1_ALPHA, -- {GL_CONSTANT_EXT, }, //MUX_PRIM_ALPHA, -- {GL_PRIMARY_COLOR_EXT, }, //MUX_SHADE_ALPHA, -- {GL_CONSTANT_EXT, }, //MUX_ENV_ALPHA, -- {GL_CONSTANT_EXT, }, //MUX_LODFRAC, -- {GL_CONSTANT_EXT, }, //MUX_PRIMLODFRAC, -+ GL_ZERO, -+ GL_ZERO, -+ GL_PREVIOUS_EXT, -+ GL_TEXTURE0_ARB, -+ GL_TEXTURE1_ARB, -+ GL_CONSTANT_EXT, -+ GL_PRIMARY_COLOR_EXT, -+ GL_CONSTANT_EXT, -+ GL_PREVIOUS_EXT, -+ GL_TEXTURE0_ARB, -+ GL_TEXTURE1_ARB, -+ GL_CONSTANT_EXT, -+ GL_PRIMARY_COLOR_EXT, -+ GL_CONSTANT_EXT, -+ GL_CONSTANT_EXT, -+ GL_CONSTANT_EXT, - }; - - -diff -ur riceplugin.orig/OGLExtCombiner.cpp riceplugin/OGLExtCombiner.cpp ---- riceplugin.orig/OGLExtCombiner.cpp 2003-09-19 01:22:36.371323000 -0400 -+++ riceplugin/OGLExtCombiner.cpp 2003-09-19 01:24:56.994944960 -0400 -@@ -474,22 +474,22 @@ - - GLenum COGLExtColorCombiner::RGBArgsMap[] = - { -- {GL_PRIMARY_COLOR_ARB, }, //MUX_0 -- {GL_PRIMARY_COLOR_ARB, }, //MUX_1 -- {GL_PREVIOUS_ARB, }, //MUX_COMBINED, -- {GL_TEXTURE0_ARB, }, //MUX_TEXEL0, -- {GL_TEXTURE1_ARB, }, //MUX_TEXEL1, -- {GL_CONSTANT_ARB, }, //MUX_PRIM, -- {GL_PRIMARY_COLOR_ARB, }, //MUX_SHADE, -- {GL_CONSTANT_ARB, }, //MUX_ENV, -- {GL_PREVIOUS_ARB, }, //MUX_COMBALPHA, -- {GL_TEXTURE0_ARB, }, //MUX_T0_ALPHA, -- {GL_TEXTURE1_ARB, }, //MUX_T1_ALPHA, -- {GL_CONSTANT_ARB, }, //MUX_PRIM_ALPHA, -- {GL_PRIMARY_COLOR_ARB, }, //MUX_SHADE_ALPHA, -- {GL_CONSTANT_ARB, }, //MUX_ENV_ALPHA, -- {GL_CONSTANT_ARB, }, //MUX_LODFRAC, -- {GL_CONSTANT_ARB, }, //MUX_PRIMLODFRAC, -+ GL_PRIMARY_COLOR_ARB, -+ GL_PRIMARY_COLOR_ARB, -+ GL_PREVIOUS_ARB, -+ GL_TEXTURE0_ARB, -+ GL_TEXTURE1_ARB, -+ GL_CONSTANT_ARB, -+ GL_PRIMARY_COLOR_ARB, -+ GL_CONSTANT_ARB, -+ GL_PREVIOUS_ARB, -+ GL_TEXTURE0_ARB, -+ GL_TEXTURE1_ARB, -+ GL_CONSTANT_ARB, -+ GL_PRIMARY_COLOR_ARB, -+ GL_CONSTANT_ARB, -+ GL_CONSTANT_ARB, -+ GL_CONSTANT_ARB, - }; - - -diff -ur riceplugin.orig/unique.h riceplugin/unique.h ---- riceplugin.orig/unique.h 2003-09-19 01:22:36.336328320 -0400 -+++ riceplugin/unique.h 2003-09-19 01:22:36.473307496 -0400 -@@ -39,6 +39,7 @@ - // - // - -+#include - #ifdef _MSC_VER - #include - #endif diff --git a/games-emulation/mupen64/files/mupen64-gentoo-sdl.patch b/games-emulation/mupen64/files/mupen64-gentoo-sdl.patch deleted file mode 100644 index 0cec2c48eafe..000000000000 --- a/games-emulation/mupen64/files/mupen64-gentoo-sdl.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- jttl_sound-1.2/Makefile.orig 2004-07-15 23:02:26.402954048 +0000 -+++ jttl_sound-1.2/Makefile 2004-07-15 23:03:09.946334448 +0000 -@@ -1,8 +1,5 @@ - CC = gcc --#CFLAGS = -g -O3 -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=athlon `gtk-config --cflags` -DUSE_GTK -Wall `sdl-config --cflags` -lm `sdl-config --libs` --CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=athlon `gtk-config --cflags` -DUSE_GTK -Wall `sdl-config --cflags` -- --#CFLAGS = -g -O3 -fomit-frame-pointer -funroll-loops -ffast-math -mcpu=athlon `gtk-config --cflags` -DUSE_GTK -Wall -+CFLAGS = `gtk-config --cflags` -DUSE_GTK `sdl-config --cflags` $(GCFLAGS) - - LD = gcc - LDFLAGS = -shared -Wl,-Bsymbolic `gtk-config --libs` -lpthread -lm `sdl-config --libs` ---- jttl_sound-1.2/main.c.orig 2004-07-04 09:36:37.000000000 +0000 -+++ jttl_sound-1.2/main.c 2004-07-16 11:54:28.000000000 +0000 -@@ -114,7 +114,7 @@ - Popably only game that needs this is Zelda: Ocarina Of Time Master Quest */ - #define DEFAULT_FREQUENCY 33600 - /* Name of config file */ --#define CONFIG_FILE "jttl_audio.conf" -+#define CONFIG_FILE "/.mupen64/plugins/jttl_audio.conf" - - - /*--------------- VARIABLE DEFINITIONS ----------------*/ -@@ -605,7 +605,9 @@ - char line[256]; - char param[128]; - char *value; -- if ((config_file = fopen(CONFIG_FILE, "r")) == NULL) { -+ char conffilename[200]; -+ snprintf (conffilename, 200, "%s%s", getenv("HOME"), CONFIG_FILE); -+ if ((config_file = fopen(conffilename, "r")) == NULL) { - fprintf(stderr, "(EE) Cannot open config file.\n"); - return; - } diff --git a/games-emulation/mupen64/files/mupen64-rice-confdir.patch b/games-emulation/mupen64/files/mupen64-rice-confdir.patch deleted file mode 100644 index d6c7e1079604..000000000000 --- a/games-emulation/mupen64/files/mupen64-rice-confdir.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- riceplugin/Config.cpp.orig 2004-11-26 02:23:52.306288064 +0000 -+++ riceplugin/Config.cpp 2004-11-26 02:35:57.418054320 +0000 -@@ -737,8 +737,9 @@ - #else // _WIN32 - FILE *f; - char name[MAX_PATH]; -- GetPluginDir(name); -- strcat(name, CONFIG_FILE); -+ //GetPluginDir(name); -+ //strcat(name, CONFIG_FILE); -+ snprintf(name, MAX_PATH, "%s/.mupen64/plugins/%s", getenv("HOME"), CONFIG_FILE); - f = fopen(name, "rb"); - if (!f) return FALSE; - fclose(f); -@@ -889,8 +890,9 @@ - RegCloseKey(hKey2); - #else // _WIN32 - char name[MAX_PATH]; -- GetPluginDir(name); -- strcat(name, CONFIG_FILE); -+ //GetPluginDir(name); -+ //strcat(name, CONFIG_FILE); -+ snprintf(name, MAX_PATH, "%s/.mupen64/plugins/%s", getenv("HOME"), CONFIG_FILE); - FILE *f = fopen(name, "rb"); - if (!f) - { -@@ -1027,8 +1029,9 @@ - return(0); - #else // _WIN32 - char name[MAX_PATH]; -- GetPluginDir(name); -- strcat(name, CONFIG_FILE); -+ //GetPluginDir(name); -+ //strcat(name, CONFIG_FILE); -+ snprintf(name, MAX_PATH, "%s/.mupen64/plugins/%s", getenv("HOME"), CONFIG_FILE); - FILE *f = fopen(name, "rb"); - char buf[0x1000]; - while(fscanf(f, "%s", buf) == 1) diff --git a/games-emulation/mupen64/mupen64-0.5-r1.ebuild b/games-emulation/mupen64/mupen64-0.5-r1.ebuild index 0c9a3d5919b3..ab758cf5e12f 100644 --- a/games-emulation/mupen64/mupen64-0.5-r1.ebuild +++ b/games-emulation/mupen64/mupen64-0.5-r1.ebuild @@ -1,26 +1,25 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.5-r1.ebuild,v 1.2 2006/10/18 22:26:31 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.5-r1.ebuild,v 1.3 2007/02/03 06:54:35 nyhm Exp $ inherit eutils flag-o-matic multilib games +MY_P=${PN}_src-${PV} DESCRIPTION="A Nintendo 64 (N64) emulator" HOMEPAGE="http://mupen64.emulation64.com/" -SRC_URI="http://mupen64.emulation64.com/files/${PV}/mupen64_src-${PV}.tar.bz2" +SRC_URI="http://mupen64.emulation64.com/files/${PV}/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="-* ~amd64 ~x86" IUSE="opengl" -RDEPEND="sys-libs/zlib - opengl? ( virtual/opengl ) +RDEPEND="opengl? ( virtual/opengl ) >=x11-libs/gtk+-2 amd64? ( app-emulation/emul-linux-x86-gtklibs app-emulation/emul-linux-x86-sdl ) media-libs/libsdl media-libs/sdl-sound" - # Block the now included external plugins. DEPEND="${RDEPEND} dev-util/pkgconfig @@ -28,16 +27,17 @@ DEPEND="${RDEPEND} !games-emulation/mupen64-glN64 !games-emulation/mupen64-jttl_sound" - -S=${WORKDIR}/mupen64_src-${PV} +S=${WORKDIR}/${MY_P} src_unpack() { unpack ${A} - epatch "${FILESDIR}/${PN}-gentoo.patch" + epatch "${FILESDIR}"/${PN}-gentoo.patch cd "${S}" + rm -f plugins/empty - sed -i "s:#undef WITH_HOME:#define WITH_HOME \"/usr/games/\":" config.h \ + sed -i "s:#undef WITH_HOME:#define WITH_HOME \"${GAMES_PREFIX}/\":" \ + config.h \ || die "sed failed" sed -i \ @@ -51,7 +51,7 @@ src_unpack() { src_compile() { use amd64 && multilib_toolchain_setup x86 - emake mupen64 || die "emake failed on $d" + emake mupen64 || die "emake failed" emake mupen64_nogui || die "emake failed" emake plugins/mupen64_input.so || die "emake failed" emake plugins/mupen64_hle_rsp_azimer.so || die "emake failed" @@ -68,33 +68,21 @@ src_compile() { } src_install() { - local dir=${GAMES_LIBDIR}/${PN} - - exeinto "${GAMES_BINDIR}" - doexe mupen64 || die "doexe failed" - doexe mupen64_nogui || die "doexe failed" - - insinto "${dir}" - doins mupen64.ini jttl_audio.conf || "doins failed" - - dodir ${dir}/save - - cp -r lang roms plugins "${D}/${dir}/" \ - || die "cp failed" + dogamesbin mupen64 mupen64_nogui || die "dogamesbin failed" - rm "${D}/${dir}/plugins/empty" - dodoc *.txt - cp doc/readme.pdf "${D}/usr/share/doc/${PF}" + insinto "${GAMES_LIBDIR}"/${PN} + doins -r mupen64.ini jttl_audio.conf lang roms plugins || die "doins failed" + dodoc *.txt doc/readme.pdf prepgamesdirs } pkg_postinst() { games_pkg_postinst echo - ewarn "If you are upgrading from previous version of mupen64" - ewarn "backup your saved games then do a rm -rf on your" - ewarn ".mupen64 directory. After launching then new mupen copy" - ewarn "your saved games to the original place." + ewarn "If you are upgrading from a previous version of mupen64," + ewarn "backup your saved games then run rm -rf on your" + ewarn ".mupen64 directory. After launching the new version, copy" + ewarn "your saved games to their original place." echo } diff --git a/games-emulation/mupen64/mupen64-0.5.ebuild b/games-emulation/mupen64/mupen64-0.5.ebuild deleted file mode 100644 index b234a05fa64f..000000000000 --- a/games-emulation/mupen64/mupen64-0.5.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.5.ebuild,v 1.2 2006/08/21 18:22:20 mr_bones_ Exp $ - -inherit eutils games - -DESCRIPTION="A Nintendo 64 (N64) emulator" -HOMEPAGE="http://mupen64.emulation64.com/" -SRC_URI="http://mupen64.emulation64.com/files/${PV}/mupen64_src-${PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-amd64 ~x86" -IUSE="" - -RDEPEND="sys-libs/zlib - >=x11-libs/gtk+-2 - media-libs/libsdl" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -S=${WORKDIR}/mupen64_src-${PV} - -src_unpack() { - unpack ${A} - epatch "${FILESDIR}/${PN}-gentoo.patch" - - cd "${S}" - - sed -i "s:#undef WITH_HOME:#define WITH_HOME \"/usr/games/\":" config.h \ - || die "sed failed" - - sed -i \ - -e '/strip/d' \ - -e "s:CFLAGS.*=\(.*\):CFLAGS=-fPIC ${CFLAGS}:" \ - -e "s:CXXFLAGS.*=\(.*\):CXXFLAGS=-fPIC ${CXXFLAGS}:" \ - Makefile \ - || die "sed failed" -} - -src_compile() { - emake mupen64 || die "emake failed on $d" - emake mupen64_nogui || die "emake failed" - emake plugins/mupen64_input.so || die "emake failed" - emake plugins/mupen64_hle_rsp_azimer.so || die "emake failed" - emake plugins/dummyaudio.so || die "emake failed" - emake plugins/mupen64_audio.so || die "emake failed" - emake plugins/mupen64_soft_gfx.so || die "emake failed" -} - -src_install() { - local dir=${GAMES_LIBDIR}/${PN} - - exeinto "${GAMES_BINDIR}" - doexe mupen64 || die "doexe failed" - doexe mupen64_nogui || die "doexe failed" - - insinto "${dir}" - doins mupen64.ini || "doins failed" - - dodir ${dir}/save - - cp -r lang roms plugins "${D}/${dir}/" \ - || die "cp failed" - - rm "${D}/${dir}/plugins/empty" - dodoc *.txt - cp doc/readme.pdf "${D}/usr/share/doc/${PF}" - - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - echo - ewarn "If you are upgrading from a previous version of mupen64," - ewarn "backup your saved games then run rm -rf on your" - ewarn ".mupen64 directory. After launching the new version, copy" - ewarn "your saved games to their original place." - echo -}