Rework the libav-0.7 patch to copy the filename

Package-Manager: portage-2.1.10.34/cvs/Linux x86_64

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 808739dcec573e933ebd9af8a9eff7beb5c40f9a..61ab9d46d193875daf0c25077635e790b599119c 100644 (file)
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.215 2011/11/13 22:54:25 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.216 2011/11/14 09:30:17 lu_zero Exp $
+
+  14 Nov 2011; Luca Barbato <lu_zero@gentoo.org>
+  files/blender-2.60a-libav-0.7.patch:
+  Rework the libav-0.7 support to copy the filename
 
   13 Nov 2011; Sebastian Pipping <sping@gentoo.org>
   files/blender-2.57-insecure.desktop, files/blender-2.60a-insecure.desktop:

diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 11f90add7ada91b62e1e52a64a5c58bd23ffb476..7b5ca3c64436d2feed57c755145ef56b32bc8327 100644 (file)
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX blender-2.37-dirs.patch 727 RMD160 ddf5c951182f809374c43f1a1cce47f4397a868c SHA1 9b3cb06a8bd23b1a5041bd3193018c2e5e28dcfd SHA256 beb5e5835cde71a00712ddf600278ca0bbdb6020123faeb6ea7a53e8f6812e5e
 AUX blender-2.44-scriptsdir.patch 2586 RMD160 8e80859edf1fae2f401b326be4cb939108879999 SHA1 50143946828d3f2b2568e71fae5ed28f6adf7449 SHA256 a7afac10ce2431cd94d10dc3f4cae33423b5a59d0c6918199006f623cd6d68e4
 AUX blender-2.46-cve-2008-1103-1.patch 636 RMD160 11d0b7dbff6e186334a80b7f6932ace4a1bd6628 SHA1 979fa1c2f0836b46dfd26c197798625a72e0a28b SHA256 a0dd64fb749a9577d84e22896872dc2956a8530700308d0aadad588191356b96
@@ -34,7 +31,7 @@ AUX blender-2.60a-CVE-2009-3850-v3.patch 7787 RMD160 02afc6ef3bcdf314c693c44be0c
 AUX blender-2.60a-desktop.patch 643 RMD160 43b8eaaef300fac4ebf463eb024356f65f76b7f5 SHA1 1b77d5a0c5ffe791117cfe140a7b3626bd3ba21b SHA256 8f2a7619d82a7ea64ade59aa067f2e6469129fe682b88f7c3ac6975650947ec1
 AUX blender-2.60a-enable_site_module.patch 974 RMD160 e93ddcd1372751951b6e56f72c764e2043747574 SHA1 84aed7ab30f5de1989ee63b4584db7acd6747b54 SHA256 dfafc00a08504c0c3259083d01e535e00f9a952db4a551dbacf0a62ad1a5c768
 AUX blender-2.60a-insecure.desktop 594 RMD160 48d7b683f4ae057a1766dabb267e5048e92114f6 SHA1 1d6d2c61a0c79b6c78842ad354746ffe5a2d7ffa SHA256 2b7920c517c93d4f1430dc7ee70a414d32c1b17648a0e8395bbd900d1be8dd84
-AUX blender-2.60a-libav-0.7.patch 1069 RMD160 4cd584ce35a2846aec25536f26faa1ccb5fce0d0 SHA1 034488267f494c35198528736e9106755a9a7d4f SHA256 6f341d8b8e8f35fcecd1a0a394f40d3b17685d810e2adc7e818de4c2b6864a2e
+AUX blender-2.60a-libav-0.7.patch 1181 RMD160 66dc84d6ca37a97bb43886ed86b72499383636b6 SHA1 be60d7fd39821fb28b3e23a659df8f7eb51d1f60 SHA256 d8e7a08b042ce8311bd71e2edec7457ddf8fe8b64243f30f179d391ea170ab50
 AUX blender-2.60a-linux-3.patch 414 RMD160 cb1cfc00e363e00c67a3c6d3567768418be78f39 SHA1 71f4701aa2e88de35843661cf5eecfe411ccd99b SHA256 4f1f8960e1b5706b426e272c17b70682b1eaa5903fa325e4d4db21efd540d732
 AUX blender.desktop 199 RMD160 a55286923d1422f620dff35226a42fcbaf8c60a9 SHA1 c5ad8c540571a254756ac541c64933e80406aa16 SHA256 3fbab5be3f52ce56f285e422c856aecd15627cffeadcb07af313e0d64c4803ad
 AUX blender.png 2119 RMD160 e06574002001f41198dc9408ef1bba45493fcc27 SHA1 9a0d713235ce99f8e4fde4f062209ab989e48c0f SHA256 bef633319c81323bb82db274004d89082ca05cab6650eb4c4bf43f830ccb5cad
