diff options
| author |   Michael Weber <xmw@gentoo.org> | 2013-04-22 17:08:34 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2013-04-22 17:08:34 +0000 |
| commit | 32d8961db4611d84a71a06eea162a11a9937ad61 (patch) | |
| tree | 3693994f81ddc1ff518b2a028fc9a3626adf0688 /media-libs/oyranos | |
| parent | fix info build (bug #464092#c12 and #466758) (diff) | |
| download | historical-32d8961db4611d84a71a06eea162a11a9937ad61.tar.gz historical-32d8961db4611d84a71a06eea162a11a9937ad61.tar.bz2 historical-32d8961db4611d84a71a06eea162a11a9937ad61.zip | |
Improve multi abi support
Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090
Diffstat (limited to 'media-libs/oyranos')
17 files changed, 1682 insertions, 194 deletions
diff --git a/media-libs/oyranos/ChangeLog b/media-libs/oyranos/ChangeLog index 12f44aa810b5..db57e49ceca7 100644 --- a/media-libs/oyranos/ChangeLog +++ b/media-libs/oyranos/ChangeLog @@ -1,6 +1,26 @@ # ChangeLog for media-libs/oyranos # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.14 2013/04/13 02:23:48 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.15 2013/04/22 17:07:37 xmw Exp $ + +*oyranos-9999 (22 Apr 2013) +*oyranos-0.9.4-r1 (22 Apr 2013) + + 22 Apr 2013; Michael Weber <xmw@gentoo.org> -oyranos-0.4.0-r1.ebuild, + -oyranos-0.9.1-r1.ebuild, -oyranos-0.9.4.ebuild, +oyranos-0.9.4-r1.ebuild, + +files/oyranos-0.9.4-be-more-verbose.patch, + -files/oyranos-0.9.4-buildsystem.patch, + +files/oyranos-0.9.4-buildsystem-r1.patch, + +files/oyranos-0.9.4-fix-array-access.patch, + +files/oyranos-0.9.4-fix-double-object-release.patch, + +files/oyranos-0.9.4-fix-oyRankMap-helper-functions-crashes.patch, + +files/oyranos-0.9.4-fix-oyStringSegment-crash.patch, + +files/oyranos-0.9.4-fix-runpaths.patch, + +files/oyranos-0.9.4-fix-typos-and-grammar.patch, + +files/oyranos-0.9.4-omit-profile-with-error.patch, + +files/oyranos-0.9.4-set-xcalib-to-screen-if-ge-xrandr-12.patch, + +files/oyranos-0.9.4-use-more-internal-xrandr-info.patch, + +oyranos-9999.ebuild: + Improve multi abi support 13 Apr 2013; Michael Weber <xmw@gentoo.org> oyranos-0.4.0-r1.ebuild, oyranos-0.9.1-r1.ebuild, oyranos-0.9.1-r2.ebuild: diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest index fe57e45c4caa..96f353e65cc8 100644 --- a/media-libs/oyranos/Manifest +++ b/media-libs/oyranos/Manifest @@ -18,20 +18,28 @@ AUX oyranos-0.9.1-fix-real-compiler-warnings.patch 2046 SHA256 f1be19bd6f3e0a896 AUX oyranos-0.9.1-initialise-memory-for-strtod.patch 1972 SHA256 20018c5b2606b96ce7e5206c737caea940c9799a27bc23167a1aceb7102d44d8 SHA512 4e5bf0895ede4e83832a92cb06a2ffef6fffae49422cad1018daad7e6d78e3fd5629e2b542ad922e0f9bea99b34ad9f061e170913475cfc8923d2f03465c1ad0 WHIRLPOOL 797818242b9fe591fcd27ecdf47a101987a0f29113acea6aa8c0a4908b521eae6c9d3beebe5f06234b2e2b9e45e90d4d81c35b615aefd8a271e3833e931ae181 AUX oyranos-0.9.1-omit-profile-with-error.patch 1112 SHA256 ddb6939e10d06944d1ac47f2386877ffd8002aeff04d841c49efc79881936be6 SHA512 f553c303be0bda92c60598703ee2e4cd302c414267f3ff91413d2ed6f86052bbefb7a1534b00a1a20aa720d5454c50f3be2691f8e7f8b3987c02d457dfbf57a7 WHIRLPOOL 9cbdb3a7665b2b85d091c2f5b2ca81e96a380d6c786b55837606ce55eb8f7dba180a299bbe7611dfee17d881b838026973b03e9e39463406134379c9e30c4c24 AUX oyranos-0.9.1-support-pur-xrandr-without-xinerama.patch 1616 SHA256 503d431bc823c95fd79c675d84febfd6592de28fecff73fd100787a8834f7a3b SHA512 5f2c185686d61aebfec7722b72d1e8fb0616d8a3eef9d6edc42d5700d41fbab881afebf934e35105387cdf7aebbb6fb99e2f83e9e229808ecfa698493a346cc3 WHIRLPOOL b5a9c7f520d34f718353e6dbe388c5b2b630538a11d81d4a38a83369e9b1dc076e16d328768d705ea3968755a88f4356232021f67f1f97fe22f919d697b2a204 -AUX oyranos-0.9.4-buildsystem.patch 6065 SHA256 8588190bfcfd5d3b98b17372f999fcfe51462c23e0cbe22bab2935050af66c09 SHA512 854425d0448cddbc9dc7b268d709521a182d01f506c2168745b5fb3d4303184a6c2a0d0e9aee9461975e985e2669231e510ece1853b28c089db875bcd5c61802 WHIRLPOOL 7d336c1c9513ae1e053487fb8707d921fc546a07b9dcab8d843d522de5b70615a07ae97298edbe6baaa44b2666a7b1487cb31af5a3be8e5dfaa5ae53a4f5d795 -DIST oyranos-0.4.0.tar.bz2 1265839 SHA256 6fcff9d5f8dc1aaeef55e238a30c65df390a9206ed76cf473f7f0ae348c23ed9 SHA512 edd11dfbe3aa5613fdc8b38536e1a9cffd3809e4bd0c179d7c8d55d8546613580ed010942f014ca2c9c5fad7531dd9083529e73c2aacf17e4b54b7cf422b1934 WHIRLPOOL a1a9f16e0a7e3d8b396dc0b56357ae91a4f42132e75cc60ec7bd5ce581c657ff3b3f569bd7b3f2d7c593257597e6199042ae587fc054d365d87af29fbb3a15c3 +AUX oyranos-0.9.4-be-more-verbose.patch 1370 SHA256 6ac0800ce76a0ced9fdd895ec348408064c43299f2718d0571c9f28d71df1f43 SHA512 0e4170fee30865b7e9b2b1ac35df27cdaa3e67f7df9abffe9d8eb437a85461e32f77baba3daa498c6afc83d390d945e1ee7e49722dbbe89de971f3ca79260010 WHIRLPOOL 3d887ca62b4e0d0bc75a706e6b6b1ecfb615ac652e8a4d63544e5118d31ec07fe5b59cf9cca3de5ce1ffd1bc844f655620ee8d75d48717e9c4f465c9dac215db +AUX oyranos-0.9.4-buildsystem-r1.patch 6065 SHA256 b64462269c67b8791f786cbd4b8037a54571c4dff85650256558a0d988819029 SHA512 50d810da9c1dc2f5487ea96a8acf03845c45824d6bab2c90631f60b542edf9d68be547e08c8203ffba2cd31cc56815606f194574b36e0ee0812886a180cf1408 WHIRLPOOL 45b32d38c72db66904ccf794679fb3410f88ab88d6b1962f6a0764b374d5cd9813ce130520d67c9afa3557681290846c6630064d1c55cb492a0bf5579cde8021 +AUX oyranos-0.9.4-fix-array-access.patch 1082 SHA256 541475585dad65a2d30f7d306d9ca4b8a310615e3e60a4909d2686c8716a3bb0 SHA512 64870430eb014d759daf3e0c7e0ada13bf39a874efac9072ce49f409d747b13820f869320e9eb6be97435335b22741f2c43b849d493d50dd1cc2386a85597161 WHIRLPOOL 35f06ded0df8e481e9802b08eb91bf8a61bf3c2571729ef3c1cff6900b9477e7463b21968cd54352c09a00a6536e18009993483d98a6fb5f38e24cf2b162e651 +AUX oyranos-0.9.4-fix-double-object-release.patch 1183 SHA256 29bc34e193b21265bb07cc1b4296bbb6ed03d25b55f20f9a943e0f0554d3623d SHA512 9f61d1d41dcad0e6fbda2385c934f942f76c74bc93f2ceb1dee91a0346cff498e6db4ffd15a00e40a6468ff3bd528964326da99dbc73524f6f04738a9adeda10 WHIRLPOOL bd655a8edb011075359abe9f1246331d004a37eed9f1424bd21535f24b92058ec87c033052e1e04d6f5083132acbc3e2753e28918e5570526996dda8579c2fac +AUX oyranos-0.9.4-fix-oyRankMap-helper-functions-crashes.patch 1589 SHA256 041acaa59ef572b7a2604ffbde235ea52bbbe7b11949fa3661d1e00c92441529 SHA512 304a7ec1adf7be2cd18b1e33a52da8ef1153e68078a20bf4d5d2a5be9a98cda756061dd00a675f1b9eedee90b2e753a8583e2c6aacb6309fa647bf2ccebeae13 WHIRLPOOL 3f07dbf78d7513280947870d09e315d8100dbf066a54d60fec73289f5dc2585fcbc7125b6a51e7cd0a8bc451baf192db425c6000c1a571effb014d421faf7199 +AUX oyranos-0.9.4-fix-oyStringSegment-crash.patch 822 SHA256 f12a80e4959759b187847a6ed573bf8972fe098cf3c84e6a0416478d5602efde SHA512 482c8157608c6f9032a3642756155bc495fa3b75586a06ff34377c01fbf5bceb4e5761783d86a1b189bd2d879df6811ed420c58d902dc369ddc8546520f09de3 WHIRLPOOL 80f2e4e07797fd6b28ec0586cc2b1ff9796b858ce932c6853d2efdd27a8da7439f34b84c6b928fbd95dbad9ae0bb79e942abdebf08df63d922c28ddb0d02edfd +AUX oyranos-0.9.4-fix-runpaths.patch 5200 SHA256 03e1591c85cf59c272b0a415b6c33d4f3fe3f0f7cfb507cad9ec40cd51ee9e16 SHA512 770d8ebeaa2eadf7420ddbd2625a24b80766f5d2d472ad51a3d8736620b16d71033f680ce7d0ac356eea82734dac35a2b124c114b3350c3761d4777356b7f091 WHIRLPOOL 5bd64bcc4e4e192a65193f70b82a9bcc50b8ec50d7f05f1429e5a8f7844a476c507d98460fc220bb6f1bbf3749b7142aa5b3d9be2195a826687446428553c2e3 +AUX oyranos-0.9.4-fix-typos-and-grammar.patch 43847 SHA256 cea8976e827b168bb474a66692351bd9cb346b97c5fc3675bce9a8337c5c7db9 SHA512 06b17498ff4c4cac7b906af8fa912f25e36f294c143dbd3db9ba0ae7ee665af9cf6e1f4fa41b198a284a722962da2ae177cfcc66353030c9ab0ba9ac76c3ef4d WHIRLPOOL afeeb29fe45f1003c076b8f5ad32244b4924e2c709e6c87581b51f51eadd5a43174639b8d50022b7eca12c9d70b983b866d74120d618f1f950846e009de821bb +AUX oyranos-0.9.4-omit-profile-with-error.patch 1606 SHA256 06ce34d10e2cb9ca5722cb58f624b7041a8f388b53f9298200ae5a9845b7c825 SHA512 594923ae6dcac9aa8430ea3ccb9c7662c421eb2a99a27cfbf46a1083a0217a0c45aae663a1fc30fc6cf13cd2d7f0e4d63e7456180f623c19487b383f0c5a0c2f WHIRLPOOL 94675dd721df309cc10ace447b613b5eae05c8b2e5242f3443c2dd922d62dd253e308bd72e7eac03b735358b47a5c053f142ce9ac75392be99cd981a024f858a +AUX oyranos-0.9.4-set-xcalib-to-screen-if-ge-xrandr-12.patch 5370 SHA256 3d2f260eb37bee4bbcd65677099076626147f22f17fdc938d26a3b86ceb986b4 SHA512 da7a3c05e161945bab4b8336e6848d06353482351aed45febedcd66f0f1b70276ab42f4a6cbcaff7708fc9ef42d135ec2110550ca66f94aef5c3915a7cf5e176 WHIRLPOOL 89b8264aab7026718694a8f84dfefe5b49af1a912c720165305b6d2d483943c83f5c43d109ffddb90ebfe2133731b87a6fc71ec2f6f4b02c4f705785d68bc2a7 +AUX oyranos-0.9.4-use-more-internal-xrandr-info.patch 1615 SHA256 78d1c45cc18ad555a97d2a6cd50c9ad40cd12c02048f351afc0a3893772c309a SHA512 cf4b42b8e794d19dbbbeab12c97fc80b897bcda26271c943c537f827946ca4a021e818c9fa6971b101aecc10d63e4d12b5781a549b6db62977884fa67134ecbc WHIRLPOOL af3992853631a3464b3ac625628031f63c80cc2da6b0d9b0cbd9f75bc460c4213f6fef5485e55eda8784d1b74c5cc9e7722ed07db10a175654df2b85cabd86ac DIST oyranos-0.9.1.tar.bz2 1481342 SHA256 ab9dd0478b6ca881e2de43a1164816a51843ae1afdfb26943361dc0100152bb9 SHA512 00c391b90fd54e93643260faf34bacc180b6f50c640ee216c4f4cbe189108b4fad22f2c6eb0d4601126cb245b97316d21c7d38d98272dc2d29e7d6b804b1db16 WHIRLPOOL 802075b2cd80aeb26979b5e46bbce6beb3627fc332675f81157d6303c0d449084fd76718086477ad5b9e32a1c25ae493e56bc3b17b03f92b42d69b1558ccd1cf DIST oyranos-0.9.4.tar.bz2 1632276 SHA256 6dcf7f8bef0720077ee55484a5b507ba5f049094f21fbbd2752f2ed120c0768a SHA512 23ded5bac4c16aba8a2d4266981e6ad53cfa2ce720d03751625552a873de8311dda721eb8dd732860ae0a0fcdfc7346f92aaeb8bde281ceeb4895f154d6e6c59 WHIRLPOOL 7ec535e326bf102eb0d154ac995b42b4a8b23a606c35417727b54653424807c47c5a4cf7ece6411627dcffd7ca5d8b1ddc588d97d1a02fb079d27d3d20efd2a5 -EBUILD oyranos-0.4.0-r1.ebuild 2043 SHA256 4e4ded5a6fd215b8d3e86a99a5335c21787f15912f3d38560c409962d25e4de4 SHA512 dda9698f935b886cd4027b0371767fd385bf2379a59ded9ca6c820675e9c5df057f15b9a2f224c4a38d6edabda7b5df7d3f12dc2c3953dc2934e368a08c07642 WHIRLPOOL 8b256669da2b9d69437944356207fa109b826b2e4e5f69a3306f62a6c8873afab765379b60e5b90ae584b4de94f8fed941d5156ba38dc34dbedd5ef875671503 -EBUILD oyranos-0.9.1-r1.ebuild 2030 SHA256 641fa687aae599674f0373208a88b0af0415c3e06aa45ec842505cae57b556a2 SHA512 ab5beed493591cb6bdd134712403db061ce3e53947eeb3e978386c535ccf4440d035d4cc9a8c7404f63590008cb81776315a204f162e2b295ba087bfdc35247b WHIRLPOOL d0f68c41715a6bdbac77af587dc7fcb8c8abf9c6c41ef406c15b0d1efdaeed9fe70db4b7751a46edd09e061630c6d31d2a761c00985fe87cbea08fb5fd37bd2d EBUILD oyranos-0.9.1-r2.ebuild 2772 SHA256 20aac4923628af08fb2cd436889bd72f8facad90fa75ae7fc03688bd91e847d1 SHA512 b5228ca075c83cc6a25a60e223d76ac39fe014930c9f58312555aae89c4dff0ee0d775572508c3fa4f9afa23f08309101692d659954b7997b354c6e35602790e WHIRLPOOL 465ce2f1ca12a5f74195e9f80c51a252acc74e276c3d7f62bc073bb759cc45b1a129eb6ae0559e384a713862b7a2412d66f6cf88c9bc81e85823be984bb4b4e9 -EBUILD oyranos-0.9.4.ebuild 2084 SHA256 101b681c91bebe26edb54d353afd3a85dae537a6614f6625689df21e26ec48e2 SHA512 e4d3404b02e5a53a4b4face01092788aa24ebd7389e872cc6d84d4ea334062b610d2f4192c193c5eacdcb8418815c2b0e02dbd0dcc6c2012f059ce0e81fa05da WHIRLPOOL bd63a4a0755295fb1bcc5ba81ad7feecd37159f56cb3d433af75e2e479cd45487832b2a6397f630da2e303439739907cc32139a3f61619047f8824a31a52fb72 -MISC ChangeLog 3534 SHA256 e4ada7c788277f8668f2a1402f1d18b7cd3053137bc5a077e9e2bc7f3dc6354c SHA512 611b8441140def942aadd6056e822a340e7d3fcaf289cea9d2ea7e7a2a913167eea36626da80f236cb7581c7882c762f76369aac8f08a9ad4cc093ce9f4e0991 WHIRLPOOL 6ab752ff5de2f9d002bedb941af4f923c7e1a2e178ccef1d0925a2d6f402c10836bec8ca08de46b851c5ef39e2975bc52f8777d3a9e4dc9d69575748b84d38aa +EBUILD oyranos-0.9.4-r1.ebuild 3693 SHA256 ec301ac542b80d5a51a1ccd55912d2aafd97708121e0ad5ecf5eb7dea42dfd5c SHA512 07d067623e5473e4ca736991de9f98db1e8932968c6a23f1a28644c470b7c2e654d6eabd7e38f3cdd8225e610bca823365632acced24a6f07a7b1e7dc35b4e7b WHIRLPOOL e458050976229d49631bbda15e01c4714f13e0b7bdc33e2fdc89966e15d556d537420186bdafa46d4174127f10d0c3980ab1ec381e198b55822361556f5ff2b1 +EBUILD oyranos-9999.ebuild 2220 SHA256 791d724c84151a6edf9d68cd23823cdb81483adba09551c94cfd53b320fd3d0a SHA512 368a28cd1fa8b3a6e4bde0608f606e565b05ad0329de3acaefcc8d1196d8eecf39c8cbcbdc1a4ee70c0f12101089dfbef13221054077cfe42417ee6bf04a3f4e WHIRLPOOL d183579eec09597e810a433c57e69b3bd2ea6ab18ab7407d9fa0fea4a6e554b660dc8551a5489112c2421914b8c760d0eb170857b75b042fae30512b3d67187a +MISC ChangeLog 4434 SHA256 e9b323786cc3ee1121a0148f6f822bf057d2408345f64e1eba81f50e564b70a6 SHA512 70bfc2ef76b62a38883c64a99fafe5743b1c2f22b10a699ed2ce8414ab42ff1afd289cbe3ebbb22f2b1e2c3be9f4cf1e4b427e3878f19fccd13b3f3ca720d80b WHIRLPOOL 3dc238a790f4854a3a2779b88c7f2f5b319e0a7a6f373d3f0a1fe375150327b7848cfdc282c3bbd3ba923594f2b506c8da8cc8e48b4cda2e75c57ea1af816387 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAlFowbgACgkQknrdDGLu8JAY/gD/duG6fA9m5LW62KXbF2lmONFh -L9d0hYUuzY4AZ2co4a8BAJnJxODXU9n3hqM7Ymipalpo1mxhu5uvNZa3r1H2Kx5X -=7gFx +iF4EAREIAAYFAlF1bocACgkQknrdDGLu8JCvmAD/V9yWLsvSyIEu/MaHiwbu9c8C +jwppx6sle0V5JRYtuC4A/AnJZlli1ZNMHPXMOFj5L5PNQ/Ze7DhT5s91r9WHaa1h +=ImNi -----END PGP SIGNATURE----- diff --git a/media-libs/oyranos/files/oyranos-0.9.4-be-more-verbose.patch b/media-libs/oyranos/files/oyranos-0.9.4-be-more-verbose.patch new file mode 100644 index 000000000000..66ed023ff842 --- /dev/null +++ b/media-libs/oyranos/files/oyranos-0.9.4-be-more-verbose.patch @@ -0,0 +1,51 @@ +From 80fd8efab3f56c698b4182846d8707916849cad9 Mon Sep 17 00:00:00 2001 +From: Kai-Uwe Behrmann <ku.b@gmx.de> +Date: Sat, 9 Feb 2013 18:21:47 +0100 +Subject: [PATCH] * [tools]: add more verbosity to oy-monitor -v + +Here to the profile assignment part. +--- + src/tools/oyranos_gamma.c | 16 ++++++++++++++++ + 1 files changed, 16 insertions(+), 0 deletions(-) + +diff --git a/src/tools/oyranos_gamma.c b/src/tools/oyranos_gamma.c +index f2206a5..005bdd2 100644 +--- a/src/tools/oyranos_gamma.c ++++ b/src/tools/oyranos_gamma.c +@@ -747,16 +747,32 @@ int main( int argc , char** argv ) + + if(monitor_profile) + { ++ if(verbose) ++ fprintf( stdout, "oyDeviceSetProfile()\n" ); + oyDeviceSetProfile( device, monitor_profile ); ++ if(verbose) ++ fprintf( stdout, "oyDeviceUnset()\n" ); + oyDeviceUnset( device ); + } else + if(erase || unset) ++ { ++ if(verbose) ++ fprintf( stdout, "oyDeviceUnset()\n" ); + oyDeviceUnset( device ); ++ } + if(erase) ++ { ++ if(verbose) ++ fprintf( stdout, "oyConfig_EraseFromDB()\n" ); + oyConfig_EraseFromDB( device ); ++ } + + if(setup) ++ { ++ if(verbose) ++ fprintf( stdout, "oyDeviceSetup()\n" ); + oyDeviceSetup( device ); ++ } + + oyConfig_Release( &device ); + } +-- +1.5.6.5 + + diff --git a/media-libs/oyranos/files/oyranos-0.9.4-buildsystem.patch b/media-libs/oyranos/files/oyranos-0.9.4-buildsystem-r1.patch index ed864eac1612..a4516a2aeb11 100644 --- a/media-libs/oyranos/files/oyranos-0.9.4-buildsystem.patch +++ b/media-libs/oyranos/files/oyranos-0.9.4-buildsystem-r1.patch @@ -5,9 +5,9 @@ LINK_DIRECTORIES( ${XCM_LIBRARY_DIRS} ) -FIND_PACKAGE( X11 ) -+IF(X11_WANT) ++IF(WANT_X11) +FIND_PACKAGE( X11 REQUIRED ) -+ENDIF(X11_WANT) ++ENDIF(WANT_X11) IF(X11_FOUND) INCLUDE_DIRECTORIES( ${X11_INCLUDE_DIRS} ) LINK_DIRECTORIES( ${X11_LIBRARY_DIRS} ) diff --git a/media-libs/oyranos/files/oyranos-0.9.4-fix-array-access.patch b/media-libs/oyranos/files/oyranos-0.9.4-fix-array-access.patch new file mode 100644 index 000000000000..0c5ca3c83ba5 --- /dev/null +++ b/media-libs/oyranos/files/oyranos-0.9.4-fix-array-access.patch @@ -0,0 +1,27 @@ +From: Kai-Uwe Behrmann <ku.b@gmx.de> +Date: Mon, 18 Mar 2013 18:07:16 +0000 (+0100) +Subject: * [oyX1]: fix array access +X-Git-Url: http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff_plain;h=11d848a38608deeeca61288d46cfca55c6916788 + +* [oyX1]: fix array access +--- + +diff --git a/src/modules/devices/oyranos_monitor_x11.c b/src/modules/devices/oyranos_monitor_x11.c +index a530a81..bac09c1 100644 +--- a/src/modules/devices/oyranos_monitor_x11.c ++++ b/src/modules/devices/oyranos_monitor_x11.c +@@ -1329,6 +1329,13 @@ oyX1Monitor_s* oyX1Monitor_newFrom_ ( const char * display_name, + int n_scr_info = 0; + XineramaScreenInfo *scr_info = XineramaQueryScreens( display, + &n_scr_info ); ++ if(n_scr_info <= selected_screen) ++ { ++ XFree( scr_info ); ++ oyX1Monitor_release_( &disp ); ++ return 0; ++ } ++ + geo[0] = scr_info[selected_screen].x_org; + geo[1] = scr_info[selected_screen].y_org; + geo[2] = scr_info[selected_screen].width; + diff --git a/media-libs/oyranos/files/oyranos-0.9.4-fix-double-object-release.patch b/media-libs/oyranos/files/oyranos-0.9.4-fix-double-object-release.patch new file mode 100644 index 000000000000..1cbdf47a79f2 --- /dev/null +++ b/media-libs/oyranos/files/oyranos-0.9.4-fix-double-object-release.patch @@ -0,0 +1,35 @@ +From: Kai-Uwe Behrmann <ku.b@gmx.de> +Date: Wed, 20 Mar 2013 17:15:17 +0000 (+0100) +Subject: * [core]: fix double object release +X-Git-Url: http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff_plain;h=6214cf15fafae52d67233d27462488487091d8d6 + +* [core]: fix double object release + +... which was revealed by valgrind +--- + +diff --git a/src/API_generated/oyranos_devices.c b/src/API_generated/oyranos_devices.c +index 4ed5138..8cee0c8 100644 +--- a/src/API_generated/oyranos_devices.c ++++ b/src/API_generated/oyranos_devices.c +@@ -1896,7 +1896,6 @@ OYAPI int OYEXPORT + oyConfigs_MoveIn( taxi_devices, &taxi_dev, -1 ); + } + oyConfigs_Release( &configs_ ); +- oyOptions_Release( &options ); + oyFree_m_(ranks); + } + +diff --git a/src/templates/oyranos_devices.template.c b/src/templates/oyranos_devices.template.c +index 586ba36..ff555e3 100644 +--- a/src/templates/oyranos_devices.template.c ++++ b/src/templates/oyranos_devices.template.c +@@ -1881,7 +1881,6 @@ OYAPI int OYEXPORT + oyConfigs_MoveIn( taxi_devices, &taxi_dev, -1 ); + } + oyConfigs_Release( &configs_ ); +- oyOptions_Release( &options ); + oyFree_m_(ranks); + } + + diff --git a/media-libs/oyranos/files/oyranos-0.9.4-fix-oyRankMap-helper-functions-crashes.patch b/media-libs/oyranos/files/oyranos-0.9.4-fix-oyRankMap-helper-functions-crashes.patch new file mode 100644 index 000000000000..27c06cd81551 --- /dev/null +++ b/media-libs/oyranos/files/oyranos-0.9.4-fix-oyRankMap-helper-functions-crashes.patch @@ -0,0 +1,53 @@ +From: Kai-Uwe Behrmann <ku.b@gmx.de> +Date: Fri, 22 Feb 2013 18:42:23 +0000 (+0100) +Subject: * [sources]: fix counting in oyRankMap data +X-Git-Url: http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff_plain;h=c2feb3e1f1ab45702f98c8728898eab1ee849cd4 + +* [sources]: fix counting in oyRankMap data + +2013-04-21: backport to oyranos-0.9.4, remove (duplicate) patch for nonexistent file + +This fixes crashes in several oyRankMap helper functions. +--- + +diff --git a/src/API_generated/oyConfig_s.c b/src/API_generated/oyConfig_s.c +index 8ec0ff6..7ea1f3b 100644 +--- a/src/API_generated/oyConfig_s.c ++++ b/src/API_generated/oyConfig_s.c +@@ -983,14 +983,14 @@ oyRankMap * oyRankMapCopy ( const oyRankMap * rank_map, + { + oyRankMap * map = 0; + int error = !rank_map; +- int n = 0, i; ++ int n = 0, i = 0; + + if(!allocateFunc) + allocateFunc = oyAllocateFunc_; + + if(error <= 0) + { +- while( rank_map[n++].key ) {} ++ while( rank_map[i++].key ) ++n; + + oyAllocHelper_m_( map, oyRankMap, n + 1, allocateFunc, error = 1 ); + } +@@ -1025,7 +1025,7 @@ OYAPI void OYEXPORT + oyDeAlloc_f deAllocateFunc ) + { + int error = !rank_map || !*rank_map; +- int n = 0, i; ++ int n = 0, i = 0; + + if(!deAllocateFunc) + deAllocateFunc = oyDeAllocateFunc_; +@@ -1033,7 +1033,7 @@ OYAPI void OYEXPORT + if(error <= 0) + { + oyRankMap * map = *rank_map; +- while( (*rank_map)[n++].key ) {} ++ while( (*rank_map)[i++].key ) ++n; + for(i = 0; i < n; ++i) + { + deAllocateFunc( map[i].key ); map[i].key = 0; +-- +1.5.6.5 diff --git a/media-libs/oyranos/files/oyranos-0.9.4-fix-oyStringSegment-crash.patch b/media-libs/oyranos/files/oyranos-0.9.4-fix-oyStringSegment-crash.patch new file mode 100644 index 000000000000..7de609ba31dc --- /dev/null +++ b/media-libs/oyranos/files/oyranos-0.9.4-fix-oyStringSegment-crash.patch @@ -0,0 +1,25 @@ +From: Kai-Uwe Behrmann <ku.b@gmx.de> +Date: Wed, 13 Mar 2013 13:59:19 +0000 (+0100) +Subject: * [core]: fix oyStringSegment_() crash +X-Git-Url: http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff_plain;h=cf495d5ede29f7211e498217c4d06428f944bac3 + +2013-04-21: backport to oyranos-0.9.1, remove unrelated oyStringReplace_ hunk + +* [core]: fix oyStringSegment_() crash +--- + +diff --git a/src/liboyranos_core/oyranos_string.c b/src/liboyranos_core/oyranos_string.c +index 525ce7e..1d214c0 100644 +--- a/src/liboyranos_core/oyranos_string.c ++++ b/src/liboyranos_core/oyranos_string.c +@@ -499,7 +499,7 @@ char * oyStringSegment_ ( char * text, + for(; i < segment; ++i) + { + t = oyStrchr_( t, delimiter ); +- ++t; ++ if(t) ++t; + } + + end_pos = (uintptr_t) oyStrchr_(t, delimiter); +-- +1.5.6.5 diff --git a/media-libs/oyranos/files/oyranos-0.9.4-fix-runpaths.patch b/media-libs/oyranos/files/oyranos-0.9.4-fix-runpaths.patch new file mode 100644 index 000000000000..0287c119900b --- /dev/null +++ b/media-libs/oyranos/files/oyranos-0.9.4-fix-runpaths.patch @@ -0,0 +1,121 @@ +From b8f4a5fe0cea02878de106f5d02751e922438275 Mon Sep 17 00:00:00 2001 +From: Kai-Uwe Behrmann <ku.b@gmx.de> +Date: Wed, 3 Apr 2013 10:01:04 +0200 +Subject: [PATCH 1/1] * [build]: fix has insecure RUNPATHs + +https://sourceforge.net/tracker/?func=detail&atid=879553&aid=3609840&group_id=177017 + +2013-04-03: backport to oyranos-0.9.4: + merged 1-line change from commit 5b63d318e53ae8b8f3a0ccb166c97acf6103caac + +--- + CMakeLists.txt | 2 +- + src/examples/CMakeLists.txt | 26 ++++++++++++++++++++++++++ + src/examples/oforms/CMakeLists.txt | 28 ++++------------------------ + src/tools/CMakeLists.txt | 2 +- + 4 files changed, 32 insertions(+), 26 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f24965c..6e9c8fb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,7 +10,7 @@ SET (OYRANOS_DEVEL_MONTH 01) + SET (OYRANOS_DEVEL_YEAR 2013) + + SET (PACKAGE_NAME "oyranos") +-set (PACKAGE_DESCRIPTION "Oyranos is a Colour Management System (CMS) on operating system level. It allows to match predictably input device colours to output device colours across supporting applications. One goal is to make colour management useful for all users in a automated fashion and regardless of any technical knowledge.") ++SET (PACKAGE_DESCRIPTION "Oyranos is a Colour Management System (CMS) on operating system level. It allows to match predictably input device colours to output device colours across supporting applications. One goal is to make colour management useful for all users in a automated fashion and regardless of any technical knowledge.") + + SET( OY_CMMSUBPATH "colour/modules" ) + SET( OY_METASUBPATH "${PACKAGE_NAME}" ) +diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt +index dfe807c..4adfdc9 100644 +--- a/src/examples/CMakeLists.txt ++++ b/src/examples/CMakeLists.txt +@@ -60,4 +60,30 @@ IF( FLTK_FOUND ) + INSTALL (TARGETS oyranos-config-fltk DESTINATION bin) + ENDIF() + ++ + ADD_SUBDIRECTORY( oforms ) ++ ++# oFORMS for a Oyranos CLI renderer and parser ++ADD_EXECUTABLE( oyranos-xforms oforms/oyranos_xforms.c ) ++TARGET_LINK_LIBRARIES( oyranos-xforms ++ ${OY_OFORMS_LIB} oyranos ${EXTRA_LIBS} ) ++#INSTALL (TARGETS oyranos-xforms DESTINATION bin) ++ ++# oFORMS for a Oyranos FLTK renderer and parser ++IF( FLTK_FOUND ) ++ ADD_EXECUTABLE( oyranos-xforms-fltk ++ oforms/oyranos_forms_fltk.cxx ++ oforms/oyranos_widgets_fltk.cxx ++ oforms/oyranos_xforms_fltk.cxx ++ ) ++ TARGET_LINK_LIBRARIES ( oyranos-xforms-fltk oyranos ${EXTRA_LIBS} ++ ${OY_OFORMS_LIB} ${FLTK_LIBRARIES} ) ++ #INSTALL (TARGETS oyranos-xforms-fltk DESTINATION bin) ++ENDIF() ++ ++# oFORMS for a Oyranos module generation ++ADD_EXECUTABLE( oyranos-xforms-modules oforms/oyranos_xforms_modules.c ) ++TARGET_LINK_LIBRARIES( oyranos-xforms-modules ++ oyranos ${OY_OFORMS_LIB} ${EXTRA_LIBS} ) ++INSTALL (TARGETS oyranos-xforms-modules DESTINATION bin) ++ +diff --git a/src/examples/oforms/CMakeLists.txt b/src/examples/oforms/CMakeLists.txt +index 4d248ec..c0ff965 100644 +--- a/src/examples/oforms/CMakeLists.txt ++++ b/src/examples/oforms/CMakeLists.txt +@@ -1,31 +1,11 @@ + #oFORMS basics +-SET( OY_OFORMS_LIB ${PACKAGE_NAME}_forms_cmd_line ) ++SET( OY_OFORMS_LIB ${PACKAGE_NAME}_forms_cmd_line-static ) ++SET( OY_OFORMS_LIB ${OY_OFORMS_LIB} PARENT_SCOPE ) + ADD_LIBRARY( ${OY_OFORMS_LIB} +- STATIC ${OY_OFORMS_LIB}.c ) ++ STATIC ${PACKAGE_NAME}_forms_cmd_line.c ) + TARGET_LINK_LIBRARIES ( ${OY_OFORMS_LIB} oyranos ${EXTRA_LIBS} ) + +-# oFORMS for a Oyranos CML renderer and parser +-ADD_EXECUTABLE( ../oyranos-xforms oyranos_xforms.c ) +-TARGET_LINK_LIBRARIES( ../oyranos-xforms +- oyranos ${OY_OFORMS_LIB} ${EXTRA_LIBS} ) +-#INSTALL (TARGETS oyranos-xforms DESTINATION bin) ++MESSAGE( "-- OY_OFORMS_LIB: ${OY_OFORMS_LIB}" ) + +-# oFORMS for a Oyranos FLTK renderer and parser +-IF( FLTK_FOUND ) +- ADD_EXECUTABLE( ../oyranos-xforms-fltk +- oyranos_forms_fltk.cxx +- oyranos_widgets_fltk.cxx +- oyranos_xforms_fltk.cxx +- ) +- TARGET_LINK_LIBRARIES ( ../oyranos-xforms-fltk oyranos ${EXTRA_LIBS} +- ${FLTK_LIBRARIES} ) +- #INSTALL (TARGETS oyranos-xforms-fltk DESTINATION bin) +-ENDIF() +- +-# oFORMS for a Oyranos module generation +-ADD_EXECUTABLE( ../oyranos-xforms-modules oyranos_xforms_modules.c ) +-TARGET_LINK_LIBRARIES( ../oyranos-xforms-modules +- oyranos ${OY_OFORMS_LIB} ${EXTRA_LIBS} ) +-INSTALL (TARGETS ../oyranos-xforms-modules DESTINATION bin) + INSTALL (FILES ./oyranos-xforms-modules.1 DESTINATION share/man/man1 ) + +diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt +index cb23ace..3b2572a 100644 +--- a/src/tools/CMakeLists.txt ++++ b/src/tools/CMakeLists.txt +@@ -30,7 +30,7 @@ ENDIF() + + # colour conversion + ADD_EXECUTABLE( oyranos-icc "${CMAKE_CURRENT_SOURCE_DIR}/oyranos_convert.c" ) +-TARGET_LINK_LIBRARIES( oyranos-icc oyranos ${EXTRA_LIBS} ) ++TARGET_LINK_LIBRARIES( oyranos-icc oyranos ${EXTRA_LIBS} oyranos_forms_cmd_line-static ) + INSTALL (TARGETS oyranos-icc DESTINATION bin) + + ADD_SUBDIRECTORY (qcmsevents) +-- +1.5.6.5 + diff --git a/media-libs/oyranos/files/oyranos-0.9.4-fix-typos-and-grammar.patch b/media-libs/oyranos/files/oyranos-0.9.4-fix-typos-and-grammar.patch new file mode 100644 index 000000000000..790c42475aef --- /dev/null +++ b/media-libs/oyranos/files/oyranos-0.9.4-fix-typos-and-grammar.patch @@ -0,0 +1,968 @@ +commit bf50dbd47ddef1ccb49bb44cbf893ae7844240d6 +Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Wed Apr 3 02:14:21 2013 +0200 + + more typo and grammar fixes + +diff --git a/po/cs.po b/po/cs.po +index 9440519..a99974e 100644 +--- a/po/cs.po ++++ b/po/cs.po +@@ -290,7 +290,7 @@ msgstr "Již aktivováno" + + #: liboyranos_config/oyranos_texts.c:273 + #, fuzzy +-msgid "Anylyze ICC profile information on your system." ++msgid "Analyze ICC profile information on your system." + msgstr "umí zobrazit informace o profilu ICC" + + #: modules/oyranos_cmm_oyra_image.c:1065 +@@ -417,7 +417,7 @@ msgid "" + "Behaviour of color space transformation for proofing. Most people want a " + "preview on screen only. The Relative Colorimetric intent is right for that. " + "The Absolute Colorimetric intent needs a very careful profiling and non-" +-"trivial setup, but allowes for side-by-side comparisions." ++"trivial setup, but allows for side-by-side comparisons." + msgstr "" + "Způsob transformace barev pro simulaci. Většina uživatelů použije funkci " + "simulace pouze na obrazovce, pro což se hodí relativní kolorimetrický záměr. " +@@ -670,7 +670,7 @@ msgstr "Transformace barev mohou být interně uloženy různými způsoby" + #: liboyranos_config/oyranos_texts.c:174 + msgid "" + "Color content can sometimes have no ICC profile assigned. This is a critical " +-"situation as the system can not properly convert these colors. Therefor the " ++"situation as the system can not properly convert these colors. Therefore the " + "color processing parts need to pick some profile as a guess. These settings " + "allow to change the picked ICC profile to guide the processing components " + "and allow proper conversion and compositing." +@@ -1024,7 +1024,7 @@ msgstr "" + + #: liboyranos_config/oyranos_texts.c:236 + msgid "" +-"Decide what to do when the default color spaces dont match the current ones." ++"Decide what to do when the default color spaces don't match the current ones." + msgstr "" + "Rozhodnout co dělat, když se výchozí barvový prostor nerovná aktuálnímu." + +@@ -2179,7 +2179,7 @@ msgstr "Oyranos X11" + #. HTML + #: liboyranos_config/oyranos_xml.c:1036 + msgid "" +-"Oyranos allowes detailed settings like preferred editing color spaces and " ++"Oyranos allows detailed settings like preferred editing color spaces and " + "the behaviour of color conversions or simulation. Oyranos reduces the work " + "involved in all color management related decisions through automation, " + "useful defaults and grouping of settings in selectable policies." +@@ -2372,27 +2372,27 @@ msgid "Postscript CRD Information" + msgstr "Náhled, saturace" + + #: liboyranos_config/oyranos_texts.c:336 +-msgid "Prefered CIE*Lab Editing Color Space" ++msgid "Preferred CIE*Lab Editing Color Space" + msgstr "Preferovaný CIE*Lab barvový prostor pro editaci" + + #: API_generated/oyranos_profile.c:66 +-msgid "Prefered CMM" ++msgid "Preferred CMM" + msgstr "" + + #: liboyranos_config/oyranos_texts.c:316 +-msgid "Prefered Cmyk Editing Color Space" ++msgid "Preferred Cmyk Editing Color Space" + msgstr "Preferovaný barvový prostor CMYK pro editaci" + + #: liboyranos_config/oyranos_texts.c:346 +-msgid "Prefered Gray Editing Color Space" ++msgid "Preferred Gray Editing Color Space" + msgstr "Preferovaný barvový prostor pro editaci v šedi." + + #: liboyranos_config/oyranos_texts.c:306 +-msgid "Prefered Rgb Editing Color Space" ++msgid "Preferred Rgb Editing Color Space" + msgstr "Preferovaný barvový prostor RGB pro editaci" + + #: liboyranos_config/oyranos_texts.c:326 +-msgid "Prefered XYZ Editing Color Space" ++msgid "Preferred XYZ Editing Color Space" + msgstr "Preferovaný barvový prostor XYZ pro editaci" + + #. choices +@@ -2622,7 +2622,7 @@ msgstr "Záměr transformace" + + #: liboyranos_config/oyranos_texts.c:479 + msgid "" +-"Rendering intent for color space transformations is typical the Relative " ++"Rendering intent for color space transformations is typically the Relative " + "Colorimetric intent plus Black Point Compensation or the Perceptual intent." + msgstr "" + "Záměr pro transformace mezi různými barvovými prostory se obvykle volí " +@@ -2932,7 +2932,7 @@ msgstr "The client side window data handler of Oyranos." + #: liboyranos_config/oyranos_texts.c:219 + msgid "" + "The conversion between color spaces of different shape and size can happen " +-"in various ways. The Perceptual rendering intent is usual the best choice " ++"in various ways. The Perceptual rendering intent is usually the best choice " + "for photographs and artistic imagery. It is used in many automatic systems. " + "The Relative Colorimetric rendering intent provides a well-defined standard, " + "one-to-one color mapping, but without applying white point adaption. This " +@@ -3268,7 +3268,7 @@ msgstr "" + + #: liboyranos_config/oyranos_texts.c:347 + msgid "" +-"The preferred Gray Editing Color Space shall describe a single lighness " ++"The preferred Gray Editing Color Space shall describe a single lightness " + "channel color space for grayscale images." + msgstr "" + "Preferovaný barvový prostor editace v šedi by měl popisovat barvový prostor " +@@ -3283,13 +3283,13 @@ msgstr "" + "barvový prostor jako např. sRGB." + + #: liboyranos_config/oyranos_texts.c:327 +-msgid "The preferred XYZ Editing Color Space shall decribe CIE*XYZ." ++msgid "The preferred XYZ Editing Color Space shall describe CIE*XYZ." + msgstr "Preferovaný barvový prostor editace XYZ by měl popisovat CIE*XYZ." + + #: liboyranos_config/oyranos_texts.c:183 + msgid "" + "The proofing color space represents a real color device for simulation. " +-"Possible uses cases are to simulate a print machine, a viewing environment " ++"Possible use cases are to simulate a print machine, a viewing environment " + "in a theater or a expected small monitor gamut." + msgstr "" + "Barvový prostor pro simulaci zastupuje skutečné zařízení, jež má být " +@@ -3387,7 +3387,7 @@ msgstr "Tepelná vosková tiskárna" + #: liboyranos_config/oyranos_texts.c:429 + msgid "" + "This setting decides what to do in the case that colors have no color space " +-"assigned. Typical the according assumed ICC profile should be assigned." ++"assigned. Typically the according assumed ICC profile should be assigned." + msgstr "" + "Toto nastavení rozhoduje, co se má dělat v případě, že barvy nemají přiřazen " + "žádný barvový prostor. Obvykle by měl být přiřazen příslušný předpokládaný " +diff --git a/po/de.po b/po/de.po +index 80a106a..80869df 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -292,7 +292,7 @@ msgid "Already enabled" + msgstr "Bereits eingeschalten" + + #: liboyranos_config/oyranos_texts.c:273 +-msgid "Anylyze ICC profile information on your system." ++msgid "Analyze ICC profile information on your system." + msgstr "Details zu ICC Profilen in Ihrem System" + + #: modules/oyranos_cmm_oyra_image.c:1065 +@@ -415,7 +415,7 @@ msgid "" + "Behaviour of color space transformation for proofing. Most people want a " + "preview on screen only. The Relative Colorimetric intent is right for that. " + "The Absolute Colorimetric intent needs a very careful profiling and non-" +-"trivial setup, but allowes for side-by-side comparisions." ++"trivial setup, but allows for side-by-side comparisons." + msgstr "" + "Verhalten der Farbübertragung bei der Simulation. Die meisten Nutzer " + "wünschen eine Simulation nur an einem Bildschirm. Die relativ farbmetrische " +@@ -652,7 +652,7 @@ msgstr "Farbumwandlung können intern unterschiedlich gespeichert werden" + #: liboyranos_config/oyranos_texts.c:174 + msgid "" + "Color content can sometimes have no ICC profile assigned. This is a critical " +-"situation as the system can not properly convert these colors. Therefor the " ++"situation as the system can not properly convert these colors. Therefore the " + "color processing parts need to pick some profile as a guess. These settings " + "allow to change the picked ICC profile to guide the processing components " + "and allow proper conversion and compositing." +@@ -1000,7 +1000,7 @@ msgstr "" + + #: liboyranos_config/oyranos_texts.c:236 + msgid "" +-"Decide what to do when the default color spaces dont match the current ones." ++"Decide what to do when the default color spaces don't match the current ones." + msgstr "" + "Was ist zu tuen falls Standardfarbräume nicht mit den Eingestellten " + "übereinstimmen." +@@ -2100,7 +2100,7 @@ msgstr "Oyranos X11" + #. HTML + #: liboyranos_config/oyranos_xml.c:1036 + msgid "" +-"Oyranos allowes detailed settings like preferred editing color spaces and " ++"Oyranos allows detailed settings like preferred editing color spaces and " + "the behaviour of color conversions or simulation. Oyranos reduces the work " + "involved in all color management related decisions through automation, " + "useful defaults and grouping of settings in selectable policies." +@@ -2283,27 +2283,27 @@ msgid "Postscript CRD Information" + msgstr "Postscript CRD Information" + + #: liboyranos_config/oyranos_texts.c:336 +-msgid "Prefered CIE*Lab Editing Color Space" ++msgid "Preferred CIE*Lab Editing Color Space" + msgstr "Bevorzugter CIE*Lab Editierfarbraum" + + #: API_generated/oyranos_profile.c:66 +-msgid "Prefered CMM" ++msgid "Preferred CMM" + msgstr "Bevorzugte CMM" + + #: liboyranos_config/oyranos_texts.c:316 +-msgid "Prefered Cmyk Editing Color Space" ++msgid "Preferred Cmyk Editing Color Space" + msgstr "Bevorzugter Cmyk Editierfarbraum" + + #: liboyranos_config/oyranos_texts.c:346 +-msgid "Prefered Gray Editing Color Space" ++msgid "Preferred Gray Editing Color Space" + msgstr "Bevorzugter Grau Editierfarbraum" + + #: liboyranos_config/oyranos_texts.c:306 +-msgid "Prefered Rgb Editing Color Space" ++msgid "Preferred Rgb Editing Color Space" + msgstr "Bevorzugter Rgb Editierfarbraum" + + #: liboyranos_config/oyranos_texts.c:326 +-msgid "Prefered XYZ Editing Color Space" ++msgid "Preferred XYZ Editing Color Space" + msgstr "Bevorzugter XYZ Editierfarbraum" + + #. choices +@@ -2520,7 +2520,7 @@ msgstr "Übertragungsart: " + + #: liboyranos_config/oyranos_texts.c:479 + msgid "" +-"Rendering intent for color space transformations is typical the Relative " ++"Rendering intent for color space transformations is typically the Relative " + "Colorimetric intent plus Black Point Compensation or the Perceptual intent." + msgstr "" + +@@ -2817,7 +2817,7 @@ msgstr "Die benutzerseitige Fensterdatenagent von Oyranos." + #: liboyranos_config/oyranos_texts.c:219 + msgid "" + "The conversion between color spaces of different shape and size can happen " +-"in various ways. The Perceptual rendering intent is usual the best choice " ++"in various ways. The Perceptual rendering intent is usually the best choice " + "for photographs and artistic imagery. It is used in many automatic systems. " + "The Relative Colorimetric rendering intent provides a well-defined standard, " + "one-to-one color mapping, but without applying white point adaption. This " +@@ -3146,7 +3146,7 @@ msgstr "" + + #: liboyranos_config/oyranos_texts.c:347 + msgid "" +-"The preferred Gray Editing Color Space shall describe a single lighness " ++"The preferred Gray Editing Color Space shall describe a single lightness " + "channel color space for grayscale images." + msgstr "" + "Der bevorzugte Grautonfarbraum soll Farben mit einem einzigen " +@@ -3159,13 +3159,13 @@ msgid "" + msgstr "Der bevorzugte Rgb Editierfarbraum sollte wohlgeformt sein." + + #: liboyranos_config/oyranos_texts.c:327 +-msgid "The preferred XYZ Editing Color Space shall decribe CIE*XYZ." ++msgid "The preferred XYZ Editing Color Space shall describe CIE*XYZ." + msgstr "Der bevorzugter XYZ Editierfarbraum soll CIE*XYZ definieren." + + #: liboyranos_config/oyranos_texts.c:183 + msgid "" + "The proofing color space represents a real color device for simulation. " +-"Possible uses cases are to simulate a print machine, a viewing environment " ++"Possible use cases are to simulate a print machine, a viewing environment " + "in a theater or a expected small monitor gamut." + msgstr "" + "Der Simulationsfarbraum stellt das Farbverhalten eines realen Gerätes dar. " +@@ -3257,7 +3257,7 @@ msgstr "Thermischer Wachsdrucker" + #: liboyranos_config/oyranos_texts.c:429 + msgid "" + "This setting decides what to do in the case that colors have no color space " +-"assigned. Typical the according assumed ICC profile should be assigned." ++"assigned. Typically the according assumed ICC profile should be assigned." + msgstr "" + "Die Einstellung entscheidet was mit Farben ohne Farbprofil geschehen soll. " + "Typischerweise wird das vermutete Farbprofil automatisch zugewiesen." +diff --git a/po/eo.po b/po/eo.po +index 787905a..bcf0dfc 100644 +--- a/po/eo.po ++++ b/po/eo.po +@@ -308,7 +308,7 @@ msgid "Already enabled" + msgstr "" + + #: liboyranos_config/oyranos_texts.c:273 +-msgid "Anylyze ICC profile information on your system." ++msgid "Analyze ICC profile information on your system." + msgstr "" + + #: modules/oyranos_cmm_oyra_image.c:1065 +@@ -435,7 +435,7 @@ msgid "" + "Behaviour of color space transformation for proofing. Most people want a " + "preview on screen only. The Relative Colorimetric intent is right for that. " + "The Absolute Colorimetric intent needs a very careful profiling and non-" +-"trivial setup, but allowes for side-by-side comparisions." ++"trivial setup, but allows for side-by-side comparisons." + msgstr "" + + #: modules/oyranos_cmm_lraw.cpp:1041 +@@ -665,7 +665,7 @@ msgstr "" + #: liboyranos_config/oyranos_texts.c:174 + msgid "" + "Color content can sometimes have no ICC profile assigned. This is a critical " +-"situation as the system can not properly convert these colors. Therefor the " ++"situation as the system can not properly convert these colors. Therefore the " + "color processing parts need to pick some profile as a guess. These settings " + "allow to change the picked ICC profile to guide the processing components " + "and allow proper conversion and compositing." +@@ -992,7 +992,7 @@ msgstr "" + + #: liboyranos_config/oyranos_texts.c:236 + msgid "" +-"Decide what to do when the default color spaces dont match the current ones." ++"Decide what to do when the default color spaces don't match the current ones." + msgstr "" + + #: liboyranos_config/oyranos_texts.c:154 +@@ -2067,7 +2067,7 @@ msgstr "" + #. HTML + #: liboyranos_config/oyranos_xml.c:1036 + msgid "" +-"Oyranos allowes detailed settings like preferred editing color spaces and " ++"Oyranos allows detailed settings like preferred editing color spaces and " + "the behaviour of color conversions or simulation. Oyranos reduces the work " + "involved in all color management related decisions through automation, " + "useful defaults and grouping of settings in selectable policies." +@@ -2235,31 +2235,31 @@ msgstr "kolora" + + #: liboyranos_config/oyranos_texts.c:336 + #, fuzzy +-msgid "Prefered CIE*Lab Editing Color Space" ++msgid "Preferred CIE*Lab Editing Color Space" + msgstr "kolora" + + #: API_generated/oyranos_profile.c:66 +-msgid "Prefered CMM" ++msgid "Preferred CMM" + msgstr "" + + #: liboyranos_config/oyranos_texts.c:316 + #, fuzzy +-msgid "Prefered Cmyk Editing Color Space" ++msgid "Preferred Cmyk Editing Color Space" + msgstr "kolora" + + #: liboyranos_config/oyranos_texts.c:346 + #, fuzzy +-msgid "Prefered Gray Editing Color Space" ++msgid "Preferred Gray Editing Color Space" + msgstr "kolora" + + #: liboyranos_config/oyranos_texts.c:306 + #, fuzzy +-msgid "Prefered Rgb Editing Color Space" ++msgid "Preferred Rgb Editing Color Space" + msgstr "kolora" + + #: liboyranos_config/oyranos_texts.c:326 + #, fuzzy +-msgid "Prefered XYZ Editing Color Space" ++msgid "Preferred XYZ Editing Color Space" + msgstr "kolora" + + #. choices +@@ -2478,7 +2478,7 @@ msgstr "" + + #: liboyranos_config/oyranos_texts.c:479 + msgid "" +-"Rendering intent for color space transformations is typical the Relative " ++"Rendering intent for color space transformations is typically the Relative " + "Colorimetric intent plus Black Point Compensation or the Perceptual intent." + msgstr "" + +@@ -2748,7 +2748,7 @@ msgstr "" + #: liboyranos_config/oyranos_texts.c:219 + msgid "" + "The conversion between color spaces of different shape and size can happen " +-"in various ways. The Perceptual rendering intent is usual the best choice " ++"in various ways. The Perceptual rendering intent is usually the best choice " + "for photographs and artistic imagery. It is used in many automatic systems. " + "The Relative Colorimetric rendering intent provides a well-defined standard, " + "one-to-one color mapping, but without applying white point adaption. This " +@@ -2962,7 +2962,7 @@ msgstr "" + + #: liboyranos_config/oyranos_texts.c:347 + msgid "" +-"The preferred Gray Editing Color Space shall describe a single lighness " ++"The preferred Gray Editing Color Space shall describe a single lightness " + "channel color space for grayscale images." + msgstr "" + +@@ -2973,13 +2973,13 @@ msgid "" + msgstr "" + + #: liboyranos_config/oyranos_texts.c:327 +-msgid "The preferred XYZ Editing Color Space shall decribe CIE*XYZ." ++msgid "The preferred XYZ Editing Color Space shall describe CIE*XYZ." + msgstr "" + + #: liboyranos_config/oyranos_texts.c:183 + msgid "" + "The proofing color space represents a real color device for simulation. " +-"Possible uses cases are to simulate a print machine, a viewing environment " ++"Possible use cases are to simulate a print machine, a viewing environment " + "in a theater or a expected small monitor gamut." + msgstr "" + +@@ -3055,7 +3055,7 @@ msgstr "" + #: liboyranos_config/oyranos_texts.c:429 + msgid "" + "This setting decides what to do in the case that colors have no color space " +-"assigned. Typical the according assumed ICC profile should be assigned." ++"assigned. Typically the according assumed ICC profile should be assigned." + msgstr "" + + #: modules/oyranos_cmm_oyIM_profile.c:1167 +diff --git a/po/eu.po b/po/eu.po +index f86f417..277b42d 100644 +--- a/po/eu.po ++++ b/po/eu.po +@@ -315,7 +315,7 @@ msgstr "" + + #: liboyranos_config/oyranos_texts.c:273 + #, fuzzy +-msgid "Anylyze ICC profile information on your system." ++msgid "Analyze ICC profile information on your system." + msgstr "Oyranos-en ezarpenak" + + #: modules/oyranos_cmm_oyra_image.c:1065 +@@ -447,7 +447,7 @@ msgid "" + "Behaviour of color space transformation for proofing. Most people want a " + "preview on screen only. The Relative Colorimetric intent is right for that. " + "The Absolute Colorimetric intent needs a very careful profiling and non-" +-"trivial setup, but allowes for side-by-side comparisions." ++"trivial setup, but allows for side-by-side comparisons." + msgstr "" + + #: modules/oyranos_cmm_lraw.cpp:1041 +@@ -679,7 +679,7 @@ msgstr "" + #: liboyranos_config/oyranos_texts.c:174 + msgid "" + "Color content can sometimes have no ICC profile assigned. This is a critical " +-"situation as the system can not properly convert these colors. Therefor the " ++"situation as the system can not properly convert these colors. Therefore the " + "color processing parts need to pick some profile as a guess. These settings " + "allow to change the picked ICC profile to guide the processing components " + "and allow proper conversion and compositing." +@@ -1031,7 +1031,7 @@ msgstr "" + + #: liboyranos_config/oyranos_texts.c:236 + msgid "" +-"Decide what to do when the default color spaces dont match the current ones." ++"Decide what to do when the default color spaces don't match the current ones." + msgstr "" + + #: liboyranos_config/oyranos_texts.c:154 +@@ -2167,7 +2167,7 @@ msgstr "Oyranos-en ezarpenak" + #. HTML + #: liboyranos_config/oyranos_xml.c:1036 + msgid "" +-"Oyranos allowes detailed settings like preferred editing color spaces and " ++"Oyranos allows detailed settings like preferred editing color spaces and " + "the behaviour of color conversions or simulation. Oyranos reduces the work " + "involved in all color management related decisions through automation, " + "useful defaults and grouping of settings in selectable policies." +@@ -2349,31 +2349,31 @@ msgstr "Aurrebista, saturatua" + + #: liboyranos_config/oyranos_texts.c:336 + #, fuzzy +-msgid "Prefered CIE*Lab Editing Color Space" ++msgid "Preferred CIE*Lab Editing Color Space" + msgstr "Kolore-espazioa" + + #: API_generated/oyranos_profile.c:66 +-msgid "Prefered CMM" ++msgid "Preferred CMM" + msgstr "" + + #: liboyranos_config/oyranos_texts.c:316 + #, fuzzy +-msgid "Prefered Cmyk Editing Color Space" ++msgid "Preferred Cmyk Editing Color Space" + msgstr "Kolore-espazioa" + + #: liboyranos_config/oyranos_texts.c:346 + #, fuzzy +-msgid "Prefered Gray Editing Color Space" ++msgid "Preferred Gray Editing Color Space" + msgstr "Kolore-espazioa" + + #: liboyranos_config/oyranos_texts.c:306 + #, fuzzy +-msgid "Prefered Rgb Editing Color Space" ++msgid "Preferred Rgb Editing Color Space" + msgstr "Kolore-espazioa" + + #: liboyranos_config/oyranos_texts.c:326 + #, fuzzy +-msgid "Prefered XYZ Editing Color Space" ++msgid "Preferred XYZ Editing Color Space" + msgstr "Kolore-espazioa" + + #. choices +@@ -2610,7 +2610,7 @@ msgstr "Oyranos-en ezarpenak" + + #: liboyranos_config/oyranos_texts.c:479 + msgid "" +-"Rendering intent for color space transformations is typical the Relative " ++"Rendering intent for color space transformations is typically the Relative " + "Colorimetric intent plus Black Point Compensation or the Perceptual intent." + msgstr "" + +@@ -2896,7 +2896,7 @@ msgstr "" + #: liboyranos_config/oyranos_texts.c:219 + msgid "" + "The conversion between color spaces of different shape and size can happen " +-"in various ways. The Perceptual rendering intent is usual the best choice " ++"in various ways. The Perceptual rendering intent is usually the best choice " + "for photographs and artistic imagery. It is used in many automatic systems. " + "The Relative Colorimetric rendering intent provides a well-defined standard, " + "one-to-one color mapping, but without applying white point adaption. This " +@@ -3113,7 +3113,7 @@ msgstr "Kolore-espazioa" + #: liboyranos_config/oyranos_texts.c:347 + #, fuzzy + msgid "" +-"The preferred Gray Editing Color Space shall describe a single lighness " ++"The preferred Gray Editing Color Space shall describe a single lightness " + "channel color space for grayscale images." + msgstr "Kolore-espazioa" + +@@ -3126,13 +3126,13 @@ msgstr "Kolore-espazioa" + + #: liboyranos_config/oyranos_texts.c:327 + #, fuzzy +-msgid "The preferred XYZ Editing Color Space shall decribe CIE*XYZ." ++msgid "The preferred XYZ Editing Color Space shall describe CIE*XYZ." + msgstr "Kolore-espazioa" + + #: liboyranos_config/oyranos_texts.c:183 + msgid "" + "The proofing color space represents a real color device for simulation. " +-"Possible uses cases are to simulate a print machine, a viewing environment " ++"Possible use cases are to simulate a print machine, a viewing environment " + "in a theater or a expected small monitor gamut." + msgstr "" + +@@ -3208,7 +3208,7 @@ msgstr "Inprimagailu ezko-termala" + #: liboyranos_config/oyranos_texts.c:429 + msgid "" + "This setting decides what to do in the case that colors have no color space " +-"assigned. Typical the according assumed ICC profile should be assigned." ++"assigned. Typically the according assumed ICC profile should be assigned." + msgstr "" + + #: modules/oyranos_cmm_oyIM_profile.c:1167 +diff --git a/po/fr.po b/po/fr.po +index f02e45c..737dc28 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -309,7 +309,7 @@ msgstr "" + + #: liboyranos_config/oyranos_texts.c:273 + #, fuzzy +-msgid "Anylyze ICC profile information on your system." ++msgid "Analyze ICC profile information on your system." + msgstr "Oyranos Préférences" + + #: modules/oyranos_cmm_oyra_image.c:1065 +@@ -441,7 +441,7 @@ msgid "" + "Behaviour of color space transformation for proofing. Most people want a " + "preview on screen only. The Relative Colorimetric intent is right for that. " + "The Absolute Colorimetric intent needs a very careful profiling and non-" +-"trivial setup, but allowes for side-by-side comparisions." ++"trivial setup, but allows for side-by-side comparisons." + msgstr "" + + #: modules/oyranos_cmm_lraw.cpp:1041 +@@ -673,7 +673,7 @@ msgstr "" + #: liboyranos_config/oyranos_texts.c:174 + msgid "" + "Color content can sometimes have no ICC profile assigned. This is a critical " +-"situation as the system can not properly convert these colors. Therefor the " ++"situation as the system can not properly convert these colors. Therefore the " + "color processing parts need to pick some profile as a guess. These settings " + "allow to change the picked ICC profile to guide the processing components " + "and allow proper conversion and compositing." +@@ -1020,7 +1020,7 @@ msgstr "" + + #: liboyranos_config/oyranos_texts.c:236 + msgid "" +-"Decide what to do when the default color spaces dont match the current ones." ++"Decide what to do when the default color spaces don't match the current ones." + msgstr "" + + #: liboyranos_config/oyranos_texts.c:154 +@@ -2156,7 +2156,7 @@ msgstr "Oyranos Préférences" + #. HTML + #: liboyranos_config/oyranos_xml.c:1036 + msgid "" +-"Oyranos allowes detailed settings like preferred editing color spaces and " ++"Oyranos allows detailed settings like preferred editing color spaces and " + "the behaviour of color conversions or simulation. Oyranos reduces the work " + "involved in all color management related decisions through automation, " + "useful defaults and grouping of settings in selectable policies." +@@ -2335,31 +2335,31 @@ msgstr "Aperçu, saturation" + + #: liboyranos_config/oyranos_texts.c:336 + #, fuzzy +-msgid "Prefered CIE*Lab Editing Color Space" ++msgid "Preferred CIE*Lab Editing Color Space" + msgstr "Espace colorimétrique" + + #: API_generated/oyranos_profile.c:66 +-msgid "Prefered CMM" ++msgid "Preferred CMM" + msgstr "" + + #: liboyranos_config/oyranos_texts.c:316 + #, fuzzy +-msgid "Prefered Cmyk Editing Color Space" ++msgid "Preferred Cmyk Editing Color Space" + msgstr "Espace colorimétrique" + + #: liboyranos_config/oyranos_texts.c:346 + #, fuzzy +-msgid "Prefered Gray Editing Color Space" ++msgid "Preferred Gray Editing Color Space" + msgstr "Espace colorimétrique" + + #: liboyranos_config/oyranos_texts.c:306 + #, fuzzy +-msgid "Prefered Rgb Editing Color Space" ++msgid "Preferred Rgb Editing Color Space" + msgstr "Espace colorimétrique" + + #: liboyranos_config/oyranos_texts.c:326 + #, fuzzy +-msgid "Prefered XYZ Editing Color Space" ++msgid "Preferred XYZ Editing Color Space" + msgstr "Espace colorimétrique" + + #. choices +@@ -2589,7 +2589,7 @@ msgstr "Oyranos Préférences" + + #: liboyranos_config/oyranos_texts.c:479 + msgid "" +-"Rendering intent for color space transformations is typical the Relative " ++"Rendering intent for color space transformations is typically the Relative " + "Colorimetric intent plus Black Point Compensation or the Perceptual intent." + msgstr "" + +@@ -2870,7 +2870,7 @@ msgstr "" + #: liboyranos_config/oyranos_texts.c:219 + msgid "" + "The conversion between color spaces of different shape and size can happen " +-"in various ways. The Perceptual rendering intent is usual the best choice " ++"in various ways. The Perceptual rendering intent is usually the best choice " + "for photographs and artistic imagery. It is used in many automatic systems. " + "The Relative Colorimetric rendering intent provides a well-defined standard, " + "one-to-one color mapping, but without applying white point adaption. This " +@@ -3087,7 +3087,7 @@ msgstr "Espace colorimétrique" + #: liboyranos_config/oyranos_texts.c:347 + #, fuzzy + msgid "" +-"The preferred Gray Editing Color Space shall describe a single lighness " ++"The preferred Gray Editing Color Space shall describe a single lightness " + "channel color space for grayscale images." + msgstr "Espace colorimétrique" + +@@ -3100,13 +3100,13 @@ msgstr "Espace colorimétrique" + + #: liboyranos_config/oyranos_texts.c:327 + #, fuzzy +-msgid "The preferred XYZ Editing Color Space shall decribe CIE*XYZ." ++msgid "The preferred XYZ Editing Color Space shall describe CIE*XYZ." + msgstr "Espace colorimétrique" + + #: liboyranos_config/oyranos_texts.c:183 + msgid "" + "The proofing color space represents a real color device for simulation. " +-"Possible uses cases are to simulate a print machine, a viewing environment " ++"Possible use cases are to simulate a print machine, a viewing environment " + "in a theater or a expected small monitor gamut." + msgstr "" + +@@ -3182,7 +3182,7 @@ msgstr "" + #: liboyranos_config/oyranos_texts.c:429 + msgid "" + "This setting decides what to do in the case that colors have no color space " +-"assigned. Typical the according assumed ICC profile should be assigned." ++"assigned. Typically the according assumed ICC profile should be assigned." + msgstr "" + + #: modules/oyranos_cmm_oyIM_profile.c:1167 +diff --git a/po/oyranos.pot b/po/oyranos.pot +index c5f064d..d4eb1f8 100644 +--- a/po/oyranos.pot ++++ b/po/oyranos.pot +@@ -139,7 +139,7 @@ msgid "Internal stored Size" + msgstr "" + + #: API_generated/oyranos_profile.c:66 +-msgid "Prefered CMM" ++msgid "Preferred CMM" + msgstr "" + + #: API_generated/oyranos_profile.c:67 +@@ -552,7 +552,7 @@ msgstr "" + #: liboyranos_config/oyranos_texts.c:174 + msgid "" + "Color content can sometimes have no ICC profile assigned. This is a critical " +-"situation as the system can not properly convert these colors. Therefor the " ++"situation as the system can not properly convert these colors. Therefore the " + "color processing parts need to pick some profile as a guess. These settings " + "allow to change the picked ICC profile to guide the processing components " + "and allow proper conversion and compositing." +@@ -569,7 +569,7 @@ msgstr "" + #: liboyranos_config/oyranos_texts.c:183 + msgid "" + "The proofing color space represents a real color device for simulation. " +-"Possible uses cases are to simulate a print machine, a viewing environment " ++"Possible use cases are to simulate a print machine, a viewing environment " + "in a theater or a expected small monitor gamut." + msgstr "" + +@@ -631,7 +631,7 @@ msgstr "" + #: liboyranos_config/oyranos_texts.c:219 + msgid "" + "The conversion between color spaces of different shape and size can happen " +-"in various ways. The Perceptual rendering intent is usual the best choice " ++"in various ways. The Perceptual rendering intent is usually the best choice " + "for photographs and artistic imagery. It is used in many automatic systems. " + "The Relative Colorimetric rendering intent provides a well-defined standard, " + "one-to-one color mapping, but without applying white point adaption. This " +@@ -666,7 +666,7 @@ msgstr "" + + #: liboyranos_config/oyranos_texts.c:236 + msgid "" +-"Decide what to do when the default color spaces dont match the current ones." ++"Decide what to do when the default color spaces don't match the current ones." + msgstr "" + + #: liboyranos_config/oyranos_texts.c:237 +@@ -720,7 +720,7 @@ msgid "Profile Information" + msgstr "" + + #: liboyranos_config/oyranos_texts.c:273 +-msgid "Anylyze ICC profile information on your system." ++msgid "Analyze ICC profile information on your system." + msgstr "" + + #: liboyranos_config/oyranos_texts.c:284 +@@ -743,7 +743,7 @@ msgid "Editing Rgb" + msgstr "" + + #: liboyranos_config/oyranos_texts.c:306 +-msgid "Prefered Rgb Editing Color Space" ++msgid "Preferred Rgb Editing Color Space" + msgstr "" + + #: liboyranos_config/oyranos_texts.c:307 +@@ -757,7 +757,7 @@ msgid "Editing Cmyk" + msgstr "" + + #: liboyranos_config/oyranos_texts.c:316 +-msgid "Prefered Cmyk Editing Color Space" ++msgid "Preferred Cmyk Editing Color Space" + msgstr "" + + #: liboyranos_config/oyranos_texts.c:317 +@@ -771,11 +771,11 @@ msgid "Editing XYZ" + msgstr "" + + #: liboyranos_config/oyranos_texts.c:326 +-msgid "Prefered XYZ Editing Color Space" ++msgid "Preferred XYZ Editing Color Space" + msgstr "" + + #: liboyranos_config/oyranos_texts.c:327 +-msgid "The preferred XYZ Editing Color Space shall decribe CIE*XYZ." ++msgid "The preferred XYZ Editing Color Space shall describe CIE*XYZ." + msgstr "" + + #: liboyranos_config/oyranos_texts.c:335 +@@ -783,7 +783,7 @@ msgid "Editing Lab" + msgstr "" + + #: liboyranos_config/oyranos_texts.c:336 +-msgid "Prefered CIE*Lab Editing Color Space" ++msgid "Preferred CIE*Lab Editing Color Space" + msgstr "" + + #: liboyranos_config/oyranos_texts.c:337 +@@ -795,12 +795,12 @@ msgid "Editing Gray" + msgstr "" + + #: liboyranos_config/oyranos_texts.c:346 +-msgid "Prefered Gray Editing Color Space" ++msgid "Preferred Gray Editing Color Space" + msgstr "" + + #: liboyranos_config/oyranos_texts.c:347 + msgid "" +-"The preferred Gray Editing Color Space shall describe a single lighness " ++"The preferred Gray Editing Color Space shall describe a single lightness " + "channel color space for grayscale images." + msgstr "" + +@@ -910,7 +910,7 @@ msgstr "" + #: liboyranos_config/oyranos_texts.c:429 + msgid "" + "This setting decides what to do in the case that colors have no color space " +-"assigned. Typical the according assumed ICC profile should be assigned." ++"assigned. Typically the according assumed ICC profile should be assigned." + msgstr "" + + #. choices +@@ -1012,7 +1012,7 @@ msgstr "" + + #: liboyranos_config/oyranos_texts.c:479 + msgid "" +-"Rendering intent for color space transformations is typical the Relative " ++"Rendering intent for color space transformations is typically the Relative " + "Colorimetric intent plus Black Point Compensation or the Perceptual intent." + msgstr "" + +@@ -1067,7 +1067,7 @@ msgid "" + "Behaviour of color space transformation for proofing. Most people want a " + "preview on screen only. The Relative Colorimetric intent is right for that. " + "The Absolute Colorimetric intent needs a very careful profiling and non-" +-"trivial setup, but allowes for side-by-side comparisions." ++"trivial setup, but allows for side-by-side comparisons." + msgstr "" + + #: liboyranos_config/oyranos_texts.c:507 +@@ -1168,7 +1168,7 @@ msgstr "" + #. HTML + #: liboyranos_config/oyranos_xml.c:1036 + msgid "" +-"Oyranos allowes detailed settings like preferred editing color spaces and " ++"Oyranos allows detailed settings like preferred editing color spaces and " + "the behaviour of color conversions or simulation. Oyranos reduces the work " + "involved in all color management related decisions through automation, " + "useful defaults and grouping of settings in selectable policies." +diff --git a/src/liboyranos_config/oyranos_texts.c b/src/liboyranos_config/oyranos_texts.c +index f7a7244..7a86a42 100644 +--- a/src/liboyranos_config/oyranos_texts.c ++++ b/src/liboyranos_config/oyranos_texts.c +@@ -171,7 +171,7 @@ oyOptionStringsTranslate_ () + oyGROUP_DEFAULT_PROFILES, 0, 0, + _("Assumed Color Space"), + _("Assumed Color Space for untagged colors"), +- _("Color content can sometimes have no ICC profile assigned. This is a critical situation as the system can not properly convert these colors. Therefor the color processing parts need to pick some profile as a guess. These settings allow to change the picked ICC profile to guide the processing components and allow proper conversion and compositing."), ++ _("Color content can sometimes have no ICC profile assigned. This is a critical situation as the system can not properly convert these colors. Therefore the color processing parts need to pick some profile as a guess. These settings allow to change the picked ICC profile to guide the processing components and allow proper conversion and compositing."), + 0, /* choices */ + NULL, NULL, NULL, NULL, + NULL, +@@ -180,7 +180,7 @@ oyOptionStringsTranslate_ () + 0, 0, 0, + _("Proofing Color Space"), + _("Color Space for Simulating real devices"), +- _("The proofing color space represents a real color device for simulation. Possible uses cases are to simulate a print machine, a viewing environment in a theater or a expected small monitor gamut."), ++ _("The proofing color space represents a real color device for simulation. Possible use cases are to simulate a print machine, a viewing environment in a theater or a expected small monitor gamut."), + 0, /* choices */ + NULL, NULL, NULL, NULL, + NULL, +@@ -216,7 +216,7 @@ oyOptionStringsTranslate_ () + oyGROUP_BEHAVIOUR, 0, 0, + _("Rendering"), + _("The kind of ICC gamut mapping for transforming colors between differently sized color spaces"), +- _("The conversion between color spaces of different shape and size can happen in various ways. The Perceptual rendering intent is usual the best choice for photographs and artistic imagery. It is used in many automatic systems. The Relative Colorimetric rendering intent provides a well-defined standard, one-to-one color mapping, but without applying white point adaption. This can lead to color clipping in case of colors falling outside the target gamut as a price for the otherwise colorimetric correctness. The Relative Colorimetric intent is often used in combination with Black Point Compensation. The Saturation rendering intent shall provide an optimal use of saturated device colors. The Absolute Colorimetric rendering intent works like the relative colorimetric one except the white point is adapted. All rendering intents beside the colorimetric ones rely on the color tables designed by the profile vendor."), ++ _("The conversion between color spaces of different shape and size can happen in various ways. The Perceptual rendering intent is usually the best choice for photographs and artistic imagery. It is used in many automatic systems. The Relative Colorimetric rendering intent provides a well-defined standard, one-to-one color mapping, but without applying white point adaption. This can lead to color clipping in case of colors falling outside the target gamut as a price for the otherwise colorimetric correctness. The Relative Colorimetric intent is often used in combination with Black Point Compensation. The Saturation rendering intent shall provide an optimal use of saturated device colors. The Absolute Colorimetric rendering intent works like the relative colorimetric one except the white point is adapted. All rendering intents beside the colorimetric ones rely on the color tables designed by the profile vendor."), + 0, /* choices */ + NULL, NULL, NULL, NULL, + NULL, +@@ -233,7 +233,7 @@ oyOptionStringsTranslate_ () + oySET_OPTIONS_M_( oyWIDGETTYPE_GROUP_TREE, oyWIDGET_GROUP_BEHAVIOUR_MISSMATCH, 1, + oyGROUP_BEHAVIOUR, 0, 0, + _("Mismatching"), +- _("Decide what to do when the default color spaces dont match the current ones."), ++ _("Decide what to do when the default color spaces don't match the current ones."), + _("Decide how to resolve conflicts with input color spaces and current settings."), + 0, /* choices */ + NULL, NULL, NULL, NULL, +@@ -270,7 +270,7 @@ oyOptionStringsTranslate_ () + 0, 0, 0, + _("Information"), + _("Profile Information"), +- _("Anylyze ICC profile information on your system."), ++ _("Analyze ICC profile information on your system."), + 0, /* choices */ + NULL, NULL, NULL, NULL, + NULL, +@@ -303,7 +303,7 @@ oyOptionStringsTranslate_ () + oySET_OPTIONS_M_( oyWIDGETTYPE_DEFAULT_PROFILE, oyWIDGET_EDITING_RGB, 2, + oyGROUP_DEFAULT_PROFILES, oyGROUP_DEFAULT_PROFILES_EDIT, 0, + _("Editing Rgb"), +- _("Prefered Rgb Editing Color Space"), ++ _("Preferred Rgb Editing Color Space"), + _("The preferred Rgb Editing Color Space should represent a well behaving color space like sRGB."), + 0, /* choices */ + NULL, NULL, NULL, NULL, +@@ -313,7 +313,7 @@ oyOptionStringsTranslate_ () + oySET_OPTIONS_M_( oyWIDGETTYPE_DEFAULT_PROFILE, oyWIDGET_EDITING_CMYK, 2, + oyGROUP_DEFAULT_PROFILES, oyGROUP_DEFAULT_PROFILES_EDIT, 0, + _("Editing Cmyk"), +- _("Prefered Cmyk Editing Color Space"), ++ _("Preferred Cmyk Editing Color Space"), + _("The preferred Cmyk Editing Color Space should represent a color space that complies to well defined printing conditions like FOGRA or SWOP."), + 0, /* choices */ + NULL, NULL, NULL, NULL, +@@ -323,8 +323,8 @@ oyOptionStringsTranslate_ () + oySET_OPTIONS_M_( oyWIDGETTYPE_DEFAULT_PROFILE, oyWIDGET_EDITING_XYZ, 2, + oyGROUP_DEFAULT_PROFILES, oyGROUP_DEFAULT_PROFILES_EDIT, 0, + _("Editing XYZ"), +- _("Prefered XYZ Editing Color Space"), +- _("The preferred XYZ Editing Color Space shall decribe CIE*XYZ."), ++ _("Preferred XYZ Editing Color Space"), ++ _("The preferred XYZ Editing Color Space shall describe CIE*XYZ."), + 0, /* choices */ + NULL, NULL, NULL, NULL, + OY_DEFAULT_EDITING_XYZ_PROFILE, +@@ -333,7 +333,7 @@ oyOptionStringsTranslate_ () + oySET_OPTIONS_M_( oyWIDGETTYPE_DEFAULT_PROFILE, oyWIDGET_EDITING_LAB, 2, + oyGROUP_DEFAULT_PROFILES, oyGROUP_DEFAULT_PROFILES_EDIT, 0, + _("Editing Lab"), +- _("Prefered CIE*Lab Editing Color Space"), ++ _("Preferred CIE*Lab Editing Color Space"), + _("The preferred CIE*Lab Editing Color Space shall describe the CIE*Lab."), + 0, /* choices */ + NULL, NULL, NULL, NULL, +@@ -343,8 +343,8 @@ oyOptionStringsTranslate_ () + oySET_OPTIONS_M_( oyWIDGETTYPE_DEFAULT_PROFILE, oyWIDGET_EDITING_GRAY, 2, + oyGROUP_DEFAULT_PROFILES, oyGROUP_DEFAULT_PROFILES_EDIT, 0, + _("Editing Gray"), +- _("Prefered Gray Editing Color Space"), +- _("The preferred Gray Editing Color Space shall describe a single lighness channel color space for grayscale images."), ++ _("Preferred Gray Editing Color Space"), ++ _("The preferred Gray Editing Color Space shall describe a single lightness channel color space for grayscale images."), + 0, /* choices */ + NULL, NULL, NULL, NULL, + OY_DEFAULT_EDITING_GRAY_PROFILE, +@@ -426,7 +426,7 @@ oyOptionStringsTranslate_ () + oyGROUP_BEHAVIOUR, oyGROUP_BEHAVIOUR_MISSMATCH, 0, + _("No Image profile"), + _("Image has no color space embedded. What default action shall be performed?"), +- _("This setting decides what to do in the case that colors have no color space assigned. Typical the according assumed ICC profile should be assigned."), ++ _("This setting decides what to do in the case that colors have no color space assigned. Typically the according assumed ICC profile should be assigned."), + 3, /* choices */ + _("Assign No Profile"),_("Assign Assumed Profile"),_("Prompt"), NULL, + OY_ACTION_UNTAGGED_ASSIGN, +@@ -476,7 +476,7 @@ oyOptionStringsTranslate_ () + oyGROUP_BEHAVIOUR, oyGROUP_BEHAVIOUR_RENDERING, 0, + _("Rendering Intent"), + _("Rendering intent for color space transformations."), +- _("Rendering intent for color space transformations is typical the Relative Colorimetric intent plus Black Point Compensation or the Perceptual intent."), ++ _("Rendering intent for color space transformations is typically the Relative Colorimetric intent plus Black Point Compensation or the Perceptual intent."), + 4, /* choices */ + _("Perceptual"),_("Relative Colorimetric"),_("Saturation"),_("Absolute Colorimetric"), + OY_DEFAULT_RENDERING_INTENT, +@@ -496,7 +496,7 @@ oyOptionStringsTranslate_ () + oyGROUP_BEHAVIOUR, oyGROUP_BEHAVIOUR_PROOF, 0, + _("Proofing Rendering Intent"), + _("Behaviour of color space transformation for proofing"), +- _("Behaviour of color space transformation for proofing. Most people want a preview on screen only. The Relative Colorimetric intent is right for that. The Absolute Colorimetric intent needs a very careful profiling and non-trivial setup, but allowes for side-by-side comparisions."), ++ _("Behaviour of color space transformation for proofing. Most people want a preview on screen only. The Relative Colorimetric intent is right for that. The Absolute Colorimetric intent needs a very careful profiling and non-trivial setup, but allows for side-by-side comparisons."), + 2, /* choices */ + _("Relative Colorimetric"),_("Absolute Colorimetric"),NULL,NULL, + OY_DEFAULT_RENDERING_INTENT_PROOF, diff --git a/media-libs/oyranos/files/oyranos-0.9.4-omit-profile-with-error.patch b/media-libs/oyranos/files/oyranos-0.9.4-omit-profile-with-error.patch new file mode 100644 index 000000000000..f87f004cf66f --- /dev/null +++ b/media-libs/oyranos/files/oyranos-0.9.4-omit-profile-with-error.patch @@ -0,0 +1,54 @@ +From: Kai-Uwe Behrmann <ku.b@gmx.de> +Date: Tue, 26 Mar 2013 11:09:01 +0000 (+0100) +Subject: * [source]: omit profile with error +X-Git-Url: http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff_plain;h=ecbfe88cf77863c7c925f61d0e69d11474059cb8 + +* [source]: omit profile with error + +a proper return value would be more helpful +--- + +diff --git a/src/API_generated/oyProfile_s_.c b/src/API_generated/oyProfile_s_.c +index 83629fe..338ed08 100644 +--- a/src/API_generated/oyProfile_s_.c ++++ b/src/API_generated/oyProfile_s_.c +@@ -8,12 +8,12 @@ + * Oyranos is an open source Colour Management System + * + * @par Copyright: +- * 2004-2012 (C) Kai-Uwe Behrmann ++ * 2004-2013 (C) Kai-Uwe Behrmann + * + * @author Kai-Uwe Behrmann <ku.b@gmx.de> + * @par License: + * new BSD - see: http://www.opensource.org/licenses/bsd-license.php +- * @date 2012/10/31 ++ * @date 2013/03/26 + */ + + +@@ -724,6 +724,9 @@ oyProfile_s_ * oyProfile_FromFile_ ( const char * name, + } + } + ++ if(error >= 1 && s) ++ oyProfile_Release( (oyProfile_s**)&s ); ++ + oyHash_Release_( &entry ); + + return s; +diff --git a/src/sources/Profile.private_methods_definitions.c b/src/sources/Profile.private_methods_definitions.c +index 7b49ca6..e131893 100644 +--- a/src/sources/Profile.private_methods_definitions.c ++++ b/src/sources/Profile.private_methods_definitions.c +@@ -311,6 +311,9 @@ oyProfile_s_ * oyProfile_FromFile_ ( const char * name, + } + } + ++ if(error >= 1 && s) ++ oyProfile_Release( (oyProfile_s**)&s ); ++ + oyHash_Release_( &entry ); + + return s; + diff --git a/media-libs/oyranos/files/oyranos-0.9.4-set-xcalib-to-screen-if-ge-xrandr-12.patch b/media-libs/oyranos/files/oyranos-0.9.4-set-xcalib-to-screen-if-ge-xrandr-12.patch new file mode 100644 index 000000000000..6acfcdd11cfa --- /dev/null +++ b/media-libs/oyranos/files/oyranos-0.9.4-set-xcalib-to-screen-if-ge-xrandr-12.patch @@ -0,0 +1,131 @@ +From: Kai-Uwe Behrmann <ku.b@gmx.de> +Date: Sun, 17 Feb 2013 19:28:06 +0000 (+0100) +Subject: * [oyX1]: set xcalib to screen if XRandR >= 1.2 +X-Git-Url: http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff_plain;h=505b3931d9de6c667566278c5b3a1713d43212a8 + +* [oyX1]: set xcalib to screen if XRandR >= 1.2 +--- + +diff --git a/src/modules/devices/oyranos_monitor_x11.c b/src/modules/devices/oyranos_monitor_x11.c +index a090b14..a530a81 100644 +--- a/src/modules/devices/oyranos_monitor_x11.c ++++ b/src/modules/devices/oyranos_monitor_x11.c +@@ -90,6 +90,8 @@ RROutput + XRROutputInfo * + oyX1Monitor_xrrOutputInfo_( oyX1Monitor_s * disp ) { return disp->output_info; } + int oyX1Monitor_activeOutputs_( oyX1Monitor_s * disp ) { return disp->active_outputs; } ++int oyX1Monitor_rrVersion_ ( oyX1Monitor_s * disp ) { return disp->rr_version; } ++int oyX1Monitor_rrScreen_ ( oyX1Monitor_s * disp ) { return disp->rr_screen; } + + + #endif +@@ -680,7 +682,8 @@ int oyX1MonitorProfileSetup ( const char * display_name, + char *text = 0; + + DBG_PROG_START +- disp = oyX1Monitor_newFrom_( display_name, 0 ); ++ /* XRandR needs a expensive initialisation */ ++ disp = oyX1Monitor_newFrom_( display_name, 1 ); + if(!disp) + return 1; + +@@ -721,6 +724,13 @@ int oyX1MonitorProfileSetup ( const char * display_name, + */ + sprintf(text,"xcalib -d %s -s %d %s \'%s\'", dpy_name, disp->geo[1], + oy_debug?"-v":"", profile_fullname); ++ if(oyX1Monitor_infoSource_( disp ) == oyX11INFO_SOURCE_XRANDR) ++ sprintf(text,"xcalib -d %s -s %d %s \'%s\'", dpy_name, oyX1Monitor_rrScreen_(disp), ++ oy_debug?"-v":"", profile_fullname); ++ else ++ sprintf(text,"xcalib -d %s -s %d %s \'%s\'", dpy_name, disp->geo[1], ++ oy_debug?"-v":"", profile_fullname); ++ + { + Display * display = oyX1Monitor_device_( disp ); + int effective_screen = oyX1Monitor_screen_( disp ); +@@ -751,17 +761,21 @@ int oyX1MonitorProfileSetup ( const char * display_name, + #endif + + /* Check for incapabilities of X gamma table access */ +- if(can_gamma || oyX1Monitor_screen_( disp ) == 0) ++ if(can_gamma || oyX1Monitor_screen_( disp ) == 0 || oyX1Monitor_infoSource_( disp ) == oyX11INFO_SOURCE_XRANDR ) + error = system(text); + if(error && + error != 65280) + { /* hack */ +- WARNc2_S("%s %s", _("No monitor gamma curves by profile:"), +- oyNoEmptyName_m_(profil_basename) ) ++ WARNc3_S("%s %s %d", _("No monitor gamma curves by profile:"), ++ oyNoEmptyName_m_(profil_basename), error ) + error = -1; + } else ++ { + /* take xcalib error not serious, turn into a issue */ ++ if(oy_debug) ++ DBG1_S("xcalib returned %d", error) + error = -1; ++ } + } + + if(oy_debug) +@@ -873,7 +887,8 @@ int oyX1MonitorProfileUnset ( const char * display_name ) + + DBG_PROG_START + +- disp = oyX1Monitor_newFrom_( display_name, 0 ); ++ /* XRandR needs a expensive initialisation */ ++ disp = oyX1Monitor_newFrom_( display_name, 1 ); + if(!disp) + { + DBG_PROG_ENDE +@@ -926,10 +941,16 @@ int oyX1MonitorProfileUnset ( const char * display_name ) + if( (ptr = strchr(ptr,'.')) != 0 ) + ptr[0] = '\000'; + +- oySnprintf2_(command, 1024, "xgamma -gamma 1.0 -screen %d -display %s", ++ if(oyX1Monitor_infoSource_( disp ) == oyX11INFO_SOURCE_XRANDR) ++ oySnprintf2_(command, 1024, "xrandr -display %s --output %s --gamma .999999:.999999:.999999", ++ dpy_name, oyX1Monitor_systemPort_(disp)); ++ else ++ oySnprintf2_(command, 1024, "xgamma -gamma 1.0 -screen %d -display %s", + disp->geo[1], dpy_name); + +- if(screen == disp->geo[1]) ++ if(oy_debug) ++ DBG3_S( "%d %d system: %s", screen, disp->geo[1], command ) ++ if(screen == disp->geo[1] || oyX1Monitor_infoSource_( disp ) == oyX11INFO_SOURCE_XRANDR) + r = system( command ); + if(r) WARNc2_S("%s %d", _("found issues"),r); + +@@ -1347,17 +1368,16 @@ oyX1Monitor_s* oyX1Monitor_newFrom_ ( const char * display_name, + + if(monitors == 0) + { +- if(strcmp("default", output_info->name) != 0) +- { +- disp->info_source = oyX11INFO_SOURCE_XRANDR; +- +- } else ++ if(!XRRGetCrtcGammaSize( display, output_info->crtc )) + { + XRRFreeOutputInfo( output_info ); + break; + } + } + ++ if(XRRGetCrtcGammaSize( display, output_info->crtc )) ++ disp->info_source = oyX11INFO_SOURCE_XRANDR; ++ + crtc_info = XRRGetCrtcInfo( disp->display, res_temp, + output_info->crtc ); + if(crtc_info) +@@ -1390,6 +1410,8 @@ oyX1Monitor_s* oyX1Monitor_newFrom_ ( const char * display_name, + if(disp->output_info->name && oyStrlen_(disp->output_info->name)) + disp->system_port = oyStringCopy_( disp->output_info->name, + oyAllocateFunc_ ); ++ disp->rr_version = major_versionp*100 + minor_versionp; ++ disp->rr_screen = xrand_screen; + } + + ++ monitors; + diff --git a/media-libs/oyranos/files/oyranos-0.9.4-use-more-internal-xrandr-info.patch b/media-libs/oyranos/files/oyranos-0.9.4-use-more-internal-xrandr-info.patch new file mode 100644 index 000000000000..d2a58ea73091 --- /dev/null +++ b/media-libs/oyranos/files/oyranos-0.9.4-use-more-internal-xrandr-info.patch @@ -0,0 +1,35 @@ +From 5c9b4a85213e5f63d716655b6c61a7efce07223c Mon Sep 17 00:00:00 2001 +From: Kai-Uwe Behrmann <ku.b@gmx.de> +Date: Sun, 17 Feb 2013 20:27:04 +0100 +Subject: [PATCH] * [oyX1]: use more internal XRandR information + +--- + src/include_private/oyranos_monitor_internal_x11.h | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/src/include_private/oyranos_monitor_internal_x11.h b/src/include_private/oyranos_monitor_internal_x11.h +index c41aa3a..363b759 100644 +--- a/src/include_private/oyranos_monitor_internal_x11.h ++++ b/src/include_private/oyranos_monitor_internal_x11.h +@@ -60,6 +60,8 @@ typedef struct { + RROutput output; /**< XRandR output */ + XRROutputInfo * output_info; /**< XRandR output info */ + int active_outputs; /**< outputs with crtc and gamma size */ ++ int rr_version; /**< XRandR version */ ++ int rr_screen; /**< nth XRandR output */ + # endif + char * system_port; /**< the operating systems port name */ + oyBlob_s * edid; /**< edid for the device */ +@@ -95,6 +97,8 @@ RROutput oyX1Monitor_xrrOutput_ ( oyX1Monitor_s * disp ); + XRROutputInfo * + oyX1Monitor_xrrOutputInfo_( oyX1Monitor_s * disp ); + int oyX1Monitor_activeOutputs_( oyX1Monitor_s * disp ); ++int oyX1Monitor_rrVersion_ ( oyX1Monitor_s * disp ); ++int oyX1Monitor_rrScreen_ ( oyX1Monitor_s * disp ); + # endif + + int oyX1MonitorProfileSetup ( const char * display_name, +-- +1.5.6.5 + + diff --git a/media-libs/oyranos/oyranos-0.4.0-r1.ebuild b/media-libs/oyranos/oyranos-0.4.0-r1.ebuild deleted file mode 100644 index a506d7b4d118..000000000000 --- a/media-libs/oyranos/oyranos-0.4.0-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.4.0-r1.ebuild,v 1.3 2013/04/13 02:23:48 xmw Exp $ - -EAPI=4 - -inherit eutils toolchain-funcs - -DESCRIPTION="colour management system allowing to share various settings across applications and services" -HOMEPAGE="http://www.oyranos.org/" -SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.4/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X doc static-libs test xinerama" - -RDEPEND="<app-admin/elektra-0.7.1-r3 - dev-libs/libxml2 - dev-libs/yajl - media-gfx/exiv2 - media-libs/lcms:0 - media-libs/libpng:0 - media-libs/libraw - >=media-libs/libXcm-0.5.0 - X? ( x11-libs/fltk:1 - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXxf86vm - xinerama? ( x11-libs/libXinerama ) )" -DEPEND="${RDEPEND} - app-doc/doxygen - test? ( media-libs/icc-profiles-basiccolor-printing2009 - media-libs/icc-profiles-openicc )" - -RESTRICT="test" - -src_prepare() { - einfo remove bundled elektra yajl - rm -rf elektra* yajl || die - #keep bundled libXNVCtrl - - epatch "${FILESDIR}"/${P}-buildsystem.patch \ - "${FILESDIR}"/${PN}-0.3.2-test.patch - - if ! use X ; then - sed -e '/FLTK_GUI =/s:=.*:=:' \ - -i makefile.in || die - fi - - sed -e '/#include/s:alpha/oyranos_alpha.h:oyranos_alpha.h:' \ - -i examples/libraw/oyranos_file.cpp || die - - sed -e '/^#include/s:kdb.h:elektra-kdb.h:' \ - -i test.c test2.cpp oyranos_elektra.c || die -} - -src_configure() { - tc-export CC CXX - econf --prefix=/usr \ - --enable-verbose \ - $(use_with X x) \ - $(use_enable X libX11) \ - $(use_enable X libXext) \ - $(use_enable X libXrandr) \ - $(use_enable X libXxf86vm) \ - $(use_enable X fltk) \ - $(use_enable static-libs static) \ - $(use_enable xinerama libXinerama) -} - -src_compile() { - emake all - use X && emake oforms - emake docu -} - -src_install() { - emake DESTDIR="${D}" docdir="${EPREFIX}"/usr/share/doc/${P} install-main - - if ! use doc ; then - rm -rf "${ED}/usr/share/doc/${P}/html" || die - fi -} diff --git a/media-libs/oyranos/oyranos-0.9.1-r1.ebuild b/media-libs/oyranos/oyranos-0.9.1-r1.ebuild deleted file mode 100644 index 1c8fd41aaf55..000000000000 --- a/media-libs/oyranos/oyranos-0.9.1-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.1-r1.ebuild,v 1.2 2013/04/13 02:23:48 xmw Exp $ - -EAPI=4 - -inherit eutils toolchain-funcs - -DESCRIPTION="colour management system allowing to share various settings across applications and services" -HOMEPAGE="http://www.oyranos.org/" -SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.4/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X doc static-libs test xinerama" - -RDEPEND="<app-admin/elektra-0.7.1-r3 - dev-libs/libxml2 - dev-libs/yajl - media-gfx/exiv2 - media-libs/lcms:0 - media-libs/libpng:0 - media-libs/libraw - >=media-libs/libXcm-0.5.1 - X? ( x11-libs/fltk:1 - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXxf86vm - xinerama? ( x11-libs/libXinerama ) )" -DEPEND="${RDEPEND} - app-doc/doxygen - media-gfx/graphviz - test? ( media-libs/icc-profiles-basiccolor-printing2009 - media-libs/icc-profiles-openicc )" - -RESTRICT="test" - -src_prepare() { - einfo remove bundled elektra yajl - rm -rf elektra* yajl || die - #keep bundled libXNVCtrl - - epatch "${FILESDIR}"/${PN}-0.9.0-buildsystem.patch - epatch "${FILESDIR}"/${PN}-0.9.1-buildsystem-2.patch - - if ! use X ; then - sed -e '/FLTK_GUI =/s:=.*:=:' \ - -i makefile.in || die - fi - - if has_version "<app-admin/elektra-0.8.3" ; then - sed -e '/^#include/s:kdb.h:elektra-kdb.h:' \ - -i test.c test2.cpp oyranos_elektra.c || die - fi -} - -src_configure() { - tc-export CC CXX - econf --prefix=/usr \ - --enable-verbose \ - $(use_with X x) \ - $(use_enable X libX11) \ - $(use_enable X libXext) \ - $(use_enable X libXrandr) \ - $(use_enable X libXxf86vm) \ - $(use_enable X fltk) \ - $(use_enable static-libs static) \ - $(use_enable xinerama libXinerama) -} - -src_compile() { - emake all - use X && emake oforms - emake docu -} - -src_install() { - emake DESTDIR="${D}" docdir="${EPREFIX}"/usr/share/doc/${P} install-main - - if ! use doc ; then - rm -rf "${ED}/usr/share/doc/${P}/html" || die - fi -} diff --git a/media-libs/oyranos/oyranos-0.9.4-r1.ebuild b/media-libs/oyranos/oyranos-0.9.4-r1.ebuild new file mode 100644 index 000000000000..0aa79089df34 --- /dev/null +++ b/media-libs/oyranos/oyranos-0.9.4-r1.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.4-r1.ebuild,v 1.1 2013/04/22 17:07:37 xmw Exp $ + +EAPI=5 + +inherit eutils flag-o-matic cmake-utils cmake-multilib + +DESCRIPTION="colour management system allowing to share various settings across applications and services" +HOMEPAGE="http://www.oyranos.org/" +SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.4/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X cairo cups doc exif fltk qt4 test" + +RDEPEND="=app-admin/elektra-0.7*[${MULTILIB_USEDEP}] + media-libs/icc-profiles-basiccolor-printing2009 + media-libs/icc-profiles-basiccolor-printing2009 + >=media-libs/libXcm-0.5.2[${MULTILIB_USEDEP}] + X? ( x11-libs/libXfixes[${MULTILIB_USEDEP}] + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-libs/libXxf86vm[${MULTILIB_USEDEP}] + x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + !amd64? ( + dev-libs/libxml2 + cairo? ( x11-libs/cairo ) + cups? ( net-print/cups ) + qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) + ) + amd64? ( + abi_x86_64? ( + dev-libs/libxml2 + || ( media-libs/lcms:0 media-libs/lcms:2 ) + media-libs/libpng:0 + cairo? ( x11-libs/cairo ) + cups? ( net-print/cups ) + qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) + ) + abi_x86_32? ( + app-emulation/emul-linux-x86-baselibs + cairo? ( app-emulation/emul-linux-x86-gtklibs ) + cups? ( app-emulation/emul-linux-x86-baselibs ) + qt4? ( app-emulation/emul-linux-x86-qtlibs ) + ) + ) + media-gfx/graphviz + dev-libs/yajl + exif? ( media-gfx/exiv2 ) + fltk? ( x11-libs/fltk:1 )" +DEPEND="${RDEPEND} + app-doc/doxygen" + +RESTRICT="test" +REQUIRED_USE="amd64? ( exif? ( !abi_x86_32 ) )" +CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindXcm FindCUPS" + +src_prepare() { + einfo remove bundled libs + rm -rf elektra* yajl || die + + epatch "${FILESDIR}/${P}"-buildsystem-r1.patch + + #upstream(ed) fixes, be more verbose, better xrandr handling + epatch "${FILESDIR}/${P}"-fix-array-access.patch \ + "${FILESDIR}/${P}"-fix-oyRankMap-helper-functions-crashes.patch \ + "${FILESDIR}/${P}"-fix-oyStringSegment-crash.patch \ + "${FILESDIR}/${P}"-be-more-verbose.patch \ + "${FILESDIR}/${P}"-use-more-internal-xrandr-info.patch \ + "${FILESDIR}/${P}"-set-xcalib-to-screen-if-ge-xrandr-12.patch \ + "${FILESDIR}/${P}"-fix-double-object-release.patch \ + "${FILESDIR}/${P}"-omit-profile-with-error.patch \ + "${FILESDIR}/${P}"-fix-typos-and-grammar.patch + + #upstream fix for QA notice, gentoo bug 464254 + epatch "${FILESDIR}/${P}"-fix-runpaths.patch + + #fix really ugly and prominently visible typo (solved in 0.9.5) + sed -e 's/Promt/Prompt/' \ + -i src/liboyranos_config/oyranos_texts.c po/*.{po,pot} settings/*xml || die + + if use fltk ; then + #src/examples does not include fltk flags + append-cflags $(fltk-config --cflags) + append-cxxflags $(fltk-confiag --cxxflags) + fi + + cmake-utils_src_prepare + + mycmakeargs=( + $(usex X -DWANT_X11=1 "") + $(usex cairo -DWANT_CAIRO=1 "") + $(usex cups -DWANT_CUPS=1 "") + $(usex exif -DWANT_EXIV2=1 "") + $(usex fltk -DWANT_FLTK=1 "") + $(usex qt4 -DWANT_QT4=1 "") + -DWANT_LIBRAW=1 + ) +} + +src_configure() { + cmake-multilib_src_configure + + if use abi_x86_32 && use abi_x86_64 ; then + sed -e 's:lib64:lib32:g' \ + -i "${S}"-x86/CMakeCache.txt || die + fi +} + +src_install() { + if use abi_x86_32 && use abi_x86_64 ; then + sed -e '/OY_LIBDIR/s:lib32:lib64:'\ + -i "${S}"-x86/src/include/oyranos_version.h || die + fi + + cmake-multilib_src_install + + dodoc AUTHORS ChangeLog README + if use doc ; then + mv "${ED}/usr/share/doc/${PN}/*" "${ED}/usr/share/doc/${P}" || die + fi + rm -rf "${ED}/usr/share/doc/${PN}" || die +} diff --git a/media-libs/oyranos/oyranos-0.9.4.ebuild b/media-libs/oyranos/oyranos-9999.ebuild index 14a16b606676..b2878fbac9ef 100644 --- a/media-libs/oyranos/oyranos-0.9.4.ebuild +++ b/media-libs/oyranos/oyranos-9999.ebuild @@ -1,24 +1,26 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.4.ebuild,v 1.2 2013/04/12 23:54:12 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild,v 1.1 2013/04/22 17:07:37 xmw Exp $ EAPI=5 -inherit eutils flag-o-matic cmake-utils cmake-multilib +inherit eutils flag-o-matic cmake-utils cmake-multilib git-2 DESCRIPTION="colour management system allowing to share various settings across applications and services" HOMEPAGE="http://www.oyranos.org/" -SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.4/${P}.tar.bz2" +EGIT_REPO_URI="git://www.${PN}.org/git/${PN}" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="" IUSE="X cairo cups doc exif fltk qt4 raw test" -RDEPEND=">=app-admin/elektra-0.8.3-r1 +RDEPEND="=app-admin/elektra-0.7* dev-libs/libxml2 dev-libs/yajl media-gfx/exiv2 + media-libs/icc-profiles-basiccolor-printing2009 + media-libs/icc-profiles-basiccolor-printing2009 || ( media-libs/lcms:0 media-libs/lcms:2 ) media-libs/libpng:0 media-libs/libraw @@ -35,16 +37,21 @@ RDEPEND=">=app-admin/elektra-0.8.3-r1 raw? ( media-libs/libraw )" DEPEND="${RDEPEND} app-doc/doxygen - media-gfx/graphviz - test? ( media-libs/icc-profiles-basiccolor-printing2009 - media-libs/icc-profiles-openicc )" + media-gfx/graphviz" -#RESTRICT="test" +RESTRICT="test" -CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindElektra FindXcm FindCUPS" +CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindXcm FindCUPS" src_prepare() { - epatch "${FILESDIR}/${P}"-buildsystem.patch + einfo remove bundled libs + rm -rf elektra* yajl || die + + epatch "${FILESDIR}/${PN}"-0.9.4-buildsystem-r1.patch + + #fix really ugly and prominently visible typo (solved in 0.9.5) + sed -e 's/Promt/Prompt/' \ + -i src/liboyranos_config/oyranos_texts.c po/*.{po,pot} settings/*xml || die if use fltk ; then #src/examples does not include fltk flags @@ -54,9 +61,6 @@ src_prepare() { cmake-utils_src_prepare - einfo remove bundled libs - rm -rf elektra* yajl || die - mycmakeargs=( $(usex X -DWANT_X11=1 "") $(usex cairo -DWANT_CAIRO=1 "") |