diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-02-08 21:51:10 +0000 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-02-08 21:51:10 +0000 |
commit | 64998b0d001b3ea4d940372ff4be208e80718e32 (patch) | |
tree | f16874349a39d74a91a22479e47e84c2bba2a109 /app-emulation/wine | |
parent | Install libnvidia-eglcore.so too (bug #500708 by Mariusz Ceier). (diff) | |
download | historical-64998b0d001b3ea4d940372ff4be208e80718e32.tar.gz historical-64998b0d001b3ea4d940372ff4be208e80718e32.tar.bz2 historical-64998b0d001b3ea4d940372ff4be208e80718e32.zip |
Version bump, see http://www.winehq.org/announce/1.7.12 for the announcement. Update osmesa patch (bug #500352).
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61
Diffstat (limited to 'app-emulation/wine')
-rw-r--r-- | app-emulation/wine/ChangeLog | 9 | ||||
-rw-r--r-- | app-emulation/wine/Manifest | 28 | ||||
-rw-r--r-- | app-emulation/wine/files/wine-1.7.12-osmesa-check.patch | 38 | ||||
-rw-r--r-- | app-emulation/wine/wine-1.7.12.ebuild | 436 | ||||
-rw-r--r-- | app-emulation/wine/wine-9999.ebuild | 6 |
5 files changed, 498 insertions, 19 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index 341a600d6071..cf9a1c8e59a8 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-emulation/wine # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.495 2014/01/26 10:55:18 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.496 2014/02/08 21:50:51 tetromino Exp $ + +*wine-1.7.12 (08 Feb 2014) + + 08 Feb 2014; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.7.12.ebuild, + wine-9999.ebuild, +files/wine-1.7.12-osmesa-check.patch: + Version bump, see http://www.winehq.org/announce/1.7.12 for the announcement. + Update osmesa patch (bug #500352). 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> wine-1.6.1.ebuild: Stable for x86, wrt bug #497962 diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index dc527568e6d9..ac49967efef0 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -11,6 +11,7 @@ AUX wine-1.5.26-winegcc.patch 1808 SHA256 91c1012059b93a421b2eae9f2ea46b7b327d6d AUX wine-1.5.30-libwine.patch 1777 SHA256 2f0155c2c1d11fd9a06deab54dd753c1161e32217eae82604f8c1d542e87af4f SHA512 e6d566f75632065def197cf27b5705a3f2f736a7b3bb4ae03df19fea00fd980a5b5d0517981469fef0fa5347c1c3b9651894fb23d937b5dbbd993cd292f67183 WHIRLPOOL 62ed15db6bddda47dcf74d846e15a9904c11abdf63e0321e7e2bc3197f60c819992b3a95a4395f85edeef9181a1866749194b9744be8d42bd94acab37470aad6 AUX wine-1.5.31-gnutls-3.2.0.patch 1616 SHA256 3ce82009b05fe997b0d198ad83533026d6410811ecfc6254c1505d0b9d18caf0 SHA512 09de6ff03da996197cd6833c1f53e9f39b43fc43e02ad3b4e12648a57288c1fa200886a805e6811372e12665f9a5d463603f9a9ba39cb1392b2cf4d11f3f9a65 WHIRLPOOL 590a9206913a51eae81e236057bbed346dae8f895575dcc948ba7168edf5c0605db6278344fad727c2a828a2aeef258f72a57a12b5dca244a3b7b82cfe43452a AUX wine-1.6-memset-O3.patch 695 SHA256 1f04496713e8a401ba068702c5c3e104b18635bfb54808e5641a3c48a9b9bad4 SHA512 ad7231f8dedf98f9e9b91fcb8bbe72a716d78285127b0c33396de0b1e17a191f91f9a4a377c0e90671bb5f4e57bfb087ef7e80c9537c6c73b3c9bb90b3885968 WHIRLPOOL 91689c31054b896609493e2b0b4fe67e3d752d889f4ccae9c3e15229543341998809fd19a2040457e04fbdbd45505f0f2b49052844004193872713053d7239f8 +AUX wine-1.7.12-osmesa-check.patch 1722 SHA256 42648efa15040011ef868f92fd615924a83b5a30dab25505928226d8bc48159d SHA512 faca80f9747f3d7bfd05c3410bcccfaf17b3f397e30dd9ec382eccc326de346d195d6a184ec78e44b26d5e5e4b2af749ce58a0e6bad0b15a4fd1f2ea610d3124 WHIRLPOOL c5314849d15a53dc00af80f44249c10107b17825c4a2ab4510a5799b154bb1cdb516b3b632e1e959802588f673b9eac8ed6de2dfb59bde34acdd5b752115f695 AUX wine-1.7.2-osmesa-check.patch 1740 SHA256 5264ac291435eb64c70cef4bdccbf8d4448472b4f014ab15ede35bcceebb6579 SHA512 4738a381923df7b45ea68092efb7ccb967907976d6d2f8bb0167af4211c377a73e296481b94092ac232f9ae09edf21447da92a134ebfff9b32acdd9e20340b95 WHIRLPOOL 95a90f8ff5a649833b39cb28de997c3b516cd09a53cf71d616c4fd412dfa6e71c47a1255a4d0597d85a62966cd9d6b9fae1c21c88e67d8650d31d414fca8fd42 DIST wine-1.2.3.tar.bz2 17651336 SHA256 3fd8d3f2b466d07eb90b8198cdc9ec3005917a4533db7b8c6c69058a2e57c61f SHA512 602ae802aa6f94c4498ccae96a67e355a8aa5cdc1e9c1e0f29482f45a9e7cc7af766ade9f2f1fef77ee77d5bbfc5f34cd110b95db244b8cff42998b5b0cf708d WHIRLPOOL 02ac95d8c86d0f2d870c8e4c4789c1bef1ef965f8bb186de23fd3a949126ba2aadd5791d1908bdf11d946d5dc5348b085881c2594cf1b407fa0df44c1990ecd9 DIST wine-1.3.28.tar.bz2 19626794 SHA256 9a311124a1a911066ab9d3a742dda888487ee516a18eda946be105a1d1135a38 SHA512 b8fb881cf03dce1a40a9212bc6170858ddde38cd2fc282b455ab94cee7ee2e78f5043fee72df3b1e7566c29fb8c8a43726953a8bc5eb22d3ab7f869e6f4e9722 WHIRLPOOL acb6b8b978541e1b0f95f124e95ad9823e73590229515fd40e4e59d5af21c414c4824490710b436370b4d3fda3c477d6c4b626f89c6cc90e2fcf066355c3bee9 @@ -54,6 +55,7 @@ DIST wine-1.6.tar.bz2 21124403 SHA256 e1f130efbdcbfa211ca56ee03357ccd17a31443889 DIST wine-1.7.0.tar.bz2 21217085 SHA256 0106ba3c8f0699cc7ae6edfcf505f7709c9e6d963bf32ff9c690607def9d4d77 SHA512 0e730aff64fd026b6fcb3a8b7e2440fbb673c892f5124611a001af5264f2ec1ddfdc94d7b78ffe3080008b0ec0658da0131d680c5e2d80f5c655b6abeb8379b4 WHIRLPOOL 3c607d0f7537815020af28f539699f8290e3d64291422f9f58bda5b836fe083224ed6108aca3147d713491183866fa57ed9964cb4a255d4980ae27180f2a29f4 DIST wine-1.7.10.tar.bz2 21312974 SHA256 44270e4b97ef930e4e4b59088e6e3972e91e85bacf9a9a4d8712a877c9d5cbdb SHA512 157fe4146df3c174643cc1ac29748778aa90fb9e602b417ad772d3da2af3a86307ca818ded860722513efdba57b85e06a2db2869a69a3f579255829dc3d8ac55 WHIRLPOOL eaba07f65c416ce93b9243df402ad0fb5a2f5e7bce43f40b73941f2ea7baddbcab9ce3a999d9086faeaead7552f5d34234cc3b3f3798db2fb98982ef22a98b71 DIST wine-1.7.11.tar.bz2 21359534 SHA256 c07d2771ed96c45d428bb11d164c5e4bbe48d6857a0a4cba2e0b73c5f1044f93 SHA512 9743c4cf382b6846d98aa383d9db22cb99bca510ec2db3e9224f10d08095c4a3fe4449b3019d5a6f401458a98696d096a454d00584c667074aed618c47544dcf WHIRLPOOL 38356b5df2c9f5a78b9eb66c6e0f09f7371c57d84f601e6614228b64c629a2c9c222696078d7627df850792a0111e7876fe460c4575bac4accf2f56a391315c6 +DIST wine-1.7.12.tar.bz2 21366705 SHA256 2dcdff7bf8bac2bc10da85e3e632e8add830f22cf416173e53abca4ec580b392 SHA512 7b5be06dd6d71512884bbcc386fb021725125fb95a4493a033624c2b801eaec7fb4be4b70894ee914da138d8e310da3ac49b8a32538ee21d127201cebc44b449 WHIRLPOOL fb04306058403f82df8cf3e88d21d8011bd2e7cdfa4c31f28e64ea0d24393cd6ed8f61724839a1b5cde272ac8dd854c6c6185e7dee8271881b9b3eb1612f4bbe DIST wine-1.7.3.tar.bz2 21489049 SHA256 c66c93c2ffec8d1d9922fbaa226b169d62deb77fcbfd0fbd7379b77dbd97d47f SHA512 41109866b259a5f939c9ca4c26ed0a5ca74fa9cafa2f348b83510dd386459c87ac044a6f954f2f83ce00961d866a6e636ed96aa9e94584b7a79486d434b406cc WHIRLPOOL 90e6aed8930e3496701292415ce87f29a87870a1d00ad26d4f3c4adf33cd296093d0ef3d363bf5cead1ebd5ab4e86907ccb015c10d85f6f90d5f48cd81681b0f DIST wine-1.7.4.tar.bz2 21500746 SHA256 517b3465dbf5b516d3fe886c0f9d4f310dc1d4a38ca4e5580c5d66bab3fb6969 SHA512 4267eb43311fe53537a1864a70e88e4bf444b8979dc858725a1170ed06af4e727604a22bafb3deb448eeb62c170ce67ce8eb8082bce040f5488b1a4c4bc6bb95 WHIRLPOOL 7bb14e0dfd4f9a7411e1d5484dba62f8584a0e03997cc3c6192893dccbc7de316eb79a1e5b0ccf96d20e74cf512ebc79e760076ff4882625bc81b410ad8be0bf DIST wine-1.7.8.tar.bz2 21463503 SHA256 30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 SHA512 1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea WHIRLPOOL 3b5b18384ff04b80b936160c2c6e03676d69663c023f484981305c9272d0601b74cda5c5f7d56008b3900d702b1a4fe1929f16b1fba304a6480b076ffede663a @@ -100,6 +102,7 @@ DIST winepulse-patches-1.5.30.tar.bz2 45835 SHA256 61f7cdee2c5cb21457a721752a452 DIST winepulse-patches-1.6-rc1.tar.bz2 47873 SHA256 c963b08e520aafdc618caaa50044979ec573aa1862bc0637f1f4e381b3fc3665 SHA512 f5f9cbcb93ffcec8dc43bd8949d7f7ee71ab75771dc04ee1e28c3b4ba2ab3d7f7089ae2f872aed835979a94e51563e65e6fd8333104617c8e0465525c2854654 WHIRLPOOL ec38890c71a3e40d433c8e99f483f2453c2e88119d824aabebbc9c6cc95b3585ee8e1d47e1a00df795d6b731d041fd7e1b987781b76b66bf0dbf9f7cac4642e3 DIST winepulse-patches-1.7.0.tar.bz2 48368 SHA256 280f8583574d5f0ef437e15790f96d0ade9bd4b5cc44771ec89023f76728ba73 SHA512 67c36d380c40d3a8144fd5f9e5bf5eea6adfdd178a6ebf3727e281938bdaffddfcc2f49cb30837195cf47f4c176c1812f0ab64bc36c8981611fc86dc5a8266bc WHIRLPOOL d8775bfff9bac174cb91550643a1994a3d0ea2e22a24c05d46ca2a7a7521ff53f481880c2e0191c4f0494acf11a05a8183abca033aa58ac58bbc8bd762d02a5b DIST winepulse-patches-1.7.10.tar.bz2 49205 SHA256 7330b4552b572244bbe99c16005d725eaf382995c986add170474381b90df468 SHA512 ef3a5477bc5803bfba609dc3299a7c07833958628d1aff01d100da57c0d270344ee326649206708c50c2a12b025f987a4e0f1dee9126e52e2778b256c45ba567 WHIRLPOOL b40088d8665f3cc57b4936774ac6dc2e6b005d75aa7c7385248ce35e5cf6e168ae212771f771b68dbf91fc5034b7ba54f907e93283cc2eddaa18e825d9b734a9 +DIST winepulse-patches-1.7.12.tar.bz2 49171 SHA256 6c5b3f46ea1c4615c49ee0f6f65936cf650cce6640f0feb4236c707064a9d392 SHA512 ec41f6024d6e2325f14f8caa15bbe38c8dca6c69beb5343063365f58dd8b7edbbc4d24ad176de72cf0e37acae03eb9769b68fcbd40a672680e06156f4a59b12c WHIRLPOOL de8a33ee784606e76a60166e3e29a1fb748ce4b3af1db136558888bd09bb0a044e4a1a9a61ce3de59d55f93c98575ac8d77c3ff17de4d69cda3b8fbd8f6c33c5 DIST winepulse-patches-1.7.3.tar.bz2 49163 SHA256 893dc6251984f6a7306dc8064c50a6a605921094f84feb436c23be3b9e5d077a SHA512 f04b33479c92ce31df74ea49b8582cee2f9d7a4cdf132f212f021da89b19dda8e5a4b0daaec81533b100ef0af023157cf43581ab75fa263da3c1a5d712ec3e9d WHIRLPOOL ae2a599d7bdb49ce77cc56844ff74c7fd62b1f1164e9f7fdec499244fd609799c0fd7421d29ffda7e9fb599962f75c2ebe44ce72e0f0a80677e140f759ab22f9 DIST winepulse-patches-1.7.4.tar.bz2 49182 SHA256 26cc1ab6d91c45b4d83f07bbd7f43c9824470700a58325f0a1bfc1b76bfe419f SHA512 55095dcd3ebd1560316382ee5f625203589ba8ac2437f7993bee0edf61004d3c0cdba0aabc2e9aed3d195d8eda4088241766dde4c44564e81ea99cc47404cdff WHIRLPOOL 978f3bcc3cc14098b604cd737d9fa6911a5c3b76773a060586ba183a055cdc25e3b436c262c813094c7c2158ae607bcb3020738da16bbe2c48c595728755f98c DIST winepulse-patches-1.7.8.tar.bz2 49140 SHA256 0fd31ea7fec8817561a7b304bbfad6bdd014eb566b0c533e15773064bca555ad SHA512 18c88d4da37714d0216c01929eb92c99161fdf7024d8516512fc2585bc8d5a700fb1b5eb9fb667149e104305f366c867973f41b688a04f63e7cce76f5d85389a WHIRLPOOL 60dfeeb1d51c9ea7730ff1e9263d44fbcf3509e6ae68df1e3d30d965999f19525979f64617494bb1c3e1712c7117f30bebfbcbc75b1b08ba1f1e033720b0cacc @@ -145,28 +148,23 @@ EBUILD wine-1.6.ebuild 12502 SHA256 5b27fc93d97379c12444b0c7a722545080ddfd0b663b EBUILD wine-1.7.0.ebuild 12421 SHA256 411f57e42e30b82d4c1ac099689281582d6f88b6e1c8a55089e1736a369647fd SHA512 6de6f1aa8e9056b2281618fddc8f32cbee9b15d123dc5cc588e73ef68b254e6a8618380bd967de56635ec3a05849354e6da7d1fa2860bbd97430d2bb6782c9b5 WHIRLPOOL ee9bb901643bfde35a1ff5f615c30b24d9afe360e452c61eb6549a15867ec1c2947f6e662f6f15f1b28897921188bb52686a50d3a23828fe29ef335726f1f9a9 EBUILD wine-1.7.10.ebuild 12756 SHA256 6241d5d9da059712d0f304ff5124f6321c0089d7294be673c20f67fa06f373ba SHA512 fc762b1eedbcfb0cbb204ce601975408d6595c243be22b732c890f093d7157a6a51567e7c74c3497ec0fef203f7a816a1a7fe2bbddd2ed063f2b80977a1b7107 WHIRLPOOL 7411c9db26a9987fcc901effe4d4935220374ae4424da1605c49bf75cbb6563c24068498fa0b1afd4f754ed5b43ea82b9c54bd5dd392dace4bee7d745e1ac2ed EBUILD wine-1.7.11.ebuild 12756 SHA256 67876f88ce08ae48cb0b8e450a189bd71cb14e1c9e60d35918c78ff55ae6921e SHA512 92a6eff8da9c16dd5206568ae2eaa41bd4c524ffdd76a9913b9b30d179f19f026585eca52aa19e8076e1234976dcfa9ba722e7284099a5abb15bf2cd17a46088 WHIRLPOOL f3bef1cf062095352c9178f0e88490ad05b0c58113e5f2b7dfed20b2520809cb16730e1061f01b2765dd3d90f5b365ab6fec2f5ab8be2d186be37ef5348d5cc2 +EBUILD wine-1.7.12.ebuild 12757 SHA256 232d537fb88664ad4e7851ca5ba3d6240243cc535eb77505b53f3c07dbc00fa6 SHA512 de5c7f6abd81b30b77c5d04bc6ec5def62db502f004af6a398ed29296e530d2b23615dc2a46a154ee48be569d0f74eca64a9611c1af3c0003788bfb672a2cfb2 WHIRLPOOL 643f45280cfac304df09c74e5fc686368f24003cc593c4ec7c84967390c4fd0f3ebf5a653253f362b547b9386e1bdf735eea363c23fcc36224b9931c33a51f33 EBUILD wine-1.7.3.ebuild 12423 SHA256 58d6df01c3bede22cb1c84e2b682e273d73060bd869dad74a7d14aa94f2c2aa5 SHA512 5aea1a2b1fa41f3eb61936820aca4c96b7dd404671772894a199cbf12b721f9746ec837020d464c37f49d7da6a4cbd70ffa89746588854a8513a5d16b953d747 WHIRLPOOL 5f267b3b58f5b0e8b6780abf30229e292c836542f684c34042644e28642fab53dccadcb043a22f279e94d5a8f822f8ec2262e1b2cdcdff227c94bf4f13c02dec EBUILD wine-1.7.4.ebuild 12423 SHA256 7ef9808dc6efaf8c1fb60407b79ef3a19ab112a21d33f5e34188e3962641d2f9 SHA512 fe9281355ae372866431a68b276327cd3e5cf55887aee7eee6d989e1e6fe5e9f4f0fe9e2bcb3c681f886ca57ba26786cf09eee90f66a87d62fa4882775f5775b WHIRLPOOL e4247512391929136600c3d37ecfc6f757cc1a91ae179e73dc30e73d23f7cdaa4a3678d69bdb96951afa4b2a5a189fdb8ef22f5cbe736675839f58ccd916cdea EBUILD wine-1.7.8.ebuild 12754 SHA256 d6c8decb636bd23b1deba6677bf3167515bd9555ce86d91461c8d6595f17c412 SHA512 94622108c0733bce3c6f60cec2d2dc684228e77d2eaa6f90256e3070186881cd142084feec69098dc460727a06c0e9aed2a6ce9d4082023f0d03b24fb5be3d77 WHIRLPOOL bfd3793ff8530ddf5c76b543a16286af1fc841b6ba4e18573910b5ba6e3de663a180c699266a9dedec71f324b4eee15bc9b99c8acd1e50e9f4ca4bdbea1638bf EBUILD wine-1.7.9.ebuild 12754 SHA256 cde2305629c14b891331fc2953a5c32b8f7cc9da23e9ace13b5fd3a78100a5fc SHA512 0b5e5e5ec720a3a91e0e1605ed7de09cf2b86675b170293c1cade2a7e70d3d31b956013a36e216324e75845928f0c540584293775b9648831a790eb125bf2052 WHIRLPOOL db9a0dd9a4562eb6ba3172970a1e0e4d094107824b43fa5dade5787f6d3fe7d3e474247d4aec8f95b8c78b67123249fd82b9a67eeeb9573fad3ed0a2ab6eefaf -EBUILD wine-9999.ebuild 12756 SHA256 47815cf8e17c0ae1e07ecd77c120bd4d3fe5a0fb3075aa4377fc742e0a5766cf SHA512 be66fec6f67a5a9346c129161addb204998b95fda60eb3269f62f47f114043c96030cc0a0be2d5b523fe56f041abaee8031239eb8b76b45958ea6cc8dc894a78 WHIRLPOOL 770a74fb6c59d5d2f19b966fedee1242cd81c0a302f1b5aea1f51f192cef2dfd20590c9f16620d700c18c6579e495cf3e7df721470fb3a8bcbabda575b27d1b3 -MISC ChangeLog 17021 SHA256 45de2c8ae66d584ebc7fe9c83c346bad01e03bd1c15be41a9f00fcf901d5a757 SHA512 3d446fcc1997955206f6ed63cf08f5fa47276ebb0d6b90706401757a84fd2db7a000284dc43416ef969fece371885c39fd3511edfda27983389b668d25bda795 WHIRLPOOL 8dc030bc5d1a6705a4c6efb20f95dcc6300e7c5651d2a08937a84576e1a271d319b25f9ef3b8eab2b6c4bb41ba44849270041143f5d50afe1e6b093be23b8ad5 +EBUILD wine-9999.ebuild 12757 SHA256 439e2dfa6696c97df9539f0460015b363a57d3ed60ce338729866b8741ee91ed SHA512 3f5d20b5edb81ae5e106b050f72379db96c81812d900521cff2a2b2db8e0800a63b958b615ac609078143b74d76a045f7c506850fc46406bace8443cb1355f52 WHIRLPOOL 384d9bd51d369b90013efb599bc03d84934c121656d8c66021a9e9bc4d0919e2f1ccacc23bffb4aadeef2dd6d3b6faade9062a002d403581ec35e8f88268ed72 +MISC ChangeLog 17312 SHA256 be86b74c30560d2312de640044267a76bb307c3ab7c011c7d927afb9842ea35f SHA512 c180dfc9cea75a52e91a97b95a505c0bf7827cd67770245fe02198f12dbb131a1cc745f9cc6efe8d764c8ff85d92ddfc8c421b7d05fbcd26983db4ca5b7fb01d WHIRLPOOL 37f28c70b4ae7a80612468f13a4852ffed411bea36eed2982debb89fda52e23415951af0bc15ea92f9fa3e2c1db4a7bb02a120c76492d1bd89491da6eed15e94 MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014 MISC metadata.xml 2236 SHA256 2b4d3de73fa84f3f3d192e3d29d8fd22796d4c5630151a380c3c33597263436e SHA512 884a7aa53e7694cec121453103bf3873cba1a8323f8a6ee5fc5e326b05610f1c2d36c07bc357c12777749a33f0ebf986f78341fea5c752dc14f3ab4b90f137a5 WHIRLPOOL 3a2b66e0af17c2e260621e5e065ece87be1a355c8da5bf3c8638f360ed5d1dcd062c44b0e26e72a708e5bc4fb5d8e054e0049ab58b090fc2fe5ed6e2cdee9c19 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS5OmYAAoJELp701BxlEWfbrAP/jCYf3Qb3fZkq73OGBwiLCND -9mUhDlDZqOwoovLAdy99VoYIkWBvszvhPV7Gilwzh0975FYWBYx+DNqiDRlONao0 -p+Tkw5QcOlhs3fwu+4VBdDtIYvEPlJjt/rba4drsLo5vF8PVUrMusERNfgshaM05 -oZmgid59t5p1+bKu5V2poGlHr4GDtye5KR6O2a8ET2s1/FG0DV0W+zCZSo1YXyTB -UPQhnJUcrfS4ev6kWEdzD2JPqxrq0iwjl9YBr3sf5bk4wyCq+6UxAbYD2PS10t7F -C0BLasxk07yoeq7ha/GtsY4UKRoBJvHdLbFamREbuKSjVN4VL2bzGZkJ7aBbAdOT -ktPVCwNL0QScIklRnPh5lf2k8d9fpqZZfXojnNbp7wMrvRZ/DFuQCi3ERg9hDRq2 -IlILXcuhwfcGJFEZyO/2B8AoFefusOUAdL1hOj+saVkon9jlHXdYnWg6PaGIbmie -p1P8lksYn5rCDkqSRfRDCSZ6JLz9c0bEcbZmxFtv0UfqelazZgpv7LBxsKC5sCRw -BQcovJC55wsdaxdkhYeH4jWttGb4/hkE+mBcbq5PMO9aoQL41H5P+SaEzZtzPO+P -UBsXuiA59ML3odcAWYUD4ZRFf+IJOQjay5jXMDJea1bGaRcgqVQ58RztHyXSU7Js -rPIXyZZU4jX1A00HwmPd -=PiFZ +iQEcBAEBCAAGBQJS9qaKAAoJEJ0WA1zPCt1h2EIIAJWLSSAxO9+vdBVHYynf8bPd +d/AuDt3sB5INr/1R5jL/9dPIhUu/FCf3ybcVKNAuWdE+JRu28VtJQZqSeNwF5kfq +QI590GOuWJQRyjEAhxciyP2dB2VqSHE8T6Vlbkz7jFHh6sMWW2SjwNjD+JsIeyoK +Lmte0TGATDGPgw7zOyczGUoZXWFdLeYA8vO62LnAAX4dj77wkQToPRUxQMcjt7Pj +F/TnCxDECPBmo3dwUkcBpnSejM3vinkobPXA9jRj5j19oDduRa7gnwqwWpJH8Kes +x+ThgSYMmNV6Hri8v5lPc2zuxgeWLxGLVYbi5CSAuw4XjMBkq1cRYQd3rj0ClTY= +=YNuF -----END PGP SIGNATURE----- diff --git a/app-emulation/wine/files/wine-1.7.12-osmesa-check.patch b/app-emulation/wine/files/wine-1.7.12-osmesa-check.patch new file mode 100644 index 000000000000..7cafcd4e6dc8 --- /dev/null +++ b/app-emulation/wine/files/wine-1.7.12-osmesa-check.patch @@ -0,0 +1,38 @@ +From 6932b9a17c4f64c13f7060895d46334bc7022430 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Tue, 7 Aug 2012 01:29:01 -0400 +Subject: [PATCH] Do not check for libGL symbols when checking libOSMesa + +If mesa had been built with shared glapi, glAccum is not available in +libOSMesa without explicitly linking to libGL. In addition, in +mesa-8.0.x and earlier, libOSMesa needs to be explicitly linked to +libglapi if mesa was built with shared glapi, see +https://bugs.gentoo.org/show_bug.cgi?id=399813 +And in mesa-8.1.x, libOSMesa in addition needs libdl, libpthread, and +libstdc++, see https://bugs.gentoo.org/show_bug.cgi?id=431832 +--- + configure.ac | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index de807d2..a2e8684 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1233,7 +1233,13 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c + + if test "x$with_osmesa" != "xno" + then +- WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS -lm $X_EXTRA_LIBS]) ++ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS -lm $X_EXTRA_LIBS]) ++ if test "x$ac_cv_lib_soname_OSMesa" = "x"; then ++ osmesa_save_CC=$CC ++ CC=$CXX ++ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi -lpthread -ldl $X_LIBS -lm $X_EXTRA_LIBS]) ++ CC=$osmesa_save_CC ++ fi + WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"], + [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.]) + fi +-- +1.8.5.3 + diff --git a/app-emulation/wine/wine-1.7.12.ebuild b/app-emulation/wine/wine-1.7.12.ebuild new file mode 100644 index 000000000000..bcf0652cf69d --- /dev/null +++ b/app-emulation/wine/wine-1.7.12.ebuild @@ -0,0 +1,436 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.12.ebuild,v 1.1 2014/02/08 21:50:51 tetromino Exp $ + +EAPI="5" + +AUTOTOOLS_AUTORECONF=1 +PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW" +PLOCALE_BACKUP="en" + +inherit autotools-multilib eutils fdo-mime flag-o-matic gnome2-utils l10n multilib pax-utils toolchain-funcs virtualx + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://source.winehq.org/git/wine.git" + inherit git-2 + SRC_URI="" + #KEYWORDS="" +else + MY_P="${PN}-${PV/_/-}" + SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2" + KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" + S=${WORKDIR}/${MY_P} +fi + +GV="2.24" +MV="4.5.2" +PULSE_PATCHES="winepulse-patches-1.7.12" +WINE_GENTOO="wine-gentoo-2013.06.24" +DESCRIPTION="Free implementation of Windows(tm) on Unix" +HOMEPAGE="http://www.winehq.org/" +SRC_URI="${SRC_URI} + gecko? ( + abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi ) + abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi ) + ) + mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi ) + pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 ) + http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) + test? ( abi_x86_32 ) + elibc_glibc? ( threads ) + mono? ( abi_x86_32 ) + osmesa? ( opengl )" #286560 + +# FIXME: the test suite is unsuitable for us; many tests require net access +# or fail due to Xvfb's opengl limitations. +RESTRICT="test" + +NATIVE_DEPEND=" + truetype? ( >=media-libs/freetype-2.0.0 ) + capi? ( net-dialup/capi4k-utils ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + udisks? ( sys-apps/dbus ) + fontconfig? ( media-libs/fontconfig:= ) + gphoto2? ( media-libs/libgphoto2:= ) + openal? ( media-libs/openal:= ) + gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) + X? ( + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXrandr + x11-libs/libXi + x11-libs/libXxf86vm + ) + xinerama? ( x11-libs/libXinerama ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups:= ) + opencl? ( virtual/opencl ) + opengl? ( + virtual/glu + virtual/opengl + ) + gsm? ( media-sound/gsm:= ) + jpeg? ( virtual/jpeg:0= ) + ldap? ( net-nds/openldap:= ) + lcms? ( media-libs/lcms:2= ) + mp3? ( >=media-sound/mpg123-1.5.0 ) + netapi? ( net-fs/samba[netapi(+)] ) + nls? ( sys-devel/gettext ) + odbc? ( dev-db/unixODBC:= ) + osmesa? ( media-libs/mesa[osmesa] ) + pulseaudio? ( media-sound/pulseaudio ) + xml? ( dev-libs/libxml2 dev-libs/libxslt ) + scanner? ( media-gfx/sane-backends:= ) + ssl? ( net-libs/gnutls:= ) + png? ( media-libs/libpng:0= ) + v4l? ( media-libs/libv4l ) + xcomposite? ( x11-libs/libXcomposite )" + +COMMON_DEPEND=" + !amd64? ( ${NATIVE_DEPEND} ) + amd64? ( + abi_x86_64? ( ${NATIVE_DEPEND} ) + abi_x86_32? ( + truetype? ( || ( + >=app-emulation/emul-linux-x86-xlibs-2.1[development] + >=media-libs/freetype-2.0.0[abi_x86_32] + ) ) + ncurses? ( || ( + app-emulation/emul-linux-x86-baselibs[development] + sys-libs/ncurses[abi_x86_32] + ) ) + udisks? ( || ( + >=app-emulation/emul-linux-x86-baselibs-20130224[development] + sys-apps/dbus[abi_x86_32] + ) ) + fontconfig? ( || ( + app-emulation/emul-linux-x86-xlibs[development] + media-libs/fontconfig[abi_x86_32] + ) ) + gphoto2? ( + app-emulation/emul-linux-x86-medialibs[development] + ) + openal? ( || ( + app-emulation/emul-linux-x86-sdl[development] + media-libs/openal[abi_x86_32] + ) ) + gstreamer? ( + app-emulation/emul-linux-x86-gstplugins + app-emulation/emul-linux-x86-medialibs[development] + ) + X? ( || ( + app-emulation/emul-linux-x86-xlibs[development] + ( + x11-libs/libXcursor[abi_x86_32] + x11-libs/libXext[abi_x86_32] + x11-libs/libXrandr[abi_x86_32] + x11-libs/libXi[abi_x86_32] + x11-libs/libXxf86vm[abi_x86_32] + ) + ) ) + xinerama? ( || ( + app-emulation/emul-linux-x86-xlibs[development] + x11-libs/libXinerama[abi_x86_32] + ) ) + alsa? ( || ( + app-emulation/emul-linux-x86-soundlibs[alsa,development] + media-libs/alsa-lib[abi_x86_32] + ) ) + cups? ( app-emulation/emul-linux-x86-baselibs ) + opencl? ( virtual/opencl[abi_x86_32] ) + opengl? ( || ( + app-emulation/emul-linux-x86-opengl[development] + ( + virtual/glu[abi_x86_32] + virtual/opengl[abi_x86_32] + ) + ) ) + gsm? ( || ( + app-emulation/emul-linux-x86-soundlibs[development] + media-sound/gsm[abi_x86_32] + ) ) + jpeg? ( || ( + app-emulation/emul-linux-x86-baselibs[development] + virtual/jpeg:0[abi_x86_32] + ) ) + ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) + lcms? ( || ( + app-emulation/emul-linux-x86-baselibs[development] + media-libs/lcms:2[abi_x86_32] + ) ) + mp3? ( || ( + app-emulation/emul-linux-x86-soundlibs[development] + >=media-sound/mpg123-1.5.0[abi_x86_32] + ) ) + nls? ( app-emulation/emul-linux-x86-baselibs[development] ) + odbc? ( app-emulation/emul-linux-x86-db[development] ) + osmesa? ( || ( + >=app-emulation/emul-linux-x86-opengl-20121028[development] + media-libs/mesa[osmesa,abi_x86_32] + ) ) + pulseaudio? ( || ( + app-emulation/emul-linux-x86-soundlibs[development] + >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + ) ) + xml? ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] ) + scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) + ssl? ( app-emulation/emul-linux-x86-baselibs[development] ) + png? ( || ( + app-emulation/emul-linux-x86-baselibs[development] + media-libs/libpng:0[abi_x86_32] + ) ) + v4l? ( || ( + app-emulation/emul-linux-x86-medialibs[development] + media-libs/libv4l[abi_x86_32] + ) ) + xcomposite? ( || ( + app-emulation/emul-linux-x86-xlibs[development] + x11-libs/libXcomposite[abi_x86_32] + ) ) + ) + )" + +RDEPEND="${COMMON_DEPEND} + dos? ( games-emulation/dosbox ) + perl? ( dev-lang/perl dev-perl/XML-Simple ) + samba? ( >=net-fs/samba-3.0.25 ) + selinux? ( sec-policy/selinux-wine ) + udisks? ( sys-fs/udisks:2 ) + pulseaudio? ( realtime? ( sys-auth/rtkit ) )" + +DEPEND="${COMMON_DEPEND} + amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) ) + X? ( + x11-proto/inputproto + x11-proto/xextproto + x11-proto/xf86vidmodeproto + ) + xinerama? ( x11-proto/xineramaproto ) + prelink? ( sys-devel/prelink ) + >=sys-kernel/linux-headers-2.6 + virtual/pkgconfig + virtual/yacc + sys-devel/flex" + +# These use a non-standard "Wine" category, which is provided by +# /etc/xdg/applications-merged/wine.menu +QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop +usr/share/applications/wine-notepad.desktop +usr/share/applications/wine-uninstaller.desktop +usr/share/applications/wine-winecfg.desktop" + +wine_build_environment_check() { + [[ ${MERGE_TYPE} = "binary" ]] && return 0 + + if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then + eerror "You need gcc-4.4+ to build 64-bit wine" + eerror + return 1 + fi + + if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then + eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." + eerror "See https://bugs.gentoo.org/487864 for more details." + eerror + return 1 + fi +} + +pkg_pretend() { + wine_build_environment_check || die +} + +pkg_setup() { + wine_build_environment_check || die +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git-2_src_unpack + else + unpack ${MY_P}.tar.bz2 + fi + + use pulseaudio && unpack "${PULSE_PATCHES}.tar.bz2" + unpack "${WINE_GENTOO}.tar.bz2" + + l10n_find_plocales_changes "${S}/po" "" ".po" +} + +src_prepare() { + local md5="$(md5sum server/protocol.def)" + local PATCHES=( + "${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726 + "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615 + "${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386 + "${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508 + ) + use pulseaudio && PATCHES+=( + "../${PULSE_PATCHES}"/*.patch #421365 + ) + + autotools-utils_src_prepare + + if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then + einfo "server/protocol.def was patched; running tools/make_requests" + tools/make_requests || die #432348 + fi + sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die + if ! use run-exes; then + sed -i '/^MimeType/d' tools/wine.desktop || die #117785 + fi + + # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 + cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die + + l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS +} + +do_configure() { + local myeconfargs=( "${myeconfargs[@]}" ) + + if use amd64; then + if [[ ${ABI} == amd64 ]]; then + myeconfargs+=( --enable-win64 ) + else + use netapi && ewarn "Disabling netapi in wine32; see https://bugs.gentoo.org/494394" + # We currently don't have 32-bit libnetapi on amd64; #494394 + myeconfargs+=( + --without-netapi + --disable-win64 + ) + fi + + # Note: using --with-wine64 results in problems with multilib.eclass + # CC/LD hackery. We're using separate tools instead. + fi + + autotools-utils_src_configure +} + +src_configure() { + export LDCONFIG=/bin/true + use custom-cflags || strip-flags + + local myeconfargs=( # common + --sysconfdir=/etc/wine + $(use_with alsa) + $(use_with capi) + $(use_with lcms cms) + $(use_with cups) + $(use_with ncurses curses) + $(use_with udisks dbus) + $(use_with fontconfig) + $(use_with ssl gnutls) + $(use_with gphoto2 gphoto) + $(use_with gsm) + $(use_with gstreamer) + --without-hal + $(use_with jpeg) + $(use_with ldap) + $(use_with mp3 mpg123) + $(use_with netapi) + $(use_with nls gettext) + $(use_with openal) + $(use_with opencl) + $(use_with opengl) + $(use_with osmesa) + $(use_with oss) + $(use_with png) + $(use_with threads pthread) + $(use_with scanner sane) + $(use_enable test tests) + $(use_with truetype freetype) + $(use_with v4l) + $(use_with X x) + $(use_with xcomposite) + $(use_with xinerama) + $(use_with xml) + $(use_with xml xslt) + ) + + use pulseaudio && myeconfargs+=( --with-pulse ) + + if use amd64 && use abi_x86_32; then + # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 + # set AR and RANLIB to make QA scripts happy; #483342 + tc-export PKG_CONFIG AR RANLIB + fi + + multilib_parallel_foreach_abi do_configure +} + +src_compile() { + autotools-multilib_src_compile depend + autotools-multilib_src_compile all +} + +src_test() { + if [[ $(id -u) == 0 ]]; then + ewarn "Skipping tests since they cannot be run under the root user." + ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf" + return + fi + + # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" + multilib_toolchain_setup x86 + local BUILD_DIR="${S}-${ABI}" + cd "${BUILD_DIR}" || die + WINEPREFIX="${T}/.wine-${ABI}" Xemake test +} + +src_install() { + local DOCS=( ANNOUNCE AUTHORS README ) + add_locale_docs() { + local locale_doc="documentation/README.$1" + [[ ! -e ${locale_doc} ]] || DOCS=( "${DOCS[@]}" ${locale_doc} ) + } + l10n_for_each_locale_do add_locale_docs + autotools-multilib_src_install + + emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}" + if use gecko ; then + insinto /usr/share/wine/gecko + use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi + use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi + fi + if use mono ; then + insinto /usr/share/wine/mono + doins "${DISTDIR}"/wine-mono-${MV}.msi + fi + if ! use perl ; then + rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die + fi + + use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055 + use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader} + + if use abi_x86_64 && ! use abi_x86_32; then + dosym /usr/bin/wine{64,} # 404331 + dosym /usr/bin/wine{64,}-preloader + fi + + # respect LINGUAS when installing man pages, #469418 + for l in de fr pl; do + use linguas_${l} || rm -r "${D}"usr/share/man/${l}* + done +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + fdo-mime_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + fdo-mime_desktop_database_update +} diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index 64ef6e5af884..a6ab78c0f4c4 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.162 2014/01/04 03:49:37 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.163 2014/02/08 21:50:51 tetromino Exp $ EAPI="5" @@ -24,7 +24,7 @@ fi GV="2.24" MV="4.5.2" -PULSE_PATCHES="winepulse-patches-1.7.10" +PULSE_PATCHES="winepulse-patches-1.7.12" WINE_GENTOO="wine-gentoo-2013.06.24" DESCRIPTION="Free implementation of Windows(tm) on Unix" HOMEPAGE="http://www.winehq.org/" @@ -267,7 +267,7 @@ src_prepare() { local PATCHES=( "${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726 "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615 - "${FILESDIR}"/${PN}-1.7.2-osmesa-check.patch #429386 + "${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386 "${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508 ) use pulseaudio && PATCHES+=( |