diff options
author | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2014-06-25 11:03:16 +0000 |
---|---|---|
committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2014-06-25 11:03:16 +0000 |
commit | bcb0f56ca5cb965efc50dad10fbf32d0c9a4d32c (patch) | |
tree | 13dfd6601160a46e86521fa4c2e4d45b3456de76 /media-libs/libsdl | |
parent | Version bumps. (diff) | |
download | historical-bcb0f56ca5cb965efc50dad10fbf32d0c9a4d32c.tar.gz historical-bcb0f56ca5cb965efc50dad10fbf32d0c9a4d32c.tar.bz2 historical-bcb0f56ca5cb965efc50dad10fbf32d0c9a4d32c.zip |
Remove old versions that can no longer build due to bug #471300.
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2324E7B566DF2611!
Diffstat (limited to 'media-libs/libsdl')
-rw-r--r-- | media-libs/libsdl/ChangeLog | 8 | ||||
-rw-r--r-- | media-libs/libsdl/Manifest | 40 | ||||
-rw-r--r-- | media-libs/libsdl/files/libsdl-1.2.13-sdl-config.patch | 20 | ||||
-rw-r--r-- | media-libs/libsdl/files/libsdl-1.2.14-click.patch | 15 | ||||
-rw-r--r-- | media-libs/libsdl/files/libsdl-1.2.14-glibc213.patch | 11 | ||||
-rw-r--r-- | media-libs/libsdl/files/libsdl-1.2.14-joystick.patch | 37 | ||||
-rw-r--r-- | media-libs/libsdl/libsdl-1.2.14-r6.ebuild | 155 | ||||
-rw-r--r-- | media-libs/libsdl/libsdl-1.2.15-r2.ebuild | 146 | ||||
-rw-r--r-- | media-libs/libsdl/libsdl-1.2.15-r3.ebuild | 147 |
9 files changed, 23 insertions, 556 deletions
diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog index 2deb114e2fb6..91f6163b2181 100644 --- a/media-libs/libsdl/ChangeLog +++ b/media-libs/libsdl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/libsdl # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.218 2014/06/22 13:39:57 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.219 2014/06/25 11:03:07 chithanh Exp $ + + 25 Jun 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + -files/libsdl-1.2.13-sdl-config.patch, -files/libsdl-1.2.14-click.patch, + -files/libsdl-1.2.14-glibc213.patch, -files/libsdl-1.2.14-joystick.patch, + -libsdl-1.2.14-r6.ebuild, -libsdl-1.2.15-r2.ebuild, -libsdl-1.2.15-r3.ebuild: + Remove old versions that can no longer build due to bug #471300. *libsdl-1.2.15-r6 (22 Jun 2014) diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest index 387a30e0c35b..52871f6901ad 100644 --- a/media-libs/libsdl/Manifest +++ b/media-libs/libsdl/Manifest @@ -1,41 +1,33 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX libsdl-1.2.13-sdl-config.patch 780 SHA256 1c73cc815ae4f6fdaee3dc899a9f38e9f29f88e3997070c9fba226b36dbed015 SHA512 c79b0b5674a2a70862425150d8b481f1a0ed0bc400bc69835e53932422583bdde061d1f72da8d3ad0aaaa4499126bc2770f11941435e6c848bd4d90d040a0d03 WHIRLPOOL 5762b64726808967cd51215b1fd04c3cd52baa9517b25c30c99e669d450f19666d7179c9c69bf8d6a09ac109d52148fee0bbaa458ab77aacddf793914faf1c80 -AUX libsdl-1.2.14-click.patch 625 SHA256 e1ff242656caf11e7d554149da0c97840c4cd5d7833cd10c655282603e3846d8 SHA512 fc0dd13d51a84fea8e6ec2c0716ba6e039729a054499b2f6ac852551405f62b55bccc311f9e87bc4d2adf50355263886617f452c40641aaf38c22479c2635479 WHIRLPOOL 9ac7981b7b3addfee2407b8908820b033a82a972f1c60841581219b14bcb80c58fac885655f37b143fbb1441405587391e1cd3c0a0d02577db389e7328452842 -AUX libsdl-1.2.14-glibc213.patch 246 SHA256 be5c1cf2d7405e03c59dcb2ee519b0546b59d67f6b4b2b3bc792143cfab3a109 SHA512 ae290b9e2ffcd591be39eb5c195892f1decfb51fe1166cc53618ec4630110a167411e2f9f6577ed1ccd94e332c490b5f166bd78bfac2da190af09e946eae47bd WHIRLPOOL 32c6a7fab67b10089a28f5eeec5f110f6a336635d8fc227ffd0bec181b3114886bb03a6cf3c91bd0b9cb7b5e3fe54b860fc2043e25c8ca1c88e458e0f47cc211 -AUX libsdl-1.2.14-joystick.patch 1477 SHA256 a16b6e5af27921357bb082c68cc786b23209c2a5bd4e3ffa5e997709c26f36c8 SHA512 4e3a0197594ed0449453c924bba67320e74ba24754d1d6c235907a552ad5194c2d1a83be9f6f2148bf22f36f2f8c5d65e74f8ed1ae9c4121e7ad0633303ffb05 WHIRLPOOL f532d30a4ddfa0b78b0a35617ed235a4b46ba907a88f83b62def3bc576cbe32a6a02241d2e48ec9aca255cd6779ca3c9a52cbcf273fbba34b7c5543e320609ac AUX libsdl-1.2.15-const-xdata32.patch 2253 SHA256 b0560f37c8927d00cfb034580f15d08ebfd31bca38f470761957c02590b87f9e SHA512 f1804afb7e70f80a7262df8affc5c1c71b3da1a448085e88fc0b50df4fa293f595542e5456e988ba1477c8aaefea3ba81d7c3e729307da21ce3560b369abe327 WHIRLPOOL d32d5ad03a34b41bff6c693bbba7e65fce6e8346e66aaf9d58b157de04abed2e88744fa0ff26d26da882415b57d6612bb226171977cb313a36ce5dee18a6c46e AUX libsdl-1.2.15-gamma.patch 1339 SHA256 bdf3983a5854a9f46a9ada06dccc62b743418a7a770fd6614797c37d438a625c SHA512 0717e8eea7a9a1bcadb56c4a51023142d57718ccfff4e372faba3e28ce17b3e32caa8a8ffc8054c8b49bab566a44fd46f5eaf97b778ba6ec991d845d4ae464ce WHIRLPOOL 60e834947bc51ded07032dcc66eb1c78ed575513d8dbf4327943b926b0b22c164b56663886b489e5d6d09bab47222eecc8fe18b141bb7b1fd2e4338bac0bc9d2 AUX libsdl-1.2.15-joystick.patch 315 SHA256 fa912a36cf6a0926e91a34efa756d3514bb42c1de834f416a52c4fa3ba777dd3 SHA512 653e7d2e2dbc4c945e4e4e43dc53f569164c8bbb1e4e9d9c2421cd7da13849d04439ef9cbcf6736c6e5d2aa695a1b24d314045eb3f817dcb1b6f2e93fbfb2e1a WHIRLPOOL 8bed5ac8999bfa1b7c4391643e24f73c7f81ceb602e6fce5d99ecf8aced67b551ee20db6df367ef3d9b252323417fca4eb6c192db95c535776d6d15d231d3503 AUX libsdl-1.2.15-resizing.patch 2098 SHA256 0e4c2c4a11dbf611e317be4e866f99bde619eb1ca3942524e96b7ef94d8180f4 SHA512 afa82d81e03fe974b2c1a4f3c9ed48a15472784548c8e88f988bb03ea992e8ce86bbad74f7e5980dd1476139cf82180eda72e77041e065925cb373cda47c268b WHIRLPOOL a298ec48388f2f34dfd3c40a5912fc1ec47ff9a19983054f78544f6794873a42090010b4b606c9c9f2dfa7ea6ee447e87915a733e34431b7db7ae39a23c605ee AUX libsdl-1.2.15-sdl-config.patch 780 SHA256 1c73cc815ae4f6fdaee3dc899a9f38e9f29f88e3997070c9fba226b36dbed015 SHA512 c79b0b5674a2a70862425150d8b481f1a0ed0bc400bc69835e53932422583bdde061d1f72da8d3ad0aaaa4499126bc2770f11941435e6c848bd4d90d040a0d03 WHIRLPOOL 5762b64726808967cd51215b1fd04c3cd52baa9517b25c30c99e669d450f19666d7179c9c69bf8d6a09ac109d52148fee0bbaa458ab77aacddf793914faf1c80 -DIST SDL-1.2.14.tar.gz 4014154 SHA256 5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642eed9b6 SHA512 61ab65661492038d319b83521a27dc80dc71c76b63965ec094c9f53fbb76466e612d119297f9797d62147a0641808136181d0926e8082cb9b3e8d2a8e688a8b2 WHIRLPOOL 67dc18b19f9f97c5b9052cc96b38462085df91df743953426fabb1dacacbe28c4325c75e65c04ac383ea688383a46d9fc79dc91a6d54599ddd72528c30c5cfea DIST SDL-1.2.15.tar.gz 3920622 SHA256 d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00 SHA512 ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc WHIRLPOOL 21b9aadb7b00002a6f3760902cd40aeb1b145228348b887049b40a435c2b9a1a3679a83100421e9634178b9da32d524371d6912c190a75e83ef3170ad45bc159 -EBUILD libsdl-1.2.14-r6.ebuild 4599 SHA256 c84eece3b71e2dd8a6d7601f9a10c4f8ef724b1ff10fa43b65774a844671df62 SHA512 5bdbbc525603a4c0603dc5d54d85e4711b64454f99b05e0b0a8de259494bf534da9b8fc5567e6d5c1add5540fce59c726ed002a4f51e6b70d391d76e9defe1ae WHIRLPOOL 5bf03ec5358d9d58c37deecf7c227502ae81580d42084ba11e915f231a55f841453cf4a0041753fcc8c99fd5c999d63aa1f53ac6a671f84ab841a5d9e4daff23 -EBUILD libsdl-1.2.15-r2.ebuild 4135 SHA256 bf8d565a61eade20d767a1273023a6b439e6bda626dee086075fde6e4acbad0c SHA512 0e7f9a6c6a3a0efbad8a8a35f2685abb20e27e88bdda0830af5e3981fd4fb65b3aa819644ef0b4f46bea71c2c71fc30646a4f053f2fe227b8050bbf0588aa6f4 WHIRLPOOL a796255734a52215f96ea6dff82404987748540326d831e45685b6a5583ae88567a9f63315fe9147e1976f2bc5367e7894bf3d6b34fd3be1e6a5c6c536a4a4d4 -EBUILD libsdl-1.2.15-r3.ebuild 4179 SHA256 5e891e51838911016feaab3b819b35e1cf3a8b4329495e25c272141b9d2b2e69 SHA512 7a1822664e523eb33cd184110e66b0e587aa0a0c7ce9e507b74e3bbc29754ec0d8cc496d3de5efd915c668be8bdf0565b973bce1705830c3e71415e9e7e68f61 WHIRLPOOL e5d4ee7f7fd1bc5c3e0d4794a0ce1cc800386ca44a4e52445f0844611abf27ed87d87a6715b0503559fdf6d3836229c6f2bf73edfd41fb29c82d1b0eafb5dcab EBUILD libsdl-1.2.15-r4.ebuild 4213 SHA256 b5a1380c46ac5805f55a5906477b42c4a7e96781c40fb3fe2c63b32addf20eb0 SHA512 2187394d63d9bc174804af1c921b4a1fe52cb7fb15e0616ddb0773552f158bb53cb371801f026f025355ef84de6dd5bfa54769279b6822a238e6666a7d0b415b WHIRLPOOL 8b03cae279068d9888e674021c83e787ff4973cc6d881c13d0b60590051ea2ae47df9f302a34bae88377dc142fa4863896a3264ccd1af679711081af54c50b9a EBUILD libsdl-1.2.15-r5.ebuild 4877 SHA256 f93a821f09daaa11ab16446afacdef3fd9db70bca867e78de718662fbc30e1b4 SHA512 e44dd1512a748eecd16593098e775c747be3fbdb59ff7fabfd4f19f8ba1595c9d1682be206e315c0912f11a7e863673adce0bb7d4471b8077a3b826acc2362d5 WHIRLPOOL cfdef28576d69c7264aaa673844f6f15a287706ef2325c76e4e22af1fca697d53b067782767b9362638dd7bee89724d36eecccc196568c736f9e2d4df3319bdd EBUILD libsdl-1.2.15-r6.ebuild 4614 SHA256 f2ea95fed9a555f29bc304906169047d427c393fda833dd1c6ca7907436b8e55 SHA512 aba6dd9b18b5c7c587bc325aa9967d42c0d9cca437219878a0bc01cd3eb474af0c8a5a3e807b066e10d219e0ba86cbd192c16c3f1c7b8c7208cf872cc4ad30e5 WHIRLPOOL bdcea5f1a0fb80174f8a7dc4d11715282037a139da310aa9502de0ad9cda4cee6e8ff9de751270b1099abbd8ec82964316262d14d7e1f010bc446a519f1bd52a -MISC ChangeLog 33375 SHA256 1b178ef02f1c7bb47cbc8d0ba8aa29ef83c07edfb295d94ece6d9e498efda3a5 SHA512 0080b70f789a1c70e7d38a8f53eee0cd8586f4c2907076c48176ead82a7010e9087b53dd5253a6aac0992ad6a4b33b8cfbfae6bf58cf5ecd732e20730c22bfa9 WHIRLPOOL 41de4df6d07191aeaba88077a87e704658ad2c3756fea215a13fa2033f3d5aa2875585d0699d8a8308a5fc91ed7e5880c9f0b1f0ca09ac3a245b068bc238b717 +MISC ChangeLog 33743 SHA256 f883b5b0508d24f72100f359fb0baea96d97aaa2ff2e5a4036745852a9ca8861 SHA512 9059ce47d1c1a8aa68f00ce1aa33573fe32361553f6e701f8c162f53644363c8373feabcaf94d260c81fb4b834b00ab3e0aa5aa260825e5f350f2a4b1d643287 WHIRLPOOL 105218effe15d8206abb8c1497d2c3acb828a6aa702c69d5682d028f399d146f942a45c70275818430af36f62703132fe6047d0a5863c849a993f6e027945acb MISC metadata.xml 1357 SHA256 c30d6116cdf83062fc106ea80d843c5613ea0e7a91ea6afe17ab11077b2b7574 SHA512 e516d46b97979f83d286fb61a349cdd31e02db3de02ad2147a90e528c3ad19aab46c13c3fc72f8fcc418524b3bc50b37cf77ea2b1d05dce090d0b018dcb34224 WHIRLPOOL 02d5acf8972de51c728d469b24adb110204a0f70e57772322a65b62982a1c17d1150da36311260a606e02b694a117ced89c161ca2001b0713903caa15610da75 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQJ8BAEBCABmBQJTptyxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy -MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgxBoQAOrA+d8dCZCjP0LAWoWoudoo -1cpGXQCoJ6O+dbaX07t9LHvsnr1bSoPLSn+7V33B+PExP+0m0xMDi77vj9j52NJO -6WIVvfaL6PbgEWbaOkJkgz/LJgUEaK5Eofb+A4dQgmNGIa84wcrkutkPyqKL+R5G -0cbMBdRFMiece/t/XDytA7386KJM4kl39m3aV0cXP9rZa7UtYyU4Fsgcl3lyQb7D -wUMR1xghm0uoQl9jZ1eqN6vD8PDn19U0Yvhzw2/wHD15YP8Hj7BxMbyiOAq4rfDH -TlmRNUBKTEz0nsYXi/7ItizkDF0nsCCtxY9FITQBjbrB+xbCxf4Am/nuAA58oWw0 -DnZAUJVN0xwyBhw6jeTWy2RlYfQLlWslHHA0Qc3SWz3W2fQhKknheIw3UQn0OeQl -iBTzT8ME3lD3eu6XzowHn+g914ZpQnVAkl3czxkw0mcjQgaGFYw0czRocqNLCboe -DV7BnpvfBnc4S8JGjlzgVZUJGmlOrMvT9lEOUxHjgG7OJkbnUPp+0glWtRJOo8GE -zEe3kyYNP7GCmWXUdEGgmORPaBli3h7EMKectmaO5qerNXL7SA6kZpL27PHT0POp -QLDiANC7VqOc3O45v9bbByIOazQy08iW7ZaBGVbq1WBDRhz7EkifsqgGYwWZV6XO -Fj4g+agtmWBodnqPMzBk -=BJX1 +iQJ8BAEBCABmBQJTqqx7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy +MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYR2WIP+wQKzi2bE4LteXXUl//uMlfF +Y4azZGUPpvmB3KgTt+VM3cPm285eG2HmRzn37DEwl/fghVfvJH7R5oBZbA2JdoQC +SRUILYRHk0oD15I2jMy/jE1upq98K6GswfxU43jCpnuX1UEUrv0PxB/4Wqm4BJQG +z59QpSnn7UwiSQB2Wgu8fbhhgfwQKHnkm6mzljRDctm51uvbUrVR+v4oE7RpdiQf +YrfEM6KQzpOZHsR8kTiVhi/N3Lu5R8XSZXqkNGOJVrsBlusuCMaTCL8TdKua4Sye +mhHiy4OO0XTt8l0hpPXstQmq95mpxSBIBO9sOVqM1sBGOwUqyJfz8yLnesamUxXU +L5XW4LE6emvvWiZjVcPf4p0BH1ve04lAolncCiQzSwpGC8JdrqiYpJGE6XjEPCkb +eunp8MAi18OJnl2aYhRv2GV5BWcalC/Atybep5bbpmlLTGsKTiKuMvahiIK6vIGL +q6JQ3WNjUAU2PSpZQztMgiOgJVruBC7ueq0Zq+F6YJtCyBqa7GhEkzV1eHxihAcK +zeJtJ5mK1fzk4Wubl6Yl49p4EtSY4UAl9GkPMgzCE3vSZ/Oi2krMGV0aqTcjpYRn +JP65nXxEwTKlwh/7gtzdquI7j4tAmUEGqqtrO901Om0RtWZQ4iA5h+VhETtpPzJ1 +d6kTH3Uqmyb32tTpp6Ij +=Hg8i -----END PGP SIGNATURE----- diff --git a/media-libs/libsdl/files/libsdl-1.2.13-sdl-config.patch b/media-libs/libsdl/files/libsdl-1.2.13-sdl-config.patch deleted file mode 100644 index f430428e6e90..000000000000 --- a/media-libs/libsdl/files/libsdl-1.2.13-sdl-config.patch +++ /dev/null @@ -1,20 +0,0 @@ -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/files/libsdl-1.2.14-click.patch b/media-libs/libsdl/files/libsdl-1.2.14-click.patch deleted file mode 100644 index f6e048b2cf6b..000000000000 --- a/media-libs/libsdl/files/libsdl-1.2.14-click.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- SDL-1.2.14/src/video/x11/SDL_x11events.c -+++ SDL-1.2/src/video/x11/SDL_x11events.c -@@ -441,8 +441,10 @@ - if ( xevent.xcrossing.mode == NotifyUngrab ) - printf("Mode: NotifyUngrab\n"); - #endif -- if ( xevent.xcrossing.detail != NotifyInferior ) { -- if ( this->input_grab == SDL_GRAB_OFF ) { -+ if ( (xevent.xcrossing.mode != NotifyGrab) && -+ (xevent.xcrossing.mode != NotifyUngrab) && -+ (xevent.xcrossing.detail != NotifyInferior) ) { -+ if ( this->input_grab == SDL_GRAB_OFF ) { - posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS); - } else { - posted = SDL_PrivateMouseMotion(0, 0, diff --git a/media-libs/libsdl/files/libsdl-1.2.14-glibc213.patch b/media-libs/libsdl/files/libsdl-1.2.14-glibc213.patch deleted file mode 100644 index 364f69d02f5d..000000000000 --- a/media-libs/libsdl/files/libsdl-1.2.14-glibc213.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/video/SDL_blit.c -+++ b/src/video/SDL_blit.c -@@ -214,7 +214,7 @@ - dstskip = w+info->d_skip; - if ( dst < src ) { - while ( h-- ) { -- SDL_memcpy(dst, src, w); -+ SDL_memmove(dst, src, w); - src += srcskip; - dst += dstskip; - } diff --git a/media-libs/libsdl/files/libsdl-1.2.14-joystick.patch b/media-libs/libsdl/files/libsdl-1.2.14-joystick.patch deleted file mode 100644 index 1d699eac5019..000000000000 --- a/media-libs/libsdl/files/libsdl-1.2.14-joystick.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- SDL-1.2.14/src/joystick/linux/SDL_sysjoystick.c -+++ SDL-1.2.14-mod/src/joystick/linux/SDL_sysjoystick.c -@@ -700,26 +700,26 @@ - continue; - } - if ( test_bit(i, absbit) ) { -- int values[5]; -+ struct input_absinfo values; - -- if ( ioctl(fd, EVIOCGABS(i), values) < 0 ) -+ if ( ioctl(fd, EVIOCGABS(i), &values) < 0 ) - continue; - #ifdef DEBUG_INPUT_EVENTS - printf("Joystick has absolute axis: %x\n", i); - printf("Values = { %d, %d, %d, %d, %d }\n", -- values[0], values[1], -- values[2], values[3], values[4]); -+ values.value, values.minimum, -+ values.maximum, values.fuzz, values.flat); - #endif /* DEBUG_INPUT_EVENTS */ - joystick->hwdata->abs_map[i] = joystick->naxes; -- if ( values[1] == values[2] ) { -+ if ( values.minimum == values.maximum ) { - joystick->hwdata->abs_correct[i].used = 0; - } else { - joystick->hwdata->abs_correct[i].used = 1; - joystick->hwdata->abs_correct[i].coef[0] = -- (values[2] + values[1]) / 2 - values[4]; -+ (values.maximum + values.minimum) / 2 - values.flat; - joystick->hwdata->abs_correct[i].coef[1] = -- (values[2] + values[1]) / 2 + values[4]; -- t = ((values[2] - values[1]) / 2 - 2 * values[4]); -+ (values.maximum + values.minimum) / 2 + values.flat; -+ t = ((values.maximum - values.minimum) / 2 - 2 * values.flat); - if ( t != 0 ) { - joystick->hwdata->abs_correct[i].coef[2] = (1 << 29) / t; - } else { diff --git a/media-libs/libsdl/libsdl-1.2.14-r6.ebuild b/media-libs/libsdl/libsdl-1.2.14-r6.ebuild deleted file mode 100644 index c295188c7755..000000000000 --- a/media-libs/libsdl/libsdl-1.2.14-r6.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.14-r6.ebuild,v 1.7 2014/05/15 16:15:03 ulm Exp $ - -EAPI=2 -inherit flag-o-matic multilib 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.1" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" -# WARNING: -# if you disable the sound, video, joystick use flags or turn on the custom-cflags use flag -# in USE and something breaks, you pick up the pieces. Be prepared for -# bug reports to be marked INVALID. -IUSE="oss alsa nas X dga xv xinerama fbcon directfb ggi svga tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio ps3 static-libs" - -RDEPEND="sound? ( >=media-libs/audiofile-0.1.9 ) - alsa? ( media-libs/alsa-lib ) - nas? ( - media-libs/nas - x11-libs/libXt - x11-libs/libXext - x11-libs/libX11 - ) - X? ( - x11-libs/libXt - x11-libs/libXext - x11-libs/libX11 - x11-libs/libXrandr - ) - 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 virtual/glu ) - ppc64? ( ps3? ( sys-libs/libspe2 ) ) - tslib? ( x11-libs/tslib ) - pulseaudio? ( media-sound/pulseaudio )" -DEPEND="${RDEPEND} - nas? ( - x11-proto/xextproto - x11-proto/xproto - ) - X? ( - x11-proto/xextproto - x11-proto/xproto - ) - x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) )" - -S=${WORKDIR}/SDL-${PV} - -pkg_setup() { - if use !sound || use !video || use !joystick ; 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 with the sound, video, and joystick flags in USE." - ewarn "You need to know what you're doing to selectively turn off parts of libsdl." - epause 30 - fi - if use custom-cflags ; 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 custom-cflags use flag in USE." - epause 10 - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.2.13-sdl-config.patch \ - "${FILESDIR}"/${P}-click.patch \ - "${FILESDIR}"/${P}-joystick.patch \ - "${FILESDIR}"/${P}-glibc213.patch - - elibtoolize -} - -src_configure() { - local myconf= - if [[ $(tc-arch) != "x86" ]] ; then - myconf="${myconf} --disable-nasm" - else - myconf="${myconf} --enable-nasm" - fi - use custom-cflags || strip-flags - use sound || myconf="${myconf} --disable-audio" - use video \ - && myconf="${myconf} --enable-video-dummy" \ - || myconf="${myconf} --disable-video" - use joystick || 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-rpath \ - --disable-arts \ - --disable-esd \ - --enable-events \ - --enable-cdrom \ - --enable-threads \ - --enable-timers \ - --enable-file \ - --enable-cpuinfo \ - --disable-alsa-shared \ - --disable-esd-shared \ - --disable-pulseaudio-shared \ - --disable-arts-shared \ - --disable-nas-shared \ - --disable-osmesa-shared \ - $(use_enable oss) \ - $(use_enable alsa) \ - $(use_enable pulseaudio) \ - $(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_enable ps3 video-ps3) \ - $(use_enable tslib input-tslib) \ - $(use_with X x) \ - $(use_enable static-libs static) \ - --disable-video-x11-xme \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la - dodoc BUGS CREDITS README README-SDL.txt README.CVS TODO WhatsNew - dohtml -r ./ -} diff --git a/media-libs/libsdl/libsdl-1.2.15-r2.ebuild b/media-libs/libsdl/libsdl-1.2.15-r2.ebuild deleted file mode 100644 index 86ed5b5c53d5..000000000000 --- a/media-libs/libsdl/libsdl-1.2.15-r2.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r2.ebuild,v 1.10 2014/05/15 16:15:03 ulm Exp $ - -EAPI=2 -inherit flag-o-matic multilib 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.1" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -# WARNING: -# If you turn on the custom-cflags use flag in USE and something breaks, -# you pick up the pieces. Be prepared for bug reports to be marked INVALID. -IUSE="oss alsa nas X dga xv xinerama fbcon directfb ggi svga tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio ps3 static-libs" - -RDEPEND="sound? ( >=media-libs/audiofile-0.1.9 ) - alsa? ( media-libs/alsa-lib ) - nas? ( - media-libs/nas - x11-libs/libXt - x11-libs/libXext - x11-libs/libX11 - ) - X? ( - x11-libs/libXt - x11-libs/libXext - x11-libs/libX11 - x11-libs/libXrandr - ) - 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 virtual/glu ) - ppc64? ( ps3? ( sys-libs/libspe2 ) ) - tslib? ( x11-libs/tslib ) - pulseaudio? ( media-sound/pulseaudio )" -DEPEND="${RDEPEND} - nas? ( - x11-proto/xextproto - x11-proto/xproto - ) - X? ( - x11-proto/xextproto - x11-proto/xproto - ) - x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) )" - -S=${WORKDIR}/SDL-${PV} - -pkg_setup() { - if use custom-cflags ; 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 custom-cflags use flag in USE." - epause 10 - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-sdl-config.patch \ - "${FILESDIR}"/${P}-resizing.patch \ - "${FILESDIR}"/${P}-joystick.patch - - elibtoolize -} - -src_configure() { - local myconf= - if [[ $(tc-arch) != "x86" ]] ; then - myconf="${myconf} --disable-nasm" - else - myconf="${myconf} --enable-nasm" - fi - use custom-cflags || strip-flags - use sound || myconf="${myconf} --disable-audio" - use video \ - && myconf="${myconf} --enable-video-dummy" \ - || myconf="${myconf} --disable-video" - use joystick || 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-rpath \ - --disable-arts \ - --disable-esd \ - --enable-events \ - --enable-cdrom \ - --enable-threads \ - --enable-timers \ - --enable-file \ - --enable-cpuinfo \ - --disable-alsa-shared \ - --disable-esd-shared \ - --disable-pulseaudio-shared \ - --disable-arts-shared \ - --disable-nas-shared \ - --disable-osmesa-shared \ - $(use_enable oss) \ - $(use_enable alsa) \ - $(use_enable pulseaudio) \ - $(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_enable ps3 video-ps3) \ - $(use_enable tslib input-tslib) \ - $(use_with X x) \ - $(use_enable static-libs static) \ - --disable-video-x11-xme \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - use static-libs || prune_libtool_files --all - dodoc BUGS CREDITS README README-SDL.txt README.HG TODO WhatsNew - dohtml -r ./ -} diff --git a/media-libs/libsdl/libsdl-1.2.15-r3.ebuild b/media-libs/libsdl/libsdl-1.2.15-r3.ebuild deleted file mode 100644 index fa562441580b..000000000000 --- a/media-libs/libsdl/libsdl-1.2.15-r3.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r3.ebuild,v 1.2 2014/05/15 16:15:03 ulm Exp $ - -EAPI=2 -inherit flag-o-matic multilib 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.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -# WARNING: -# If you turn on the custom-cflags use flag in USE and something breaks, -# you pick up the pieces. Be prepared for bug reports to be marked INVALID. -IUSE="oss alsa nas X dga xv xinerama fbcon directfb ggi svga tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio ps3 static-libs" - -RDEPEND="sound? ( >=media-libs/audiofile-0.1.9 ) - alsa? ( media-libs/alsa-lib ) - nas? ( - media-libs/nas - x11-libs/libXt - x11-libs/libXext - x11-libs/libX11 - ) - X? ( - x11-libs/libXt - x11-libs/libXext - x11-libs/libX11 - x11-libs/libXrandr - ) - 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 virtual/glu ) - ppc64? ( ps3? ( sys-libs/libspe2 ) ) - tslib? ( x11-libs/tslib ) - pulseaudio? ( media-sound/pulseaudio )" -DEPEND="${RDEPEND} - nas? ( - x11-proto/xextproto - x11-proto/xproto - ) - X? ( - x11-proto/xextproto - x11-proto/xproto - ) - x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) )" - -S=${WORKDIR}/SDL-${PV} - -pkg_setup() { - if use custom-cflags ; 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 custom-cflags use flag in USE." - epause 10 - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-sdl-config.patch \ - "${FILESDIR}"/${P}-resizing.patch \ - "${FILESDIR}"/${P}-joystick.patch \ - "${FILESDIR}"/${P}-gamma.patch - - elibtoolize -} - -src_configure() { - local myconf= - if [[ $(tc-arch) != "x86" ]] ; then - myconf="${myconf} --disable-nasm" - else - myconf="${myconf} --enable-nasm" - fi - use custom-cflags || strip-flags - use sound || myconf="${myconf} --disable-audio" - use video \ - && myconf="${myconf} --enable-video-dummy" \ - || myconf="${myconf} --disable-video" - use joystick || 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-rpath \ - --disable-arts \ - --disable-esd \ - --enable-events \ - --enable-cdrom \ - --enable-threads \ - --enable-timers \ - --enable-file \ - --enable-cpuinfo \ - --disable-alsa-shared \ - --disable-esd-shared \ - --disable-pulseaudio-shared \ - --disable-arts-shared \ - --disable-nas-shared \ - --disable-osmesa-shared \ - $(use_enable oss) \ - $(use_enable alsa) \ - $(use_enable pulseaudio) \ - $(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_enable ps3 video-ps3) \ - $(use_enable tslib input-tslib) \ - $(use_with X x) \ - $(use_enable static-libs static) \ - --disable-video-x11-xme \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - use static-libs || prune_libtool_files --all - dodoc BUGS CREDITS README README-SDL.txt README.HG TODO WhatsNew - dohtml -r ./ -} |