diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2014-12-17 16:45:27 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2014-12-17 16:45:27 +0000 |
| commit | c2f8a44f3585ef347bf4ca81d5b9569ffce0eb52 (patch) | |
| tree | a31972184831eb3fd33973a7a983399e12ceccdd /media-gfx/blender | |
| parent | Remove code paths that are not called anymore (diff) | |
| download | historical-c2f8a44f3585ef347bf4ca81d5b9569ffce0eb52.tar.gz historical-c2f8a44f3585ef347bf4ca81d5b9569ffce0eb52.tar.bz2 historical-c2f8a44f3585ef347bf4ca81d5b9569ffce0eb52.zip | |
fix bug #532640
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020
Diffstat (limited to 'media-gfx/blender')
| -rw-r--r-- | media-gfx/blender/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/blender/Manifest | 33 | ||||
| -rw-r--r-- | media-gfx/blender/blender-2.72b.ebuild | 5 | ||||
| -rw-r--r-- | media-gfx/blender/files/blender-2.72-T42797.diff | 13 |
4 files changed, 38 insertions, 19 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index 67c0b92057b6..ad81cec345b2 100644 --- a/media-gfx/blender/ChangeLog +++ b/media-gfx/blender/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/blender # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.278 2014/12/16 16:08:05 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.279 2014/12/17 16:45:22 hasufell Exp $ + + 17 Dec 2014; Julian Ospald <hasufell@gentoo.org> blender-2.72b.ebuild, + +files/blender-2.72-T42797.diff: + fix bug #532640 16 Dec 2014; Julian Ospald <hasufell@gentoo.org> blender-2.72b.ebuild: add list of bundled deps diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index c52bfa29f97f..0228d40048ef 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -9,26 +9,27 @@ AUX 06-blender-2.68-fix-install-rules.patch 740 SHA256 93ae6cc8cfbb2ce856adf7a0d AUX 07-blender-2.70-sse2.patch 1421 SHA256 b20d9aba206543e765e147e7740aff48ef968b90620d9d4b902cb6c23b9ba28f SHA512 9888110efaab16ec15438ad463c3ffa0bb4f64c23bb162254abe0ddb4acd42935a5fd1fdbf186b1cf1dad042044f8777b5f58c446423894788c655187bfe3cca WHIRLPOOL c3990dac70078a13ba005da5b649b9b72bdf04313551f2e41d639efc6a666006e1af54f11bb8c82608956df03547297303bf7a8a6e8cd03364d994910bde60c7 AUX 08-blender-2.71-gflags.patch 2223 SHA256 295c043088854b62da158ff6a445a8cdb0114a2298de32f4221cb483e9eb407a SHA512 efec5beed218ba0ab3c76ec65c47408631753567c31076cb8431923d5ff0df59c91ab1d2d42007944d307c6aba35746c2435eb9318b65fd69b4c2ed280570f87 WHIRLPOOL 4b5721af9fe9bebe4df1f324eb53f25459f454ce28f46b9af703c47660969b9a6dc1e73d544dbdad2738aad3a9ae53cf8d805bf20af8763f8a59b051302435c2 AUX 09-blender-2.72b-unbundle-minilzo.patch 1170 SHA256 17464deac2c2536b671e16415fc3d37077727f558f8b36e1405ccf179f3c563b SHA512 d062628c837b1f4889bc9616b0814abc27c38cb1f7a77d9276846dccc12c148f22d4647d9aabb41ec342c7c52a4fad95c110869d9599c5204f803a5fb237eed2 WHIRLPOOL 69719041ebe17430fccc45875f08a64c34431c0f6f9e744d2b7d1a3b82c358a69ecbe5d8033eae63d112fcb60ffff108dc03a6b9dad7f0bbdd9c014046781dbc +AUX blender-2.72-T42797.diff 338 SHA256 96ea23f8c588dff6a91415fbb69d007bf4ae4d46e5579d2d7421efb0abaa37fc SHA512 a659582b36f8f07bb866fbd97a4393b186e527dabf76c2ab7112a7f0b96504d077cf5ab0422c6eca53c3c70583caa2d280e0fa1f4454d1935ad8d764079f0d84 WHIRLPOOL 1f1d3e50e52f3e9c92db6950f35cafea3410c1bcb109af1e5c91fab289a3c841ab0489164fe81e99c2d8b8ae8ccd5ee6114233ecdadfbf09eb8b67bbfe43461e DIST blender-2.72b.tar.gz 52018242 SHA256 4436c704afa28e2e5e7b28b2c06981806ddedab70565d40972e422c00644bf47 SHA512 9767797621e443ff9b6810d1713dda110f883c33626d40d7fe5dda676f549e3591516dc24b75feebd85823dd13437c34521ca752139cd31ddacf31ea6b14e124 WHIRLPOOL 3687255bc9f4195b25b66a75630676ee15e67cf10a058dca11b3472617b54aae2bebb1810cc16e19c58ca1c09b1ea8b70f72e30c05632ab0bae8910925a37a54 -EBUILD blender-2.72b.ebuild 8075 SHA256 24dce5d3c516dae7ff6f8422c9457d7ff39b8c65d55c203294b39fa38864d69c SHA512 c53d2231f116c2553a4c2b30293743421577b7d48f92a9d1eac6d931c3438f7384c2c6b791714fc8644af741f26268374931b228e83c07df61ad3a837636fb84 WHIRLPOOL e9e1cb7b24d37a96c52961301f3c048d6e2682c2d756cd26c858b68dfe009cd958a6b9c167b084d82ee0fe112d80ea377f76d701634d0f68ce373f2d03dcf7f7 -MISC ChangeLog 50048 SHA256 10bbc67cc7a8151e7516f534829c1d65ee2dbb80718d3feb10909115aa7e7184 SHA512 2e24fe531480d377bce61aa03437c6071f46f0f100d7e8dad996abc82525029406bc9082492cc88a2d9cbd08844c9299f72a76fb9da0525b6ce85ad04f4d0810 WHIRLPOOL 0ce3867576a155bc35d320b689af2d6b40f5a0c6dc10eda1ce96e23d336a047b0c74ecde965c1fb711fef34b3fbc9926d576d686eb86574c245dc882623d2c74 +EBUILD blender-2.72b.ebuild 8116 SHA256 00d94fb5af67341b3dd7f218dbb351c6cef2e333dc1bc99af94b58231ff557e2 SHA512 5842be5a16bb893925093e203ca45892791460f2b2e0349337959b724a3df54781731c1d102384773f0f9bbf3bab86d0b21c1bd840eaaad891c5e989b8123f15 WHIRLPOOL 0e25ce96505aaf2752de86e61c62779b52c5b5e0d307dddb61b170e3f3287daec38338de0e7f1287327769b52977097ec601146e070ed48e1374e08bca04eb5c +MISC ChangeLog 50175 SHA256 0962df1255541657c70a5c59c2e7b9af6aa9818c4ea2d1c0b9a10185a57ba7b4 SHA512 46703c8a3c14b3c8a121fb9197a8d808daeba8837d762f0b9a0ac3cfa855835c6b698a38c8883fd2e7922d2e0f959edc9f6dd00d27ac2879238e8ca530a253c8 WHIRLPOOL 138b15d2c08006c518da2c201157bc5d350bf655069831432581abe71e0a2acd0c4fb83af93e2b47a2f0c3ef6dc90821df46c03dc954efd63fea7fc505d26b69 MISC metadata.xml 1943 SHA256 442b4b8f917e536321467f5b4408d6530fc8030db5d3efa532a007aaa81defb0 SHA512 8a18cfb1afc6e465c3e10698470794971c2b967f914332421817bbe1c6dc92372d61139803d3b5b7bdd5fd6a80c53b0eb2d0554ae8b41e5d5e4b75de30969a0c WHIRLPOOL 9ab06cf2763dbedc21723e36e9afa72710d8299f602c63152345ea3c67ea3398d8e7ac0c6b4b1c37a2767cb6598b5a76d793ab300483a052c00e6789f08f648c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJUkFjnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJUkbMnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy -MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgsuMQAL6XKY3HiDEjNL9iJCWj+UIP -1jC3mc28P2JHa6ms10wOGeX5jgkiyYZ7FQdaj+ba/+/HwAa5ZZigko6sLRm3KTcT -R+H6Z0FIiKO3Fyj2CRPBGkPe/bCqAi3ti/ZvzZrSUYExKyMArjOyayPeMPYqAJSs -VgGs1ZBINKlimT0NATjJv97tvkoWvk1dWsAUVI9PCnvS73JNTd8YAemN8sDa8x2z -K0rRH4ivjEFDRdRpzGxheraVH5M8bmZKXBbe5RMozQHiA8qH8o1wbyZMeuQXq9Ut -9hUm1vag4Tt7YF+El+avnG0/C5Xl6dEhQ8mjQlj3Sgf2+9y4bgPoW8bY9N0WNuKM -ldyavfFwBzViPVY7xq5Mra1a2JVkKckKeGF+gxeEuOA1p4MhNHc1pI8gSRYU8r1q -S+3YGTz9TPzH2Q6BhY4YOMWNVeOkWL6WxTnmQQal5NNUIFl2FS/2gIrDQqi/ii6w -mHYxNC9H3Z/l5XHByaUORTQXSv3i6i2N5kGh0HNInVgeWCtxNkzAdey8N6PeV5Pu -5E768RGMqWr6w0SPXwl6jbEaS9cGL0K6VzpmMvvIenXnYdLpPNprOOcvmANb5xD/ -/TfdfvPk/RVUBhI4eaZtZ0C1DBxezT7gKn5UW3JBkI3zhPDf1iRitXMM25Gc6jAY -wLewqVLJt9E6J75daDWx -=Jdod +MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgvvYP/1CrcSkufZlMILoGD9mVWEgb +JM/1/gziP7eHd8oxwqIeHGsS4iYdQ+p9qC3J6xTUysWypWWt54iyeymPvYBJMo4+ +YIjdKzODL4bng7Js8CkVCFgDSEE5R/zXjbdUjJ1pI1/7/yfaPrSQ8qHTWsV/8Ask +R42NBGHSA/HDj7GrrYayN5ePLbo1/3BIw4OCQpUWQwFrx/tygaJAEV6kKyuep+UX +vrD2u+efYPJdnpfWaOJjiqbWUeNiXMJt+SPzfymfTVDicgqwTIPwZ5SxgKnRihUj +BgujDrrJP6dqV6HyKwn7+TrBGYwUG5/ShwL0+RhMoDHeO707AZzxgbKPCDFn4eJB +v0dQFPYRz7hL6xdhTGRmzr1+ctxkrgaCBEiQzwYsFA+FekOn7eZKuEa2mz6b4kp7 +VwQjCob/8W00ETrdYo3H+ufsuh0TLd8IOwk5fZ2t18ZpLcWakX0+zIFEUwGW44yA +vq1Pko5Yxm57rStv7+C51wMo2a4dTDFEb+sltE9Bi0mScf2ZzVJtTWmM3FP5hCqC +dzL6dsOLDEQgtTAhwQZkI3jkZcG/q7nBOMWz9U63XO0iTX7bNW/vgX0hcLBw3uiD +fyHq+PekwV3bwNQVcKEmPnp1GbHLR30uaB22+jixJHM/DuHPLCUDySghkZ9MTjJQ +DewXt7CI3CASMW40L+pk +=vDEP -----END PGP SIGNATURE----- diff --git a/media-gfx/blender/blender-2.72b.ebuild b/media-gfx/blender/blender-2.72b.ebuild index 5aa66c718691..079bcf83f618 100644 --- a/media-gfx/blender/blender-2.72b.ebuild +++ b/media-gfx/blender/blender-2.72b.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/media-gfx/blender/blender-2.72b.ebuild,v 1.2 2014/12/16 16:08:05 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.72b.ebuild,v 1.3 2014/12/17 16:45:22 hasufell Exp $ ## BUNDLED-DEPS: # extern/recastnavigation @@ -132,7 +132,8 @@ src_prepare() { "${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \ "${FILESDIR}"/07-${PN}-2.70-sse2.patch \ "${FILESDIR}"/08-${PN}-2.71-gflags.patch \ - "${FILESDIR}"/09-${PN}-2.72b-unbundle-minilzo.patch + "${FILESDIR}"/09-${PN}-2.72b-unbundle-minilzo.patch \ + "${FILESDIR}"/${PN}-2.72-T42797.diff epatch_user diff --git a/media-gfx/blender/files/blender-2.72-T42797.diff b/media-gfx/blender/files/blender-2.72-T42797.diff new file mode 100644 index 000000000000..d1db31882019 --- /dev/null +++ b/media-gfx/blender/files/blender-2.72-T42797.diff @@ -0,0 +1,13 @@ +--- source/blender/blenfont/intern/blf_glyph.c ++++ source/blender/blenfont/intern/blf_glyph.c +@@ -262,8 +262,8 @@ + g->xoff = -1; + g->yoff = -1; + bitmap = slot->bitmap; +- g->width = bitmap.width; +- g->height = bitmap.rows; ++ g->width = (int)bitmap.width; ++ g->height = (int)bitmap.rows; + + if (g->width && g->height) { + if (sharp) { |