@@ -48,12 +45,5 @@ EBUILD blender-2.49a.ebuild 4819 RMD160 109229feaf551d5c4829ecad0f4eb7c9cfea8c1e
 EBUILD blender-2.49b-r2.ebuild 5050 RMD160 87bba6723e7f083f395666581f568848154c3233 SHA1 105297aa72047f8501775933f1d4b51bf992d60e SHA256 39dec297a537d22f07576adc90211ec8806f8d63c6c30906f58f6e51dc2cc764
 EBUILD blender-2.57-r1.ebuild 13935 RMD160 e379b03c655891ed9bfc0c0542ab5a955cc3710b SHA1 2d988031adfed101d7c6bec64ae36b7bfefba460 SHA256 98934feed8e0cc661dac38746f1a8322088269c470fb32c84d1af2c494f8f834
 EBUILD blender-2.60a.ebuild 13799 RMD160 ef3db70e4cf2b0bee253435a8f60330e1817032e SHA1 27cd6ebc6e505076e76f8f2cd09e7f4261ac3300 SHA256 af6906ae77071826856a1d58ef023f3445034ccdc0c7aa1706e47af1f9399998
-MISC ChangeLog 33417 RMD160 0925c1cc1b998bb90b838a5824231c307b11ca9e SHA1 0fac94f8ff156ed4feca68d378d3e899af9cc2cf SHA256 c261fdcbecb5b14254a28b260948ada8a7889e13e0f55a50728f67c69b806009
+MISC ChangeLog 33560 RMD160 2dfeea7199ab7fcf48e70c911936aaa465ff670a SHA1 5cf1c68a79bc5a2b0f7849e0d4509222c107aa09 SHA256 f18c2f95056b4805fe10edc16efa32ba6a56780290dd156429a8ef6b42da628c
 MISC metadata.xml 1799 RMD160 7330ec5ccf7f7a86f31abf0b5f45bf84025c505a SHA1 a8bc4c5db954f24ea50e879b1bdbd5753430b3ee SHA256 f4bc849a0cc6a805fe6624699c5c1b9248336f7b879484f777f31b7c755759ea
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk7ASqQACgkQsAvGakAaFgC4ngCeKUbkyyk2q3mP4aHqDBAx6t8o
-oPcAoMhr1ugbVsCJ8lwCLGKzxvuiWRL5
-=FDUn
------END PGP SIGNATURE-----

diff --git a/media-gfx/blender/files/blender-2.60a-libav-0.7.patch b/media-gfx/blender/files/blender-2.60a-libav-0.7.patch
index 9bf321649036e38748806abed14880ec45a0f7a8..3bae020a02aebedae97c227e589f3b40f78cbfa1 100644 (file)
--- a/media-gfx/blender/files/blender-2.60a-libav-0.7.patch
+++ b/media-gfx/blender/files/blender-2.60a-libav-0.7.patch
@@ -1,14 +1,15 @@
 --- blender-2.60a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp    2011-10-24 20:09:01.000000000 +0200
 +++ blender-2.60a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2011-11-13 12:34:01.000000000 +0100
-@@ -40,6 +40,7 @@
+@@ -40,6 +40,8 @@
  #include <libavcodec/avcodec.h>
  #include <libavformat/avformat.h>
  #include <libavformat/avio.h>
 +#include <libavutil/mathematics.h>
++#include <libavutil/avstring.h>
  #include "ffmpeg_compat.h"
  }
  
-@@ -57,10 +58,14 @@
+@@ -57,10 +58,15 @@
  {
        static const char* formats[] = { NULL, "ac3", "flac", "matroska", "mp2", "mp3", "ogg", "wav" };
  
@@ -18,7 +19,8 @@
 +        if (!m_formatCtx) AUD_THROW(AUD_ERROR_FFMPEG, context_error);
  
 -      m_outputFmt = m_formatCtx->oformat;
-+        m_outputFmt = m_formatCtx->oformat = av_guess_format(formats[format], filename.c_str(), NULL);
++      av_strlcpy(m_formatCtx->filename, filename.c_str(), sizeof(m_formatCtx->filename));
++      m_outputFmt = m_formatCtx->oformat = av_guess_format(formats[format], filename.c_str(), NULL);
 +      if (!m_outputFmt) {
 +            avformat_free_context(m_formatCtx);
 +            AUD_THROW(AUD_ERROR_FFMPEG, context_error);