summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2007-11-17 18:39:26 +0000
committerLuca Barbato <lu_zero@gentoo.org>2007-11-17 18:39:26 +0000
commit9af767af38571c9d9177a35c0acd83b022aaecfb (patch)
treeaccd97a40a7827295b42b7b7a8d1e4e1bd7f7c64 /media-gfx
parentamd64 stable, bug #199458. (diff)
downloadhistorical-9af767af38571c9d9177a35c0acd83b022aaecfb.tar.gz
historical-9af767af38571c9d9177a35c0acd83b022aaecfb.tar.bz2
historical-9af767af38571c9d9177a35c0acd83b022aaecfb.zip
Fix texture import from ffmpeg, bug #199448
Package-Manager: portage-2.1.3.19
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/blender/ChangeLog7
-rw-r--r--media-gfx/blender/Manifest16
-rw-r--r--media-gfx/blender/files/blender-2.44-swscale.patch4
3 files changed, 16 insertions, 11 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index e7b72a2b876f..eb03e62be52e 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/blender
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.124 2007/11/17 15:13:53 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.125 2007/11/17 18:39:26 lu_zero Exp $
+
+ 17 Nov 2007; Luca Barbato <lu_zero@gentoo.org>
+ files/blender-2.44-swscale.patch:
+ Fix texture import from ffmpeg, thanks again to Maciej Pawlik <yaq@world.pl>
+ for fixing the patch in bug #199448
17 Nov 2007; Luca Barbato <lu_zero@gentoo.org> blender-2.45.ebuild:
Fix deps, thanks to Maciej Pawlik <yaq@world.pl> for spotting the issue in
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index e173c52118d3..ed3f36585c3c 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -6,10 +6,10 @@ AUX blender-2.44-scriptsdir.patch 2586 RMD160 8e80859edf1fae2f401b326be4cb939108
MD5 969160ddcac4ca5bd002174829a4bc9c files/blender-2.44-scriptsdir.patch 2586
RMD160 8e80859edf1fae2f401b326be4cb939108879999 files/blender-2.44-scriptsdir.patch 2586
SHA256 a7afac10ce2431cd94d10dc3f4cae33423b5a59d0c6918199006f623cd6d68e4 files/blender-2.44-scriptsdir.patch 2586
-AUX blender-2.44-swscale.patch 4054 RMD160 18073ebc77ad8ecb99fe9bb9a256da8d18fa1dbb SHA1 8e235a99df47de04f9622b9df92ac6c3fe65a4b1 SHA256 48514c38d8b0e9db6bfb833264ddbc9a86473954ba62677e39da396654d0d9c1
-MD5 b0d7dfaa38207be65eabb0c3b3443091 files/blender-2.44-swscale.patch 4054
-RMD160 18073ebc77ad8ecb99fe9bb9a256da8d18fa1dbb files/blender-2.44-swscale.patch 4054
-SHA256 48514c38d8b0e9db6bfb833264ddbc9a86473954ba62677e39da396654d0d9c1 files/blender-2.44-swscale.patch 4054
+AUX blender-2.44-swscale.patch 4054 RMD160 8e0f31402682e01763ccd8ad529fb57db064c423 SHA1 2e8a322644d4cfafc59f6fa33b34e46851a03836 SHA256 c74007ad24989a215b04dd275c8dee33960a05297901daf3c457e4c42de51c35
+MD5 26a5897d83035f00312531aa7be1fa36 files/blender-2.44-swscale.patch 4054
+RMD160 8e0f31402682e01763ccd8ad529fb57db064c423 files/blender-2.44-swscale.patch 4054
+SHA256 c74007ad24989a215b04dd275c8dee33960a05297901daf3c457e4c42de51c35 files/blender-2.44-swscale.patch 4054
AUX blender.desktop 197 RMD160 6d5bf65f7cdce71123f193b0912c42e212832af7 SHA1 d0387c8e525a7c24b1a150a36fc6152874d0136e SHA256 dff04dfaa1c1105099717a04af9c6ad028c7cd5a2e21d72f6dc7182ca703cff1
MD5 b8e304980dc2bfd9a7157037d6ead44b files/blender.desktop 197
RMD160 6d5bf65f7cdce71123f193b0912c42e212832af7 files/blender.desktop 197
@@ -54,10 +54,10 @@ EBUILD blender-2.45.ebuild 3381 RMD160 37d46f9c27da21b4b9c965dccc7e7a52ee80891a
MD5 131b5ec3f8f682d27ee7689136b6e2c0 blender-2.45.ebuild 3381
RMD160 37d46f9c27da21b4b9c965dccc7e7a52ee80891a blender-2.45.ebuild 3381
SHA256 222548d52b0342a25b25ffa0619792466f33f53efa3a8f4aacab1ca302fa5009 blender-2.45.ebuild 3381
-MISC ChangeLog 17695 RMD160 2e2f094acddd5562d1ebe5bea17a8be43093a04e SHA1 64b5781ca7d8b7734a0ce25c99ecc9f66a0bb876 SHA256 ab8d96a0bc67c822e95ecdf3e06b663e4a74267229484b289321fb905e5492af
-MD5 c0f9054ecab7b32f5c1b45a5cca6730e ChangeLog 17695
-RMD160 2e2f094acddd5562d1ebe5bea17a8be43093a04e ChangeLog 17695
-SHA256 ab8d96a0bc67c822e95ecdf3e06b663e4a74267229484b289321fb905e5492af ChangeLog 17695
+MISC ChangeLog 17898 RMD160 f9e4dddfed499468f742b2441d346a4fc47aff47 SHA1 07a327f9b975f8238f0a8046490b7040c65bb20e SHA256 55e3d99e2d5d93d2a50dc185a93b03882d4c170b66d584b47000771f8672b8c1
+MD5 4eebcbe6398fc95c8c242ca887621e40 ChangeLog 17898
+RMD160 f9e4dddfed499468f742b2441d346a4fc47aff47 ChangeLog 17898
+SHA256 55e3d99e2d5d93d2a50dc185a93b03882d4c170b66d584b47000771f8672b8c1 ChangeLog 17898
MISC metadata.xml 492 RMD160 c477917476fbde6356586768276eda1ea31ae3ea SHA1 4a109fbded83a3f6c403ab5f3ec20e7113c1a26c SHA256 0ef00c095e68d12b312f8558b8909b4ae633717cf12932d7a4e479faf7fb9e18
MD5 cfcd6135fc23767decafee2a97f5ac0a metadata.xml 492
RMD160 c477917476fbde6356586768276eda1ea31ae3ea metadata.xml 492
diff --git a/media-gfx/blender/files/blender-2.44-swscale.patch b/media-gfx/blender/files/blender-2.44-swscale.patch
index 4a8df202990e..1982d73b2cfa 100644
--- a/media-gfx/blender/files/blender-2.44-swscale.patch
+++ b/media-gfx/blender/files/blender-2.44-swscale.patch
@@ -92,10 +92,10 @@ index 5b185a4..5cdb651 100644
+ img_convert_ctx = sws_getContext(
+ anim->pCodecCtx->width,
+ anim->pCodecCtx->height,
-+ PIX_FMT_RGBA32,
++ anim->pCodecCtx->pix_fmt,
+ anim->pCodecCtx->width,
+ anim->pCodecCtx->height,
-+ anim->pCodecCtx->pix_fmt,
++ PIX_FMT_RGBA32,
+ SWS_BICUBIC,
+ NULL, NULL, NULL);
+ }