Added patch from Debian by Reinhard Tartler (siretart) to support Libav 10; fixes bug #509298, proxied commit for Nikoli.

Package-Manager: portage-2.2.10_p125/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 182 insertions, 11 deletions

diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index f488a2f55e3f..c1d4c29a0e4b 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mplayer2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.121 2014/06/09 19:27:56 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.122 2014/07/13 19:56:14 tomwij Exp $
+
+  13 Jul 2014; Tom Wijsman <TomWij@gentoo.org>
+  +files/mplayer2-2.0_p20131009_support_libav10.patch,
+  mplayer2-2.0_p20131009.ebuild:
+  Added patch from Debian by Reinhard Tartler (siretart) to support Libav 10;
+  fixes bug #509298, proxied commit for Nikoli.
 
   09 Jun 2014; Maxim Koltsov <maksbotan@gentoo.org>
   mplayer2-2.0_p20131009.ebuild, mplayer2-9999.ebuild:
diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest
index bf4e3f916cd7..090417d01202 100644
--- a/media-video/mplayer2/Manifest
+++ b/media-video/mplayer2/Manifest
@@ -3,24 +3,25 @@ Hash: SHA256
 
 AUX generate-tarball.sh 964 SHA256 49ca2e1174e26f73f2dfadb42426f304e30fc2d7f049e577699ecfdf775b9599 SHA512 7141872caebf0e76e92f400f97f0bb540aed071decfb7668cf652d9a6f304cab968355b6d12343001b797d9cbfb113c3a5a272418427391ec7c85404dd618f90 WHIRLPOOL 1adef66fb0889c55f7a095eb1c543935c0a3b4e92ec4d3f086cbfbf9348dac58acec61aa57f0d222376da80cabb0925f3a59215dabf3c93a0baac1e89967d850
 AUX mplayer2-2.0_p20120828-ffmpeg.patch 765 SHA256 2387daac56d711d4a7d32fc15f1b20d787342e4eb21b7cdab44aa04f2b01bc43 SHA512 e5ffa7ba9cba0c381ae37903659aaa050ecde489d7fc011e9375c41800afda08ee6073126a1e1099c4a83deb890b4ebb7ca0af43c3a9664aad8f7546757be140 WHIRLPOOL 1eb7aea177a423dd999e6c4797405bbb61c6f474ec086e9a7b91310fdc51292177fecfbb9191ba6af8326f49791607eb2d09b4201c900d3df3cbeee30a9f29d8
