From: Alexis Ballier Date: Mon, 9 Jan 2012 15:26:53 +0000 (+0000) Subject: look for metadata closer to what the test suite expects, disable logging outside... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2e8b3fad42c626b9c1677c740d535eab5e31648d;p=gentoo.git look for metadata closer to what the test suite expects, disable logging outside of php so that most of the testsuite passes now Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- diff --git a/dev-php/ffmpeg-php/ChangeLog b/dev-php/ffmpeg-php/ChangeLog index 915899ce0177..981540b733f4 100644 --- a/dev-php/ffmpeg-php/ChangeLog +++ b/dev-php/ffmpeg-php/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-php/ffmpeg-php # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ChangeLog,v 1.2 2012/01/09 14:53:06 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ChangeLog,v 1.3 2012/01/09 15:26:53 aballier Exp $ + + 09 Jan 2012; Alexis Ballier ffmpeg-php-0.6.0-r1.ebuild, + files/ffmpeg-php-0.6.0-ffmpeg.patch, +files/ffmpeg-php-0.6.0-log.patch: + look for metadata closer to what the test suite expects, disable logging + outside of php so that most of the testsuite passes now 09 Jan 2012; Alexis Ballier ffmpeg-php-0.6.0-r1.ebuild, +files/ffmpeg-php-0.6.0-ffmpeg.patch: diff --git a/dev-php/ffmpeg-php/Manifest b/dev-php/ffmpeg-php/Manifest index f05c8f5a691e..c979bfbddcda 100644 --- a/dev-php/ffmpeg-php/Manifest +++ b/dev-php/ffmpeg-php/Manifest @@ -2,15 +2,16 @@ Hash: SHA1 AUX ffmpeg-php-0.6.0-avutil50.patch 1347 RMD160 a0dc5c175ebfd5b5f4992c53746b6bd97f1dd092 SHA1 c5e0126265a2d86bac6c341d56fa89eb082d24b4 SHA256 a08ad6582c7e57a43eddc7419fe37b89b1194d85d752a7a2a8837c1192784eec -AUX ffmpeg-php-0.6.0-ffmpeg.patch 11687 RMD160 4070885c43dec098ffc3a279571126a09ebde15c SHA1 a4f33379710ec614aa1b5b10b9008b9cc66e6dc6 SHA256 22e9bdd364d81955b771fda0322232466257f4fdad581c78c407cb614f150abd +AUX ffmpeg-php-0.6.0-ffmpeg.patch 11682 RMD160 a0ee03ba447a6ff4a4e735f9a5eb14648a2ad477 SHA1 7cfba73f77f816f2cd1227db4b39b4c580ac17da SHA256 ad404b3e8d498549bc705516e23de0dc8182b02bb90bd53efa74d380ba2480ce +AUX ffmpeg-php-0.6.0-log.patch 459 RMD160 19ac8f39c757f422b38bf1687c7c5fe4cc5485c4 SHA1 ab996789a22d1932c99fd52b14d753935a436bb5 SHA256 0cea92de0a3e7bb4f07805259884c9b0f4f9a4e449ad8b655c7eb9bdcc85a789 DIST ffmpeg-php-0.6.0.tbz2 275557 RMD160 a779b06f09fce3ff3c8326bb10db4ab8aadf425e SHA1 2978b5af51af3eda0639840634297eb584b394c1 SHA256 ec8a9847e0f4d5101a5afedb7dac318e9a13f099865215ae99d08d56add9b141 -EBUILD ffmpeg-php-0.6.0-r1.ebuild 1013 RMD160 49c7e95d5ce954077110704f50b5360749faa250 SHA1 1fcd87641efe79cbf2912df6dd4da60b02885c1a SHA256 a15a463c3a98f3d4c1b319cfdeedb817c298c938842941ad197a1042b7786bc4 -MISC ChangeLog 2198 RMD160 ade19ce1db3583539d5c42666068f2511e4d9a4f SHA1 9365886b13419908dbba487755befd385fa8688f SHA256 a740c2e0a73c86528155eea5913597af7f94eba99a0ff1c6db9cba24020d39ff +EBUILD ffmpeg-php-0.6.0-r1.ebuild 1051 RMD160 58edee7914cc110e6248e0e2549c9dfcd8e47baf SHA1 fd1add9fb6bb664709150c2b198911d4cb99a594 SHA256 5914e0e1b0511befbdfbb2a7c20cad8dbd26f805e2fcbba71616dffd2fe9f896 +MISC ChangeLog 2486 RMD160 ff0c26a60f6f1bbaed076bcb8baa89aa657e1d38 SHA1 1edc92ae9e18aaa0849bc26b76f26e31c9dc71e9 SHA256 2d15b2ef040d68b8da2cf62624be460f4f91a185dcecf18ecd8c705359697a5d MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk8K/1gACgkQvFcC4BYPU0qfDwCbBqCrRW72HT6QkBsxmxtG4t8T -N30An0cOlsjPEQQWO3j+F/2zGmjboLx9 -=FkCa +iEYEARECAAYFAk8LB0IACgkQvFcC4BYPU0q11QCcDJLw00IF8JuDtgc7uVC/nOv3 +08sAn0zkPo3RoUXg0lLZQ6bMrwhVsKXt +=U+hz -----END PGP SIGNATURE----- diff --git a/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r1.ebuild b/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r1.ebuild index 0c107bab2567..393fd5fe13a4 100644 --- a/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r1.ebuild +++ b/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r1.ebuild,v 1.2 2012/01/09 14:53:06 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r1.ebuild,v 1.3 2012/01/09 15:26:53 aballier Exp $ EAPI="3" @@ -35,6 +35,7 @@ src_prepare() { cd "${WORKDIR}/${slot}" epatch "${FILESDIR}/${P}-avutil50.patch" epatch "${FILESDIR}/${P}-ffmpeg.patch" + epatch "${FILESDIR}/${P}-log.patch" done php-ext-source-r2_src_prepare } 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);