diff options
author | Mike Frysinger <vapier@gentoo.org> | 2006-05-26 05:26:45 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2006-05-26 05:26:45 +0000 |
commit | 88cf6630b8a99413c426c7af5171e21f74375b2f (patch) | |
tree | d15d9c50e42a2b2a298f65c33b5df886620126b4 /media-libs | |
parent | dont bother duplicating the nobuggy-x patch (diff) | |
download | historical-88cf6630b8a99413c426c7af5171e21f74375b2f.tar.gz historical-88cf6630b8a99413c426c7af5171e21f74375b2f.tar.bz2 historical-88cf6630b8a99413c426c7af5171e21f74375b2f.zip |
Version bump #133754 by Stephan.
Package-Manager: portage-2.1_rc2-r1
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/libsdl/ChangeLog | 10 | ||||
-rw-r--r-- | media-libs/libsdl/Manifest | 114 | ||||
-rw-r--r-- | media-libs/libsdl/files/digest-libsdl-1.2.10 | 3 | ||||
-rw-r--r-- | media-libs/libsdl/files/libsdl-1.2.10-PIC-hidden-symbols.patch | 168 | ||||
-rw-r--r-- | media-libs/libsdl/files/libsdl-1.2.10-libcaca.patch | 592 | ||||
-rw-r--r-- | media-libs/libsdl/files/libsdl-1.2.10-sdl-config.patch | 20 | ||||
-rw-r--r-- | media-libs/libsdl/libsdl-1.2.10.ebuild | 150 |
7 files changed, 1007 insertions, 50 deletions
diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog index a6909efcbf7f..8838c301e734 100644 --- a/media-libs/libsdl/ChangeLog +++ b/media-libs/libsdl/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-libs/libsdl # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.100 2006/05/07 23:35:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.101 2006/05/26 05:26:45 vapier Exp $ + +*libsdl-1.2.10 (26 May 2006) + + 26 May 2006; Mike Frysinger <vapier@gentoo.org> + +files/libsdl-1.2.10-PIC-hidden-symbols.patch, + +files/libsdl-1.2.10-libcaca.patch, +files/libsdl-1.2.10-sdl-config.patch, + +libsdl-1.2.10.ebuild: + Version bump #133754 by Stephan. 07 May 2006; Mike Frysinger <vapier@gentoo.org> files/libsdl-1.2.9-DirectFB-updates.patch: diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest index c3c404863aeb..750a481c9426 100644 --- a/media-libs/libsdl/Manifest +++ b/media-libs/libsdl/Manifest @@ -1,145 +1,161 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 1.2.7-26headers.patch 1017 RMD160 b7acd61cb356802d04592c31bd52b5dfe2325d64 SHA1 a901d283976826d55fa9d31015e0d4f3b7422062 SHA256 37025b52dece9be3cab2cb7cf9dda0982340779a15a4a1dc3e6322425ed123bf size 1017 +AUX 1.2.7-26headers.patch 1017 RMD160 b7acd61cb356802d04592c31bd52b5dfe2325d64 SHA1 a901d283976826d55fa9d31015e0d4f3b7422062 SHA256 37025b52dece9be3cab2cb7cf9dda0982340779a15a4a1dc3e6322425ed123bf MD5 71a857d2bbcc34c4807638eb5d710f2e files/1.2.7-26headers.patch 1017 RMD160 b7acd61cb356802d04592c31bd52b5dfe2325d64 files/1.2.7-26headers.patch 1017 SHA256 37025b52dece9be3cab2cb7cf9dda0982340779a15a4a1dc3e6322425ed123bf files/1.2.7-26headers.patch 1017 -AUX 1.2.7-gcc34.patch 8196 RMD160 15f4051fc12b21458b48bf3bb2415c46f41e3ca4 SHA1 6be212048f649ef4cbac32ccf2513489eb42fda9 SHA256 9d36bc9e77d10a409dd2b16d425d3c67cd030835c62be15b314f25fda60b1a17 size 8196 +AUX 1.2.7-gcc34.patch 8196 RMD160 15f4051fc12b21458b48bf3bb2415c46f41e3ca4 SHA1 6be212048f649ef4cbac32ccf2513489eb42fda9 SHA256 9d36bc9e77d10a409dd2b16d425d3c67cd030835c62be15b314f25fda60b1a17 MD5 206ddd08dd3e33819d03245d11af3014 files/1.2.7-gcc34.patch 8196 RMD160 15f4051fc12b21458b48bf3bb2415c46f41e3ca4 files/1.2.7-gcc34.patch 8196 SHA256 9d36bc9e77d10a409dd2b16d425d3c67cd030835c62be15b314f25fda60b1a17 files/1.2.7-gcc34.patch 8196 -AUX 1.2.7-joystick.patch 1317 RMD160 8971e62fe677bc8ee68abe6999df32b2286dbb80 SHA1 81d5170139117b8c677343b527de6a6d6ba861be SHA256 2769d0a4bde171eb83a9d55be0c831a019391977e23d0f6c9cf865f01059742d size 1317 +AUX 1.2.7-joystick.patch 1317 RMD160 8971e62fe677bc8ee68abe6999df32b2286dbb80 SHA1 81d5170139117b8c677343b527de6a6d6ba861be SHA256 2769d0a4bde171eb83a9d55be0c831a019391977e23d0f6c9cf865f01059742d MD5 e71ab5ce20cb7c70631a59f9d209cce1 files/1.2.7-joystick.patch 1317 RMD160 8971e62fe677bc8ee68abe6999df32b2286dbb80 files/1.2.7-joystick.patch 1317 SHA256 2769d0a4bde171eb83a9d55be0c831a019391977e23d0f6c9cf865f01059742d files/1.2.7-joystick.patch 1317 -AUX 1.2.7-joystick2.patch 16196 RMD160 ee78e906b40bc02e2804167e317608e630e79cac SHA1 958343ca4eb4b09304cf80ed31e1c63643f72e79 SHA256 fd239a87d11443d295c2043fd6df486c56ea2b8df90ea2fc0b68351f2b7fb692 size 16196 +AUX 1.2.7-joystick2.patch 16196 RMD160 ee78e906b40bc02e2804167e317608e630e79cac SHA1 958343ca4eb4b09304cf80ed31e1c63643f72e79 SHA256 fd239a87d11443d295c2043fd6df486c56ea2b8df90ea2fc0b68351f2b7fb692 MD5 abf0c6fe9d93e5b0cc9a4dbb6d93ad87 files/1.2.7-joystick2.patch 16196 RMD160 ee78e906b40bc02e2804167e317608e630e79cac files/1.2.7-joystick2.patch 16196 SHA256 fd239a87d11443d295c2043fd6df486c56ea2b8df90ea2fc0b68351f2b7fb692 files/1.2.7-joystick2.patch 16196 -AUX 1.2.7-nobuggy-X.patch 568 RMD160 581d2fabac061fea3b99e4aa2dfa8da7294b28c3 SHA1 d9ecc42a6d92f06a0fb3cf5e4aeebc0fdb2c320d SHA256 de0aceb950ab3a53459398ae73d1e2d1f5462e8d94582ec9299a4bfdbd9e9860 size 568 -MD5 4f1ce33c931d461bed06277f60341085 files/1.2.7-nobuggy-X.patch 568 -RMD160 581d2fabac061fea3b99e4aa2dfa8da7294b28c3 files/1.2.7-nobuggy-X.patch 568 -SHA256 de0aceb950ab3a53459398ae73d1e2d1f5462e8d94582ec9299a4bfdbd9e9860 files/1.2.7-nobuggy-X.patch 568 -AUX 1.2.8-amd64-endian.patch 651 RMD160 17a13323662906014a43271d07d36a9d2cb65791 SHA1 3d910d6782a9c76e5902f753759c01d3a9771dea SHA256 a28f2f5417b77cc5091ab575f083e64aeb2dd05a923adf6e9a74fd4e9e686925 size 651 +AUX 1.2.8-amd64-endian.patch 651 RMD160 17a13323662906014a43271d07d36a9d2cb65791 SHA1 3d910d6782a9c76e5902f753759c01d3a9771dea SHA256 a28f2f5417b77cc5091ab575f083e64aeb2dd05a923adf6e9a74fd4e9e686925 MD5 5d1fcf4587b0ce9cd723aa69f9ef7dba files/1.2.8-amd64-endian.patch 651 RMD160 17a13323662906014a43271d07d36a9d2cb65791 files/1.2.8-amd64-endian.patch 651 SHA256 a28f2f5417b77cc5091ab575f083e64aeb2dd05a923adf6e9a74fd4e9e686925 files/1.2.8-amd64-endian.patch 651 -AUX 1.2.8-direct-8bit-color.patch 7414 RMD160 4c89b8faa45af89812ba9fa8b3779bf18ff113ab SHA1 9bfc1ab284be8fee4e959abe5856cc9fff3f73cc SHA256 fc6238e282671a0bd674d82ac06c969af43960cbaad47f15309e297de52b0774 size 7414 +AUX 1.2.8-direct-8bit-color.patch 7414 RMD160 4c89b8faa45af89812ba9fa8b3779bf18ff113ab SHA1 9bfc1ab284be8fee4e959abe5856cc9fff3f73cc SHA256 fc6238e282671a0bd674d82ac06c969af43960cbaad47f15309e297de52b0774 MD5 e6471a33cb0d62a807640ef3eccffb5f files/1.2.8-direct-8bit-color.patch 7414 RMD160 4c89b8faa45af89812ba9fa8b3779bf18ff113ab files/1.2.8-direct-8bit-color.patch 7414 SHA256 fc6238e282671a0bd674d82ac06c969af43960cbaad47f15309e297de52b0774 files/1.2.8-direct-8bit-color.patch 7414 -AUX 1.2.8-gcc2.patch 743 RMD160 e7e418c760a70d1d4e7c5a220783b88ded954fb3 SHA1 58cd7f0f08857328b1ec2cc200571ccdbb45721c SHA256 11998f59b9d5e58ff2da6ea4bc56c2c77fba6d1218e1535a364568c8e365fae8 size 743 +AUX 1.2.8-gcc2.patch 743 RMD160 e7e418c760a70d1d4e7c5a220783b88ded954fb3 SHA1 58cd7f0f08857328b1ec2cc200571ccdbb45721c SHA256 11998f59b9d5e58ff2da6ea4bc56c2c77fba6d1218e1535a364568c8e365fae8 MD5 323ad5b1e83521630dd4d54819c5efbd files/1.2.8-gcc2.patch 743 RMD160 e7e418c760a70d1d4e7c5a220783b88ded954fb3 files/1.2.8-gcc2.patch 743 SHA256 11998f59b9d5e58ff2da6ea4bc56c2c77fba6d1218e1535a364568c8e365fae8 files/1.2.8-gcc2.patch 743 -AUX 1.2.8-gcc4.patch 6875 RMD160 c52234d3a830dfb5aae949a71524ad7622bce70e SHA1 4233ca6f1b99ff92c05811f55b1454943438934c SHA256 a79f76205cf02012bf4f8efece480367052bf4436f3e5f20b5a542fac3ea99e7 size 6875 +AUX 1.2.8-gcc4.patch 6875 RMD160 c52234d3a830dfb5aae949a71524ad7622bce70e SHA1 4233ca6f1b99ff92c05811f55b1454943438934c SHA256 a79f76205cf02012bf4f8efece480367052bf4436f3e5f20b5a542fac3ea99e7 MD5 4e92be33d24fa96149b0e68eb916e259 files/1.2.8-gcc4.patch 6875 RMD160 c52234d3a830dfb5aae949a71524ad7622bce70e files/1.2.8-gcc4.patch 6875 SHA256 a79f76205cf02012bf4f8efece480367052bf4436f3e5f20b5a542fac3ea99e7 files/1.2.8-gcc4.patch 6875 -AUX 1.2.8-keyrepeat.patch 598 RMD160 44c4c97bf0d722afae61eef33108a62a3e5bbedd SHA1 396249760a7269824858b8bf285709c91d149f9f SHA256 9df186cfbaf8c9770fd3ca306d4c3b582955ebd396750f19e3cb37680321bd13 size 598 +AUX 1.2.8-keyrepeat.patch 598 RMD160 44c4c97bf0d722afae61eef33108a62a3e5bbedd SHA1 396249760a7269824858b8bf285709c91d149f9f SHA256 9df186cfbaf8c9770fd3ca306d4c3b582955ebd396750f19e3cb37680321bd13 MD5 60ecfde6cc7b734ef03b93357c537674 files/1.2.8-keyrepeat.patch 598 RMD160 44c4c97bf0d722afae61eef33108a62a3e5bbedd files/1.2.8-keyrepeat.patch 598 SHA256 9df186cfbaf8c9770fd3ca306d4c3b582955ebd396750f19e3cb37680321bd13 files/1.2.8-keyrepeat.patch 598 -AUX 1.2.8-linux26.patch 1268 RMD160 7b557acca2209ed0daf8cb4af4300a3aa1ee62be SHA1 db43ff5d6622ed99899e3d042d3fa8c776afb7cd SHA256 d26eaf2b6741bfe9b67d6540980a7972ba13713dd06c9f048512dcbcfcf32966 size 1268 +AUX 1.2.8-linux26.patch 1268 RMD160 7b557acca2209ed0daf8cb4af4300a3aa1ee62be SHA1 db43ff5d6622ed99899e3d042d3fa8c776afb7cd SHA256 d26eaf2b6741bfe9b67d6540980a7972ba13713dd06c9f048512dcbcfcf32966 MD5 e0c6c6ffc15475282fc864b8f52f0abf files/1.2.8-linux26.patch 1268 RMD160 7b557acca2209ed0daf8cb4af4300a3aa1ee62be files/1.2.8-linux26.patch 1268 SHA256 d26eaf2b6741bfe9b67d6540980a7972ba13713dd06c9f048512dcbcfcf32966 files/1.2.8-linux26.patch 1268 -AUX 1.2.8-nobuggy-X.patch 568 RMD160 581d2fabac061fea3b99e4aa2dfa8da7294b28c3 SHA1 d9ecc42a6d92f06a0fb3cf5e4aeebc0fdb2c320d SHA256 de0aceb950ab3a53459398ae73d1e2d1f5462e8d94582ec9299a4bfdbd9e9860 size 568 +AUX 1.2.8-nobuggy-X.patch 568 RMD160 581d2fabac061fea3b99e4aa2dfa8da7294b28c3 SHA1 d9ecc42a6d92f06a0fb3cf5e4aeebc0fdb2c320d SHA256 de0aceb950ab3a53459398ae73d1e2d1f5462e8d94582ec9299a4bfdbd9e9860 MD5 4f1ce33c931d461bed06277f60341085 files/1.2.8-nobuggy-X.patch 568 RMD160 581d2fabac061fea3b99e4aa2dfa8da7294b28c3 files/1.2.8-nobuggy-X.patch 568 SHA256 de0aceb950ab3a53459398ae73d1e2d1f5462e8d94582ec9299a4bfdbd9e9860 files/1.2.8-nobuggy-X.patch 568 -AUX libsdl-1.2.6-fullscreen.patch 1094 RMD160 6e76b71881b42712d88413a601bec8b3193d732f SHA1 f3c3d3592f209cce92efef9b0da755303aaad4d9 SHA256 e9a4a17e98761c8e2e202bed06dbe614f45dd44e4382f0e855880a5bf4c82887 size 1094 +AUX libsdl-1.2.10-PIC-hidden-symbols.patch 4247 RMD160 4b69adf31eb690619a2b05cf41cc89dcf56a66e5 SHA1 37b98876ba283d60388f3fd585f1bf6c96ff8641 SHA256 ebddb80f6a0b0c627d74dabf2832bc64ed8c0705959cad92087184782bc359c4 +MD5 09d2bf66d15fd0b252d67aa1ed0630d2 files/libsdl-1.2.10-PIC-hidden-symbols.patch 4247 +RMD160 4b69adf31eb690619a2b05cf41cc89dcf56a66e5 files/libsdl-1.2.10-PIC-hidden-symbols.patch 4247 +SHA256 ebddb80f6a0b0c627d74dabf2832bc64ed8c0705959cad92087184782bc359c4 files/libsdl-1.2.10-PIC-hidden-symbols.patch 4247 +AUX libsdl-1.2.10-libcaca.patch 17034 RMD160 d6ee0da79f21fa69ef0d3ad4b1e9fa76815dfa01 SHA1 cf8e09994ecaa919955ce92198ef5a7b6899bed6 SHA256 930bda73223f4d00dd979ae2b7dd86c51ae57a310ec3a4d5e97dbac452d8e3a0 +MD5 5110a1432def77889f6f88fae64e2c9d files/libsdl-1.2.10-libcaca.patch 17034 +RMD160 d6ee0da79f21fa69ef0d3ad4b1e9fa76815dfa01 files/libsdl-1.2.10-libcaca.patch 17034 +SHA256 930bda73223f4d00dd979ae2b7dd86c51ae57a310ec3a4d5e97dbac452d8e3a0 files/libsdl-1.2.10-libcaca.patch 17034 +AUX libsdl-1.2.10-sdl-config.patch 780 RMD160 63a3f86cd25011d0d1e983d89910d4bceb965e86 SHA1 01c8d54cb8a22ea2a1e898b3ca39f9baca07dc98 SHA256 1c73cc815ae4f6fdaee3dc899a9f38e9f29f88e3997070c9fba226b36dbed015 +MD5 2d9bced29ca7e5c69410ce1e3ff58e09 files/libsdl-1.2.10-sdl-config.patch 780 +RMD160 63a3f86cd25011d0d1e983d89910d4bceb965e86 files/libsdl-1.2.10-sdl-config.patch 780 +SHA256 1c73cc815ae4f6fdaee3dc899a9f38e9f29f88e3997070c9fba226b36dbed015 files/libsdl-1.2.10-sdl-config.patch 780 +AUX libsdl-1.2.6-fullscreen.patch 1094 RMD160 6e76b71881b42712d88413a601bec8b3193d732f SHA1 f3c3d3592f209cce92efef9b0da755303aaad4d9 SHA256 e9a4a17e98761c8e2e202bed06dbe614f45dd44e4382f0e855880a5bf4c82887 MD5 419d8c241f85b4deba895c615faa5612 files/libsdl-1.2.6-fullscreen.patch 1094 RMD160 6e76b71881b42712d88413a601bec8b3193d732f files/libsdl-1.2.6-fullscreen.patch 1094 SHA256 e9a4a17e98761c8e2e202bed06dbe614f45dd44e4382f0e855880a5bf4c82887 files/libsdl-1.2.6-fullscreen.patch 1094 -AUX libsdl-1.2.8-gcc2.patch 15033 RMD160 6d7d4a7eacfe0881357cf4a1447a7e690056e780 SHA1 0b56f0f0d442e14a2198347b89a1f7dd82844d35 SHA256 721488967ee9a482c64be69691cb7f49aa99f8aceba0b285be938c911530dbc0 size 15033 +AUX libsdl-1.2.8-gcc2.patch 15033 RMD160 6d7d4a7eacfe0881357cf4a1447a7e690056e780 SHA1 0b56f0f0d442e14a2198347b89a1f7dd82844d35 SHA256 721488967ee9a482c64be69691cb7f49aa99f8aceba0b285be938c911530dbc0 MD5 8404c8c79f0fafd9daf84a09c64dbb5d files/libsdl-1.2.8-gcc2.patch 15033 RMD160 6d7d4a7eacfe0881357cf4a1447a7e690056e780 files/libsdl-1.2.8-gcc2.patch 15033 SHA256 721488967ee9a482c64be69691cb7f49aa99f8aceba0b285be938c911530dbc0 files/libsdl-1.2.8-gcc2.patch 15033 -AUX libsdl-1.2.8-libcaca.patch 19418 RMD160 13368a0b7e8f9e4b0ff177c1a1abd09095893bf7 SHA1 9faa1b3c34d7aaaa039e72e7b0b11d1321447b5d SHA256 467ed6b41eb9555b7ab833ef7d792d997f4579ec811f3862011144e6dda7d19d size 19418 +AUX libsdl-1.2.8-libcaca.patch 19418 RMD160 13368a0b7e8f9e4b0ff177c1a1abd09095893bf7 SHA1 9faa1b3c34d7aaaa039e72e7b0b11d1321447b5d SHA256 467ed6b41eb9555b7ab833ef7d792d997f4579ec811f3862011144e6dda7d19d MD5 ebca26b8a60c4c68471691ab7bd9271e files/libsdl-1.2.8-libcaca.patch 19418 RMD160 13368a0b7e8f9e4b0ff177c1a1abd09095893bf7 files/libsdl-1.2.8-libcaca.patch 19418 SHA256 467ed6b41eb9555b7ab833ef7d792d997f4579ec811f3862011144e6dda7d19d files/libsdl-1.2.8-libcaca.patch 19418 -AUX libsdl-1.2.8-no-cxx.patch 688 RMD160 44ec283effb9738e733a83381755d530fde2fc85 SHA1 a6a6980aa180c194ede219f39a994b7a69b7ddaa SHA256 d8f7243701f607ab249395ca0772eada2da93839aad45206cff504d602c72f00 size 688 +AUX libsdl-1.2.8-no-cxx.patch 688 RMD160 44ec283effb9738e733a83381755d530fde2fc85 SHA1 a6a6980aa180c194ede219f39a994b7a69b7ddaa SHA256 d8f7243701f607ab249395ca0772eada2da93839aad45206cff504d602c72f00 MD5 14e090fd7a72ed528972ddc8b6a90fb4 files/libsdl-1.2.8-no-cxx.patch 688 RMD160 44ec283effb9738e733a83381755d530fde2fc85 files/libsdl-1.2.8-no-cxx.patch 688 SHA256 d8f7243701f607ab249395ca0772eada2da93839aad45206cff504d602c72f00 files/libsdl-1.2.8-no-cxx.patch 688 -AUX libsdl-1.2.8-sdl-config.patch 738 RMD160 e26ad00652f718fd02f06232fca59a7488aa3399 SHA1 962464fbca82120fff44454d7149890a3af8411d SHA256 70877471bc69d37355394ebb6c91e796ce298283a168fe15a486a8cce48d2868 size 738 +AUX libsdl-1.2.8-sdl-config.patch 738 RMD160 e26ad00652f718fd02f06232fca59a7488aa3399 SHA1 962464fbca82120fff44454d7149890a3af8411d SHA256 70877471bc69d37355394ebb6c91e796ce298283a168fe15a486a8cce48d2868 MD5 5b76156f2699a03a798bd4ed9b0f4233 files/libsdl-1.2.8-sdl-config.patch 738 RMD160 e26ad00652f718fd02f06232fca59a7488aa3399 files/libsdl-1.2.8-sdl-config.patch 738 SHA256 70877471bc69d37355394ebb6c91e796ce298283a168fe15a486a8cce48d2868 files/libsdl-1.2.8-sdl-config.patch 738 -AUX libsdl-1.2.9-DirectFB-updates.patch 2281 RMD160 161eb59e7ce0b7fa4f991fbed284d1a80dbeb262 SHA1 d27dd8fe62d77fa0aa0f5175b4b42f4c53eae591 SHA256 99063b3e9d683c4c904fd83d8c9644c27c5f77cae7b3fc0fb2aa9ce8e94d5563 size 2281 +AUX libsdl-1.2.9-DirectFB-updates.patch 2281 RMD160 161eb59e7ce0b7fa4f991fbed284d1a80dbeb262 SHA1 d27dd8fe62d77fa0aa0f5175b4b42f4c53eae591 SHA256 99063b3e9d683c4c904fd83d8c9644c27c5f77cae7b3fc0fb2aa9ce8e94d5563 MD5 5a88bb67efffa260b077a2fad266ad1d files/libsdl-1.2.9-DirectFB-updates.patch 2281 RMD160 161eb59e7ce0b7fa4f991fbed284d1a80dbeb262 files/libsdl-1.2.9-DirectFB-updates.patch 2281 SHA256 99063b3e9d683c4c904fd83d8c9644c27c5f77cae7b3fc0fb2aa9ce8e94d5563 files/libsdl-1.2.9-DirectFB-updates.patch 2281 -AUX libsdl-1.2.9-PIC-SDL_stretch.patch 396 RMD160 18c8081ae2f6d35fcc57289d3c6c874ac7a869bf SHA1 775a1811d6de18f4bb2e7a22a0ecf2f50aa52423 SHA256 b166d8408ea88459422b9027ba0a58c4cb86d1218aeb69e0f7a9e270ffba4f10 size 396 +AUX libsdl-1.2.9-PIC-SDL_stretch.patch 396 RMD160 18c8081ae2f6d35fcc57289d3c6c874ac7a869bf SHA1 775a1811d6de18f4bb2e7a22a0ecf2f50aa52423 SHA256 b166d8408ea88459422b9027ba0a58c4cb86d1218aeb69e0f7a9e270ffba4f10 MD5 2ce49535d1db8c32ba4345ecc63eee24 files/libsdl-1.2.9-PIC-SDL_stretch.patch 396 RMD160 18c8081ae2f6d35fcc57289d3c6c874ac7a869bf files/libsdl-1.2.9-PIC-SDL_stretch.patch 396 SHA256 b166d8408ea88459422b9027ba0a58c4cb86d1218aeb69e0f7a9e270ffba4f10 files/libsdl-1.2.9-PIC-SDL_stretch.patch 396 -AUX libsdl-1.2.9-PIC-hermes-call-dont-jump.patch 4928 RMD160 f405fa068840f1041bede1c944ff17167d5a47be SHA1 a4118f5b46dbf265d0e49ed7298ee7d2d6db2c24 SHA256 22d9048db46226e15b84e2d5cc400b2e357e1d7395f149040b5c38678230c820 size 4928 +AUX libsdl-1.2.9-PIC-hermes-call-dont-jump.patch 4928 RMD160 f405fa068840f1041bede1c944ff17167d5a47be SHA1 a4118f5b46dbf265d0e49ed7298ee7d2d6db2c24 SHA256 22d9048db46226e15b84e2d5cc400b2e357e1d7395f149040b5c38678230c820 MD5 327bae5c9d159acaa55b2da63c3ee561 files/libsdl-1.2.9-PIC-hermes-call-dont-jump.patch 4928 RMD160 f405fa068840f1041bede1c944ff17167d5a47be files/libsdl-1.2.9-PIC-hermes-call-dont-jump.patch 4928 SHA256 22d9048db46226e15b84e2d5cc400b2e357e1d7395f149040b5c38678230c820 files/libsdl-1.2.9-PIC-hermes-call-dont-jump.patch 4928 -AUX libsdl-1.2.9-PIC-hermes-cpuid.patch 452 RMD160 7578c5e70108164f46017edc2e47d27b8d163cbc SHA1 74b57489e0cb08278a42a0f59f19f37a57990206 SHA256 7335feab2e79bbb38fe62d259e1dc1dc8ab4b0f39c044960cbe55be977e5e49a size 452 +AUX libsdl-1.2.9-PIC-hermes-cpuid.patch 452 RMD160 7578c5e70108164f46017edc2e47d27b8d163cbc SHA1 74b57489e0cb08278a42a0f59f19f37a57990206 SHA256 7335feab2e79bbb38fe62d259e1dc1dc8ab4b0f39c044960cbe55be977e5e49a MD5 c214458f3c67b5451a5f305a2532ce64 files/libsdl-1.2.9-PIC-hermes-cpuid.patch 452 RMD160 7578c5e70108164f46017edc2e47d27b8d163cbc files/libsdl-1.2.9-PIC-hermes-cpuid.patch 452 SHA256 7335feab2e79bbb38fe62d259e1dc1dc8ab4b0f39c044960cbe55be977e5e49a files/libsdl-1.2.9-PIC-hermes-cpuid.patch 452 -AUX libsdl-1.2.9-PIC-load-mmx-masks-from-stack.patch 3901 RMD160 6614004fca1a7a670ab6e2e27e5e5cd07ce1e9b0 SHA1 6adf9ae7c482641a09a395cc452bde3cdc557197 SHA256 17554e4e7f84c18403002fc7edf3ebb4c2ac50d6eef8c363f87b1542d282cb25 size 3901 +AUX libsdl-1.2.9-PIC-load-mmx-masks-from-stack.patch 3901 RMD160 6614004fca1a7a670ab6e2e27e5e5cd07ce1e9b0 SHA1 6adf9ae7c482641a09a395cc452bde3cdc557197 SHA256 17554e4e7f84c18403002fc7edf3ebb4c2ac50d6eef8c363f87b1542d282cb25 MD5 25b8b048d7e5d2a6edc59a66f34566e7 files/libsdl-1.2.9-PIC-load-mmx-masks-from-stack.patch 3901 RMD160 6614004fca1a7a670ab6e2e27e5e5cd07ce1e9b0 files/libsdl-1.2.9-PIC-load-mmx-masks-from-stack.patch 3901 SHA256 17554e4e7f84c18403002fc7edf3ebb4c2ac50d6eef8c363f87b1542d282cb25 files/libsdl-1.2.9-PIC-load-mmx-masks-from-stack.patch 3901 -AUX libsdl-1.2.9-PIC-yuv-mmx.patch 13260 RMD160 ca53bf2622f20bae270342776b4a7f56bb413504 SHA1 21812c9e63ccca2f8e69488c7f4b9702712e4ae0 SHA256 433c4a78fc5d39c108bb9ccaeec36f3856202db6fc72e239a8369e25b71f8e33 size 13260 +AUX libsdl-1.2.9-PIC-yuv-mmx.patch 13260 RMD160 ca53bf2622f20bae270342776b4a7f56bb413504 SHA1 21812c9e63ccca2f8e69488c7f4b9702712e4ae0 SHA256 433c4a78fc5d39c108bb9ccaeec36f3856202db6fc72e239a8369e25b71f8e33 MD5 351838164a2c51a3cc19516e1ee8d3e7 files/libsdl-1.2.9-PIC-yuv-mmx.patch 13260 RMD160 ca53bf2622f20bae270342776b4a7f56bb413504 files/libsdl-1.2.9-PIC-yuv-mmx.patch 13260 SHA256 433c4a78fc5d39c108bb9ccaeec36f3856202db6fc72e239a8369e25b71f8e33 files/libsdl-1.2.9-PIC-yuv-mmx.patch 13260 -AUX libsdl-1.2.9-dlvsym-check.patch 907 RMD160 215efcbe2ffede50e616393e7fc2adbe7c739191 SHA1 82836289545a0747edd9d3d8e8d6ab43ccc466bd SHA256 1cd166042fcd3a39d99f34f918c0859ce88cae2ef927db94d253a0b2ce21f9c2 size 907 +AUX libsdl-1.2.9-dlvsym-check.patch 907 RMD160 215efcbe2ffede50e616393e7fc2adbe7c739191 SHA1 82836289545a0747edd9d3d8e8d6ab43ccc466bd SHA256 1cd166042fcd3a39d99f34f918c0859ce88cae2ef927db94d253a0b2ce21f9c2 MD5 7fd44027d68e34cfdd399e23931caa94 files/libsdl-1.2.9-dlvsym-check.patch 907 RMD160 215efcbe2ffede50e616393e7fc2adbe7c739191 files/libsdl-1.2.9-dlvsym-check.patch 907 SHA256 1cd166042fcd3a39d99f34f918c0859ce88cae2ef927db94d253a0b2ce21f9c2 files/libsdl-1.2.9-dlvsym-check.patch 907 -AUX libsdl-1.2.9-endian-cvs-updates.patch 1667 RMD160 21d8e046d22ff35dd1c550de2f22892df0a3144f SHA1 569eb21b2934e5a55b81eeb73692c0a803b04219 SHA256 1b2c0e466baae1e28343c8b24a8380e6d63f26276a6657f616a88f1c08ffaeb6 size 1667 +AUX libsdl-1.2.9-endian-cvs-updates.patch 1667 RMD160 21d8e046d22ff35dd1c550de2f22892df0a3144f SHA1 569eb21b2934e5a55b81eeb73692c0a803b04219 SHA256 1b2c0e466baae1e28343c8b24a8380e6d63f26276a6657f616a88f1c08ffaeb6 MD5 5133fc3223d62fd0a24e9343c5520b69 files/libsdl-1.2.9-endian-cvs-updates.patch 1667 RMD160 21d8e046d22ff35dd1c550de2f22892df0a3144f files/libsdl-1.2.9-endian-cvs-updates.patch 1667 SHA256 1b2c0e466baae1e28343c8b24a8380e6d63f26276a6657f616a88f1c08ffaeb6 files/libsdl-1.2.9-endian-cvs-updates.patch 1667 -AUX libsdl-1.2.9-gcc-mmx.patch 15320 RMD160 d186c849105a4f9c7b46265ca15b6969d5666029 SHA1 4efb6881ab438ae9303a5d84c3f207d0d191bbdd SHA256 be3528c2d262a6fc1d3697ae1ce935d172dbe8b4699b914586426b00221fc4af size 15320 +AUX libsdl-1.2.9-gcc-mmx.patch 15320 RMD160 d186c849105a4f9c7b46265ca15b6969d5666029 SHA1 4efb6881ab438ae9303a5d84c3f207d0d191bbdd SHA256 be3528c2d262a6fc1d3697ae1ce935d172dbe8b4699b914586426b00221fc4af MD5 27b5c7cf673424d9c9ce5e26d5031385 files/libsdl-1.2.9-gcc-mmx.patch 15320 RMD160 d186c849105a4f9c7b46265ca15b6969d5666029 files/libsdl-1.2.9-gcc-mmx.patch 15320 SHA256 be3528c2d262a6fc1d3697ae1ce935d172dbe8b4699b914586426b00221fc4af files/libsdl-1.2.9-gcc-mmx.patch 15320 -AUX libsdl-1.2.9-no-exec-stack.patch 1146 RMD160 70a0cfbe54417634d5c075d779eac7781b8048f7 SHA1 59215ea6a1cf67dbfbaf2e9256e2758aaf9af0ee SHA256 c89f5c4987d39eaf979affad152b4e762c08b8d402a01d95533da9fde9510998 size 1146 +AUX libsdl-1.2.9-no-exec-stack.patch 1146 RMD160 70a0cfbe54417634d5c075d779eac7781b8048f7 SHA1 59215ea6a1cf67dbfbaf2e9256e2758aaf9af0ee SHA256 c89f5c4987d39eaf979affad152b4e762c08b8d402a01d95533da9fde9510998 MD5 1aec1ecf1921c28a0b02c6e47c35b192 files/libsdl-1.2.9-no-exec-stack.patch 1146 RMD160 70a0cfbe54417634d5c075d779eac7781b8048f7 files/libsdl-1.2.9-no-exec-stack.patch 1146 SHA256 c89f5c4987d39eaf979affad152b4e762c08b8d402a01d95533da9fde9510998 files/libsdl-1.2.9-no-exec-stack.patch 1146 -AUX libsdl-1.2.9-sdl-blit-mmx-check.patch 551 RMD160 18eb2d7b0b6fef9e0c47f4917fdb31faf37a0021 SHA1 7f9fbc0f3fe4d11c371fa067be8c944b760c66a1 SHA256 2dc359619d9af0cd418577b364c3395d9e3093fcfdd0195e9a0ebe62df3e4aaf size 551 +AUX libsdl-1.2.9-sdl-blit-mmx-check.patch 551 RMD160 18eb2d7b0b6fef9e0c47f4917fdb31faf37a0021 SHA1 7f9fbc0f3fe4d11c371fa067be8c944b760c66a1 SHA256 2dc359619d9af0cd418577b364c3395d9e3093fcfdd0195e9a0ebe62df3e4aaf MD5 7335dd719002ab81477446278b2f786f files/libsdl-1.2.9-sdl-blit-mmx-check.patch 551 RMD160 18eb2d7b0b6fef9e0c47f4917fdb31faf37a0021 files/libsdl-1.2.9-sdl-blit-mmx-check.patch 551 SHA256 2dc359619d9af0cd418577b364c3395d9e3093fcfdd0195e9a0ebe62df3e4aaf files/libsdl-1.2.9-sdl-blit-mmx-check.patch 551 -DIST SDL-1.2.7.tar.gz 2470936 size 2470936 -DIST SDL-1.2.8.tar.gz 2602449 size 2602449 -DIST SDL-1.2.9.tar.gz 2688179 size 2688179 -EBUILD libsdl-1.2.7-r3.ebuild 4269 RMD160 0fc74c62e328acb6154ae15666038c775bd2698b SHA1 f7b3be7368f128bd6432f6c7457a55d720c1bd94 SHA256 a2b6006b1c505e59025d4339dd036d05a6f1bd86e3d521ba6aef09b62fe484c4 size 4269 -MD5 295699b0a2b7e8a2a173bcc3d5cd416e libsdl-1.2.7-r3.ebuild 4269 -RMD160 0fc74c62e328acb6154ae15666038c775bd2698b libsdl-1.2.7-r3.ebuild 4269 -SHA256 a2b6006b1c505e59025d4339dd036d05a6f1bd86e3d521ba6aef09b62fe484c4 libsdl-1.2.7-r3.ebuild 4269 -EBUILD libsdl-1.2.8-r1.ebuild 5430 RMD160 12e57d98eceb9387657ec273d65038cd957d50d9 SHA1 84d1d3d4c910f9f25b2fadb3201d28101ec5312c SHA256 7f6d9d42c635ead78ca4912a8a05881bf0be96b9cfd895e8558aad2f73994daf size 5430 +DIST SDL-1.2.10.tar.gz 2792344 RMD160 e2e73a580638ab29d4b000152ed80999545e9fb5 SHA1 ad64b3b58b3cf83a28a1c21bedf270da43118f67 SHA256 f4d384266a3174770234d40829c767ff7090f3e1a9c9fc9fd5e130f51ddf7a70 +DIST SDL-1.2.7.tar.gz 2470936 +DIST SDL-1.2.8.tar.gz 2602449 +DIST SDL-1.2.9.tar.gz 2688179 +EBUILD libsdl-1.2.10.ebuild 4356 RMD160 0c36aa7102a2e205a91fb5218256c4b6faf6211a SHA1 c5b275ede4b805b845b24dca854537fd338f0421 SHA256 4f0585ef5a904c4a73add5a79bad91be1b4be9358e6f53b45f9c838da3d8f47f +MD5 166b0253ba9887a02fdca6d2f008bf4b libsdl-1.2.10.ebuild 4356 +RMD160 0c36aa7102a2e205a91fb5218256c4b6faf6211a libsdl-1.2.10.ebuild 4356 +SHA256 4f0585ef5a904c4a73add5a79bad91be1b4be9358e6f53b45f9c838da3d8f47f libsdl-1.2.10.ebuild 4356 +EBUILD libsdl-1.2.7-r3.ebuild 4269 RMD160 78ca7654af8eca755e73c58b1c5d6d6b6998612e SHA1 61c2d2c90e4e31551fac4c557823b4b25016a557 SHA256 1eb38d7e30a20096b1480a62a6a759a436fa4b40688dbd2ca86da0e434a1fc05 +MD5 5c56de3cfb83340e0d889828dd372194 libsdl-1.2.7-r3.ebuild 4269 +RMD160 78ca7654af8eca755e73c58b1c5d6d6b6998612e libsdl-1.2.7-r3.ebuild 4269 +SHA256 1eb38d7e30a20096b1480a62a6a759a436fa4b40688dbd2ca86da0e434a1fc05 libsdl-1.2.7-r3.ebuild 4269 +EBUILD libsdl-1.2.8-r1.ebuild 5430 RMD160 12e57d98eceb9387657ec273d65038cd957d50d9 SHA1 84d1d3d4c910f9f25b2fadb3201d28101ec5312c SHA256 7f6d9d42c635ead78ca4912a8a05881bf0be96b9cfd895e8558aad2f73994daf MD5 5c442d00f0d05f9935c3f7ac6756d4d2 libsdl-1.2.8-r1.ebuild 5430 RMD160 12e57d98eceb9387657ec273d65038cd957d50d9 libsdl-1.2.8-r1.ebuild 5430 SHA256 7f6d9d42c635ead78ca4912a8a05881bf0be96b9cfd895e8558aad2f73994daf libsdl-1.2.8-r1.ebuild 5430 -EBUILD libsdl-1.2.9-r1.ebuild 5054 RMD160 b045ef71646bce475345caf83db87f3ade0ae5a9 SHA1 44144121455d9a657d648a58ec975c18cb39f72c SHA256 0b82552237b5d1cc9a4ab2ee3a844a267821b65d06ba226298cf33e6d33b5c03 size 5054 +EBUILD libsdl-1.2.9-r1.ebuild 5054 RMD160 b045ef71646bce475345caf83db87f3ade0ae5a9 SHA1 44144121455d9a657d648a58ec975c18cb39f72c SHA256 0b82552237b5d1cc9a4ab2ee3a844a267821b65d06ba226298cf33e6d33b5c03 MD5 0d7a5559dd4da7706dd08b959c54c1de libsdl-1.2.9-r1.ebuild 5054 RMD160 b045ef71646bce475345caf83db87f3ade0ae5a9 libsdl-1.2.9-r1.ebuild 5054 SHA256 0b82552237b5d1cc9a4ab2ee3a844a267821b65d06ba226298cf33e6d33b5c03 libsdl-1.2.9-r1.ebuild 5054 -EBUILD libsdl-1.2.9.ebuild 4643 RMD160 aac01c7a3f935649f1d64a166c3892ca62b9282c SHA1 1493794853306c119c27b2eaa4db18ed4e9036b7 SHA256 2aa67035dea53f4f861205e03998be56b93980af0783b3cfd1b8c886f2cee74c size 4643 +EBUILD libsdl-1.2.9.ebuild 4643 RMD160 aac01c7a3f935649f1d64a166c3892ca62b9282c SHA1 1493794853306c119c27b2eaa4db18ed4e9036b7 SHA256 2aa67035dea53f4f861205e03998be56b93980af0783b3cfd1b8c886f2cee74c MD5 62041b7bb258830e75ef4464d7124598 libsdl-1.2.9.ebuild 4643 RMD160 aac01c7a3f935649f1d64a166c3892ca62b9282c libsdl-1.2.9.ebuild 4643 SHA256 2aa67035dea53f4f861205e03998be56b93980af0783b3cfd1b8c886f2cee74c libsdl-1.2.9.ebuild 4643 -MISC ChangeLog 15904 RMD160 afc0f5e29bdb37c61dfed27b2db9fa065ba5eca5 SHA1 d0524ef68b02f7579104da0220eb6cdaa080a888 SHA256 5ad7fc828409281474dec90905339efe14fb0945958d9536892e5735be6a9806 size 15904 -MD5 b8b974487657a790cf9bd750c3026037 ChangeLog 15904 -RMD160 afc0f5e29bdb37c61dfed27b2db9fa065ba5eca5 ChangeLog 15904 -SHA256 5ad7fc828409281474dec90905339efe14fb0945958d9536892e5735be6a9806 ChangeLog 15904 -MISC metadata.xml 974 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f SHA1 8f8471103d29e564169640539c3a2a6a7de5b8c7 SHA256 e575130f8fd4925956581f5d4230469e915b1a8d63269cc0aa3510f3a4743b9b size 974 +MISC ChangeLog 16171 RMD160 004659b0083550723b26683246f98965e365d389 SHA1 bcb496fc824ea1fac4a950adf6aef3270ee9fec2 SHA256 6fc75b11ee3f666ecf6c4cd3736341b46a329e9e0dc033fccd1279939c757838 +MD5 0d9f0606b9ad003dd10ea4f3bc7b1a37 ChangeLog 16171 +RMD160 004659b0083550723b26683246f98965e365d389 ChangeLog 16171 +SHA256 6fc75b11ee3f666ecf6c4cd3736341b46a329e9e0dc033fccd1279939c757838 ChangeLog 16171 +MISC metadata.xml 974 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f SHA1 8f8471103d29e564169640539c3a2a6a7de5b8c7 SHA256 e575130f8fd4925956581f5d4230469e915b1a8d63269cc0aa3510f3a4743b9b MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f metadata.xml 974 SHA256 e575130f8fd4925956581f5d4230469e915b1a8d63269cc0aa3510f3a4743b9b metadata.xml 974 +MD5 aa5d93c0540e95b816b1d90d0dbce35d files/digest-libsdl-1.2.10 235 +RMD160 09fcb1eff5bce9e196dfd3736e7ead0d0b520b57 files/digest-libsdl-1.2.10 235 +SHA256 884be8dbec06d8824f6e583f8f2ad16f057cb9708b70d7b914b55aa466975c7c files/digest-libsdl-1.2.10 235 MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r3 62 RMD160 c04aa24561002b68478108efe776f5e3674362a9 files/digest-libsdl-1.2.7-r3 62 SHA256 47186061882d9f9c723e8e6872fdd6e0e2b7040e8d335659cfdf4a6ae31a60ec files/digest-libsdl-1.2.7-r3 62 @@ -155,7 +171,7 @@ SHA256 3cce938068213f4f37dff77781a8fd56736d5c68927c71f9b42bc0153992b39b files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEXoRs2+ySkm8kpY0RAoqaAJ0TA2yI3mIkPKF+O1euGr4BRQEwDACff7CQ -sYkYJJmidX6cRm0v0YCr+9Y= -=lsSU +iD8DBQFEdpJK2+ySkm8kpY0RArWOAKC+7w0rQTM31KWFjk4wPxLSthRFHwCeJEQt +BT23OOtPpvUGh8hekTYUsBE= +=ZV7c -----END PGP SIGNATURE----- diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.10 b/media-libs/libsdl/files/digest-libsdl-1.2.10 new file mode 100644 index 000000000000..dc8e2bfb28c2 --- /dev/null +++ b/media-libs/libsdl/files/digest-libsdl-1.2.10 @@ -0,0 +1,3 @@ +MD5 b7b46a866b8bf32df8c041a00e567c7d SDL-1.2.10.tar.gz 2792344 +RMD160 e2e73a580638ab29d4b000152ed80999545e9fb5 SDL-1.2.10.tar.gz 2792344 +SHA256 f4d384266a3174770234d40829c767ff7090f3e1a9c9fc9fd5e130f51ddf7a70 SDL-1.2.10.tar.gz 2792344 diff --git a/media-libs/libsdl/files/libsdl-1.2.10-PIC-hidden-symbols.patch b/media-libs/libsdl/files/libsdl-1.2.10-PIC-hidden-symbols.patch new file mode 100644 index 000000000000..857fc6591aa3 --- /dev/null +++ b/media-libs/libsdl/files/libsdl-1.2.10-PIC-hidden-symbols.patch @@ -0,0 +1,168 @@ +kill off textrels by hiding internal symbols + +http://bugzilla.libsdl.org/show_bug.cgi?id=157 +http://www.libsdl.org/pipermail/sdl/2006-March/073618.html + +--- configure.in ++++ configure.in +@@ -591,10 +591,13 @@ CheckNASM() + , enable_nasm=yes) + if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then +- AC_PATH_PROG(NASM, nasm) +- if test x$NASM != x -a x$NASM != x'"$NASM"'; then ++ AC_PATH_PROG(NASM, yasm) ++ if test "x$NASM" = x -o "x$NASM" = x'"$NASM"'; then ++ AC_PATH_PROG(NASM, nasm) ++ fi ++ if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then + AC_DEFINE(SDL_HERMES_BLITTERS) + SOURCES="$SOURCES $srcdir/src/hermes/*.asm" +- if test x$NASMFLAGS = x; then ++ if test x"$NASMFLAGS" = x; then + case $ARCH in + win32) + NASMFLAGS="-f win32" +@@ -607,6 +610,15 @@ AC_HELP_STRING([--enable-nasm], [use nas + ;; + esac + fi ++ NASMFLAGS="$NASMFLAGS -i $srcdir/src/hermes/" ++ ++ dnl See if hidden visibility is supported ++ echo 'GLOBAL _bar:function hidden' > nasm_vis.asm ++ if $NASM $NASMFLAGS nasm_vis.asm -o nasm_vis.o >&AS_MESSAGE_LOG_FD ; then ++ NASMFLAGS="$NASMFLAGS -DHIDDEN_VISIBILITY" ++ fi ++ rm -f nasm_vis.asm nasm_vis.o ++ + AC_SUBST(NASM) + AC_SUBST(NASMFLAGS) + +--- src/hermes/mmx_main.asm ++++ src/hermes/mmx_main.asm +@@ -9,8 +9,10 @@ + + BITS 32 + +-GLOBAL _ConvertMMX +-GLOBAL _mmxreturn ++%include "common.asm" ++ ++SDL_FUNC _ConvertMMX ++SDL_FUNC _mmxreturn + + SECTION .text + +--- src/hermes/mmxp2_32.asm ++++ src/hermes/mmxp2_32.asm +@@ -20,12 +20,13 @@ + + BITS 32 + ++%include "common.asm" + +-GLOBAL _ConvertMMXpII32_24RGB888 +-GLOBAL _ConvertMMXpII32_16RGB565 +-GLOBAL _ConvertMMXpII32_16BGR565 +-GLOBAL _ConvertMMXpII32_16RGB555 +-GLOBAL _ConvertMMXpII32_16BGR555 ++SDL_FUNC _ConvertMMXpII32_24RGB888 ++SDL_FUNC _ConvertMMXpII32_16RGB565 ++SDL_FUNC _ConvertMMXpII32_16BGR565 ++SDL_FUNC _ConvertMMXpII32_16RGB555 ++SDL_FUNC _ConvertMMXpII32_16BGR555 + + EXTERN _mmxreturn + +--- src/hermes/x86_main.asm ++++ src/hermes/x86_main.asm +@@ -11,10 +11,12 @@ + + BITS 32 + +-GLOBAL _ConvertX86 +-GLOBAL _x86return ++%include "common.asm" ++ ++SDL_FUNC _ConvertX86 ++SDL_FUNC _x86return + +-GLOBAL _Hermes_X86_CPU ++SDL_FUNC _Hermes_X86_CPU + + SECTION .text + +--- src/hermes/x86p_16.asm ++++ src/hermes/x86p_16.asm +@@ -10,19 +10,14 @@ + ; Used with permission. + ; + +- + BITS 32 + +-GLOBAL _ConvertX86p16_32RGB888 +-GLOBAL _ConvertX86p16_32BGR888 +-GLOBAL _ConvertX86p16_32RGBA888 +-GLOBAL _ConvertX86p16_32BGRA888 +-GLOBAL _ConvertX86p16_24RGB888 +-GLOBAL _ConvertX86p16_24BGR888 +-GLOBAL _ConvertX86p16_16BGR565 +-GLOBAL _ConvertX86p16_16RGB555 +-GLOBAL _ConvertX86p16_16BGR555 +-GLOBAL _ConvertX86p16_8RGB332 ++%include "common.asm" ++ ++SDL_FUNC _ConvertX86p16_16BGR565 ++SDL_FUNC _ConvertX86p16_16RGB555 ++SDL_FUNC _ConvertX86p16_16BGR555 ++SDL_FUNC _ConvertX86p16_8RGB332 + + EXTERN _ConvertX86 + EXTERN _x86return +--- src/hermes/x86p_32.asm ++++ src/hermes/x86p_32.asm +@@ -9,19 +9,20 @@ + ; Most routines are (c) Glenn Fiedler (ptc@gaffer.org), used with permission + ; + +- + BITS 32 + +-GLOBAL _ConvertX86p32_32BGR888 +-GLOBAL _ConvertX86p32_32RGBA888 +-GLOBAL _ConvertX86p32_32BGRA888 +-GLOBAL _ConvertX86p32_24RGB888 +-GLOBAL _ConvertX86p32_24BGR888 +-GLOBAL _ConvertX86p32_16RGB565 +-GLOBAL _ConvertX86p32_16BGR565 +-GLOBAL _ConvertX86p32_16RGB555 +-GLOBAL _ConvertX86p32_16BGR555 +-GLOBAL _ConvertX86p32_8RGB332 ++%include "common.asm" ++ ++SDL_FUNC _ConvertX86p32_32BGR888 ++SDL_FUNC _ConvertX86p32_32RGBA888 ++SDL_FUNC _ConvertX86p32_32BGRA888 ++SDL_FUNC _ConvertX86p32_24RGB888 ++SDL_FUNC _ConvertX86p32_24BGR888 ++SDL_FUNC _ConvertX86p32_16RGB565 ++SDL_FUNC _ConvertX86p32_16BGR565 ++SDL_FUNC _ConvertX86p32_16RGB555 ++SDL_FUNC _ConvertX86p32_16BGR555 ++SDL_FUNC _ConvertX86p32_8RGB332 + + EXTERN _x86return + +--- src/hermes/common.asm ++++ src/hermes/common.asm +@@ -0,0 +1,9 @@ ++; Some common macros for hermes nasm code ++ ++%macro SDL_FUNC 1 ++%ifdef HIDDEN_VISIBILITY ++GLOBAL %1:function hidden ++%else ++GLOBAL %1:function ++%endif ++%endmacro diff --git a/media-libs/libsdl/files/libsdl-1.2.10-libcaca.patch b/media-libs/libsdl/files/libsdl-1.2.10-libcaca.patch new file mode 100644 index 000000000000..d5ec96dd6adf --- /dev/null +++ b/media-libs/libsdl/files/libsdl-1.2.10-libcaca.patch @@ -0,0 +1,592 @@ +--- SDL-1.2.10/configure.in ++++ SDL-1.2.10/configure.in +@@ -1316,6 +1316,38 @@ AC_HELP_STRING([--enable-video-aalib], [ + fi + } + ++dnl Find the libcaca includes ++CheckCaca() ++{ ++ AC_ARG_ENABLE(video-caca, ++AC_HELP_STRING([--enable-video-caca], [use libcaca video driver [[default=no]]]), ++ , enable_video_caca=no) ++ if test x$enable_video = xyes -a x$enable_video_caca = xyes; then ++ video_caca=no ++ AC_PATH_PROG(CACACONFIG, caca-config, no) ++ if test x$CACACONFIG != xno; then ++ AC_MSG_CHECKING(for libcaca support) ++ CACA_CFLAGS=`$CACACONFIG --cflags` ++ CACA_LDFLAGS=`$CACACONFIG --libs` ++ save_CFLAGS="$CFLAGS" ++ AC_TRY_COMPILE([ ++ #include <caca.h> ++ ],[ ++ ],[ ++ video_caca=yes ++ ]) ++ CFLAGS="$save_CFLAGS" ++ AC_MSG_RESULT($video_caca) ++ if test x$video_caca = xyes; then ++ AC_DEFINE(SDL_VIDEO_DRIVER_CACA) ++ EXTRA_CFLAGS="$EXTRA_CFLAGS $CACA_CFLAGS" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $CACA_LDFLAGS" ++ SOURCES="$SOURCES $srcdir/src/video/caca/*.c" ++ fi ++ fi ++ fi ++} ++ + dnl Set up the QTopia video driver if enabled + CheckQtopia() + { +@@ -2130,6 +2162,7 @@ case "$host" in + CheckVGL + CheckWscons + CheckAAlib ++ CheckCaca + CheckQtopia + CheckPicoGUI + CheckOpenGLX11 +--- SDL-1.2.10/src/video/caca/SDL_cacaevents.c ++++ SDL-1.2.10/src/video/caca/SDL_cacaevents.c +@@ -0,0 +1,98 @@ ++/* ++ SDL - Simple DirectMedia Layer ++ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library General Public ++ License along with this library; if not, write to the Free ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ ++ Sam Lantinga ++ slouken@libsdl.org ++*/ ++ ++#ifdef SAVE_RCSID ++static char rcsid = ++ "@(#) $Id: libsdl-1.2.10-libcaca.patch,v 1.1 2006/05/26 05:26:45 vapier Exp $"; ++#endif ++ ++#include <stdio.h> ++ ++#include <caca.h> ++ ++#include "SDL.h" ++#include "../../events/SDL_sysevents.h" ++#include "../../events/SDL_events_c.h" ++#include "SDL_cacavideo.h" ++#include "SDL_cacaevents_c.h" ++ ++void Caca_PumpEvents(_THIS) ++{ ++ int posted = 0; ++ int event; ++ SDL_keysym keysym; ++ ++ if( ! this->screen ) /* Wait till we got the screen initialised */ ++ return; ++ ++ do { ++ posted = 0; ++ ++ /* Get libcaca event */ ++ SDL_mutexP(Caca_mutex); ++ event = caca_get_event(CACA_EVENT_ANY); ++ SDL_mutexV(Caca_mutex); ++ ++ if ( event & (CACA_EVENT_KEY_PRESS | CACA_EVENT_KEY_RELEASE)) { ++ int key; ++ switch ( event & 0xffffff ) ++ { ++ case CACA_KEY_LEFT: key = SDLK_LEFT; break; ++ case CACA_KEY_RIGHT: key = SDLK_RIGHT; break; ++ case CACA_KEY_UP: key = SDLK_UP; break; ++ case CACA_KEY_DOWN: key = SDLK_DOWN; break; ++ default: key = event & 0xff; break; ++ } ++ /* Key pressed */ ++/* printf("Key pressed: %d (%c)\n", key, key); */ ++ keysym.scancode = key; ++ keysym.sym = key; ++ keysym.mod = KMOD_NONE; ++ keysym.unicode = 0; ++ if ( SDL_TranslateUNICODE ) { ++ keysym.unicode = key; ++ } ++ posted += SDL_PrivateKeyboard((event & CACA_EVENT_KEY_PRESS) ? SDL_PRESSED : SDL_RELEASED, &keysym); ++ } ++ else if ( event & (CACA_EVENT_MOUSE_PRESS | CACA_EVENT_MOUSE_RELEASE) ) { ++ /* FIXME: we currently ignore the button type! */ ++ int button = event & 0x00ffffff; ++ if ( button > 3 ) { ++ button = 1; ++ } ++ posted += SDL_PrivateMouseButton((event & CACA_EVENT_MOUSE_PRESS) ? SDL_PRESSED : SDL_RELEASED, button, 0, 0); ++ } ++ else if ( event & CACA_EVENT_MOUSE_MOTION ) { ++ int new_x = 0, new_y = 0; ++ new_x = ((event & 0x00fff000) >> 12) * Caca_w / caca_get_width(); ++ new_y = ((event & 0x00000fff) >> 0) * Caca_h / caca_get_height(); ++ posted += SDL_PrivateMouseMotion(0, 0, new_x, new_y); ++ } ++ } while ( posted ); ++} ++ ++void Caca_InitOSKeymap(_THIS) ++{ ++ return; ++} ++ ++ +--- SDL-1.2.10/src/video/caca/SDL_cacaevents_c.h ++++ SDL-1.2.10/src/video/caca/SDL_cacaevents_c.h +@@ -0,0 +1,35 @@ ++/* ++ SDL - Simple DirectMedia Layer ++ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library General Public ++ License along with this library; if not, write to the Free ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ ++ Sam Lantinga ++ slouken@libsdl.org ++*/ ++ ++#ifdef SAVE_RCSID ++static char rcsid = ++ "@(#) $Id: libsdl-1.2.10-libcaca.patch,v 1.1 2006/05/26 05:26:45 vapier Exp $"; ++#endif ++ ++#include "SDL_cacavideo.h" ++ ++/* Variables and functions exported by SDL_sysevents.c to other parts. ++ of the native video subsystem (SDL_sysvideo.c) ++*/ ++extern void Caca_PumpEvents(_THIS); ++extern void Caca_InitOSKeymap(_THIS); ++ +--- SDL-1.2.10/src/video/caca/SDL_cacavideo.c ++++ SDL-1.2.10/src/video/caca/SDL_cacavideo.c +@@ -0,0 +1,301 @@ ++/* ++ SDL - Simple DirectMedia Layer ++ Copyright (C) 2003 Sam Hocevar ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library General Public ++ License along with this library; if not, write to the Free ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ ++ Sam Hocevar ++ sam@zoy.org ++*/ ++ ++#ifdef SAVE_RCSID ++static char rcsid = ++ "@(#) $Id: libsdl-1.2.10-libcaca.patch,v 1.1 2006/05/26 05:26:45 vapier Exp $"; ++#endif ++ ++/* libcaca based SDL video driver implementation. ++*/ ++ ++#include <stdlib.h> ++#include <stdio.h> ++#include <string.h> ++#include <unistd.h> ++#include <sys/stat.h> ++ ++ ++#include "SDL.h" ++#include "SDL_error.h" ++#include "SDL_video.h" ++#include "SDL_mouse.h" ++#include "../SDL_sysvideo.h" ++#include "../SDL_pixels_c.h" ++#include "../../events/SDL_events_c.h" ++ ++#include "SDL_cacavideo.h" ++#include "SDL_cacaevents_c.h" ++ ++#include <caca.h> ++ ++/* Initialization/Query functions */ ++static int Caca_VideoInit(_THIS, SDL_PixelFormat *vformat); ++static SDL_Rect **Caca_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags); ++static SDL_Surface *Caca_SetVideoMode(_THIS, SDL_Surface *current, int width, int height, int bpp, Uint32 flags); ++static void Caca_VideoQuit(_THIS); ++ ++/* Hardware surface functions */ ++static int Caca_AllocHWSurface(_THIS, SDL_Surface *surface); ++static int Caca_LockHWSurface(_THIS, SDL_Surface *surface); ++static int Caca_FlipHWSurface(_THIS, SDL_Surface *surface); ++static void Caca_UnlockHWSurface(_THIS, SDL_Surface *surface); ++static void Caca_FreeHWSurface(_THIS, SDL_Surface *surface); ++ ++/* Cache the VideoDevice struct */ ++static struct SDL_VideoDevice *local_this; ++ ++/* libcaca driver bootstrap functions */ ++ ++static int Caca_Available(void) ++{ ++ return 1; /* Always available ! */ ++} ++ ++static void Caca_DeleteDevice(SDL_VideoDevice *device) ++{ ++ free(device->hidden); ++ free(device); ++} ++static SDL_VideoDevice *Caca_CreateDevice(int devindex) ++{ ++ SDL_VideoDevice *device; ++ ++ /* Initialize all variables that we clean on shutdown */ ++ device = (SDL_VideoDevice *)malloc(sizeof(SDL_VideoDevice)); ++ if ( device ) { ++ memset(device, 0, (sizeof *device)); ++ device->hidden = (struct SDL_PrivateVideoData *) ++ malloc((sizeof *device->hidden)); ++ } ++ if ( (device == NULL) || (device->hidden == NULL) ) { ++ SDL_OutOfMemory(); ++ if ( device ) { ++ free(device); ++ } ++ return(0); ++ } ++ memset(device->hidden, 0, (sizeof *device->hidden)); ++ ++ /* Set the function pointers */ ++ device->VideoInit = Caca_VideoInit; ++ device->ListModes = Caca_ListModes; ++ device->SetVideoMode = Caca_SetVideoMode; ++ device->CreateYUVOverlay = NULL; ++ device->SetColors = NULL; ++ device->UpdateRects = NULL; ++ device->VideoQuit = Caca_VideoQuit; ++ device->AllocHWSurface = Caca_AllocHWSurface; ++ device->CheckHWBlit = NULL; ++ device->FillHWRect = NULL; ++ device->SetHWColorKey = NULL; ++ device->SetHWAlpha = NULL; ++ device->LockHWSurface = Caca_LockHWSurface; ++ device->UnlockHWSurface = Caca_UnlockHWSurface; ++ device->FlipHWSurface = NULL; ++ device->FreeHWSurface = Caca_FreeHWSurface; ++ device->SetCaption = NULL; ++ device->SetIcon = NULL; ++ device->IconifyWindow = NULL; ++ device->GrabInput = NULL; ++ device->GetWMInfo = NULL; ++ device->InitOSKeymap = Caca_InitOSKeymap; ++ device->PumpEvents = Caca_PumpEvents; ++ ++ device->free = Caca_DeleteDevice; ++ ++ return device; ++} ++ ++VideoBootStrap Caca_bootstrap = { ++ "caca", "Color ASCII Art Library", ++ Caca_Available, Caca_CreateDevice ++}; ++ ++int Caca_VideoInit(_THIS, SDL_PixelFormat *vformat) ++{ ++ int i; ++ ++ /* Initialize all variables that we clean on shutdown */ ++ for ( i=0; i<SDL_NUMMODES; ++i ) { ++ SDL_modelist[i] = malloc(sizeof(SDL_Rect)); ++ SDL_modelist[i]->x = SDL_modelist[i]->y = 0; ++ } ++ /* Modes sorted largest to smallest */ ++ SDL_modelist[0]->w = 1024; SDL_modelist[0]->h = 768; ++ SDL_modelist[1]->w = 800; SDL_modelist[1]->h = 600; ++ SDL_modelist[2]->w = 640; SDL_modelist[2]->h = 480; ++ SDL_modelist[3]->w = 320; SDL_modelist[3]->h = 400; ++ SDL_modelist[4]->w = 320; SDL_modelist[4]->h = 240; ++ SDL_modelist[5]->w = 320; SDL_modelist[5]->h = 200; ++ SDL_modelist[6] = NULL; ++ ++ Caca_mutex = SDL_CreateMutex(); ++ ++ /* Initialize the library */ ++ if ( caca_init() != 0 ) { ++ SDL_SetError("Unable to initialize libcaca"); ++ return(-1); ++ } ++ ++ /* Initialize private variables */ ++ Caca_lastkey = 0; ++ Caca_bitmap = NULL; ++ Caca_buffer = NULL; ++ ++ local_this = this; ++ ++ /* Determine the screen depth (use default 8-bit depth) */ ++ vformat->BitsPerPixel = 8; ++ vformat->BytesPerPixel = 1; ++ ++ /* We're done! */ ++ return(0); ++} ++ ++SDL_Rect **Caca_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags) ++{ ++ if(format->BitsPerPixel != 8) ++ return NULL; ++ ++ if ( flags & SDL_FULLSCREEN ) { ++ return SDL_modelist; ++ } else { ++ return (SDL_Rect **) -1; ++ } ++} ++ ++/* Various screen update functions available */ ++static void Caca_DirectUpdate(_THIS, int numrects, SDL_Rect *rects); ++ ++SDL_Surface *Caca_SetVideoMode(_THIS, SDL_Surface *current, ++ int width, int height, int bpp, Uint32 flags) ++{ ++ if ( Caca_buffer ) { ++ free( Caca_buffer ); ++ Caca_buffer = NULL; ++ } ++ ++ if ( Caca_bitmap ) { ++ caca_free_bitmap( Caca_bitmap ); ++ Caca_bitmap = NULL; ++ } ++ ++ Caca_buffer = malloc(2 * ((width + 15) & ~15) * height); ++ if ( ! Caca_buffer ) { ++ SDL_SetError("Couldn't allocate buffer for requested mode"); ++ return(NULL); ++ } ++ ++ memset(Caca_buffer, 0, 2 * ((width + 15) & ~15) * height); ++ ++ /* Allocate the new pixel format for the screen */ ++ if ( ! SDL_ReallocFormat(current, 16, 0xf800, 0x07e0, 0x001f, 0) ) { ++ return(NULL); ++ } ++ ++ /* Set up the new mode framebuffer */ ++ current->flags = SDL_FULLSCREEN; ++ Caca_w = current->w = width; ++ Caca_h = current->h = height; ++ current->pitch = 2 * ((width + 15) & ~15); ++ current->pixels = Caca_buffer; ++ ++ /* Create the libcaca bitmap */ ++ Caca_bitmap = caca_create_bitmap( 16, width, height, current->pitch, 0xf800, 0x07e0, 0x001f, 0x0000 ); ++ if ( ! Caca_bitmap ) { ++ SDL_SetError("Couldn't allocate libcaca bitmap"); ++ return(NULL); ++ } ++ ++ /* Set the blit function */ ++ this->UpdateRects = Caca_DirectUpdate; ++ ++ /* We're done */ ++ return(current); ++} ++ ++/* We don't actually allow hardware surfaces other than the main one */ ++static int Caca_AllocHWSurface(_THIS, SDL_Surface *surface) ++{ ++ return(-1); ++} ++static void Caca_FreeHWSurface(_THIS, SDL_Surface *surface) ++{ ++ return; ++} ++ ++/* We need to wait for vertical retrace on page flipped displays */ ++static int Caca_LockHWSurface(_THIS, SDL_Surface *surface) ++{ ++ /* TODO ? */ ++ return(0); ++} ++static void Caca_UnlockHWSurface(_THIS, SDL_Surface *surface) ++{ ++ return; ++} ++ ++/* FIXME: How is this done with libcaca? */ ++static int Caca_FlipHWSurface(_THIS, SDL_Surface *surface) ++{ ++ SDL_mutexP(Caca_mutex); ++ caca_refresh(); ++ SDL_mutexV(Caca_mutex); ++ return(0); ++} ++ ++static void Caca_DirectUpdate(_THIS, int numrects, SDL_Rect *rects) ++{ ++ SDL_mutexP(Caca_mutex); ++ caca_draw_bitmap( 0, 0, caca_get_width() - 1, caca_get_height() - 1, ++ Caca_bitmap, Caca_buffer ); ++ caca_refresh(); ++ SDL_mutexV(Caca_mutex); ++ return; ++} ++ ++/* Note: If we are terminated, this could be called in the middle of ++ another SDL video routine -- notably UpdateRects. ++*/ ++void Caca_VideoQuit(_THIS) ++{ ++ int i; ++ ++ /* Free video mode lists */ ++ for ( i=0; i<SDL_NUMMODES; ++i ) { ++ if ( SDL_modelist[i] != NULL ) { ++ free(SDL_modelist[i]); ++ SDL_modelist[i] = NULL; ++ } ++ } ++ ++ if ( Caca_bitmap ) { ++ caca_free_bitmap( Caca_bitmap ); ++ Caca_bitmap = NULL; ++ } ++ ++ caca_end(); ++ ++ SDL_DestroyMutex(Caca_mutex); ++} ++ +--- SDL-1.2.10/src/video/caca/SDL_cacavideo.h ++++ SDL-1.2.10/src/video/caca/SDL_cacavideo.h +@@ -0,0 +1,73 @@ ++/* ++ SDL - Simple DirectMedia Layer ++ Copyright (C) 2003 Sam Hocevar ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library General Public ++ License along with this library; if not, write to the Free ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ ++ Sam Hocevar ++ sam@zoy.org ++*/ ++ ++#ifdef SAVE_RCSID ++static char rcsid = ++ "@(#) $Id: libsdl-1.2.10-libcaca.patch,v 1.1 2006/05/26 05:26:45 vapier Exp $"; ++#endif ++ ++#ifndef _SDL_cacavideo_h ++#define _SDL_cacavideo_h ++ ++#include "SDL_mouse.h" ++#include "../SDL_sysvideo.h" ++#include "SDL_mutex.h" ++ ++#include <sys/time.h> ++#include <time.h> ++ ++#include <caca.h> ++ ++/* Hidden "this" pointer for the video functions */ ++#define _THIS SDL_VideoDevice *this ++ ++#define SDL_NUMMODES 6 ++ ++/* Private display data */ ++struct SDL_PrivateVideoData { ++ SDL_Rect *SDL_modelist[SDL_NUMMODES+1]; ++ SDL_mutex *mutex; ++ ++ struct caca_bitmap *bitmap; ++ void *buffer; ++ int w, h; ++ ++ int lastkey; ++ struct timeval lasttime; ++}; ++ ++/* Old variable names */ ++#define SDL_modelist (this->hidden->SDL_modelist) ++#define Caca_palette (this->hidden->palette) ++#define Caca_bitmap (this->hidden->bitmap) ++#define Caca_buffer (this->hidden->buffer) ++ ++#define Caca_w (this->hidden->w) ++#define Caca_h (this->hidden->h) ++ ++#define Caca_lastkey (this->hidden->lastkey) ++#define Caca_lasttime (this->hidden->lasttime) ++ ++#define Caca_mutex (this->hidden->mutex) ++ ++#endif /* _SDL_cacavideo_h */ ++ +--- SDL-1.2.10/src/video/SDL_sysvideo.h ++++ SDL-1.2.10/src/video/SDL_sysvideo.h +@@ -404,6 +404,9 @@ extern VideoBootStrap OS2FSLib_bootstrap + #if SDL_VIDEO_DRIVER_AALIB + extern VideoBootStrap AALIB_bootstrap; + #endif ++#if SDL_VIDEO_DRIVER_CACA ++extern VideoBootStrap CACA_bootstrap; ++#endif + #if SDL_VIDEO_DRIVER_DUMMY + extern VideoBootStrap DUMMY_bootstrap; + #endif +--- SDL-1.2.10/src/video/SDL_video.c ++++ SDL-1.2.10/src/video/SDL_video.c +@@ -120,6 +120,9 @@ static VideoBootStrap *bootstrap[] = { + #if SDL_VIDEO_DRIVER_AALIB + &AALIB_bootstrap, + #endif ++#if SDL_VIDEO_DRIVER_CACA ++ &CACA_bootstrap, ++#endif + #if SDL_VIDEO_DRIVER_DUMMY + &DUMMY_bootstrap, + #endif diff --git a/media-libs/libsdl/files/libsdl-1.2.10-sdl-config.patch b/media-libs/libsdl/files/libsdl-1.2.10-sdl-config.patch new file mode 100644 index 000000000000..f430428e6e90 --- /dev/null +++ b/media-libs/libsdl/files/libsdl-1.2.10-sdl-config.patch @@ -0,0 +1,20 @@ +Only output -L -rpath cruft if using a non-standard install location. + +Makes ABI / cross-compiling easier on the soul. + +--- sdl-config.in ++++ sdl-config.in +@@ -44,7 +44,12 @@ + echo -I@includedir@/SDL @SDL_CFLAGS@ + ;; + @ENABLE_SHARED_TRUE@ --libs) +-@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ ++@ENABLE_SHARED_TRUE@ if test x"${prefix}" != x"/usr" ; then ++@ENABLE_SHARED_TRUE@ libdirs="-L@libdir@" ++@ENABLE_SHARED_TRUE@ else ++@ENABLE_SHARED_TRUE@ libdirs="" ++@ENABLE_SHARED_TRUE@ fi ++@ENABLE_SHARED_TRUE@ echo $libdirs @SDL_RLD_FLAGS@ @SDL_LIBS@ + @ENABLE_SHARED_TRUE@ ;; + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) diff --git a/media-libs/libsdl/libsdl-1.2.10.ebuild b/media-libs/libsdl/libsdl-1.2.10.ebuild new file mode 100644 index 000000000000..7cee87c2817a --- /dev/null +++ b/media-libs/libsdl/libsdl-1.2.10.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.10.ebuild,v 1.1 2006/05/26 05:26:45 vapier Exp $ + +inherit flag-o-matic toolchain-funcs eutils libtool + +DESCRIPTION="Simple Direct Media Layer" +HOMEPAGE="http://www.libsdl.org/" +SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +# WARNING: +# if you have the noaudio, novideo, nojoystick, or noflagstrip use flags +# in USE and something breaks, you pick up the pieces. Be prepared for +# bug reports to be marked INVALID. +IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca noaudio novideo nojoystick noflagstrip" + +RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 ) + alsa? ( media-libs/alsa-lib ) + esd? ( >=media-sound/esound-0.2.19 ) + arts? ( kde-base/arts ) + nas? ( + media-libs/nas + || ( ( + x11-libs/libXt + x11-libs/libXext + x11-libs/libX11 ) + virtual/x11 ) ) + X? ( + || ( ( + x11-libs/libXt + x11-libs/libXext + x11-libs/libX11 ) + virtual/x11 ) ) + directfb? ( >=dev-libs/DirectFB-0.9.19 ) + ggi? ( >=media-libs/libggi-2.0_beta3 ) + svga? ( >=media-libs/svgalib-1.4.2 ) + aalib? ( media-libs/aalib ) + libcaca? ( >=media-libs/libcaca-0.9-r1 ) + opengl? ( virtual/opengl )" +DEPEND="${RDEPEND} + nas? ( + || ( ( + x11-proto/xextproto + x11-proto/xproto ) + virtual/x11 ) ) + X? ( + || ( ( + x11-proto/xextproto + x11-proto/xproto ) + virtual/x11 ) ) + x86? ( dev-lang/nasm )" + +S=${WORKDIR}/SDL-${PV} + +pkg_setup() { + if use noaudio || use novideo || use nojoystick ; then + ewarn "Since you've chosen to turn off some of libsdl's functionality," + ewarn "don't bother filing libsdl-related bugs until trying to remerge" + ewarn "libsdl without the no* flags in USE. You need to know what" + ewarn "you're doing to selectively turn off parts of libsdl." + epause 30 + fi + if use noflagstrip ; then + ewarn "Since you've chosen to use possibly unsafe CFLAGS," + ewarn "don't bother filing libsdl-related bugs until trying to remerge" + ewarn "libsdl without the noflagstrip use flag in USE." + epause 10 + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/libsdl-1.2.10-libcaca.patch #40224 + epatch "${FILESDIR}"/libsdl-1.2.10-sdl-config.patch + epatch "${FILESDIR}"/libsdl-1.2.10-PIC-hidden-symbols.patch + + ./autogen.sh || die "autogen failed" + elibtoolize +} + +src_compile() { + local myconf= + if [[ $(tc-arch) != "x86" ]] ; then + myconf="${myconf} --disable-nasm" + else + myconf="${myconf} $(use_enable x86 nasm)" + fi + use noflagstrip || strip-flags + use noaudio && myconf="${myconf} --disable-audio" + use novideo \ + && myconf="${myconf} --disable-video" \ + || myconf="${myconf} --enable-video-dummy" + use nojoystick && myconf="${myconf} --disable-joystick" + + local directfbconf="--disable-video-directfb" + if use directfb ; then + # since DirectFB can link against SDL and trigger a + # dependency loop, only link against DirectFB if it + # isn't broken #61592 + echo 'int main(){}' > directfb-test.c + $(tc-getCC) directfb-test.c -ldirectfb 2>/dev/null \ + && directfbconf="--enable-video-directfb" \ + || ewarn "Disabling DirectFB since libdirectfb.so is broken" + fi + + myconf="${myconf} ${directfbconf}" + + econf \ + --disable-dependency-tracking \ + --disable-rpath \ + --enable-events \ + --enable-cdrom \ + --enable-threads \ + --enable-timers \ + --enable-endian \ + --enable-file \ + --enable-cpuinfo \ + $(use_enable oss) \ + $(use_enable alsa) \ + $(use_enable esd) \ + $(use_enable arts) \ + $(use_enable nas) \ + $(use_enable X video-x11) \ + $(use_enable dga) \ + $(use_enable xv video-x11-xv) \ + $(use_enable xinerama video-x11-xinerama) \ + $(use_enable X video-x11-xrandr) \ + $(use_enable dga video-dga) \ + $(use_enable fbcon video-fbcon) \ + $(use_enable ggi video-ggi) \ + $(use_enable svga video-svga) \ + $(use_enable aalib video-aalib) \ + $(use_enable libcaca video-caca) \ + $(use_enable opengl video-opengl) \ + $(use_with X x) \ + --disable-video-x11-xme \ + ${myconf} || die + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + dodoc BUGS CREDITS README README-SDL.txt README.CVS TODO WhatsNew + dohtml -r ./ +} |