+AUX mplayer2-2.0_p20131009_support_libav10.patch 5172 SHA256 285d5ea88763b2c41e252327b205b268696f807cf8592507648d5b4c3301a398 SHA512 d7efeac8a4db5feee4300707de80d498381f81b96eeb0a61431e7d005d3102b6083d5faaa795c741a8281baf9ee1660da1c0c07463f9525bba09cb7e85c6d6d3 WHIRLPOOL 3a39264ecc09151e412d9f436813f95ecaa8cb42e683274204737c6ebbc860df08cab1828bf3ad0810c0e7cf009a3101c5e2c2d769ee0c8716c37a53a93705ed
 AUX mplayer2-py2compat.patch 2179 SHA256 36e26a89ec03de0e349443ca3ce07c58e408e032200f49c3ce849691589a1cc7 SHA512 a90417c923c36c78d4c8053de89b26f69cd29a01ee37028360c8c564b903ee00ac0d7e98bcaf25220998951f25987cd89ede47b54518736c14abd1e7153e6568 WHIRLPOOL 987c63235be05fd3dbe89e4e291649c6f2176771e07c8515c08725a4e3d54118136b968531565a65c1e83bd754cc51e9bef5493ec2e653dfa4b3278c8bed6cce
 DIST mplayer2-2.0_p20130126.tar.xz 1914780 SHA256 ed68090e1ed2698132065ab4567e2920a6fb9f2f0868efc172f612d6848919f5 SHA512 b54780a0a45619ababf874fe40797a6c73c4adea26469178bbd5bf3396cd1977631622a8e150c02b650cf4a415d1e5d80943fda1e50935d921328022187b65dc WHIRLPOOL b1876eece2223d1b1281aeb1043c1f436c518363a2e720a2eb6be92853cac3ed0dce16b3c4300acffe4746925831ccfddcc24553d5fdcac4cce385701d5625bf
 DIST mplayer2-2.0_p20130428.tar.xz 1911464 SHA256 41e54e6c86761196e111250fd6db79161bfd08f2cccf7d624e9b25b038fdf6c0 SHA512 da0101736b76535d38b1063c3ec7054003c8013f24df949bac26d51deebb41fcb6116af35d3b49bd6d9c1cc76842ab58c8e049a42e70dc5694058e3e6ed44bd8 WHIRLPOOL f97620ec26483e498d21b75fb533d09e41542ca18bb6a5a535c40c33fad34f745966f10a001026766610b6e40754dcecab3dc6292c00532437d2a92cb8d21079
 DIST mplayer2-2.0_p20131009.tar.xz 1907780 SHA256 c105b3804d4d66af29015d4ecd46abbdff75c39d78d5457c535519ecc4d3855a SHA512 8c072bf8fa6a908d3c587e5f26daa6a07098abc8dabd20f77b172e8de5537125873ac1cfc8f07e5616eb0b35aaa73fbab2b30e94a057d220c481dae7740cb3e6 WHIRLPOOL f595c4032371239f1f31f6356d5c7d07534fc8227ba3f1e1452b507ac64baec0747c80b067eaed5fbdc58ee957875a39d9d782eed45b6d797d9a283a34496b78
 EBUILD mplayer2-2.0_p20130126.ebuild 11686 SHA256 9a56cd8eb35665a77423fde35a76c98cc2b091f9837376821fb2271bfb4d94bb SHA512 9be3e0cc59a7166a615cce848be8b09db375a813fe774d221dde9624f79d954f820de092d39248ab79d8703670bbdd072bf670fcca609443c809f098e2fadc54 WHIRLPOOL d3aa4cf4d5a2c48a969c46bbf3bedbde8952026c0f58466fa3ebed5c2e359ae1688c1243f43dc31d2c4d2b0c25f5781cf57df4ca6692a4b064dc2f4aee60b27e
 EBUILD mplayer2-2.0_p20130428-r1.ebuild 10360 SHA256 b7e1021fdbb83a1fbf3b48be3be61325fe040b24b5a062cfd4422ad7c8f4a70c SHA512 7a0a46abea3a6b9a1e292f074437db79bcc6151f123b7555304012f781248f80d54b9526de6b94438774416d51aa3ccc73e4994fabb6190ce4477d3dcc9e6a5d WHIRLPOOL 45c61da51c4f41905448a57abf7840abd6be1dff8d7b2d0b8ed7d2a0a4f6160377edf970c7c937ad5f636f1b23a49be80d5159f66048bdfb3ce8f2927bced3ec
-EBUILD mplayer2-2.0_p20131009.ebuild 10418 SHA256 b5e6c3b308d3af7d08cb04eb837040eb9baddae4c2c1a1d003ce6a48d1488df4 SHA512 61c66083e901c156b90a25d1b2a50e703899f91e12b06fb9e41998df04ab7276add90fa4d61d12ce42676e445417a99b6c45b9b8f0b8dc1571f0b9c52d0a26b5 WHIRLPOOL 5b144a81ec210f9580149a72312a34ea024a380d065c5bc7e448be1c2ab185289221a6f5da98a59b8af87df43b5f460c7622ce034567ffe73e8154a181051874
+EBUILD mplayer2-2.0_p20131009.ebuild 10464 SHA256 18ef573dc51737ee2c106c5a5b7a33298363ccb036947166a18f49f24a71eb19 SHA512 056709f855e36b3b2e6816c0aee60b70cb7b11d0ae26555f2168a2307ba42d9d3a9db09fa50be0aec951c2e5941bb9fd2fde9b262ffdadefb1c011059ba99329 WHIRLPOOL b14bc0ca84ce1a48fc13cc2c720ffdb265adf6f354137771db2b19b043b014e832a843ac12ddf394adf86bdae766646b0d51f14c2707b4585d87bbf4e5dbafc1
 EBUILD mplayer2-9999.ebuild 10410 SHA256 ae8ad7828cb616e3b0ab1e90611a5bd042ca205063f5cadc945cc7ee4b92caba SHA512 e5d530701c4f38fe4084c94d994d362e6c7c4b3d6368fe533c9b5522d7efaac5a539686089852ecb363d66b11fd448a7fa107635f314639e1a7cf2be26cd0f97 WHIRLPOOL d992e3841a432b14fbe66a7bc3488996cf6b08a7d6cb98b11d4bcfd762a88ef83a9ebe5ceeb6d8db0d4591b1cfe4d238e8bc0f3eada61f1e788b4b59544ae670
