diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-02-11 16:09:52 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-02-11 16:09:52 +0000 |
commit | f78108598211053d41752a83e0345441bb9014ae (patch) | |
tree | dd2fc7ae0a1aea7bda4942ab0c453d1e55284b37 /media-video/mpv | |
parent | dc45b83b28fb83e9659492066e347b8dc60bc9e3 (diff) |
gentoo resync : 11.02.2018
Diffstat (limited to 'media-video/mpv')
-rw-r--r-- | media-video/mpv/Manifest | 18 | ||||
-rw-r--r-- | media-video/mpv/files/0.18.0/mpv-0.18.0-fix-doc-build.patch | 23 | ||||
-rw-r--r-- | media-video/mpv/files/0.18.0/mpv-0.18.0-fix-fbo-resize-memleak.patch | 27 | ||||
-rw-r--r-- | media-video/mpv/files/0.18.0/mpv-0.18.0-fix-height-alignment-on-xv.patch | 66 | ||||
-rw-r--r-- | media-video/mpv/files/0.18.0/mpv-0.18.0-fix-initial-av-sync.patch | 42 | ||||
-rw-r--r-- | media-video/mpv/files/mpv-0.25.0-fix-float-comparisons-in-tests.patch | 61 | ||||
-rw-r--r-- | media-video/mpv/metadata.xml | 4 | ||||
-rw-r--r-- | media-video/mpv/mpv-0.18.0-r1.ebuild | 306 | ||||
-rw-r--r-- | media-video/mpv/mpv-0.25.0-r2.ebuild | 5 | ||||
-rw-r--r-- | media-video/mpv/mpv-0.26.0.ebuild | 3 | ||||
-rw-r--r-- | media-video/mpv/mpv-0.27.0-r1.ebuild | 3 | ||||
-rw-r--r-- | media-video/mpv/mpv-0.28.0.ebuild | 1 |
12 files changed, 76 insertions, 483 deletions
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 02c7ea9877ea..26fb0e23e73a 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,25 +1,19 @@ -AUX 0.18.0/mpv-0.18.0-fix-doc-build.patch 831 BLAKE2B b96ae8909ea8ca3d365d8d2c151bc677e69bd38018dde435692e57e0815bead583fdf990c12d144b8621d5fd42f8b5094870aa2ecf9457624329f340fc321870 SHA512 6cc45a7cf6a46ab27d1d5e6385b6f63afe06e38d70711dbcb8fcc2bf84bbbda89b8da9d2385a3cbbf2f3520399a12c996246cda19d5bb06457b2fa5fda210f1e -AUX 0.18.0/mpv-0.18.0-fix-fbo-resize-memleak.patch 1210 BLAKE2B 3446085dc6fcf593699b2c22c0092c6be0461c5eda7bbd3ca4979bb4d3ff55db0169bd99136ca1a76303d36828f03c382b60f771aeacd65e6d76571fb0ec4764 SHA512 646cd1a2ba058d8103a912a62aea6f0c8f89ade398ea71c3a63bccfb7bf30d33e3833bf20e8d88b2fd47fd61a0839adeea0e8140d05093a67544522fd9882aaf -AUX 0.18.0/mpv-0.18.0-fix-height-alignment-on-xv.patch 2936 BLAKE2B 69c1a579c95dbe032e9c98748458e5fb45aa23cf2b8e36205875f7d2f4aa435c1382234eefc16581d33b5a8b9c99847429908df2a06253a7875149ba6d803a31 SHA512 7bdaf3a416100b488279095067d8b4f63c11655223586724cbe0a1462b9c29866ba049f46c74e70abfe9871881ffc41d5f0348363806f2b4df259700d610bb4f -AUX 0.18.0/mpv-0.18.0-fix-initial-av-sync.patch 1590 BLAKE2B a9ec7dbcbcdaf8f7a3074d720e26f07ded341840219724e2bbeb85e40e92935b18a6bce588edeb019a692cea1742b7b7d941dd7ce61e7ce73847c006698d49c9 SHA512 7c083b34c70bafb04fa19cad0562c5de7c5181239907a7671b0a8ec905d711fa7982e0de2954fc664148c1db063e85318665cb550db162961d4ef117410e39f1 AUX 0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch 1456 BLAKE2B e74c5828301daa303ee1fa826b96b06827ca6fa8fc9652cb6cd6f6e1fd82e002f4023a97c239cf332881a4f6686ea9b9d786d31e57fea7c1e06edecfc5877c2a SHA512 42cb00778b84157eff45d5143c3e1a232f7c98377d33aa9dbbb30122e678458168fe651b959656f00916a86069b727e814a6b8a9a7d10cd58f45dace2db32ef7 AUX 0.27.0/mpv-0.27.0-fix-wrong-colors-with-hwdec.patch 2102 BLAKE2B 507ffa5983e2988889f82de786771bc4ff8ba6d5c7ca32cf16443e76906a93a101861098aa5e5c58c48b0eeeac0db74e787b1a8b452115d1ce45888d6ac37e5c SHA512 b2bfcb9529e2b90f786b3277a54018dedc3d8f38db5bf1f45c2df365ea297f05fc93524d225a308078b353f7be3c830e4091070a30a6ca30d767b8d207cb01bd AUX 0.27.0/mpv-0.27.0-remove-duplicate-android-option.patch 996 BLAKE2B 67988decbfe56b78541ba8786d4a12d124177278b424fad796ce814bb3befefce9dd9ffa7048eb727676769f3273a35137b184151ad1f1f9bdaf73c22bbf6fdd SHA512 cb2e04515da4f4d1154f489327ec282b75e71c8257477ac2f2602bb21b7c2765b2b6ebc7e5c7e1f6a57f271a804e694a9bf8dd25aa71b34fa13ab7a0ee21283e AUX 0.27.0/mpv-0.27.0-support-libva2.patch 2918 BLAKE2B c9e217ebc0e42b56c327f8437a396dcb523ceeba3d2c2684a62babacb6bd3db636cd2e23e3311e0c57000e261f74b7c693aa128eedbb9b3f6f48d85e04beca3a SHA512 ece9f59d7875ba881bc9e913c3e44449401e0cc0bcfd46493f4c0d167e853bac9033fd7af2c15056768289709ec2a8d6b54c571360c140bbec3fd9d947c6b50b AUX mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch 1456 BLAKE2B 0d360a6470830fd2c76cc75a1712976112bdfc8269d04ec42de054d1f63d3e028b9ee61adc7d49500479f0f14955a627a34d797b512a9a9f976bc6b45b1e47b6 SHA512 f4865f5ed364012f1cba98c7522f43050c158e36f0100350e87db18636913bdad0b668c62283362366aba10f58db13297d21b111596475200283471d7da058a6 AUX mpv-0.23.0-make-libavdevice-check-accept-libav.patch 694 BLAKE2B 655bf30240ac95f63385bd3bb3c5c9da264aedfb20c2e4abbf43d17dbdb9f5f7a79c6b8d056f6bec32144be87a23b88f0722d6193ad216771bd9e220ef7efa76 SHA512 15861e0f27598c626a5f39319b473483d5d1cec26ca2aad928f6cc751568d7c6eab9bac479665677da92c5c962a3060a8b7cc02899390702e7fed370c28d9a6e -DIST mpv-0.18.0.tar.gz 2758960 BLAKE2B 5ab201a9c8ed34d2a880cc8f81426ff130ae74867e6ed4d1475f47da8ae3d62be8df9fd3e1476f4f15d1721c05f1972cb1c6c9e0ade6b27d0732b1946f0ed4a6 SHA512 5a899ea680b4da6d668a6e77a254e623bafef16f376ee46639e40f151da5a000de84b382f2b07f3a1e87b60fc8e524132767fdf243e36474966af11a88277437 +AUX mpv-0.25.0-fix-float-comparisons-in-tests.patch 2096 BLAKE2B 88cfe962f3c9901e39837a8c890d0d07f362f3f5b2c1d9adc6cadffddb19bf38b918c76bdeb1d634a62ad09115c1d4adcfe218a3202843542d1d751e60e1d449 SHA512 46fdb40f0eafc9fdbf180d0334de5b57a3949b4479835750462414a996272da3ae816d62f58fc986f448045e4e8f8121cebbad19a0a031c589f5ed346a210875 DIST mpv-0.25.0-patches-r2.tar.xz 11036 BLAKE2B 09fdd566c5fcca290829c536c9e41b655e254d64e63714281119d62e6963f07f8d384eccb3f8ea6ccb2a9b63a60e19bb7ff1fd4b8e4ccccdc9b1fd8e58a7c628 SHA512 fc8d2a23dff27131d2c18d3f91861ec6e6d5240e6531d1a04c06ebef8d5467250c4f131d9faee802842e1ea485dbf350b43a3eebcc13c230cd45ff875fc855e2 DIST mpv-0.25.0.tar.gz 2874584 BLAKE2B c64321b50fd635f82bbcbce5cdefee1d0da011558cebdacd3339aaa14162f659c955bea75341ed21096eea5b689e4c1ca4d2d97feff1f4026044ddd61bdd9944 SHA512 eefc574e2995ddf6bd15c9b62986a5ca277c30949b036d57a11bbfb796c11c1e6dd7c313abd91a909dd98ca0f2b0be29ec6b980d0287a5891b42b0ffba926cbf DIST mpv-0.26.0.tar.gz 2916212 BLAKE2B b6402868face65c1179351697eff02116765eecdd105eef621faa73dc77f376aa060476bc80b92eba4839c46836c13bce0e56c6dccf0fe1aa49b1cfa463ec43e SHA512 fd772b4765317eb1ea3b54f12b86e0ac6c4d5e9d16895eb5bebe2e074a01f6b790981b9b34a87d9b23e4291149d3a7154b09fba4a259cec1949a6aa88d6ddec7 DIST mpv-0.27.0.tar.gz 2956816 BLAKE2B 2af0fc7edbecb552fd7df93dcd9124fd4e30a2c29aa53d2139f2817356a6c4eb82eed74a8fdf0493ebb0315cb2806d76a8b2d8c24706975acf4d4704fd291dac SHA512 22738f907d84d362095773972f685e3b03ab4c8172a22ddede290fc221a83ab9135b96f8b18191dabe842b2963f68983929cf065097287fc1a054a7d5f1d0ae4 DIST mpv-0.28.0.tar.gz 2982165 BLAKE2B 50f095d499df9685dec958287c159fc88be3b5db1465264404ba7c74184569ba47c147cb6491342ba8762199290f408737d03403e454a180bd0ed8b7191d14cc SHA512 33e889f9ca2dd16ad055ccd9fc5549fcead3fd15dcbc52c6b5f3ef608cf87b3d9952e9236e3dec8e7f32240b68d0b0cff1499f511d39c8f3a0501334f5c57a70 -DIST waf-1.8.12 97567 BLAKE2B 99f68b37163b67d511fe6f917b12ec3764dff7c62c4d4408f56559b497dc69f9a1b17a915fe519451f30e7a8ad1113cfad423fa23e3392e055b3bc3c1e149ca8 SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28fdb58dfcf7ae9c7833d053d298280e26e94b18af70a66fc13d08adf1fc7f9ad9b81e70d95cc74fc SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2 -EBUILD mpv-0.18.0-r1.ebuild 8452 BLAKE2B 0d6b675cba5587a1330991c634af72b537a80130045fa8784816a48062cb7870e434fbf721515b23ba16f328788781ba5052d53bf449934389984b9d43c6a330 SHA512 67506868d59230a1333fb89822e7c3d6e8652bc43c53c1c41afd980d5b6f76e01a64ee39a9f0debcb57cad000aa141b8f2dd5d909157072f1abc2ca00600725e -EBUILD mpv-0.25.0-r2.ebuild 10838 BLAKE2B 38cf2272870a4c0ca913ff007bd7e86c892039308f1b3067001bf873d8e01e87756a2579f47e0b73c7c7cc047f0775c9ea30ad14ae1aff1ba5cbb08cd7234e45 SHA512 328533ba4c5a9714a604b6d71da5dcd076113988382e17406f5fb88f11eba83a7ad7b25ab59aff86de6d1b42f0878edc2eef953f17d337bdaa1e3f15189ec4e0 -EBUILD mpv-0.26.0.ebuild 10557 BLAKE2B 2c330a98e946fd306144b6fa1f8554c93aabad75f64d286681257ce991ce9e1be37e0789ae960532c039ea3ac2623becfa6c7eea4b67cde277ce558808437930 SHA512 ffda8bdf4691643e6619334fe1b401c367c8ce7a0a3bc61494a27ad888c8121d045d22111bb98c72551a15d5dbf6e3b34252681a8642be8fa92785cb2b40944e -EBUILD mpv-0.27.0-r1.ebuild 10546 BLAKE2B 03096c1e04283da1c0deb3c31a68d6289d2dff7ce40d94027def753364e0cb0db64985fbe7aacb04740bafcaf1552979bd34d045700226f5206017a2500ae376 SHA512 a1fed55edbb1e93e10821f8ff78911cf3c8b2fad285b90b78ecc46f271e7c872d4066d2163b716eeb2de8c96f200cf053ad70a4a2e962769e00dc23781da22c3 -EBUILD mpv-0.28.0.ebuild 10286 BLAKE2B c4ce38c3f3b3a312e00c4229d1d1db8e8327f5d9392c3480b67ae66c4d6e65788331e5a3b5f8e00db12b0122c76e70abe6331f7a5a0a2078eda5a0dcfdf5161a SHA512 443932b6709c33fcabf209db06dae7860cf7a1329336fd6def619d2cfab619e1e4453b7cf870d672494042bf0210afdd402a807aa6b4d9272b8930ad23e2d40a +EBUILD mpv-0.25.0-r2.ebuild 10902 BLAKE2B fa9ae811c53d01d32b8288696436783f9cf434d04255c45ae5efb73d68821afe5bfc3a2548fde646e11b35b4329ca61fc4bf3d18e7277538274a10440cde9069 SHA512 00c1edd4c77e859fc03d8cbadfefa7278bceb94d788d1306478fbf7b7535225c15e6dc65058eccf8251b9e6f3a4f9ce7ba04bfbc2065ccff13416fc5a32ebb7b +EBUILD mpv-0.26.0.ebuild 10622 BLAKE2B 4a1f7e2dc861811e3aa5b8ed431f2aaeb29d8074e63cc396e0fa479b11ae37179f754ced934bc6c61a3e0acfb6364d0c0fc98a20aeca852602ea287fc9471884 SHA512 dd00d0b0a0d21612c8b1235b8905bf586b022410f254cdf3d944dd7146845d58d75d8480a5f2c5b3521feb576f586093eec7f89da9f7eacfb3f6bdc55e5deb36 +EBUILD mpv-0.27.0-r1.ebuild 10611 BLAKE2B 90ca794f83fefcb510c85652bbcd5e189dd7c3a7554071f2348806032edc3b8989cb313d94c443aeffa861a541145305ce21d0b8d794e15eb8aeb26198d684b2 SHA512 07ee2752322684f398aba5f1bad5e3140b84d8f395523a62158e58d7616c2b9d6cf98e8513bd31639852c7905d8b59b02fd6a70621b7776c758ebc3793203d26 +EBUILD mpv-0.28.0.ebuild 10351 BLAKE2B 723a63983cbd7f4109b1a0dd4a36d2501368e8d3ad32e3879cec388858df77b5e3c65c55977aeed3bdeb3bf99be5be720761f15265532f37e55bb530f46ea2a5 SHA512 7cd80b8251161588786a4c0104429441b5e9ecd56cbb81af587977eb66c7177100c4ac0f239ac0f2b3587994897d75b04ecc19e26bfb0554312c8cc114c5b0d4 EBUILD mpv-9999.ebuild 10286 BLAKE2B 8866ee5e4817eeeabed02799640ff4390ecc32c922d255052e4a2d171e157296c71b8438fb6ea9a0ed2276c54a38e9dc320cfb9ffc27f0625c3a5630051d1e15 SHA512 dd71019d9a8533a475c1bae6c7d720b4b59b72b7f2d031e314c9bebc810446d2f3a27b6c7376e6d498b7965b1c8bb9c6a9cc21306dd8528866b3bbfd1a3d3486 -MISC metadata.xml 2605 BLAKE2B f904ae1613a39130a0cf0b5c784e8f20e698548bff742f9bacda64b2337cb1f8a8995bcc6402fb56e7a5a18d26938c6a964619a9c51962f72e7c092ee968fcf7 SHA512 44088b7e21ef2adb8b69cdb9b7bb3db9874f5c4cf5668d8adca219f0ae7e3b8ae6c0d329ad8489bbf3a95ec5333455d95209d897f239a9c015c6c97acb7f8826 +MISC metadata.xml 2376 BLAKE2B c585e5f1e6e5c91ad9c3ad25de75bde9f01188950bafdf016c2f3b55a5cc74e48775667e173962178f13bbae5b40d2a386144bba7343ec21a2b60f2ee9c1c6c7 SHA512 8da450ad8b003eacfc8aab85b8774206163305750c559e4e7e4e8a56b4e3c398f9cea970430b37d26069c6ec333a4ae860c012a63d702dfb24dc65089edaa604 diff --git a/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-doc-build.patch b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-doc-build.patch deleted file mode 100644 index 26c8f72d4dae..000000000000 --- a/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-doc-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 4a4a9f330281ad11eb39a013bf7308063767bab8 -Author: Martin Herkt <lachs0r@srsfckn.biz> -Date: Fri Jul 15 12:57:12 2016 +0200 - -man: fix PDF build error - -ReportLab really doesn’t like breaking inline literals, so insert an -explicit line break. - -Fixes #3338 - -diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst -index 9a251ae..74d17a6 100644 ---- a/DOCS/man/options.rst -+++ b/DOCS/man/options.rst -@@ -588,6 +588,7 @@ Video - :videotoolbox: requires ``--vo=opengl`` (OS X 10.8 and up only) - :videotoolbox-copy: copies video back into system RAM (OS X 10.8 and up only) - :dxva2: requires ``--vo=opengl:backend=angle`` or -+ - ``--vo=opengl:backend=dxinterop`` (Windows only) - :dxva2-copy: copies video back to system RAM (Windows only) - :d3d11va: requires ``--vo=opengl:backend=angle`` (Windows only) diff --git a/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-fbo-resize-memleak.patch b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-fbo-resize-memleak.patch deleted file mode 100644 index 9407f15283d5..000000000000 --- a/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-fbo-resize-memleak.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 3abf9c9204e2fcbc1910deb102efab4ab9d8c149 -Author: Niklas Haas <git@nand.wakku.to> -Date: Wed Jun 8 17:32:40 2016 +0200 - -vo_opengl: don't constantly resize the output FBO - -Commit 883d3114 seems to have (accidentally?) dropped the FBOTEX_FUZZY -from the output_fbo resize, which means that current master will keep -resizing and resizing the FBO as you change the window size, introducing -severe memory leaking after a while. (Not sure why that would cause -memory leaks, but I blame nvidia) - -Either way, it's bad for performance too, so it's worth fixing. - -diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c -index bd1eb89..6c7646b 100644 ---- a/video/out/opengl/video.c -+++ b/video/out/opengl/video.c -@@ -2791,7 +2791,7 @@ void gl_video_render_frame(struct gl_video *p, struct vo_frame *frame, int fbo) - { - fbotex_change(&p->output_fbo, p->gl, p->log, - p->vp_w, abs(p->vp_h), -- p->opts.fbo_format, 0); -+ p->opts.fbo_format, FBOTEX_FUZZY); - dest_fbo = p->output_fbo.fbo; - p->output_fbo_valid = true; - } diff --git a/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-height-alignment-on-xv.patch b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-height-alignment-on-xv.patch deleted file mode 100644 index 5033157251fb..000000000000 --- a/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-height-alignment-on-xv.patch +++ /dev/null @@ -1,66 +0,0 @@ -commit 22c76e85db88a772e3360892cd3a673a89c6fc7a -Author: wm4 <wm4@nowhere> -Date: Sat Jun 25 12:44:42 2016 +0200 - -vo_xv: fix behavior with odd sizes - -The size check introduced in commit d941a57b did not consider that Xv -can round up the image size to the next chroma boundary. Doing that -makes sense, so it can't certainly be considered server misbehavior. - -Do 2 things against this: allow if the server returns a larger image (we -just crop it then), and also allocate a properly aligned image in the -first place. - -diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c -index 1e7ae7c..a5a4728 100644 ---- a/video/out/vo_xv.c -+++ b/video/out/vo_xv.c -@@ -533,6 +533,8 @@ static bool allocate_xvimage(struct vo *vo, int foo) - struct vo_x11_state *x11 = vo->x11; - // align it for faster OSD rendering (draw_bmp.c swscale usage) - int aligned_w = FFALIGN(ctx->image_width, 32); -+ // round up the height to next chroma boundary too -+ int aligned_h = FFALIGN(ctx->image_height, 2); - #if HAVE_SHM && HAVE_XEXT - if (x11->display_is_local && XShmQueryExtension(x11->display)) { - ctx->Shmem_Flag = 1; -@@ -546,7 +548,7 @@ static bool allocate_xvimage(struct vo *vo, int foo) - ctx->xvimage[foo] = - (XvImage *) XvShmCreateImage(x11->display, ctx->xv_port, - ctx->xv_format, NULL, -- aligned_w, ctx->image_height, -+ aligned_w, aligned_h, - &ctx->Shminfo[foo]); - if (!ctx->xvimage[foo]) - return false; -@@ -569,7 +571,7 @@ static bool allocate_xvimage(struct vo *vo, int foo) - ctx->xvimage[foo] = - (XvImage *) XvCreateImage(x11->display, ctx->xv_port, - ctx->xv_format, NULL, aligned_w, -- ctx->image_height); -+ aligned_h); - if (!ctx->xvimage[foo]) - return false; - ctx->xvimage[foo]->data = av_malloc(ctx->xvimage[foo]->data_size); -@@ -578,16 +580,16 @@ static bool allocate_xvimage(struct vo *vo, int foo) - XSync(x11->display, False); - } - -- if ((ctx->xvimage[foo]->width != aligned_w) || -- (ctx->xvimage[foo]->height != ctx->image_height)) { -- MP_ERR(vo, "Got XvImage with incorrect size: %ux%u (expected %ux%u)\n", -+ if ((ctx->xvimage[foo]->width < aligned_w) || -+ (ctx->xvimage[foo]->height < aligned_h)) { -+ MP_ERR(vo, "Got XvImage with too small size: %ux%u (expected %ux%u)\n", - ctx->xvimage[foo]->width, ctx->xvimage[foo]->height, - aligned_w, ctx->image_height); - return false; - } - - struct mp_image img = get_xv_buffer(vo, foo); -- img.w = aligned_w; -+ mp_image_set_size(&img, aligned_w, aligned_h); - mp_image_clear(&img, 0, 0, img.w, img.h); - return true; - } diff --git a/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-initial-av-sync.patch b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-initial-av-sync.patch deleted file mode 100644 index c2cacc3bff7a..000000000000 --- a/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-initial-av-sync.patch +++ /dev/null @@ -1,42 +0,0 @@ -commit 614efea3e67a435f3330820c3dc8b402535641e8 -Author: wm4 <wm4@nowhere> -Date: Fri Jul 1 15:51:34 2016 +0200 - -ad_lavc: work around braindead ffmpeg behavior - -The libavcodec wmapro decoder will skip some bytes at the start of the -first packet and return each time. It will not return any audio data in -this state. - -Our own code as well as libavcodec's new API handling -(avcodec_send_packet() etc.) discard the PTS on the first return, which -means the PTS is never known for the first packet. This results in a -"Failed audio resync." message. - -Fixy it by remember the PTS in next_pts. This field is used only if the -decoder outputs no PTS, and is updated after each frame - and thus -should be safe to set. - -(Possibly this should be fixed in libavcodec new API handling by not -setting the PTS to NOPTS as long as no real data has been output. It -could even interpolate the PTS if the timebase is known.) - -Fixes the failure message seen in #3297. - -diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c -index f48993f..0316f6b 100644 ---- a/audio/decode/ad_lavc.c -+++ b/audio/decode/ad_lavc.c -@@ -186,6 +186,12 @@ static int decode_packet(struct dec_audio *da, struct demux_packet *mpkt, - struct priv *priv = da->priv; - AVCodecContext *avctx = priv->avctx; - -+ // If the decoder discards the timestamp for some reason, we use the -+ // interpolated PTS. Initialize it so that it works for the initial -+ // packet as well. -+ if (mpkt && priv->next_pts == MP_NOPTS_VALUE) -+ priv->next_pts = mpkt->pts; -+ - int in_len = mpkt ? mpkt->len : 0; - - AVPacket pkt; diff --git a/media-video/mpv/files/mpv-0.25.0-fix-float-comparisons-in-tests.patch b/media-video/mpv/files/mpv-0.25.0-fix-float-comparisons-in-tests.patch new file mode 100644 index 000000000000..5498b99a3c76 --- /dev/null +++ b/media-video/mpv/files/mpv-0.25.0-fix-float-comparisons-in-tests.patch @@ -0,0 +1,61 @@ +commit f4f24c105f9c132e84cba9a9707acc261033a816 +Author: Ilya Tumaykin <itumaykin@gmail.com> +Date: Thu Feb 1 14:05:06 2018 +0300 + +tests: stop comparing floats against DBL_EPSILON, use FLT_EPSILON + +Fixes #5253. + +diff --git a/test/gl_video.c b/test/gl_video.c +index a2d2577e25..6b5f3a7060 100644 +--- a/test/gl_video.c ++++ b/test/gl_video.c +@@ -4,22 +4,22 @@ + static void test_scale_ambient_lux_limits(void **state) { + float x; + x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 16.0); +- assert_double_equal(x, 2.40f); ++ assert_float_equal(x, 2.40f); + + x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 64.0); +- assert_double_equal(x, 1.961f); ++ assert_float_equal(x, 1.961f); + } + + static void test_scale_ambient_lux_sign(void **state) { + float x; + x = gl_video_scale_ambient_lux(16.0, 64.0, 1.961, 2.40, 64.0); +- assert_double_equal(x, 2.40f); ++ assert_float_equal(x, 2.40f); + } + + static void test_scale_ambient_lux_clamping(void **state) { + float x; + x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 0.0); +- assert_double_equal(x, 2.40f); ++ assert_float_equal(x, 2.40f); + } + + static void test_scale_ambient_lux_log10_midpoint(void **state) { +@@ -27,7 +27,7 @@ static void test_scale_ambient_lux_log10_midpoint(void **state) { + // 32 corresponds to the the midpoint after converting lux to the log10 scale + x = gl_video_scale_ambient_lux(16.0, 64.0, 2.40, 1.961, 32.0); + float mid_gamma = (2.40 - 1.961) / 2 + 1.961; +- assert_double_equal(x, mid_gamma); ++ assert_float_equal(x, mid_gamma); + } + + int main(void) { +diff --git a/test/test_helpers.h b/test/test_helpers.h +index 7a61da82ea..49328f623f 100644 +--- a/test/test_helpers.h ++++ b/test/test_helpers.h +@@ -10,6 +10,7 @@ + #include <math.h> + #include <float.h> + +-#define assert_double_equal(a, b) assert_true(fabs(a - b) <= DBL_EPSILON) ++#define assert_double_equal(a, b) assert_true(fabs((a) - (b)) <= DBL_EPSILON * fmax(fabs(a), fabs(b))) ++#define assert_float_equal(a, b) assert_true(fabsf((a) - (b)) <= FLT_EPSILON * fmaxf(fabsf(a), fabsf(b))) + + #endif diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml index d04429058905..b69462424a7e 100644 --- a/media-video/mpv/metadata.xml +++ b/media-video/mpv/metadata.xml @@ -21,15 +21,13 @@ <flag name="cuda">Enable hardware video decoding via Nvidia CUDA</flag> <flag name="drm">Enable Kernel Mode Setting / Direct Rendering Manager based video output</flag> <flag name="egl">Enable support for various EGL-based video outputs / backends</flag> - <flag name="enca">Enable subtitles charset discovery via <pkg>app-i18n/enca</pkg></flag> <flag name="gbm">Enable Graphics Buffer Manager based EGL video backend</flag> <flag name="jpeg">Enable support for saving screenshots in JPEG format</flag> <flag name="libass">Enable OSD (On Screen Display) and subtitles support via <pkg>media-libs/libass</pkg></flag> - <flag name="libguess">Enable subtitles charset discovery via <pkg>app-i18n/libguess</pkg></flag> <flag name="libmpv">Build mpv shared library</flag> <flag name="lua">Enable Lua scripting, OSC (On Screen Controller) GUI and <pkg>net-misc/youtube-dl</pkg> hook-script</flag> <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag> - <flag name="opengl" restrict=">=media-video/mpv-0.25.0">Enable the recommended 'opengl' video output</flag> + <flag name="opengl">Enable the recommended 'opengl' video output</flag> <flag name="raspberry-pi">Enable support for the Raspberry Pi</flag> <flag name="rubberband">Enable high quality pitch correction via <pkg>media-libs/rubberband</pkg></flag> <flag name="sdl">Enable <pkg>media-libs/libsdl2</pkg> based video and audio outputs diff --git a/media-video/mpv/mpv-0.18.0-r1.ebuild b/media-video/mpv/mpv-0.18.0-r1.ebuild deleted file mode 100644 index b13860ffdf49..000000000000 --- a/media-video/mpv/mpv-0.18.0-r1.ebuild +++ /dev/null @@ -1,306 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -PYTHON_REQ_USE='threads(+)' - -WAF_PV=1.8.12 - -inherit fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs waf-utils - -DESCRIPTION="Media player based on MPlayer and mplayer2" -HOMEPAGE="https://mpv.io/" - -if [[ ${PV} != *9999* ]]; then - SRC_URI="https://github.com/mpv-player/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux" - DOCS=( RELEASE_NOTES ) -else - EGIT_REPO_URI="https://github.com/mpv-player/${PN}.git" - inherit git-r3 -fi -SRC_URI+=" https://waf.io/waf-${WAF_PV}" -DOCS+=( README.md ) - -# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC. -LICENSE="GPL-2+ BSD ISC" -SLOT="0" -IUSE="+alsa aqua archive bluray cdda +cli coreaudio doc drm dvb dvd +egl +enca - encode gbm +iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua - luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl - selinux test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama - +xscreensaver +xv zsh-completion" - -REQUIRED_USE=" - || ( cli libmpv ) - aqua? ( opengl ) - egl? ( || ( gbm X wayland ) ) - enca? ( iconv ) - gbm? ( drm egl ) - lcms? ( || ( opengl egl ) ) - libguess? ( iconv ) - luajit? ( lua ) - test? ( || ( opengl egl ) ) - uchardet? ( iconv ) - v4l? ( || ( alsa oss ) ) - vaapi? ( || ( gbm X wayland ) ) - vdpau? ( X ) - wayland? ( egl ) - xinerama? ( X ) - xscreensaver? ( X ) - xv? ( X ) - zsh-completion? ( cli ) -" - -COMMON_DEPEND=" - !libav? ( >=media-video/ffmpeg-2.4:0=[encode?,threads,vaapi?,vdpau?] ) - libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] ) - sys-libs/zlib - alsa? ( >=media-libs/alsa-lib-1.0.18 ) - archive? ( >=app-arch/libarchive-3.0.0:= ) - bluray? ( >=media-libs/libbluray-0.3.0 ) - cdda? ( dev-libs/libcdio-paranoia ) - drm? ( x11-libs/libdrm ) - dvb? ( virtual/linuxtv-dvb-headers ) - dvd? ( - >=media-libs/libdvdnav-4.2.0 - >=media-libs/libdvdread-4.1.0 - ) - egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) - iconv? ( - virtual/libiconv - enca? ( app-i18n/enca ) - libguess? ( >=app-i18n/libguess-1.0 ) - uchardet? ( app-i18n/uchardet ) - ) - jack? ( virtual/jack ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( >=media-libs/lcms-2.6:2 ) - libass? ( - >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] - virtual/ttf-fonts - ) - libcaca? ( >=media-libs/libcaca-0.99_beta18 ) - lua? ( - !luajit? ( <dev-lang/lua-5.3:= ) - luajit? ( dev-lang/luajit:2 ) - ) - openal? ( >=media-libs/openal-1.13 ) - opengl? ( !aqua? ( virtual/opengl ) ) - pulseaudio? ( media-sound/pulseaudio ) - raspberry-pi? ( - >=media-libs/raspberrypi-userland-0_pre20160305-r1 - media-libs/mesa[egl,gles2] - ) - rubberband? ( >=media-libs/rubberband-1.8.0 ) - samba? ( net-fs/samba[smbclient(+)] ) - sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] ) - v4l? ( media-libs/libv4l ) - vaapi? ( >=x11-libs/libva-1.4.0[drm?,X?,wayland?] ) - wayland? ( - >=dev-libs/wayland-1.6.0 - >=x11-libs/libxkbcommon-0.3.0 - ) - X? ( - x11-libs/libX11 - x11-libs/libXext - >=x11-libs/libXrandr-1.2.0 - opengl? ( x11-libs/libXdamage ) - vdpau? ( >=x11-libs/libvdpau-0.2 ) - xinerama? ( x11-libs/libXinerama ) - xscreensaver? ( x11-libs/libXScrnSaver ) - xv? ( x11-libs/libXv ) - ) -" -DEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} - >=dev-lang/perl-5.8 - dev-python/docutils - virtual/pkgconfig - doc? ( dev-python/rst2pdf ) - test? ( >=dev-util/cmocka-1.0.0 ) - v4l? ( virtual/os-headers ) -" -RDEPEND="${COMMON_DEPEND} - selinux? ( sec-policy/selinux-mplayer ) -" - -PATCHES=( - "${FILESDIR}/${PV}/${P}-fix-height-alignment-on-xv.patch" - "${FILESDIR}/${PV}/${P}-fix-initial-av-sync.patch" - "${FILESDIR}/${PV}/${P}-fix-fbo-resize-memleak.patch" - "${FILESDIR}/${PV}/${P}-fix-doc-build.patch" -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then - die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3." - fi -} - -src_prepare() { - cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die - chmod +x "${S}"/waf || die - default_src_prepare -} - -src_configure() { - local mywafargs=( - --confdir="${EPREFIX}/etc/${PN}" - --docdir="${EPREFIX}/usr/share/doc/${PF}" - - $(usex cli '' '--disable-cplayer') - $(use_enable libmpv libmpv-shared) - - # See deep down below for build-date. - --disable-libmpv-static - --disable-static-build - --disable-optimize # Don't add '-O2' to CFLAGS. - --disable-debug-build # Don't add '-g' to CFLAGS. - - $(use_enable doc html-build) - $(use_enable doc pdf-build) - $(use_enable vf-dlopen vf-dlopen-filters) - $(use_enable zsh-completion zsh-comp) - $(use_enable test) - - $(use_enable iconv) - $(use_enable samba libsmbclient) - $(use_enable lua) - $(usex luajit '--lua=luajit' '') - $(use_enable libass) - $(use_enable libass libass-osd) - $(use_enable encode encoding) - $(use_enable bluray libbluray) - $(use_enable dvd dvdread) - $(use_enable dvd dvdnav) - $(use_enable cdda) - $(use_enable enca) - $(use_enable libguess) - $(use_enable uchardet) - $(use_enable rubberband) - $(use_enable lcms lcms2) - --disable-vapoursynth # Only available in overlays. - --disable-vapoursynth-lazy - $(use_enable archive libarchive) - - --enable-libavdevice - - # Audio outputs: - $(use_enable sdl sdl2) # Listed under audio, but also includes video. - --disable-sdl1 - $(use_enable oss oss-audio) - --disable-rsound # Only available in overlays. - $(use_enable pulseaudio pulse) - $(use_enable jack) - $(use_enable openal) - --disable-opensles - $(use_enable alsa) - $(use_enable coreaudio) - - # Video outputs: - $(use_enable aqua cocoa) - $(use_enable drm) - $(use_enable gbm) - $(use_enable wayland) - $(use_enable X x11) - $(use_enable xscreensaver xss) - $(use_enable X xext) - $(use_enable xv) - $(use_enable xinerama) - $(use_enable X xrandr) - $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa') - $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11') - $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11') - $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm') - $(use_enable wayland gl-wayland) - $(use_enable vdpau) - $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11') - $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl. - $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11') - $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland') - $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm') - $(use_enable libcaca caca) - $(use_enable jpeg) - --disable-android - $(use_enable raspberry-pi rpi) - $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl') - - # HWaccels: - # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. - $(use_enable vaapi vaapi-hwaccel) - # Automagic VDPAU HW acceleration. See Gentoo bug 558870. - - # TV features: - $(use_enable v4l tv) - $(use_enable v4l tv-v4l2) - $(use_enable v4l libv4l2) - $(use_enable v4l audio-input) - $(use_enable dvb dvbin) - - # Miscellaneous features: - --disable-apple-remote # Needs testing first. See Gentoo bug 577332. - ) - - if use vaapi && use X; then - mywafargs+=( - $(use_enable opengl vaapi-glx) - $(use_enable egl vaapi-x-egl) - ) - fi - - if ! use egl && ! use opengl && ! use raspberry-pi; then - mywafargs+=(--disable-gl) - fi - - # Create reproducible non-live builds. - [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date) - - waf-utils_src_configure "${mywafargs[@]}" -} - -src_install() { - waf-utils_src_install - - if use cli && use luajit; then - pax-mark -m "${ED}"usr/bin/${PN} - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - - # bash-completion < 2.3-r1 already installs (mostly broken) mpv completion. - if use cli && ! has_version '<app-shells/bash-completion-2.3-r1' && \ - ! has_version 'app-shells/mpv-bash-completion'; then - elog "If you want to have command-line completion via bash-completion," - elog "please install app-shells/mpv-bash-completion." - fi - - if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \ - has_version 'app-shells/mpv-bash-completion'; then - elog "If command-line completion doesn't work after mpv update," - elog "please rebuild app-shells/mpv-bash-completion." - fi -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} - -src_test() { - cd "${S}"/build/test || die - for test in *; do - if [[ -x ${test} ]]; then - ./"${test}" || die "Test suite failed" - fi - done -} diff --git a/media-video/mpv/mpv-0.25.0-r2.ebuild b/media-video/mpv/mpv-0.25.0-r2.ebuild index c5ddc81267da..636102c7fe78 100644 --- a/media-video/mpv/mpv-0.25.0-r2.ebuild +++ b/media-video/mpv/mpv-0.25.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ if [[ ${PV} != *9999* ]]; then https://github.com/mpv-player/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~kensington/distfiles/${P}-patches-${PR}.tar.xz " - KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~x86 ~amd64-linux" + KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux" DOCS=( RELEASE_NOTES ) else EGIT_REPO_URI="https://github.com/mpv-player/${PN}.git" @@ -136,6 +136,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" "${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch" + "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch" ) mpv_check_compiler() { diff --git a/media-video/mpv/mpv-0.26.0.ebuild b/media-video/mpv/mpv-0.26.0.ebuild index 164672738f85..c3ff2f124af7 100644 --- a/media-video/mpv/mpv-0.26.0.ebuild +++ b/media-video/mpv/mpv-0.26.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -141,6 +141,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" "${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch" + "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch" ) pkg_setup() { diff --git a/media-video/mpv/mpv-0.27.0-r1.ebuild b/media-video/mpv/mpv-0.27.0-r1.ebuild index fd90c09f204f..558adb5ce720 100644 --- a/media-video/mpv/mpv-0.27.0-r1.ebuild +++ b/media-video/mpv/mpv-0.27.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -141,6 +141,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" "${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch" + "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch" ) pkg_setup() { diff --git a/media-video/mpv/mpv-0.28.0.ebuild b/media-video/mpv/mpv-0.28.0.ebuild index 9e4020ca8237..23b6694770d7 100644 --- a/media-video/mpv/mpv-0.28.0.ebuild +++ b/media-video/mpv/mpv-0.28.0.ebuild @@ -132,6 +132,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" + "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch" ) pkg_setup() { |