look for metadata closer to what the test suite expects, disable logging outside of php so that most of the testsuite passes now

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

2 files changed, 14 insertions, 2 deletions

diff --git a/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffmpeg.patch b/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffmpeg.patch
index 5de51efa8727..9e8c864afcf5 100644
--- a/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffmpeg.patch
+++ b/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-ffmpeg.patch
@@ -131,7 +131,7 @@ Index: work/php5.3/ffmpeg_movie.c
  
 -    RETURN_STRINGL(ffmovie_ctx->fmt_ctx->album,
 -            strlen(ffmovie_ctx->fmt_ctx->album), 1);
-+    val = get_metadata(ffmovie_ctx->fmt_ctx->metadata, "ALBUMTITLE");
++    val = get_metadata(ffmovie_ctx->fmt_ctx->metadata, "ALBUM");
 +    RETURN_STRINGL(val, strlen(val), 1);
  }
  /* }}} */
@@ -174,7 +174,7 @@ Index: work/php5.3/ffmpeg_movie.c
      GET_MOVIE_RESOURCE(ffmovie_ctx);
      
 -    RETURN_LONG(ffmovie_ctx->fmt_ctx->year);
-+    val = get_metadata(ffmovie_ctx->fmt_ctx->metadata, "YEAR");
++    val = get_metadata(ffmovie_ctx->fmt_ctx->metadata, "DATE");
 +    RETURN_STRINGL(val, strlen(val), 1);
  }
  /* }}} */
diff --git a/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-log.patch b/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-log.patch
new file mode 100644
index 000000000000..3b5bb88322e9
--- /dev/null
+++ b/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-log.patch
@@ -0,0 +1,12 @@
+Index: work/php5.3/ffmpeg-php.c
+===================================================================
+--- work.orig/php5.3/ffmpeg-php.c
++++ work/php5.3/ffmpeg-php.c
+@@ -101,6 +101,7 @@ PHP_MINIT_FUNCTION(ffmpeg)
+     if (INI_BOOL("ffmpeg.show_warnings")) {
+         av_log_set_callback(ffmpeg_errorhandler);
+     } 
++    else av_log_set_level(AV_LOG_QUIET);
+    
+     register_ffmpeg_movie_class(module_number);
+     register_ffmpeg_frame_class(module_number);