-MISC ChangeLog 22639 SHA256 e8edaf923a2c0614cb4eca8ca9ebffac16f45474f57d80d064533d156c41a23c SHA512 ff65edd65e6598aa8258cbcd84e32f2325fb5e4379aaffef7f35f0de1d3dda3e66d6daf2d7501c3795e9b4d5551605d9f2caf2fa887b4d07e214ba4c88161364 WHIRLPOOL 3daf97386cde7ca7a5fec5f102df57a330f29ab6facbc476af98070cb1a3db9e618c74b6d4ef3ddae09a21e6db4c5f0c797095e89393f79ce0ef0d3478036114
+MISC ChangeLog 22898 SHA256 f5bf542c0a45d75852e082bbab86eb8d2d49d933f5f99d662233339ba60df5d4 SHA512 25cfc6a0044634a4121753467971ef8b1a01713718095a03225638ff4d65d4f36301d5f2b4d87ebeec9759b8a75fa17d120266ccbbd22dbe86985690507b5a89 WHIRLPOOL 82866eb76ed31423e87c021ec3b2a00f2a6862251458def0d666b13b2e2f2421befcb31d3ce2ae3ead0b8d30860e29114d1f51b698bd9b85b8487c47a98c47b1
 MISC metadata.xml 3147 SHA256 b59a051d61995b8e8f565110f91005df45b271b19f55f12e873160189d523ed9 SHA512 88338f85b67efc54241fb4d6bb91883ee337fcabac184bf7cac2cb971e81bc53fd9bd9fbec1c71a2353ab5f5263218fc673d58f45642a42e9934dcf8240e9c11 WHIRLPOOL 98da9689a06cad004f9056e31766771bdd62274c05ad9334144845ea2be378197343e87c86debec08c6beaff027f82534792b3b76ae444ce7aa3eb2b4dca2cb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTlgq0AAoJEAmJmMX429reRJ8IAKmlTrF2cXm6Bwlys4nnN2oj
-UnLHo4fFZXnezD19ZfBRJ8O3REbZGddC8X6fodTs1YRQ43megCFn+vN2qxkg6ent
-s0+/TqAJJdArzYNRd1uytq9VObiXEWI9o+KlNR8OzDK6jhyLLR7Fp0jo2uMQArAp
-X3iblblSctXm4StKGKdJhGkx90srRzydSk5YMSkL8CwBEb8GTt0oFSdBlVeUgkYJ
-fyzNsSmSWjxAf5IK3w/gAveTONsRitEuVq3EjY0un0ZaXHVAWtLXkT6R4INHUekc
-BOBsTlAYiyRWYMwaZ/PizZDJtNCSMa7AAbVTcU/Pk/PanngVaEJ4hV0WZlSLoNQ=
-=OCyH
+iQEcBAEBCAAGBQJTwuRjAAoJEJWyH81tNOV9rH8IAIR3SAWLvLflNQOk1M2Ge+cL
+5r37sNiyuKEqXiJVz9ZzrYSND9+L6ds3bO1Y7GacR/fILEK6gQKA90o/lGmVVOyB
+593z/JAwlU8etx0bGpeA+HUKSW0xGdDUwC6LIK0mn0Y2VUZDhj3OMav4zbrCTjQm
+4CE3q5uJCn+Po6BElnd6ianlHHLDpCbXO28MTwrd2oOx37ikRAzlk/BocFNb64RT
+paNSVEz9I8bbXzg8rSeReHYuhZR1Xc9TAQHLHXQg+pwzvr20sRpso+GKafAuqg8f
+63mmO0IyIbveKurvwaJK0XaXuTW8cqAGE04lurf2DAbuNF9PqypL7dmxr4nhEUk=
+=Hosi
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer2/files/mplayer2-2.0_p20131009_support_libav10.patch b/media-video/mplayer2/files/mplayer2-2.0_p20131009_support_libav10.patch
new file mode 100644
index 000000000000..6b60f62bf064
--- /dev/null
+++ b/media-video/mplayer2/files/mplayer2-2.0_p20131009_support_libav10.patch
@@ -0,0 +1,163 @@
+Description: Fix compilation against libav10
+ Patch based on work by Anton Khirnov, rebasing on mplayer2 revision
+ 2c378c7 allowed great simplification.
+Author: Reinhard Tartler <siretart@tauware.de>
+Origin: debian
+Bug-Debian: http://bugs.debian.org/739337
+Last-Update: 2014-03-08
+
+--- mplayer2-2.0-728-g2c378c7.orig/Makefile
++++ mplayer2-2.0-728-g2c378c7/Makefile
+@@ -301,7 +301,6 @@ SRCS_COMMON = asxparser.c \
+               libmpcodecs/vf_ilpack.c \
+               libmpcodecs/vf_ivtc.c \
+               libmpcodecs/vf_kerndeint.c \
+-              libmpcodecs/vf_lavc.c \
+               libmpcodecs/vf_lavcdeint.c \
+               libmpcodecs/vf_mirror.c \
+               libmpcodecs/vf_noformat.c \
+--- mplayer2-2.0-728-g2c378c7.orig/screenshot.c
++++ mplayer2-2.0-728-g2c378c7/screenshot.c
+@@ -82,6 +82,7 @@ static int write_png(screenshot_ctx *ctx
+     FILE *fp = NULL;
+     void *outbuffer = NULL;
+     int success = 0;
++    int got_output;
+ 
+     struct AVCodec *png_codec = avcodec_find_encoder(AV_CODEC_ID_PNG);
+     AVCodecContext *avctx = NULL;
+@@ -104,10 +105,8 @@ static int write_png(screenshot_ctx *ctx
+         goto error_exit;
+     }
+ 
++    AVPacket pkt = { 0 };
+     size_t outbuffer_size = image->width * image->height * 3 * 2;
+-    outbuffer = malloc(outbuffer_size);
+-    if (!outbuffer)
+-        goto error_exit;
+ 
+     AVFrame *pic = ctx->pic;
+     avcodec_get_frame_defaults(pic);
+@@ -115,8 +114,8 @@ static int write_png(screenshot_ctx *ctx
+         pic->data[n] = image->planes[n];
+         pic->linesize[n] = image->stride[n];
+     }
+-    int size = avcodec_encode_video(avctx, outbuffer, outbuffer_size, pic);
+-    if (size < 1)
++    int ret = avcodec_encode_video2(avctx, &pkt, pic, &got_output);
++    if (ret < 0 || !got_output)
+         goto error_exit;
+ 
+     fp = fopen(fname, "wb");
+@@ -126,8 +125,9 @@ static int write_png(screenshot_ctx *ctx
+         goto error_exit;
+     }
+ 
+-    fwrite(outbuffer, size, 1, fp);
++    fwrite(pkt.data, pkt.size, 1, fp);
+     fflush(fp);
++    av_free_packet(&pkt);
+ 
+     if (ferror(fp))
+         goto error_exit;
+@@ -139,7 +139,6 @@ error_exit:
+     av_free(avctx);
+     if (fp)
+         fclose(fp);
+-    free(outbuffer);
+     return success;
+ }
+ 
+--- mplayer2-2.0-728-g2c378c7.orig/libmpcodecs/vf.c
++++ mplayer2-2.0-728-g2c378c7/libmpcodecs/vf.c
+@@ -48,7 +48,7 @@ extern const vf_info_t vf_info_flip;
+ extern const vf_info_t vf_info_rotate;
+ extern const vf_info_t vf_info_mirror;
+ extern const vf_info_t vf_info_palette;
+-extern const vf_info_t vf_info_lavc;
++//extern const vf_info_t vf_info_lavc;
+ extern const vf_info_t vf_info_dvbscale;
+ extern const vf_info_t vf_info_cropdetect;
+ extern const vf_info_t vf_info_test;
+@@ -131,7 +131,7 @@ static const vf_info_t *const filter_lis
+ #ifdef CONFIG_LIBPOSTPROC
+     &vf_info_pp,
+ #endif
+-    &vf_info_lavc,
++    //&vf_info_lavc,
+     &vf_info_lavcdeint,
+     &vf_info_screenshot,
+     &vf_info_fspp,
+--- mplayer2-2.0-728-g2c378c7.orig/libvo/vo_png.c
++++ mplayer2-2.0-728-g2c378c7/libvo/vo_png.c
+@@ -52,8 +52,6 @@ static int z_compression;
+ static int framenum;
+ static int use_alpha;
+ static AVCodecContext *avctx;
+-static uint8_t *outbuffer;
+-int outbuffer_size;
+ 
+ static int
+ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
+@@ -87,9 +85,10 @@ config(uint32_t width, uint32_t height,
+ 
+ 
+ static uint32_t draw_image(mp_image_t* mpi){
++    AVPacket pkt = { 0 };
+     AVFrame pic;
+     int buffersize;
+-    int res;
++    int res, got_output;
+     char buf[100];
+     FILE *outfile;
+ 
+@@ -105,22 +104,18 @@ static uint32_t draw_image(mp_image_t* m
+ 
+     pic.data[0] = mpi->planes[0];
+     pic.linesize[0] = mpi->stride[0];
+-    buffersize = mpi->w * mpi->h * 8;
+-    if (outbuffer_size < buffersize) {
+-        av_freep(&outbuffer);
+-        outbuffer = av_malloc(buffersize);
+-        outbuffer_size = buffersize;
+-    }
+-    res = avcodec_encode_video(avctx, outbuffer, outbuffer_size, &pic);
+ 
+-    if(res < 0){
++    res = avcodec_encode_video2(avctx, &pkt, &pic, &got_output);
++
++    if(res < 0 || !got_output){
+  	    mp_msg(MSGT_VO,MSGL_WARN, "[VO_PNG] Error in create_png.\n");
+             fclose(outfile);
+ 	    return 1;
+     }
+ 
+-    fwrite(outbuffer, res, 1, outfile);
++    fwrite(pkt.data, pkt.size, 1, outfile);
+     fclose(outfile);
++    av_free_packet(&pkt);
+ 
+     return VO_TRUE;
+ }
+@@ -157,8 +152,6 @@ static void uninit(void)
+     if (avctx)
+         avcodec_close(avctx);
+     av_freep(&avctx);
+-    av_freep(&outbuffer);
+-    outbuffer_size = 0;
+ }
+ 
+ static void check_events(void){}
+--- mplayer2-2.0-728-g2c378c7.orig/libmpdemux/demux_lavf.c
++++ mplayer2-2.0-728-g2c378c7/libmpdemux/demux_lavf.c
+@@ -422,8 +422,8 @@ static void handle_stream(demuxer_t *dem
+          * heuristic makes up works with subtitles in practice.
+          */
+         double fps;
+-        if (st->r_frame_rate.num)
+-            fps = av_q2d(st->r_frame_rate);
++        if (st->avg_frame_rate.num)
++            fps = av_q2d(st->avg_frame_rate);
+         else
+             fps = 1.0 / FFMAX(av_q2d(st->time_base),
+                               av_q2d(st->codec->time_base) *
diff --git a/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild b/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild
index d752899ac103..4431130e0679 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20131009.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-video/mplayer2/mplayer2-2.0_p20131009.ebuild,v 1.2 2014/06/09 19:27:56 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009.ebuild,v 1.3 2014/07/13 19:56:14 tomwij Exp $
 
 EAPI=5
 
@@ -164,6 +164,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-py2compat.patch"
+	epatch "${FILESDIR}/${P}_support_libav10.patch"
 	epatch_user
 
 	# fix path to bash executable in configure scripts