diff options
Diffstat (limited to 'media-video')
48 files changed, 114 insertions, 1851 deletions
diff --git a/media-video/2mandvd/2mandvd-1.8.5.ebuild b/media-video/2mandvd/2mandvd-1.8.5.ebuild deleted file mode 100644 index f272c5b4e872..000000000000 --- a/media-video/2mandvd/2mandvd-1.8.5.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -LANGS="cs de en it ru" - -inherit qt4-r2 - -MY_PN="2ManDVD" - -DESCRIPTION="The successor of ManDVD" -HOMEPAGE="http://kde-apps.org/content/show.php?content=99450" -SRC_URI="http://download.tuxfamily.org/${PN}/${MY_PN}-${PV}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug libav" - -DEPEND="libav? ( media-video/libav:= ) - !libav? ( media-video/ffmpeg:0= ) - media-libs/libsdl - virtual/glu - virtual/opengl - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 -" -RDEPEND="${DEPEND} - || ( app-cdr/cdrkit app-cdr/cdrtools ) - dev-lang/perl - media-fonts/dejavu - media-gfx/exif - media-libs/netpbm - media-sound/sox - media-video/dvdauthor - media-video/ffmpegthumbnailer - media-video/mjpegtools - media-video/mplayer[encode] -" - -S=${WORKDIR}/${MY_PN} - -PATCHES=( - "${FILESDIR}/${PN}-1.7.3-libav.patch" - "${FILESDIR}/${PN}-1.8.5-libavformat54.patch" - "${FILESDIR}/${PN}-1.8.5-gcc6.patch" - "${FILESDIR}/${PN}-1.8.5-ffmpeg3.patch" -) - -src_prepare() { - # Clean backup files - find . -name "*~" -delete || die - - # Delete useless chmod that violates the sandbox - sed -i -e '/chmod/d' ${MY_PN}.pro || die - - # Fix desktop file - sed -i -e '/^Categories=/s/GNOME;AudioVideo;//' ${MY_PN}.desktop || die - - qt4-r2_src_prepare -} - -pkg_postinst() { - elog "You may wish to install media-video/xine-ui and/or build" - elog "media-sound/sox with USE=mad for improved media handling support." -} diff --git a/media-video/2mandvd/Manifest b/media-video/2mandvd/Manifest deleted file mode 100644 index 90322dbd92a5..000000000000 --- a/media-video/2mandvd/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX 2mandvd-1.7.3-libav.patch 269 BLAKE2B 61441fd7534b963f04ec3ce0dd0661bf608e61b152512dc8933e36e4481915d63cafc1eff09a809f8001e2f70376dd989ef07d2c2e37543fc983027d9d7fee07 SHA512 fc6d557ee3bf81f388f3f76b57a76364d1c68105d89391eaad74f2a429e1847d97a937c627ca28085dd3e9c12d9b882e0ffa68ffe9ba7b917faa9e952a8de0c5 -AUX 2mandvd-1.8.5-ffmpeg3.patch 1469 BLAKE2B c059c22b3303abb5a34a7d7b4be0290a44aee390e6ab58953a39a67a73680a470b77d0565ea3ea14784f09d67e38efe62b7c7fee616f5b671f18f0bea5f49631 SHA512 369a5eedb48b630b26e786bb1492047d59a76ab2e84c9c21230236253ccbf55ce36f4cc9a0b7aba214d7dcbfe567e183a50cea12b2b146f5a6599bc4d04c905d -AUX 2mandvd-1.8.5-gcc6.patch 531 BLAKE2B 9dde4b57e38c34bc43ba259e6d9f8e136f542c06d333e2663de3de1ffd597011d5e67093311b0111aa5c21703d54499270226862a4c90628a1907587d69d1f05 SHA512 8598d2ba4bdc10bcda46c86749e03647971ed517218ffea1c78d314351a53013ac28fd7755f9640e8601d9f0c360c352507d1a614ee7573cc4f8512f670a7d09 -AUX 2mandvd-1.8.5-libavformat54.patch 819 BLAKE2B 415f614476cba867ded3c148e8e88fc9b00dd96c37fc9476a16d4aec25b910ba69dccd6f906ca0558b1558ec78335ed5c26de79e21cb779dfbc8d38f2adbfcb9 SHA512 ff1500e95646966258890983a37abdd42eb4509d1bb084fd901cc9ab420be1108cb2b7fe3d3db1c92c453c8ae3a2ebc60218fe4994ca7f3fc91feaffcdc23b61 -DIST 2ManDVD-1.8.5.tar.gz 29525071 BLAKE2B 7d1a4f8942fe29e29703ea9a13953f587cd482945676ee85dd8643291c3c680e280b12dbd7fe9eabecf2883251ce4ebede6a66154859ae5f65f7b83d8bbb642f SHA512 1e43034cab310ce0a642afdfcb2b4ddbc47b16b0f353adebd1fd2ec5f8445add41226390c6656e7cb520d9900e1b482adee7adb6f784d2fbfbaff2334feb3284 -EBUILD 2mandvd-1.8.5.ebuild 1482 BLAKE2B 38e560cb330aa86c7029853ae91fba2990ccc48dc659364f5fe220c43449495e3488cda0ddb8d6715a3a704f2bd01efdb92ad0e87f8e401118b8e86cd27ca6c4 SHA512 81377876f32a2ada7f81731dbf6f9d0d93a6e0e3b23bff50b0da4498de229d8b1e8ec4bb156a78818b55dbbc26cf150ed28919d1bb2cc3ec7e653517575bac2a -MISC metadata.xml 488 BLAKE2B 53a04b2d5e86186f120e6976cb1997057bf1d5c2e03cbd87e1b5da3ffed2b610ffe5dcf195703a6005d3e90f8703b6c84be124ff8e3de94c5a1d5f39b3491bcf SHA512 dae3fe802d60f26713643abbdf7fdbcb42abf1d188c0a4160aae5fc10cb3dda72b32a63148f7946b38b57c73af756b1ad2ac78757077e1e74a168e6a5fa708a5 diff --git a/media-video/2mandvd/files/2mandvd-1.7.3-libav.patch b/media-video/2mandvd/files/2mandvd-1.7.3-libav.patch deleted file mode 100644 index 59dfd1e33a1e..000000000000 --- a/media-video/2mandvd/files/2mandvd-1.7.3-libav.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- videowrapper.h -+++ videowrapper.h -@@ -11,6 +11,7 @@ - #include <libavutil/common.h> - #include <libavcodec/avcodec.h> - #include <libavformat/avformat.h> -+ #include <libavutil/mathematics.h> - #include <libswscale/swscale.h> - } - diff --git a/media-video/2mandvd/files/2mandvd-1.8.5-ffmpeg3.patch b/media-video/2mandvd/files/2mandvd-1.8.5-ffmpeg3.patch deleted file mode 100644 index 29ffc95ffa82..000000000000 --- a/media-video/2mandvd/files/2mandvd-1.8.5-ffmpeg3.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: 2ManDVD/videowrapper.cpp -=================================================================== ---- 2ManDVD.orig/videowrapper.cpp -+++ 2ManDVD/videowrapper.cpp -@@ -99,11 +99,11 @@ int videowrapper::load_video(QString fil - - img_convert_ctx = sws_getContext(pCodecCtx->width, - pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width, -- pCodecCtx->height, PIX_FMT_RGB24, SWS_BICUBIC, NULL, -+ pCodecCtx->height, AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, - NULL, NULL); - - // *** ON DETERMINE LA TAILLE DU BUFFER *** -- numBytes=avpicture_get_size(PIX_FMT_RGB24, pCodecCtx->width, -+ numBytes=avpicture_get_size(AV_PIX_FMT_RGB24, pCodecCtx->width, - pCodecCtx->height); - buffer=(uint8_t *)av_malloc(numBytes*sizeof(uint8_t)); - old_frame = -1; -@@ -120,10 +120,10 @@ QImage videowrapper::read_frame(int64_t - if ( num_frame != old_frame ) - { - // *** ALLOCATE VIDEO FRAME *** -- pFrameRGB=avcodec_alloc_frame(); -- pFrame=avcodec_alloc_frame(); -+ pFrameRGB=av_frame_alloc(); -+ pFrame=av_frame_alloc(); - -- avpicture_fill((AVPicture *)pFrameRGB, buffer, PIX_FMT_RGB24, -+ avpicture_fill((AVPicture *)pFrameRGB, buffer, AV_PIX_FMT_RGB24, - pCodecCtx->width, pCodecCtx->height); - av_seek_frame(pFormatCtx,videoStream,0, AVSEEK_FLAG_FRAME); - compte_frame = -1; diff --git a/media-video/2mandvd/files/2mandvd-1.8.5-gcc6.patch b/media-video/2mandvd/files/2mandvd-1.8.5-gcc6.patch deleted file mode 100644 index 5a16d95ef17f..000000000000 --- a/media-video/2mandvd/files/2mandvd-1.8.5-gcc6.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: 2ManDVD/tetrahedron.h -=================================================================== ---- 2ManDVD.orig/tetrahedron.h -+++ 2ManDVD/tetrahedron.h -@@ -83,7 +83,6 @@ public: - float scale_factor; - float wg_x; - float wdecal; -- GLfloat light_position[]; - - GLfloat anag_x; - GLfloat anag_y; -@@ -427,6 +426,8 @@ private: - void dropEvent(QDropEvent *); - void dragEnterEvent(QDragEnterEvent *); - Qt::DropActions supportedDropActions () const; -+public: -+ GLfloat light_position[]; - }; - - #endif diff --git a/media-video/2mandvd/files/2mandvd-1.8.5-libavformat54.patch b/media-video/2mandvd/files/2mandvd-1.8.5-libavformat54.patch deleted file mode 100644 index 89ecc4d23c60..000000000000 --- a/media-video/2mandvd/files/2mandvd-1.8.5-libavformat54.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/videowrapper.cpp b/videowrapper.cpp -index 7ae4ad3..d50599b 100644 ---- a/videowrapper.cpp -+++ b/videowrapper.cpp -@@ -38,7 +38,7 @@ void videowrapper::delete_videowrapper() - int videowrapper::load_video(QString filename) - { - // *** OUVERTURE DU FICHIER VIDEO *** -- #ifdef avformat_open_input -+ #if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,5,0) - if (avformat_open_input(&pFormatCtx,filename.toAscii().data(),NULL,NULL)!=0) - { - #else -@@ -91,13 +91,8 @@ int videowrapper::load_video(QString filename) - - // *** OUVERTURE DU CODEC *** - -- #ifdef av_find_stream_info -- if(avcodec_open(pCodecCtx, pCodec)<0) -- { -- #else - if (avcodec_open2(pCodecCtx, pCodec, NULL) < 0) - { -- #endif - qDebug() << "CAN'T FIND VIDEO CODEC"; - return 1; - } diff --git a/media-video/2mandvd/metadata.xml b/media-video/2mandvd/metadata.xml deleted file mode 100644 index 21d7a2254405..000000000000 --- a/media-video/2mandvd/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> -</maintainer> -<use> - <flag name="linguas_cs">Czech locale</flag> - <flag name="linguas_de">German locale</flag> - <flag name="linguas_en">English locale</flag> - <flag name="linguas_it">Italian locale</flag> - <flag name="linguas_ru">Russian locale</flag> -</use> -</pkgmetadata> diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex 10e6838a2c99..a8efabd08ba7 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/bdsup2sub++/Manifest b/media-video/bdsup2sub++/Manifest index aebf199ea980..f8438bf48677 100644 --- a/media-video/bdsup2sub++/Manifest +++ b/media-video/bdsup2sub++/Manifest @@ -1,4 +1,4 @@ AUX bdsup2sub++-1.0.2-hidden-config.patch 1761 BLAKE2B 523f827ea794ffc38ecf09ff08e6bdc26acee3e2e0ded6835ca78b36fdbe188ceab2d7e5f41af73f42153dfcba31a423e376571f2d9496e78fe8dc93878ee9c9 SHA512 851759e87387f3bb4536f7cfc79db1ca3ec095448d4ba29bc9258288d8e2d010689dd64c423e4d300796b2f601eb820a58c3ef4339d5cbcfafb9adac9345a7d8 DIST bdsup2sub++-1.0.2.tar.gz 301413 BLAKE2B b5651623f4a49378e4069a868410cd0a5ca7acc772cc1b30f788cc8ee355b570e7b2aea131867974530b4a0986f7cb9faffdd2fd86581cf5f730d6f7016b916e SHA512 181cd241588d0fe9217b4534c377af745ff04bcf1af5fbff44c821ec8e45063bb5df0bef0b5d8ba6a9f24740387959487c6e2d3964bfefd935a098ad525b8102 EBUILD bdsup2sub++-1.0.2.ebuild 637 BLAKE2B 1f3f7d41cd461161e8f0361acb22c92d1892dee058b342e91e30467ce007ca010154d5add41caf00a5044994178fcd537cc970a67cfdfad62fe0042ec97afba8 SHA512 7164a28718280e5df09417088ecbcaf7dc44f593129fc4760f518638df8230e74ae0082be512511cfeb29950b6d950d13c60a002b1413365d9a41f6cb78c7f48 -MISC metadata.xml 915 BLAKE2B eabcd95ca336b98d58de501c1ad1e62891abb464a6cac166934a845d215c656a2aacf570b6d9531766f0d8e18cf819ede56d4713d9659aaf4e151c563684ae5d SHA512 c68b63e1078c9e2314fa21d204421bdda0dd6c521bec461723d95ca84b17e8668eb4b7a4d944bc1b2f6bdf7ad130d3af5d54055d50c561ccc8100a3f5a6bfb24 +MISC metadata.xml 838 BLAKE2B 038fdad805f1b92f9337dc4c67456219812e23ab814dc664b90638831a3f5bfa49def12f425a161e11b88c4007911247f5f59e1d1e023734c8be771d2402b11b SHA512 815da95f92b4ad0b2e2e4c9c04b92d51613f5e08f7722af7d597c1d350adca7a02bf8e231917c3f17e95bf7bc484f44ccf39cf73650973c4833d44a60894d766 diff --git a/media-video/bdsup2sub++/metadata.xml b/media-video/bdsup2sub++/metadata.xml index d02dde92d43c..83f720c7ec2f 100644 --- a/media-video/bdsup2sub++/metadata.xml +++ b/media-video/bdsup2sub++/metadata.xml @@ -4,7 +4,6 @@ <maintainer type="person"> <email>sautier.louis@gmail.com</email> <name>Louis Sautier</name> - <description>Proxied maintainer; set to assignee in all bugs</description> </maintainer> <maintainer type="project"> <email>proxy-maint@gentoo.org</email> diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest index 6cf09b0998e6..c627f1ea92fa 100644 --- a/media-video/dvdauthor/Manifest +++ b/media-video/dvdauthor/Manifest @@ -3,5 +3,5 @@ AUX dvdauthor-0.7.2-imagemagick7.patch 850 BLAKE2B 9347652fe9d8c46691ef0143dc388 DIST dvdauthor-0.7.1.tar.gz 421324 BLAKE2B 34d7f20cc7f8a5f8ea10cfd1404a15b04e909a343e008da18035f6bf78de7b4f16729b3c2ba5ebedd7bd12e72a801874d99d5c1e6f7458a311501e07afc11788 SHA512 0875300df4711bf5758cb8a3ec03793689abd403cdebfc5736463d9b6df49a22e66e9e1f0c2abfcb7d25469c2e7f7e76789f7779cc0743ec972f8965b0f744a9 DIST dvdauthor-0.7.2.tar.gz 648305 BLAKE2B e3c918e101be1627b32d19a4ba17e676593ce260c72c4a1126acc691d9dec484e3d70817abfa1f1542d5a29d603ecbd9226e305caadd77abfb1278125f7d6c64 SHA512 202b8bba38939d122dc864921a57e89906ca99ddabf44e3b07419cc42cc052567cd892b41f1171c9c195c9a770758e9319a942ea64d14ee8fa847588c7761125 EBUILD dvdauthor-0.7.1-r1.ebuild 1179 BLAKE2B e812e3d0702e464680c98ed47a6216250ed449e7e884993339b2bbd9ef1ab50c1e21464cead9cd54b0b18872931a7d99e170ca676976884b96d727ceb71ec669 SHA512 5b32d4c47c63cf0fc42be1b50d6175a18ab61f629bc731fb965c441b0f99dc7e4f2bef6646afac2dfa751cd4bf72d5a1ac6149bafa83274f472ae427cbae72b0 -EBUILD dvdauthor-0.7.2-r1.ebuild 1271 BLAKE2B ee3897af93ce50828e2bfc662681668053d2ff74834f765626fe70a2b951180be69e306dbb72f288a1a81bcfb3a22e7574debd43fe945257f978abce66f74c78 SHA512 48eaf0e684f7abfe1ccccc2f3036c41a73461d8967718d9d691f298503724a40c0c7ea68cb0f3bf983107b1a0e2613fe1b810eafc7c2bcefd0cc2a2d73776ed2 +EBUILD dvdauthor-0.7.2-r1.ebuild 1270 BLAKE2B fbaeaf26c7e1eadca226d1b54591b967a599dc94a1470798bb5740eb8f97a95a86f2e0eabfdc482f8c20e2edec576d381c3c75bb7a7cde3ae5cd30fc670477f2 SHA512 a206699088977e1f98fa813ba10d7b550a07313bc68b083b7cb78414bb04e80bf19f9490cde95be0a84e68f664ccf3b3c728506f8819e1bf883020625a316475 MISC metadata.xml 310 BLAKE2B 98950538160adf1178a053c79da3802c04ef0ae8c45436df86f5da69c4ad200e38b971134dfc4d94c90f061502247a45d39d319b6bff1ec3f4e3cd3a9c432ac5 SHA512 e9f2f78be647d48778accbf7da1d1b925dd8c441fa07743c776eee3362bf75f57a7051a7805ad1b2ab76a5958a18ae1b889ccb006da66d3197fefb0498e1f0c4 diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild b/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild index 9a101476c604..6ac055e70b4b 100644 --- a/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild +++ b/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ppc64 ~sparc ~x86" +KEYWORDS="amd64 ppc ppc64 ~sparc x86" IUSE="graphicsmagick +imagemagick" REQUIRED_USE="^^ ( graphicsmagick imagemagick )" diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest index 02132e682c09..ae24af475cd1 100644 --- a/media-video/ffdiaporama/Manifest +++ b/media-video/ffdiaporama/Manifest @@ -4,4 +4,4 @@ DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 74337dcb935eedf DIST ffdiaporama_rsc_2.2.devel.2014.0503.tar.gz 18390602 BLAKE2B 58c38d1f62ec04b217add232873556cf57d13cd17ef672f2087b44c0aac9ee7bc890de3bb812cb1c57093565b06de51ed0ddb0465d9b7fce21311fedf51042a3 SHA512 73faafe54d7d9a3d8d91719ac56cec7323e0a497f77e0c9f243d84782aa6040677236d9e41d3b539c45d6aca2448d737912ec59bd2a7e417749ee548cd68652d DIST ffdiaporama_texturemate_1.0.2014.0125.tar.gz 30352923 BLAKE2B af558994a811508ff6b0f1dc34f33c60fca0a4f40c1cf675e08925b40c8312444a20ea95b0a0c9316225806096e9bbb209faf3e48b74041604c6d81be0175aba SHA512 e9aa9607d670a620b2e3c27d6ec5bf983eb31ab3d3139edf32ebb84d9ffa58b11c822f7db4b3f3c4a430b256719803df4a3a385bd467bdda09f8710d010eb2f5 EBUILD ffdiaporama-2.2_pre20140701-r1.ebuild 2043 BLAKE2B 0a935a359fa358838f74caa04769cbcf3be6b41ce278b5e0036fc49e40cbebc3d25acecb7c191bdcb868fda58928f32ceb76dfe5591e7ea56db57bd1b9e40e19 SHA512 67cc4b9a694ba1ef521c11dd4f02613d3035e7a59247ed95d5ee87a8ed46f65e9dcdcc03759fdd39e84f5bf98d9fb49ae96a7766e333d6ac439b532603750979 -MISC metadata.xml 2318 BLAKE2B e83dfffb315aa1cd69db71adf162fcd99579c9b0679c71bfabed3a5a48cc1b4b92b8f93dca7d4fc38e9d80b26dde542308db5784269404d0da3d543767439067 SHA512 7e1181a2cc8a5cd739ebf3a8ee34cdfd5c8fed4fe36c65da136a0ca9b479f0f11f7911ab09d32424d64027f01e3d0d3d1616f01eb903d2dab051eee3f68424bc +MISC metadata.xml 2256 BLAKE2B d224c6932982a05615b3e5094f1f1aa077682cbbe6589ea9806f47a604e7b51063c8382d542b474a078094657690cc8f785889efa696d2aca25f38ea8b3c9369 SHA512 9672bf9ac08cbd33e4effc8456c152edb1d2d7985fd21028ef06b9698077052c509b29d3f72311b5b62d36400c8cda45699026e91cb92f5d63f2f1f10597bbb6 diff --git a/media-video/ffdiaporama/metadata.xml b/media-video/ffdiaporama/metadata.xml index 60cbff526e13..84064cda7423 100644 --- a/media-video/ffdiaporama/metadata.xml +++ b/media-video/ffdiaporama/metadata.xml @@ -4,7 +4,6 @@ <maintainer type="person"> <email>olivier.laurantin@laposte.net</email> <name>Olivier Laurantin</name> - <description>Proxy maintainer. CC him on bugs</description> </maintainer> <maintainer type="project"> <email>proxy-maint@gentoo.org</email> diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index d1432644a857..b8d9988bc691 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -13,7 +13,7 @@ EBUILD ffmpeg-3.2.6.ebuild 15078 BLAKE2B 5d8e389481ae3ddbd2848fedc7292cdb2131b2c EBUILD ffmpeg-3.2.7.ebuild 15083 BLAKE2B 313da834e164cca1c3fd1fdef6fb0094aefd8b2f752e28895a292221e5005b5d496e480a9dffc779790ee4036121e18fea8ded2eacd5c9e34aa51fc335c11688 SHA512 2645eada5e381a5df2b3972dee7435f51dea461f4535796ededcc4f705979b289c48c289f3384bb58bbe1b6f64dadfda10e2c9d1674bf00d566dfe107f52a42e EBUILD ffmpeg-3.3.4.ebuild 16107 BLAKE2B 2dabd381f934dde36e6a1cd25c9c44a93a702bc09f41718649a4bf7139eb18b7854b93350e3b46df1be87fe5f1421683f24a3173431b69901527b7cc63bb97db SHA512 ed129a8ee9f66bed5c2ab724114ed77ad345e7dec13f541ede5371ca442352b2e16666a715c30bac967210464d970bd4728c7753bd08dd542478d43da83b598b EBUILD ffmpeg-3.3.5.ebuild 16109 BLAKE2B 53b38d47499dc3ec2d9cf5864ef35999032894dc100d935221ef34294610c980d058288c3ff177b4e4ecd21933426cc57a60611133bf74db9065a09bffcb8f11 SHA512 5a3d8e7d84d0cbe1e23918263be4ef1f379f563c81be266d7e7a8333674f056f69db6e3f88fb8e0521a7f4944fd427c5e91f66b277a19b7029834be9810aa616 -EBUILD ffmpeg-3.3.6.ebuild 16112 BLAKE2B 9ed6f79b8077b4cb8402963ef7a48bed40a5cfd2cd277ae1fe2a05862927593e060ee18414f0f4226857038c253b4e44e302dfea3e50b3fda610fbc631e7fc02 SHA512 6ca88a7099bfb63c04b6e4a4580de3b4523e58eb04e730da24de4abdd48d7583757f050dc8259cc31090ca34abe06d0741d8f66481b9b3ee380d109008ce3d7c +EBUILD ffmpeg-3.3.6.ebuild 16111 BLAKE2B cfd38b5c31fa6ac16ff08a5693a97dc4de04146a3c841d501ece315b3d4eb717d95a0033b336b02e2f96fb1c201ba6a4a940e0617e995e3cc888bc0681b995e1 SHA512 a2c764effeb92ba71d9563cca131fb0ad6bec842f4e9369152fa93d4a148f142b39aeae895457934dc668cf2c6db0de13bbc5cf7b7c915c3dcc0b0376d6b27a7 EBUILD ffmpeg-3.4.1.ebuild 15673 BLAKE2B e5b0aecb018af1733c0c013e132e1c5060cff109421a54f63953e4df3a15a275d746981003533e5e4bdc5ade07d2ff17977e93a0a603dc7f5bb82dfe459a69e5 SHA512 061a487f8791b210ef2e593eb5e78382b158113f61b771f92c7c51e17d3d436056f22441f814ed81d23e5b4c3c6281b7853a48433731a89dc142aac08b5d2f39 EBUILD ffmpeg-9999.ebuild 16057 BLAKE2B 262d140c3b9e9eb2f663336a77cfa94610401bcc41e5bb81ab50b7eead6bcef70a70b1ce314196557c7f334ff42e7aacdbb5914d50b8611f5a1cba8a77d0314d SHA512 bfdcf1a4c23372da65eb2be595e05975f1b28677ef04a101ee9150b6347a61f4b634a4e50a78a5b58c4514453d523550d5a2af4929a2d03e1ff9525cee454381 MISC metadata.xml 5618 BLAKE2B cfca20347486aaead0039c0a256f31949609fd3c15f35273bd783657052fe8675f08e60cfe0df4c567b88f44f801d17326b6eb77ef39324e3e45e57b09a6001f SHA512 7a235250f9177343afb6ffcf6a3ff77bdc7cf028fd2c26bf84c05c049ebb89ce9d489a86b6b37d1e90262b8b3995c57f201586737e293458d2747ed1bf12e3c3 diff --git a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild index c081af04fa2b..6d2547849fd6 100644 --- a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild +++ b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild @@ -54,7 +54,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi # Options to use as use_enable in the foo[:bar] form. diff --git a/media-video/kamoso/Manifest b/media-video/kamoso/Manifest index 7f69915784fd..eafbf2fc5de4 100644 --- a/media-video/kamoso/Manifest +++ b/media-video/kamoso/Manifest @@ -1,3 +1,3 @@ DIST kamoso-3.2.4.tar.xz 178976 BLAKE2B 2e2bb53fa18f9a1a92653ead8175a01a10409021bd04b2f45cb4bc603d931f93176e6215c1d85a8ac667602fbce1c1c3a9123a078c08293496d9c5cf137e298c SHA512 5665887e00e61c37a6079ad4fda800a507a57c3da6ee76daffb63e59d23c69e8b76063fc1383f5ef5f8c7fc3b91fee2f6e8ebe41945ca26a6a12e07249bacf2b -EBUILD kamoso-3.2.4.ebuild 821 BLAKE2B 12caf8d9017a7a8119e1acc91d4763790336ed5bb63bfbe426cb3f777a4aba1908470b43aa63ca317ac5186212382ca68ff48658e2e20369412be62f36ed27a1 SHA512 26e42304681e8c9cf10f6fbe6c7030ca720f773b30424bbcdd830c9be1081799c1ddd2b6670ef1415dc891aca9eff3cfe63f6acea6523ba9826fb4d594718bac +EBUILD kamoso-3.2.4.ebuild 827 BLAKE2B b523fcfeb19c20d205c30d1bc52ce0488201bab08ee99542c95f5504697944be7cd7aaf629bb70e4318be326c4d36f8d0a90f7e5738b2b7a44d3bf6892785f9a SHA512 2fa5b06830e718aecf6ae179c31f44c360bdf4c14493cbbaa2a59719a7fa7e3f1500551929fcd193802921070179fef12c675d7252ad9bf2620c19de4acbf069 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/media-video/kamoso/kamoso-3.2.4.ebuild b/media-video/kamoso/kamoso-3.2.4.ebuild index a6e202fdda52..061fb9aa08c7 100644 --- a/media-video/kamoso/kamoso-3.2.4.ebuild +++ b/media-video/kamoso/kamoso-3.2.4.ebuild @@ -23,7 +23,7 @@ DEPEND=" $(add_qt_dep qtdeclarative) $(add_qt_dep qtgui) $(add_qt_dep qtwidgets) - dev-libs/purpose:5 + kde-frameworks/purpose:5 media-libs/qt-gstreamer[qt5(+)] virtual/libudev:= " diff --git a/media-video/mjpg-streamer/Manifest b/media-video/mjpg-streamer/Manifest index 83bd74496681..1e5553dda6e3 100644 --- a/media-video/mjpg-streamer/Manifest +++ b/media-video/mjpg-streamer/Manifest @@ -8,4 +8,4 @@ DIST mjpg-streamer-0_pre20120621.tar.bz2 471546 BLAKE2B 3ede2a60062bba7c91ddfa0d EBUILD mjpg-streamer-0_pre20120421.ebuild 1707 BLAKE2B 72eb00d6fe7e93540bfd7789dd51464e8a4118fbe1b18230c563a041218842a42af2a5a4c043778e51ef2604c52880e67de52f7e0181c2e885aa294173075a21 SHA512 fe6810679cbb16391a73a75e38a5d3b0ee679fb615cdfb95a15dd72d9f37dac632681cac2532b329c573c9894680f46cf83fd410fe566c2c5289319e5b1d2a7e EBUILD mjpg-streamer-0_pre20120621-r1.ebuild 1846 BLAKE2B 97c6a5c51438ba1dae539f1760b7324beabb24538ff0d08b9ea234a67ecb56dbc9166b3a7a6f1182ae028b0489e9413bb686972d73b7c8e3f512abd36c50e4cc SHA512 02684add56270f3504787c487cc653e72fc6f28f13e517371a2d6fa1c341b0f5d497f4608201fcba116e36eeee6c3a123592a0959e260185d5943514fe9b66f8 EBUILD mjpg-streamer-0_pre20120621.ebuild 1787 BLAKE2B 36e9c64bc23509474ee3b2b4f54da0b57a400ae1ae057c872c68d3e1b64aa518f51f71b30be8e7f906c2e1b2612debd096f7e774ca0483bec3eaeb8195672263 SHA512 9cb6b725c59089b33daec349c9570d0528430354a7faefce39008ab269b4ae42476a762a1cd39e97195b70a04112fc265e79c6ef6e831c458c7c0144fbb5cb7e -MISC metadata.xml 2051 BLAKE2B c7839a0cd026d1c30cd42a038ddf4d8e7da21d35ee571383568a7710b206c9a92854046abed81eecee0ea237a24484c5a4b78740937d5efa2e2e49cd7729a1f9 SHA512 2b63ebfc69af90d1da59619a88ad4752c08d7522a9830e2b59be9789d31bb30b2640e79e97a51fd99500466f1aa422c13c7ded9e196cd50e7387f8839a46deff +MISC metadata.xml 1925 BLAKE2B 472f7acb0b1a740413bce8bfd1cf9903fa3b9d0632ee07a82a8a3125b68719319ceba84ecd946d389c59fa1761aac68e4cda05fd103886d526315b715174cf64 SHA512 11b6bd28a3384810de1b5b34a006684eeebccebdaf7a9d2fc93384d948dbd4b01da669ab3d8def823c2888423ba0de30bf557d25d202cc7d62577666292fac51 diff --git a/media-video/mjpg-streamer/metadata.xml b/media-video/mjpg-streamer/metadata.xml index 289845ee13ab..492364ee19f4 100644 --- a/media-video/mjpg-streamer/metadata.xml +++ b/media-video/mjpg-streamer/metadata.xml @@ -4,12 +4,10 @@ <maintainer type="person"> <email>andrzej.pauli@gmail.com</email> <name>Andrzej Pauli</name> - <description>Maintainer. Assign bugs to him.</description> </maintainer> <maintainer type="person"> <email>aidecoe@gentoo.org</email> <name>Amadeusz Żołnowski</name> - <description>Proxy maintainer. CC him on bugs.</description> </maintainer> <maintainer type="project"> <email>proxy-maint@gentoo.org</email> diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 7cff4eb9ffab..c14b4ec7332b 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,7 +1,4 @@ AUX dump_ffmpeg.sh 2529 BLAKE2B 2c945fcf0b430d74c85557f82497dbc4a2a8308ecb34c86e42cc3c6a5eed20496691839355c068ccabf6d20d11d62035231aa208341a1ce9affc44b3e30acfde SHA512 12c15efa5cdb99eac92ff808fa56c6137343cca48b73d5875a7a6b08cf36ebeda5022eb3bae0ba567ff9031d2a0f3b5dbe69ee191ae8ecf48b98a779504df66c -AUX mplayer-1.2-get_buffer.patch 12054 BLAKE2B 67f3c403ef2040f7114b6daeaa7f978954bd38913ac1c0933b60e2dddc58482d7b66ef1522d82926c9d9fcf303e804a9a6be5063c364e3955ef22f3b6d68685a SHA512 9180c1d8cb151ce2c31ef196cbc10fc0a9e694995f49bc560e3335c76e424441b53306283d6fe89ea7a3ca933ef6801d5f155942951754a217fee3d3f34ad2a0 -AUX mplayer-1.2_pre20150730-chan.patch 966 BLAKE2B 2a17ab137c53e6df01a7cab615d22c83282fab99e5d6e84e9ac97cd2bf6cd3265dee550651b0c611d9a65f28a11be1823c5c92a186f836b037109ec0132ac8aa SHA512 9ea28c193d26feba870283d110a69d42e739696571ac13d40f983b4b6f0c83f01befd12fa7825b2dca10d5f3279d29d71dd07f2f53553f78e88b182fd8250df4 -AUX mplayer-1.2_pre20150730-encode.patch 3022 BLAKE2B ab314f4ebf8363fe0a5140886f9e7be934c0820def15db4c986a94c36e9b74fab6d15709cf7a53ec3f5a43584fb99621c39d15392b23a5a7950239f19d429739 SHA512 c1da3944616205c92926910d93bf9ee39404f46cad07a68df28050aeab88a358480e9cfe09f41af8fa047b623d9400bcebc1a05c6982f704d5164a777e591792 AUX mplayer-1.3-CVE-2016-4352.patch 617 BLAKE2B 57f85be46230fa0576c6569bafc8c65f24b0a59d3b083c06d2e14fe176505567feca5024bafd73fb1b48960ea95a4705132ed6e2166a31aabcd1e34fc41e3803 SHA512 654bfa8368a02669ba249aa0c1a605f285d4d967b7038285df0ba7b83cd034ac3aff933a564fd6f33c7a153267be19d9eb517a52c8f4b53a6f81b6b2c5558512 AUX mplayer-1.3-vdpau-x11.patch 543 BLAKE2B 5e8b01243a8fd8a09389adeefadd2e3631a679138b3e50d100737703854121bb02815829dcc2ff408ad90389cba95da8ba1e4585e8c8dbd25ef52c9802f56f2e SHA512 c0dfdca8075fd8bdad7cde99e163ba5d55e6268883f852917e287eeeace85b06e244b727bd87501c77ff72fce4b6ba317d45694f1086b5cd1a63fe3ca222f805 AUX prepare_mplayer.sh 757 BLAKE2B 5de1cb4b17628dd5443f98a20717f8ed028a76446104a471a669b1c7ed7a5b76a8e86203f436240312ac4814a0ba7dba7856bb4f3723da850188a3003aae8bbb SHA512 0add0707e15d58cee331fc82f884a44b29908c503f9ddcbb63dc01e237e2f457f599bae8644ce49f1af2cc7b3183529364ce30e6748889355c17cb96cecee71a diff --git a/media-video/mplayer/files/mplayer-1.2-get_buffer.patch b/media-video/mplayer/files/mplayer-1.2-get_buffer.patch deleted file mode 100644 index 3329b9803603..000000000000 --- a/media-video/mplayer/files/mplayer-1.2-get_buffer.patch +++ /dev/null @@ -1,327 +0,0 @@ -r37476 | rtogni | 2015-09-05 18:20:27 +0200 (Sat, 05 Sep 2015) | 5 lines - -Replace deprecated get_buffer, buffer_hints, and others - -This is needed to compile with latest FFmpeg - -Index: libmpcodecs/vd_ffmpeg.c -=================================================================== ---- libmpcodecs/vd_ffmpeg.c (revision 37475) -+++ libmpcodecs/vd_ffmpeg.c (revision 37476) -@@ -40,6 +40,7 @@ - #if CONFIG_VDPAU - #include "libavcodec/vdpau.h" - #endif -+#include "libavutil/pixdesc.h" - - static const vd_info_t info = { - "FFmpeg's libavcodec codec family", -@@ -95,8 +96,11 @@ - - #include "m_option.h" - --static int get_buffer(AVCodecContext *avctx, AVFrame *pic); -+static int get_buffer(AVCodecContext *avctx, AVFrame *pic, int isreference); -+static int mpcodec_default_get_buffer(AVCodecContext *avctx, AVFrame *frame); -+static int get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags); - static void release_buffer(AVCodecContext *avctx, AVFrame *pic); -+static void mpcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic); - static void draw_slice(struct AVCodecContext *s, const AVFrame *src, int offset[4], - int y, int type, int height); - -@@ -269,19 +273,10 @@ - if (lavc_param_vismv || (lavc_param_debug & (FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP))) { - ctx->do_slices = ctx->do_dr1 = 0; - } --#ifndef CODEC_FLAG_EMU_EDGE --#define CODEC_FLAG_EMU_EDGE 0 --#endif - if(ctx->do_dr1){ -- avctx->flags |= CODEC_FLAG_EMU_EDGE; -- avctx-> reget_buffer = -- avctx-> get_buffer = get_buffer; -- avctx->release_buffer = release_buffer; -+ avctx->get_buffer2 = get_buffer2; - } else if (lavc_codec->capabilities & CODEC_CAP_DR1) { -- avctx->flags &= ~CODEC_FLAG_EMU_EDGE; -- avctx-> reget_buffer = avcodec_default_reget_buffer; -- avctx-> get_buffer = avcodec_default_get_buffer; -- avctx->release_buffer = avcodec_default_release_buffer; -+ avctx->get_buffer2 = avcodec_default_get_buffer2; - } - avctx->slice_flags = 0; - } -@@ -309,9 +304,7 @@ - if (IMGFMT_IS_HWACCEL(imgfmt)) { - ctx->do_dr1 = 1; - ctx->nonref_dr = 0; -- avctx->get_buffer = get_buffer; -- avctx->release_buffer = release_buffer; -- avctx->reget_buffer = get_buffer; -+ avctx->get_buffer2 = get_buffer2; - mp_msg(MSGT_DECVIDEO, MSGL_V, IMGFMT_IS_XVMC(imgfmt) ? - MSGTR_MPCODECS_XVMCAcceleratedMPEG2 : - "[VD_FFMPEG] VDPAU accelerated decoding\n"); -@@ -384,7 +377,6 @@ - #endif - avctx->flags2|= lavc_param_fast; - avctx->codec_tag= sh->format; -- avctx->stream_codec_tag= sh->video.fccHandler; - avctx->idct_algo= lavc_param_idct_algo; - avctx->error_concealment= lavc_param_error_concealment; - avctx->debug= lavc_param_debug; -@@ -668,7 +660,7 @@ - return 0; - } - --static int get_buffer(AVCodecContext *avctx, AVFrame *pic){ -+static int get_buffer(AVCodecContext *avctx, AVFrame *pic, int isreference){ - sh_video_t *sh = avctx->opaque; - vd_ffmpeg_ctx *ctx = sh->context; - mp_image_t *mpi=NULL; -@@ -677,27 +669,12 @@ - int width = FFMAX(avctx->width, -(-avctx->coded_width >> avctx->lowres)); - int height= FFMAX(avctx->height, -(-avctx->coded_height >> avctx->lowres)); - // special case to handle reget_buffer -- if (pic->opaque && pic->data[0] && (!pic->buffer_hints || pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE)) -+ if (pic->opaque && pic->data[0]) - return 0; - avcodec_align_dimensions(avctx, &width, &height); - //printf("get_buffer %d %d %d\n", pic->reference, ctx->ip_count, ctx->b_count); - -- if (pic->buffer_hints) { -- mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Buffer hints: %u\n", pic->buffer_hints); -- type = MP_IMGTYPE_TEMP; -- if (pic->buffer_hints & FF_BUFFER_HINTS_READABLE) -- flags |= MP_IMGFLAG_READABLE; -- if (pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE || -- pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) { -- ctx->ip_count++; -- type = MP_IMGTYPE_IP; -- flags |= MP_IMGFLAG_PRESERVE; -- } -- flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ? -- MP_IMGFLAG_DRAW_CALLBACK:0; -- mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type == MP_IMGTYPE_IP ? "using IP\n" : "using TEMP\n"); -- } else { -- if(!pic->reference){ -+ if(!isreference){ - ctx->b_count++; - flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ? - MP_IMGFLAG_DRAW_CALLBACK:0; -@@ -711,11 +688,10 @@ - }else{ - type= MP_IMGTYPE_IP; - } -- } - - if (ctx->nonref_dr) { - if (flags & MP_IMGFLAG_PRESERVE) -- return avcodec_default_get_buffer(avctx, pic); -+ return mpcodec_default_get_buffer(avctx, pic); - // Use NUMBERED since for e.g. TEMP vos assume there will - // be no other frames between the get_image and matching put_image. - type = MP_IMGTYPE_NUMBERED; -@@ -722,7 +698,6 @@ - } - - if(init_vo(sh, avctx->pix_fmt, 1) < 0){ -- avctx->release_buffer= avcodec_default_release_buffer; - goto disable_dr1; - } - -@@ -822,7 +797,6 @@ - else - printf("."); - #endif -- pic->type= FF_BUFFER_TYPE_USER; - return 0; - - disable_dr1: -@@ -829,13 +803,11 @@ - ctx->do_dr1 = 0; - // For frame-multithreading these contexts aren't - // the same and must both be updated. -- ctx->avctx->get_buffer = -- avctx->get_buffer = avcodec_default_get_buffer; -- ctx->avctx->reget_buffer = -- avctx->reget_buffer = avcodec_default_reget_buffer; -+ ctx->avctx->get_buffer2 = -+ avctx->get_buffer2 = avcodec_default_get_buffer2; - if (pic->data[0]) -- release_buffer(avctx, pic); -- return avctx->get_buffer(avctx, pic); -+ mpcodec_default_release_buffer(avctx, pic); -+ return avctx->get_buffer2(avctx, pic,0); - } - - static void release_buffer(struct AVCodecContext *avctx, AVFrame *pic){ -@@ -843,8 +815,8 @@ - sh_video_t *sh = avctx->opaque; - vd_ffmpeg_ctx *ctx = sh->context; - int i; -- if (pic->type != FF_BUFFER_TYPE_USER) { -- avcodec_default_release_buffer(avctx, pic); -+ if (pic->opaque == NULL) { -+ mpcodec_default_release_buffer(avctx, pic); - return; - } - -@@ -954,7 +926,7 @@ - // even when we do dr we might actually get a buffer we had - // FFmpeg allocate - this mostly happens with nonref_dr. - // Ensure we treat it correctly. -- dr1= ctx->do_dr1 && pic->type == FF_BUFFER_TYPE_USER; -+ dr1= ctx->do_dr1 && pic->opaque != NULL; - if(ret<0) mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Error while decoding frame!\n"); - //printf("repeat: %d\n", pic->repeat_pict); - //-- vstats generation -@@ -1128,3 +1100,148 @@ - set_format_params(avctx, selected_format); - return selected_format; - } -+ -+ -+/* -+ FFWrapper -+*/ -+static int mpcodec_default_get_buffer(AVCodecContext *avctx, AVFrame *frame) -+{ -+ return avcodec_default_get_buffer2(avctx, frame, 0); -+} -+ -+static void mpcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic) -+{ -+ av_frame_unref(pic); -+} -+ -+typedef struct CompatReleaseBufPriv { -+ AVCodecContext avctx; -+ AVFrame frame; -+ uint8_t avframe_padding[1024]; // hack to allow linking to a avutil with larger AVFrame -+} CompatReleaseBufPriv; -+ -+static void compat_free_buffer(void *opaque, uint8_t *data) -+{ -+ CompatReleaseBufPriv *priv = opaque; -+ release_buffer(&priv->avctx, &priv->frame); -+ av_freep(&priv); -+} -+ -+static void compat_release_buffer(void *opaque, uint8_t *data) -+{ -+ AVBufferRef *buf = opaque; -+ av_buffer_unref(&buf); -+} -+ -+static int get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags) -+{ -+ /* -+ * Wrap an old get_buffer()-allocated buffer in a bunch of AVBuffers. -+ * We wrap each plane in its own AVBuffer. Each of those has a reference to -+ * a dummy AVBuffer as its private data, unreffing it on free. -+ * When all the planes are freed, the dummy buffer's free callback calls -+ * release_buffer(). -+ */ -+ CompatReleaseBufPriv *priv = NULL; -+ AVBufferRef *dummy_buf = NULL; -+ int planes, i, ret; -+ -+ ret = get_buffer(avctx, frame, flags & AV_GET_BUFFER_FLAG_REF); -+ if (ret < 0) -+ return ret; -+ -+ /* return if the buffers are already set up -+ * this would happen e.g. when a custom get_buffer() calls -+ * avcodec_default_get_buffer -+ */ -+ if (frame->buf[0]) -+ goto end0; -+ -+ priv = av_mallocz(sizeof(*priv)); -+ if (!priv) { -+ ret = AVERROR(ENOMEM); -+ goto fail; -+ } -+ priv->avctx = *avctx; -+ priv->frame = *frame; -+ -+ dummy_buf = av_buffer_create(NULL, 0, compat_free_buffer, priv, 0); -+ if (!dummy_buf) { -+ ret = AVERROR(ENOMEM); -+ goto fail; -+ } -+ -+#define WRAP_PLANE(ref_out, data, data_size) \ -+do { \ -+ AVBufferRef *dummy_ref = av_buffer_ref(dummy_buf); \ -+ if (!dummy_ref) { \ -+ ret = AVERROR(ENOMEM); \ -+ goto fail; \ -+ } \ -+ ref_out = av_buffer_create(data, data_size, compat_release_buffer, \ -+ dummy_ref, 0); \ -+ if (!ref_out) { \ -+ av_buffer_unref(&dummy_ref); \ -+ av_frame_unref(frame); \ -+ ret = AVERROR(ENOMEM); \ -+ goto fail; \ -+ } \ -+} while (0) -+ -+ if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { -+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format); -+ -+ planes = av_pix_fmt_count_planes(frame->format); -+ /* workaround for AVHWAccel plane count of 0, buf[0] is used as -+ check for allocated buffers: make libavcodec happy */ -+ if (desc && desc->flags & AV_PIX_FMT_FLAG_HWACCEL) -+ planes = 1; -+ if (!desc || planes <= 0) { -+ ret = AVERROR(EINVAL); -+ goto fail; -+ } -+ -+ for (i = 0; i < planes; i++) { -+ int v_shift = (i == 1 || i == 2) ? desc->log2_chroma_h : 0; -+ int plane_size = (frame->height >> v_shift) * frame->linesize[i]; -+ -+ WRAP_PLANE(frame->buf[i], frame->data[i], plane_size); -+ } -+ } else { -+ int planar = av_sample_fmt_is_planar(frame->format); -+ planes = planar ? avctx->channels : 1; -+ -+ if (planes > FF_ARRAY_ELEMS(frame->buf)) { -+ frame->nb_extended_buf = planes - FF_ARRAY_ELEMS(frame->buf); -+ frame->extended_buf = av_malloc_array(sizeof(*frame->extended_buf), -+ frame->nb_extended_buf); -+ if (!frame->extended_buf) { -+ ret = AVERROR(ENOMEM); -+ goto fail; -+ } -+ } -+ -+ for (i = 0; i < FFMIN(planes, FF_ARRAY_ELEMS(frame->buf)); i++) -+ WRAP_PLANE(frame->buf[i], frame->extended_data[i], frame->linesize[0]); -+ -+ for (i = 0; i < frame->nb_extended_buf; i++) -+ WRAP_PLANE(frame->extended_buf[i], -+ frame->extended_data[i + FF_ARRAY_ELEMS(frame->buf)], -+ frame->linesize[0]); -+ } -+ -+ av_buffer_unref(&dummy_buf); -+ -+end0: -+ frame->width = avctx->width; -+ frame->height = avctx->height; -+ -+ return 0; -+ -+fail: -+ release_buffer(avctx, frame); -+ av_freep(&priv); -+ av_buffer_unref(&dummy_buf); -+ return ret; -+} diff --git a/media-video/mplayer/files/mplayer-1.2_pre20150730-chan.patch b/media-video/mplayer/files/mplayer-1.2_pre20150730-chan.patch deleted file mode 100644 index a448d0849458..000000000000 --- a/media-video/mplayer/files/mplayer-1.2_pre20150730-chan.patch +++ /dev/null @@ -1,25 +0,0 @@ -r37447 | rtogni | 2015-08-14 21:30:34 +0200 (Fri, 14 Aug 2015) | 3 lines - -Replace deprecated avctx->request_channels with request_channel_layout - -Index: libmpcodecs/ad_ffmpeg.c -=================================================================== ---- libmpcodecs/ad_ffmpeg.c (revision 37446) -+++ libmpcodecs/ad_ffmpeg.c (revision 37447) -@@ -46,6 +46,7 @@ - - #include "libavcodec/avcodec.h" - #include "libavutil/dict.h" -+#include "libavutil/channel_layout.h" - - struct adctx { - int last_samplerate; -@@ -127,7 +128,7 @@ - lavc_context->bits_per_coded_sample = sh_audio->wf->wBitsPerSample; - } - lavc_context->channel_layout = sh_audio->channel_layout; -- lavc_context->request_channels = audio_output_channels; -+ lavc_context->request_channel_layout = av_get_default_channel_layout(audio_output_channels); - lavc_context->codec_tag = sh_audio->format; //FOURCC - lavc_context->codec_id = lavc_codec->id; // not sure if required, imho not --A'rpi - diff --git a/media-video/mplayer/files/mplayer-1.2_pre20150730-encode.patch b/media-video/mplayer/files/mplayer-1.2_pre20150730-encode.patch deleted file mode 100644 index 06a33f832f07..000000000000 --- a/media-video/mplayer/files/mplayer-1.2_pre20150730-encode.patch +++ /dev/null @@ -1,82 +0,0 @@ -r37453 | rtogni | 2015-08-23 22:32:50 +0200 (Sun, 23 Aug 2015) | 3 lines - -Replace deprecated av_encode_video() with av_encode_video2() - -Index: libmpcodecs/vf_uspp.c -=================================================================== ---- libmpcodecs/vf_uspp.c (revision 37452) -+++ libmpcodecs/vf_uspp.c (revision 37453) -@@ -177,11 +177,16 @@ - const int x1= offset[i+count-1][0]; - const int y1= offset[i+count-1][1]; - int offset; -+ AVPacket pkt; -+ int ret, got_pkt; - p->frame->data[0]= p->src[0] + x1 + y1 * p->frame->linesize[0]; - p->frame->data[1]= p->src[1] + x1/2 + y1/2 * p->frame->linesize[1]; - p->frame->data[2]= p->src[2] + x1/2 + y1/2 * p->frame->linesize[2]; - -- avcodec_encode_video(p->avctx_enc[i], p->outbuf, p->outbuf_size, p->frame); -+ av_init_packet(&pkt); -+ pkt.data = p->outbuf; -+ pkt.size = p->outbuf_size; -+ avcodec_encode_video2(p->avctx_enc[i], &pkt, p->frame, &got_pkt); - p->frame_dec = p->avctx_enc[i]->coded_frame; - - offset= (BLOCK-x1) + (BLOCK-y1)*p->frame_dec->linesize[0]; -Index: libmpcodecs/vf_lavc.c -=================================================================== ---- libmpcodecs/vf_lavc.c (revision 37452) -+++ libmpcodecs/vf_lavc.c (revision 37453) -@@ -86,6 +86,8 @@ - mp_image_t* dmpi; - int out_size; - AVFrame *pic= vf->priv->pic; -+ int ret, got_pkt; -+ AVPacket pkt; - - pic->data[0]=mpi->planes[0]; - pic->data[1]=mpi->planes[1]; -@@ -94,10 +96,14 @@ - pic->linesize[1]=mpi->stride[1]; - pic->linesize[2]=mpi->stride[2]; - -- out_size = avcodec_encode_video(&lavc_venc_context, -- vf->priv->outbuf, vf->priv->outbuf_size, pic); -+ av_init_packet(&pkt); -+ pkt.data = vf->priv->outbuf; -+ pkt.size = vf->priv->outbuf_size; -+ ret = avcodec_encode_video2(&lavc_venc_context, &pkt, pic, &got_pkt); - -- if(out_size<=0) return 1; -+ if(ret<=0) return 1; -+ if(!got_pkt) return 1; -+ out_size = pkt.size; - - dmpi=vf_get_image(vf->next,IMGFMT_MPEGPES, - MP_IMGTYPE_EXPORT, 0, -Index: libmpcodecs/vf_mcdeint.c -=================================================================== ---- libmpcodecs/vf_mcdeint.c (revision 37452) -+++ libmpcodecs/vf_mcdeint.c (revision 37453) -@@ -92,6 +92,8 @@ - - static void filter(struct vf_priv_s *p, uint8_t *dst[3], uint8_t *src[3], int dst_stride[3], int src_stride[3], int width, int height){ - int x, y, i; -+ int got_pkt; -+ AVPacket pkt; - - for(i=0; i<3; i++){ - p->frame->data[i]= src[i]; -@@ -101,7 +103,10 @@ - p->avctx_enc->me_cmp= - p->avctx_enc->me_sub_cmp= FF_CMP_SAD /*| (p->parity ? FF_CMP_ODD : FF_CMP_EVEN)*/; - p->frame->quality= p->qp*FF_QP2LAMBDA; -- avcodec_encode_video(p->avctx_enc, p->outbuf, p->outbuf_size, p->frame); -+ av_init_packet(&pkt); -+ pkt.data = p->outbuf; -+ pkt.size = p->outbuf_size; -+ avcodec_encode_video2(p->avctx_enc, &pkt, p->frame, &got_pkt); - p->frame_dec = p->avctx_enc->coded_frame; - - for(i=0; i<3; i++){ 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() { diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest index fac923a6e7b2..528b1a5b5a00 100644 --- a/media-video/openshot/Manifest +++ b/media-video/openshot/Manifest @@ -1,3 +1,3 @@ DIST openshot-qt-2.4.0.tar.gz 60710408 BLAKE2B 33c8abe7ba3122ae720163d6ab91d367ee282b94d3d8986fdccf4f9efae832f54af7f946472c781a17f7e54083028762952d02d7139e6815cd0d44e80515c728 SHA512 95778effa5b02a467c44741384b0f43bf90343d4f450d5fcc2319ff1c3bee212338435dd8c781e0ff111a704aacdce3dbfb6bdcf62afa1f59bbb0668b58074ca -EBUILD openshot-2.4.0.ebuild 1241 BLAKE2B ea5677913bf31297680acda425640e204dcb7b176be23e35b3bec292d97fbf3dbfc1d482d5a7acd0b24709c5cf2564ecba34fe118d7c7cb5898f8e12fa023ee1 SHA512 20e7097360a48f7f195faf99b69ae9c70ede5772a27dbdd7840abc4381d92b69ebd63fc8bbd979d0845cf1f2cd8756cd5c1e5d64c24c258d923dc7bf35458fb7 +EBUILD openshot-2.4.0.ebuild 1240 BLAKE2B 3c71b11928bd2fa206d26bf62180c13f91b2d664b5501ff28113a067507cca330df7b7a361bb5fc7f3c663ec76c28ee94e8b40bd85fb6feb8da234617da0a266 SHA512 e43e784b196f12dcf89e4ffeec1c6e1d5121df8a49067f632fc5c9204f6365200cee4a22da0a3aa200a6bc099db987982d7d4f6860dc0254e1d2ed52e9dac242 MISC metadata.xml 487 BLAKE2B dc721eeb1c4ab6880cd9a5cc1c8c0a032303f0c56ff4312f723c364978b4338e3acaecc887a5617e1d691d69bb3415d92dd9cc812da161f303f33381422f7e42 SHA512 3b1dc5bc39de8b46ccea5497b228675c7d379ec627e12630d8914d9d35e316f4818bc165551dd271b24d377b3bcc2b97d528b43219765460058d123bde078149 diff --git a/media-video/openshot/openshot-2.4.0.ebuild b/media-video/openshot/openshot-2.4.0.ebuild index 5e9e7f71c08a..9781379e1fcf 100644 --- a/media-video/openshot/openshot-2.4.0.ebuild +++ b/media-video/openshot/openshot-2.4.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 @@ -18,7 +18,7 @@ SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+d LICENSE="GPL-3+" SLOT="1" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" dev-python/PyQt5[svg,webkit,${PYTHON_USEDEP}] diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest index f528d98adc47..2e2603d69883 100644 --- a/media-video/smplayer/Manifest +++ b/media-video/smplayer/Manifest @@ -1,6 +1,7 @@ AUX smplayer-14.9.0.6966-unbundle-qtsingleapplication.patch 566 BLAKE2B bc96833566d3d87d0bde532b0b6a6500671d9ec75cc0ee5f9485ea052ad030f8237d01184200f846febc07f4d7195af15d379e589de6772d58d4cfe89bff8ac3 SHA512 9c757a1eaca358c9fb712801c0a17d084ea9dd3be26dd43f9b2c83bf39d2bbe4b458ba9432aba9e76cb83b56fb698a2976951be2074acfaa787cbfbed2a54fa9 AUX smplayer-16.4.0-zero-bidi.patch 489 BLAKE2B 50f535154f771e535c244aff2dbd27b60cdbed36f01b4c3f3bf1bd27dbaceb52d41a061aa4d15501c8ae3d0e4bb3adfc2ecd5e0eaee91aa06207738321e7a89a SHA512 acde9545bc1a0659673f6e747291c837ab36b9894bde6d03e419acf579c2f8f581127424dde786496f37308676754319c4f4402f52b620e97a63cdccd1af80d6 AUX smplayer-17.1.0-advertisement_crap.patch 1982 BLAKE2B 22a5027e9d20dca47fed1176e13cd9f8f5c912f51352d07f8fc0dd1f0850dc241483e22524c9fab2b9e20e67d1527f391a791afa2ac96285c4a199801ab96b65 SHA512 7bc1a3e9fb916d3a7e0c4f9bba8bb2adb7a3822e34694f79501e228f700b27633cac2eba237ab4af221c50f07295ecab3093c2a7033578a3e0a91a1e6449570d +AUX smplayer-18.2.0-jobserver.patch 423 BLAKE2B 04452fa5992dd2cef5be64dc9a9c78ca775336174dbef69e6054361173886be26d941cabfe2c5b486a05f2b3bee7029b439652d4dfb10e5651a7db68db8b70af SHA512 6bdb6d57be84c1d020c6f2e2f547eda9a0118bfcd0e4d2cdbb940501a0853ec388f359e04a52b8ff9c6c6b38d60f3837ed2c2e127a4df5bf79751486d9ed9ed6 DIST smplayer-17.11.2.tar.bz2 5033433 BLAKE2B 0fa783172c5b3c68314d656a395db6c953de64057cdf9acc78e4bc448807bc39293ff292183fc167a122f9cf295aac786b52c0465e3d9584c506e1dd9cd73614 SHA512 e0a6e6fc29063b5f82303febdc8243c10276feb4500985e96ce418298c8f10796df44363df3136452a6cb3f8156ebdb4fba3e865a37d433f3d258db493343f81 DIST smplayer-17.12.0.tar.bz2 5040463 BLAKE2B 6171cc0071e35c001678816464c55a9c16a5978ae4cae9a428c609e4940d0d0516e7d4928e961ca1e97469d77776c7e03f8c9a5c1c6ea3597c9724a2f6ea1ada SHA512 7b09ed08cf94f03eb4f992bc1a70ba938d081410044892e55236aec791732ec34bbdd31c6cbd05aa0eeb5cab6c0bf0a7b458373157ba49eed2c6a90e0ac257d1 DIST smplayer-18.1.0.tar.bz2 5033686 BLAKE2B e05a8044e725ddcd1a31c9209fe83abf03553d671570db0affabd55c28fa11ac7c81c853c5ac0ef7e9bb5b0d69e7924e2ef8a8f57fd07e2354b926b887c4cba8 SHA512 f0fb844634fbb22c975744cc4d557503aba7131cb52c5e1165a3ff9eec259bf45ebde5b7dfefa48d5f17e2946c1cfa0cce34429b373918f488e3f51c3398884e @@ -8,5 +9,5 @@ DIST smplayer-18.2.0.tar.bz2 5033848 BLAKE2B 8996707609788f48b92868421d8feee14d2 EBUILD smplayer-17.11.2.ebuild 3083 BLAKE2B 28ea91680564dd29721212de2084ba86debe81cccc258d4075d39b534526486e55ee94ddda6b9a5ce2ff12fc7d2f985ea6b2ed3b8f9e98b089faba46748b6bca SHA512 a8a9bc7e29d2a2f3a2fa08ea28a762bfe258213980fe2c2057a9ef49d096a62cd1d7e412dd0e82a277a6e4b11539514e717458c773789c747028ea450d5d0a7c EBUILD smplayer-17.12.0.ebuild 3085 BLAKE2B 4981f54ed4407df2f7b651dea4714cfba67c976c393a54f58d76e0710e9b8de0e42befd3b5c396ba9682f28a31ca40796369e3a6213e6870f723157eac99d085 SHA512 6337e293afb3e2c2d8543bf4659336dfb960bdae78cc619a3e2842557e2568fad88b68010f31d3ab76bbf31022eb3f131b1d57df105ba85ef0261515146c4cb9 EBUILD smplayer-18.1.0.ebuild 3085 BLAKE2B 957838821f4ee49ba66a174a3bfeb265c32f983169c5d335deb690568d3bbceaaced28ca2f5e3ddea37393525f486b5e738c786888cca96c9d751db6a040cac5 SHA512 ff69d7c4889daeffce883737ae554a547263a03f79c10cd9340d5caf7ea102777302357c18d843829aadcc178fd997b57135398a1d16fb730a6ee85ce9e8c5f7 -EBUILD smplayer-18.2.0.ebuild 3085 BLAKE2B 957838821f4ee49ba66a174a3bfeb265c32f983169c5d335deb690568d3bbceaaced28ca2f5e3ddea37393525f486b5e738c786888cca96c9d751db6a040cac5 SHA512 ff69d7c4889daeffce883737ae554a547263a03f79c10cd9340d5caf7ea102777302357c18d843829aadcc178fd997b57135398a1d16fb730a6ee85ce9e8c5f7 +EBUILD smplayer-18.2.0.ebuild 3160 BLAKE2B b2ade004d76a79088a6f005b6d4b8e530559ca9b36a00343f73694973f9b40a8900b298dae67270c10a520584b56c4ca4d6e4f4debb88ad934aec692c139df4f SHA512 adbc42e0eab069359123245957912d849cd1826e4ce62050d08948e9e495e5d7de73e1016348c05a9572e9c497767f6c712be67adccc7cb2da8c0bfdd6928c49 MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4 diff --git a/media-video/smplayer/files/smplayer-18.2.0-jobserver.patch b/media-video/smplayer/files/smplayer-18.2.0-jobserver.patch new file mode 100644 index 000000000000..7bd6c75145cc --- /dev/null +++ b/media-video/smplayer/files/smplayer-18.2.0-jobserver.patch @@ -0,0 +1,18 @@ +Bug: https://bugs.gentoo.org/645742 + +--- a/Makefile ++++ b/Makefile +@@ -25,11 +25,11 @@ + + src/smplayer: + ./get_svn_revision.sh +- +cd src && $(QMAKE) $(QMAKE_OPTS) && $(DEFS) make ++ +cd src && $(QMAKE) $(QMAKE_OPTS) && $(DEFS) $(MAKE) + cd src && $(LRELEASE) smplayer.pro + + webserver/simple_web_server: +- cd webserver && make ++ cd webserver && $(MAKE) + + clean: + if [ -f src/Makefile ]; then cd src && make distclean; fi diff --git a/media-video/smplayer/smplayer-18.2.0.ebuild b/media-video/smplayer/smplayer-18.2.0.ebuild index 70deb3e4a369..7c9ad23ef750 100644 --- a/media-video/smplayer/smplayer-18.2.0.ebuild +++ b/media-video/smplayer/smplayer-18.2.0.ebuild @@ -8,7 +8,7 @@ he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW" PLOCALE_BACKUP="en_US" -inherit gnome2-utils l10n qmake-utils xdg-utils +inherit gnome2-utils l10n qmake-utils toolchain-funcs xdg-utils DESCRIPTION="Great Qt GUI front-end for mplayer/mpv" HOMEPAGE="http://www.smplayer.eu/" @@ -47,6 +47,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544 "${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch" + "${FILESDIR}/${PN}-18.2.0-jobserver.patch" ) src_prepare() { @@ -106,7 +107,7 @@ gen_translation() { } src_compile() { - default + emake CC="$(tc-getCC)" cd src/translations || die l10n_for_each_locale_do gen_translation diff --git a/media-video/ttcut/Manifest b/media-video/ttcut/Manifest index ae96f75c2d0b..b67daaaca071 100644 --- a/media-video/ttcut/Manifest +++ b/media-video/ttcut/Manifest @@ -1,10 +1,4 @@ -AUX ttcut-0.19.6-deprecated.patch 15006 BLAKE2B ecd7b9521a54bbbae09f12fddd6c6d5c38f5cb14d38521dd2a2c9f7de80d7c1c36d21bf709b5912bf7e4e381c99ca6456d22c6cb45e2ce15bb59e6a88bf03dc2 SHA512 c10a0146296026bd1ed26ae1bfbce8e78e8e80649bf7b648dc2a07530978e8513f2a3dc3f96e4774b6e78560fdc3dbb9605359a90ad83a792873c024e6b6dbd9 -AUX ttcut-0.19.6-ffmpeg-vf-setdar.patch 7161 BLAKE2B 28af3c55afaddbad4d2e8bb29c49d1b65e78f1c2f3c54f62406663224a060beb0b319209e2c4fba7e060ee05d662e46dbf10d02f60fe8f32ad5b44f8e062486d SHA512 92bdbfaceac2a3ddab306a8f7c1fc25feb2fecea518405bc857e01dc70ca122392c6f431d358dd0b52bf161b762fc098e18a795aa7ec399faac3b95146ddd012 -AUX ttcut-0.19.6-no_implicit_GLU.patch 682 BLAKE2B 065260364218122376f88f1728dc98f120d26e88b7224d02b1c03dbd2d29f10006636e261f990f1edf93167c1145e9bfac4e5c60455d79787b39467b3a50a340 SHA512 8c0b64c566d65a98d7a1b2ca673018131d1294d7d1f338bb0f680c7ac79d9dee8080ca7f6c86fcd64b9f19b7333397386ca9942f34dd6a3c114383375e5adace -AUX ttcut-0.19.6-ntsc-fps.patch 4284 BLAKE2B a558ed2ccddf288b906de82056379f3a75f91b565bf957d18e21add7b0f168c7ee0e7a7a1b120834e063685c453d9d41a6fbc0bb7c31947a5cfbf83852a81329 SHA512 16b07df7b1352ec19ed8261a54575c1087ae078422b00e634a8d74bb1d14749d04273d09a968b9c4fb72b1fefa80c4bebc01d7978bef7a1afb60650983f69fca AUX ttcut.desktop 304 BLAKE2B 9f0f6c6de3beae152b280a280953ddc156373cd3bfeacb35f265648b8e1d0c92b001bb4456ac3e1208edf6730a2a75e90cd9d879aaee73eff0c9aa198ffa8430 SHA512 82f004f65755ea24ba6b379f18e15c5fe8736da0afe4854cc5ed3e8ceeb55b0b8b6c4f3def3e4a09c25b179a3415d0a47dfcd5d8b92cb34fb7270c6a24c714ad -DIST ttcut-0.19.6.tar.gz 283977 BLAKE2B 1ff2d7c77a54f12cd9fe6c0c4a25af05b6baaa3d29083ebac52e510b68a246caabde9fbd9cd76487897072fe6390a43180096fa224e1e11cdb3011e200483fcb SHA512 796dfb6759f7e9c96f8a8481cb280044c1744a43935f226f352b9e867ebdbaeaed90c3d96acf00b5ae8afb7b2350cbd6a384eb2d38136fef38c2983467d25cf6 DIST ttcut-0.19.6_p1.tar.gz 283304 BLAKE2B ee0d000a1cc091be1848746d3b32930ae5f59865d7fc04779be9aac4bc9621eaace88a6d9263c767671643d9ce381af2cf57fc5b87707903a5abe8a59eb6cb99 SHA512 9d104436145ef209db4eaca1566d718ccdf84636a391e3f47bd829a165741f57a6123942f37ba2eb361dd46716e78e36832cb9a459ca9ed0130a70af92287494 -EBUILD ttcut-0.19.6-r3.ebuild 862 BLAKE2B aa0af7778e5094cbc306d2af0f7da680c40e26c9544eb7ef133ca89a334e8b5d9ded522d09f77057ba9997970111e20a6f509b39f212a0ec431a890fd9c7990c SHA512 3cdffa3004495a7ad6521e9112760b8a8186d197aaa508d809aec50130bee36c80bc55540498dbfc18df58a8e95eb0e5d43518536792769a90538bd15d8824e6 -EBUILD ttcut-0.19.6_p1.ebuild 783 BLAKE2B 22ca1f4e963c2ac281436dd150e72bc8f1ce0b33a1d6dd35db6406345a7e4e5de3d59696468b3e2de39c494e7480f53d85b326b5e46219e2727473f159ef9ef6 SHA512 4f856094125e5e90bb26275260c14a59fb744f0579add4e8276f0bec042811f21a8df141acd02c00e6c307dbe4b609d8684ea70fd07c8b402f7d0fde629446e9 +EBUILD ttcut-0.19.6_p1.ebuild 782 BLAKE2B 6c9d641d9f772fd9c92dc882ee4c937a654186aa7e9de4a833a8e2715e7d9c2d4d190b25d3b58086e25ce4ec6b495cc3fbdb423dced50258d30857921ca42506 SHA512 0445af1b1ef8766ccdce3a338a7afcc0d9466fded39610e74b08b287b93a00d37be297be886ed4e7f78727c07d5ddfdb68547a58c8fea5ecdfdda9e20650e097 MISC metadata.xml 929 BLAKE2B d33a2f957a306c08d1d4b03d947b975db3f77bd726df50d60de1ab4803dc2abcadd0f19d8a48f19692cde36f094556172cd9adfb120c6b5d053870c713a767c3 SHA512 b22ede083a2bec13d32c88a9f503a7ceddd13892c521bd0532168d4d7fdf8537415f256fa7548240e19ca1c949ad3215c28f6533a0eaa5ee37fcfa7093fde0ca diff --git a/media-video/ttcut/files/ttcut-0.19.6-deprecated.patch b/media-video/ttcut/files/ttcut-0.19.6-deprecated.patch deleted file mode 100644 index 95c466372f29..000000000000 --- a/media-video/ttcut/files/ttcut-0.19.6-deprecated.patch +++ /dev/null @@ -1,376 +0,0 @@ -diff -Naur ttcut-old/avstream/ttac3audioheader.h ttcut/avstream/ttac3audioheader.h ---- ttcut-old/avstream/ttac3audioheader.h 2006-02-03 21:32:50.000000000 +0100 -+++ ttcut/avstream/ttac3audioheader.h 2009-09-20 02:13:04.000000000 +0200 -@@ -116,7 +116,7 @@ - 2,1,2,3,3,4,4,5
- };
-
--__attribute__ ((unused))static char* AC3Mode[8] =
-+__attribute__ ((unused))static const char* AC3Mode[8] =
- {
- "1+1", "1/0", "2/0", "3/0",
- "2/1", "3/1", "2/2", "3/2"
-diff -Naur ttcut-old/avstream/ttac3audiostream.cpp ttcut/avstream/ttac3audiostream.cpp ---- ttcut-old/avstream/ttac3audiostream.cpp 2007-04-30 11:06:19.000000000 +0200 -+++ ttcut/avstream/ttac3audiostream.cpp 2009-09-20 02:13:04.000000000 +0200 -@@ -108,7 +108,7 @@ -
- audio_header->setHeaderOffset( stream_buffer->currentOffset() - 8 ); // +Syncwort
-
-- audio_header->crc1 = daten[0]<<8+daten[1];
-+ audio_header->crc1 = daten[0]<<(8+daten[1]);
- audio_header->fscod = (uint8_t)((daten[2]&0xc0)>>6);
- audio_header->frmsizecod = (uint8_t)(daten[2]&0x3f);
- audio_header->syncframe_words = AC3FrameLength[audio_header->fscod][audio_header->frmsizecod];
-diff -Naur ttcut-old/avstream/ttaviwriter.cpp ttcut/avstream/ttaviwriter.cpp ---- ttcut-old/avstream/ttaviwriter.cpp 2007-04-27 10:32:20.000000000 +0200 -+++ ttcut/avstream/ttaviwriter.cpp 2009-09-20 02:13:04.000000000 +0200 -@@ -126,7 +126,7 @@ - //qDebug( "%sAVI frame info: width: %d x height: %d",c_name,frameInfo->width,frameInfo->height );
-
- //TODO: avoid setting hard coded frame rate!
-- AVI_set_video(avi_file, frameInfo->width, frameInfo->height, 25.0, "YV12");
-+ AVI_set_video(avi_file, frameInfo->width, frameInfo->height, 25.0, (char*)"YV12");
-
- ref_data = new uint8_t [frameInfo->size+2*frameInfo->chroma_size];
-
-diff -Naur ttcut-old/avstream/ttdtsaudioheader.h ttcut/avstream/ttdtsaudioheader.h ---- ttcut-old/avstream/ttdtsaudioheader.h 2006-02-02 20:43:48.000000000 +0100 -+++ ttcut/avstream/ttdtsaudioheader.h 2009-09-20 02:13:04.000000000 +0200 -@@ -78,7 +78,7 @@ - 2048000, 3072000, 3840000, 4096000, 0, 0
- };
-
--__attribute__ ((unused))static char* dts_acmod[64] =
-+__attribute__ ((unused))static const char* dts_acmod[64] =
- {
- "1","DM","2/0","2/0",
- "2/0","3/0","2.1/0","3.1/0",
-diff -Naur ttcut-old/avstream/ttfilebuffer.cpp ttcut/avstream/ttfilebuffer.cpp ---- ttcut-old/avstream/ttfilebuffer.cpp 2007-09-02 13:15:09.000000000 +0200 -+++ ttcut/avstream/ttfilebuffer.cpp 2009-09-20 02:13:04.000000000 +0200 -@@ -773,8 +773,8 @@ - /* new position outside buffer*/
- else
- {
-- if ( new_pos > -1 &&
-- (file_mode == fm_open_read && new_pos < stream_length) ||
-+ if ( (new_pos > -1 &&
-+ (file_mode == fm_open_read && new_pos < stream_length)) ||
- ((file_mode == fm_open_write || file_mode == fm_create) &&
- new_pos < stream_length + 1) )
- {
-diff -Naur ttcut-old/gui/ttcutmainwindow.cpp ttcut/gui/ttcutmainwindow.cpp ---- ttcut-old/gui/ttcutmainwindow.cpp 2007-09-02 13:15:09.000000000 +0200 -+++ ttcut/gui/ttcutmainwindow.cpp 2009-09-20 02:13:04.000000000 +0200 -@@ -1030,8 +1030,8 @@ - int num_header = current_audio_stream->createHeaderList(); - - // error reading audio stream or user abort during operation -- if ( num_header == 0 && audio_type->avStreamType() != TTAVTypes::pcm_audio || -- num_header == 1 && audio_type->avStreamType() == TTAVTypes::pcm_audio ) { -+ if ( (num_header == 0 && audio_type->avStreamType() != TTAVTypes::pcm_audio) || -+ (num_header == 1 && audio_type->avStreamType() == TTAVTypes::pcm_audio) ) { - - log->errorMsg( oName, "error reading audio stream; no header list (!)" ); - delete current_audio_stream; -diff -Naur ttcut-old/ui/pixmaps/addtolist_18.xpm ttcut/ui/pixmaps/addtolist_18.xpm ---- ttcut-old/ui/pixmaps/addtolist_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/addtolist_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * addtolist_18_xpm[] = { -+static const char * addtolist_18_xpm[] = { - "18 18 163 2", - " c None", - ". c #3E98E5", -diff -Naur ttcut-old/ui/pixmaps/apply_18.xpm ttcut/ui/pixmaps/apply_18.xpm ---- ttcut-old/ui/pixmaps/apply_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/apply_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * apply_18_xpm[] = { -+static const char * apply_18_xpm[] = { - "18 18 46 1", - " c None", - ". c #707070", -diff -Naur ttcut-old/ui/pixmaps/bframe_18.xpm ttcut/ui/pixmaps/bframe_18.xpm ---- ttcut-old/ui/pixmaps/bframe_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/bframe_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char* const b_frame_18_xpm[] = { -+static const char * b_frame_18_xpm[] = { - "18 18 16 1", - ". c None", - "d c #faf515", -diff -Naur ttcut-old/ui/pixmaps/button_ok.xpm ttcut/ui/pixmaps/button_ok.xpm ---- ttcut-old/ui/pixmaps/button_ok.xpm 2007-04-27 10:32:20.000000000 +0200 -+++ ttcut/ui/pixmaps/button_ok.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * button_ok_xpm[] = { -+static const char * button_ok_xpm[] = { - "32 32 132 2", - " c None", - ". c #18AD00", -diff -Naur ttcut-old/ui/pixmaps/chapter_18.xpm ttcut/ui/pixmaps/chapter_18.xpm ---- ttcut-old/ui/pixmaps/chapter_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/chapter_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * chapter_18_xpm[] = { -+static const char * chapter_18_xpm[] = { - "18 18 157 2", - " c None", - ". c #9EAAD6", -diff -Naur ttcut-old/ui/pixmaps/clock_16.xpm ttcut/ui/pixmaps/clock_16.xpm ---- ttcut-old/ui/pixmaps/clock_16.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/clock_16.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * clock_16_xpm[] = { -+static const char * clock_16_xpm[] = { - "16 16 168 2", - " c None", - ". c #2A6AC0", -diff -Naur ttcut-old/ui/pixmaps/clock_18.xpm ttcut/ui/pixmaps/clock_18.xpm ---- ttcut-old/ui/pixmaps/clock_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/clock_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * clock_18_xpm[] = { -+static const char * clock_18_xpm[] = { - "18 18 202 2", - " c None", - ". c #2360BB", -diff -Naur ttcut-old/ui/pixmaps/cutaudio_18.xpm ttcut/ui/pixmaps/cutaudio_18.xpm ---- ttcut-old/ui/pixmaps/cutaudio_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/cutaudio_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * cutaudio_18_xpm[] = { -+static const char * cutaudio_18_xpm[] = { - "11 18 2 1", - " c None", - ". c #000000", -diff -Naur ttcut-old/ui/pixmaps/cutav_18.xpm ttcut/ui/pixmaps/cutav_18.xpm ---- ttcut-old/ui/pixmaps/cutav_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/cutav_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * cutav_18_xpm[] = { -+static const char * cutav_18_xpm[] = { - "18 18 105 2", - " c None", - ". c #CDCDD9", -diff -Naur ttcut-old/ui/pixmaps/exit_16.xpm ttcut/ui/pixmaps/exit_16.xpm ---- ttcut-old/ui/pixmaps/exit_16.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/exit_16.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * exit_16_xpm[] = { -+static const char * exit_16_xpm[] = { - "16 16 174 2", - " c None", - ". c #AE3725", -diff -Naur ttcut-old/ui/pixmaps/fileclose_18.xpm ttcut/ui/pixmaps/fileclose_18.xpm ---- ttcut-old/ui/pixmaps/fileclose_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/fileclose_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * fileclose_18_xpm[] = { -+static const char * fileclose_18_xpm[] = { - "18 18 138 2", - " c None", - ". c #3D3D5D", -diff -Naur ttcut-old/ui/pixmaps/filenew_16.xpm ttcut/ui/pixmaps/filenew_16.xpm ---- ttcut-old/ui/pixmaps/filenew_16.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/filenew_16.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * filenew_16_xpm[] = { -+static const char * filenew_16_xpm[] = { - "16 16 121 2", - " c None", - ". c #C5CAD6", -diff -Naur ttcut-old/ui/pixmaps/fileopen_16.xpm ttcut/ui/pixmaps/fileopen_16.xpm ---- ttcut-old/ui/pixmaps/fileopen_16.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/fileopen_16.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * fileopen_16_xpm[] = { -+static const char * fileopen_16_xpm[] = { - "16 16 183 2", - " c None", - ". c #9BA1D9", -diff -Naur ttcut-old/ui/pixmaps/filesave_16.xpm ttcut/ui/pixmaps/filesave_16.xpm ---- ttcut-old/ui/pixmaps/filesave_16.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/filesave_16.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * filesave_16_xpm[] = { -+static const char * filesave_16_xpm[] = { - "16 16 174 2", - " c None", - ". c #B8B8CC", -diff -Naur ttcut-old/ui/pixmaps/filesaveas_16.xpm ttcut/ui/pixmaps/filesaveas_16.xpm ---- ttcut-old/ui/pixmaps/filesaveas_16.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/filesaveas_16.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * filesaveas_16_xpm[] = { -+static const char * filesaveas_16_xpm[] = { - "16 16 180 2", - " c None", - ". c #F2C14C", -diff -Naur ttcut-old/ui/pixmaps/goto_18.xpm ttcut/ui/pixmaps/goto_18.xpm ---- ttcut-old/ui/pixmaps/goto_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/goto_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * goto_18_xpm[] = { -+static const char * goto_18_xpm[] = { - "18 18 82 1", - " c None", - ". c #127DFF", -diff -Naur ttcut-old/ui/pixmaps/iframe_18.xpm ttcut/ui/pixmaps/iframe_18.xpm ---- ttcut-old/ui/pixmaps/iframe_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/iframe_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char* const i_frame_18_xpm[] = { -+static const char * i_frame_18_xpm[] = { - "18 18 9 1", - ". c None", - "d c #000096", -diff -Naur ttcut-old/ui/pixmaps/next_18.xpm ttcut/ui/pixmaps/next_18.xpm ---- ttcut-old/ui/pixmaps/next_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/next_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * next_18_xpm[] = { -+static const char * next_18_xpm[] = { - "18 18 59 1", - " c None", - ". c #000000", -diff -Naur ttcut-old/ui/pixmaps/note_18.xpm ttcut/ui/pixmaps/note_18.xpm ---- ttcut-old/ui/pixmaps/note_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/note_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * note_18_xpm[] = { -+static const char * note_18_xpm[] = { - "18 18 93 2", - " c None", - ". c #C5AD09", -diff -Naur ttcut-old/ui/pixmaps/pause_18.xpm ttcut/ui/pixmaps/pause_18.xpm ---- ttcut-old/ui/pixmaps/pause_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/pause_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * pause_18_xpm[] = { -+static const char * pause_18_xpm[] = { - "18 18 67 1", - " c None", - ". c #000000", -diff -Naur ttcut-old/ui/pixmaps/pframe_18.xpm ttcut/ui/pixmaps/pframe_18.xpm ---- ttcut-old/ui/pixmaps/pframe_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/pframe_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char* const p_frame_18_xpm[] = { -+static const char * const p_frame_18_xpm[] = { - "18 18 15 1", - ". c None", - "e c #fa0150", -diff -Naur ttcut-old/ui/pixmaps/play_18.xpm ttcut/ui/pixmaps/play_18.xpm ---- ttcut-old/ui/pixmaps/play_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/play_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * play_18_xpm[] = { -+static const char * play_18_xpm[] = { - "18 18 38 1", - " c None", - ". c #000000", -diff -Naur ttcut-old/ui/pixmaps/prev_18.xpm ttcut/ui/pixmaps/prev_18.xpm ---- ttcut-old/ui/pixmaps/prev_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/prev_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * prev_18_xpm[] = { -+static const char * prev_18_xpm[] = { - "18 18 64 1", - " c None", - ". c #0E0E0E", -diff -Naur ttcut-old/ui/pixmaps/preview_18.xpm ttcut/ui/pixmaps/preview_18.xpm ---- ttcut-old/ui/pixmaps/preview_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/preview_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * preview_18_xpm[] = { -+static const char * preview_18_xpm[] = { - "18 18 134 2", - " c None", - ". c #A9ACB6", -diff -Naur ttcut-old/ui/pixmaps/saveimage_16.xpm ttcut/ui/pixmaps/saveimage_16.xpm ---- ttcut-old/ui/pixmaps/saveimage_16.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/saveimage_16.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * saveimage_16_xpm[] = { -+static const char * saveimage_16_xpm[] = { - "17 18 80 1", - " c None", - ". c #000000", -diff -Naur ttcut-old/ui/pixmaps/search_18.xpm ttcut/ui/pixmaps/search_18.xpm ---- ttcut-old/ui/pixmaps/search_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/search_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * search_18_xpm[] = { -+static const char * search_18_xpm[] = { - "18 18 126 2", - " c None", - ". c #000000", -diff -Naur ttcut-old/ui/pixmaps/settings_16.xpm ttcut/ui/pixmaps/settings_16.xpm ---- ttcut-old/ui/pixmaps/settings_16.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/settings_16.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * settings_16_xpm[] = { -+static const char * settings_16_xpm[] = { - "16 16 102 2", - " c None", - ". c #C1C1CE", -diff -Naur ttcut-old/ui/pixmaps/_settings_18.xpm ttcut/ui/pixmaps/_settings_18.xpm ---- ttcut-old/ui/pixmaps/_settings_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/_settings_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * settings_18_xpm[] = { -+static const char * settings_18_xpm[] = { - "16 16 102 2", - " c None", - ". c #C1C1CE", -diff -Naur ttcut-old/ui/pixmaps/settings_18.xpm ttcut/ui/pixmaps/settings_18.xpm ---- ttcut-old/ui/pixmaps/settings_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/settings_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * settings_18_xpm[] = { -+static const char * settings_18_xpm[] = { - "16 16 102 2", - " c None", - ". c #C1C1CE", -diff -Naur ttcut-old/ui/pixmaps/stop_18.xpm ttcut/ui/pixmaps/stop_18.xpm ---- ttcut-old/ui/pixmaps/stop_18.xpm 2006-02-27 18:05:47.000000000 +0100 -+++ ttcut/ui/pixmaps/stop_18.xpm 2009-09-20 02:13:04.000000000 +0200 -@@ -1,5 +1,5 @@ - /* XPM */ --static char * stop_18_xpm[] = { -+static const char * stop_18_xpm[] = { - "18 18 39 1", - " c None", - ". c #1D1D1C", diff --git a/media-video/ttcut/files/ttcut-0.19.6-ffmpeg-vf-setdar.patch b/media-video/ttcut/files/ttcut-0.19.6-ffmpeg-vf-setdar.patch deleted file mode 100644 index 6f5b05b228a0..000000000000 --- a/media-video/ttcut/files/ttcut-0.19.6-ffmpeg-vf-setdar.patch +++ /dev/null @@ -1,184 +0,0 @@ -diff -Naur ttcut-old/avstream/ttcommon.cpp ttcut/avstream/ttcommon.cpp ---- ttcut-old/avstream/ttcommon.cpp 2011-05-05 00:00:33.936254667 +0200 -+++ ttcut/avstream/ttcommon.cpp 2011-05-05 00:03:27.396254667 +0200 -@@ -51,6 +51,18 @@ - return sNewFileName;
- }
-
-+// return the aspect ratio as string value
-+QString ttAspectRatioText(int aspect_ratio_information)
-+{
-+ QString szTemp;
-+
-+ if ( aspect_ratio_information == 1 ) szTemp = "1:1";
-+ if ( aspect_ratio_information == 2 ) szTemp = "4:3";
-+ if ( aspect_ratio_information == 3 ) szTemp = "16:9";
-+ if ( aspect_ratio_information == 4 ) szTemp = "2.21:1";
-+
-+ return szTemp;
-+}
-
- // check if file fName exists
- bool ttFileExists( QString fName )
-diff -Naur ttcut-old/avstream/ttcommon.h ttcut/avstream/ttcommon.h ---- ttcut-old/avstream/ttcommon.h 2011-05-05 00:00:33.936254667 +0200 -+++ ttcut/avstream/ttcommon.h 2011-05-05 00:03:58.412921334 +0200 -@@ -11,6 +11,7 @@ - extern "C" bool ttDeleteFile( QString fName );
- extern "C" QString ttAddFileExt( QString fName, const char* cExt );
- extern "C" QString ttChangeFileExt( QString fName, const char* cExt );
-+extern "C" QString ttAspectRatioText(int aspect_ratio_information);
- extern "C" QTime ttMsecToTime( int msec );
- extern "C" QTime ttMsecToTimeD( double msec );
- extern "C" QTime ttFramesToTime(long lFrames, float fps);
-diff -Naur ttcut-old/avstream/ttmpeg2videoheader.cpp ttcut/avstream/ttmpeg2videoheader.cpp ---- ttcut-old/avstream/ttmpeg2videoheader.cpp 2011-05-05 00:00:33.936254667 +0200 -+++ ttcut/avstream/ttmpeg2videoheader.cpp 2011-05-05 00:05:42.999588000 +0200 -@@ -170,18 +170,11 @@ - }
-
- /* /////////////////////////////////////////////////////////////////////////////
-- * Returns the aspect ration as string value
-+ * Returns the aspect ratio as string value
- */
- QString TTSequenceHeader::aspectRatioText()
- {
-- QString szTemp;
--
-- if ( aspect_ratio_information == 1 ) szTemp = "1:1";
-- if ( aspect_ratio_information == 2 ) szTemp = "4:3";
-- if ( aspect_ratio_information == 3 ) szTemp = "16:9";
-- if ( aspect_ratio_information == 4 ) szTemp = "2.21:1";
--
-- return szTemp;
-+ return ttAspectRatioText(aspect_ratio_information);
- }
-
- /* /////////////////////////////////////////////////////////////////////////////
-diff -Naur ttcut-old/avstream/ttmpeg2videostream.cpp ttcut/avstream/ttmpeg2videostream.cpp ---- ttcut-old/avstream/ttmpeg2videostream.cpp 2011-05-05 00:00:33.936254667 +0200 -+++ ttcut/avstream/ttmpeg2videostream.cpp 2011-05-05 00:00:43.579588002 +0200 -@@ -1505,7 +1505,7 @@ -
- QDir temp_dir( TTCut::tempDirPath );
- QString avi_out_file = "encode.avi";
-- QString mpeg2_out_file = "encode"; // extension is added by transcode (!)
-+ QString mpeg2_out_file = "encode.m2v";
- new_file_info.setFile( temp_dir, avi_out_file );
-
- TTPicturesHeader* start_pic = header_list->pictureHeaderAt( start );
-@@ -1538,7 +1538,7 @@ - TTTranscodeProvider* transcode_prov = new TTTranscodeProvider( );
- transcode_prov->setParameter( enc_par );
-
-- // encode the part with transcode
-+ // encode the part with ffmpeg
- if ( transcode_prov->encodePart() )
- {
- new_file_info.setFile( temp_dir, "encode.m2v" );
-@@ -1565,7 +1565,7 @@ - }
- else
- {
-- log->errorMsg(c_name, "Error in transcode part (!)");
-+ log->errorMsg(c_name, "Error in ffmpeg part (!)");
- }
-
- // remove temporary files
-diff -Naur ttcut-old/extern/tttranscode.cpp ttcut/extern/tttranscode.cpp ---- ttcut-old/extern/tttranscode.cpp 2011-05-05 00:00:33.939588000 +0200 -+++ ttcut/extern/tttranscode.cpp 2011-05-05 00:02:27.062921334 +0200 -@@ -49,9 +49,9 @@ - // message logger instance - log = TTMessageLogger::getInstance(); - -- QString str_head = "starting encoder >>>transcode -y ffmpeg<<<"; -+ QString str_head = "starting encoder >>>ffmpeg<<<"; - -- str_command = "transcode"; -+ str_command = "ffmpeg"; - transcode_success = false; - - setModal( true ); -@@ -76,7 +76,7 @@ - { - #if defined (TTTRANSCODE_DEBUG) - log->debugMsg( c_name, "----------------------------------------------------" ); -- log->debugMsg( c_name, "transcode parameter:" ); -+ log->debugMsg( c_name, "ffmpeg parameter:" ); - log->debugMsg( c_name, "----------------------------------------------------" ); - log->debugMsg( c_name, "avi-file : %s", qPrintable(enc_par.avi_input_finfo.absoluteFilePath()) ); - log->debugMsg( c_name, "mpeg-file : %s", qPrintable(enc_par.mpeg2_output_finfo.absoluteFilePath()) ); -@@ -86,32 +86,32 @@ - log->debugMsg( c_name, "----------------------------------------------------" ); - #endif - -- //transcode -i encode.avi --pre_clip 0 -y ffmpeg --export_prof dvd-pal --export_asr 2 -o encode - QString str_aspect; -- str_aspect.sprintf("%d",enc_par.video_aspect_code ); -+ str_aspect = ttAspectRatioText(enc_par.video_aspect_code); - - QString str_format; - str_format.sprintf("%dx%d", enc_par.video_width, enc_par.video_height); - - QString str_bitrate; -- str_bitrate.sprintf("%f", enc_par.video_bitrate); -+ str_bitrate.sprintf("%.0f", enc_par.video_bitrate); -+ -+ QString str_aspect_opt; -+ str_aspect_opt = "setdar="; -+ -+ str_aspect_opt += str_aspect; - - strl_command_line.clear(); - - strl_command_line << "-i" -- << enc_par.avi_input_finfo.absoluteFilePath() -- << "--pre_clip" -- << "0" -- //<< "-y" // isn't neccessary unless --export_prof is specified! -- //<< "mpeg2enc,mp2enc" // mpeg2enc->video, mp2enc->audio! -- //<< "-F" -- //<< "8,\"-v 1 -q 3\"" -- << "--export_prof" -- << "dvd" // dvd-pal -- << "--export_asr" -- << str_aspect -- << "-o" -- << enc_par.mpeg2_output_finfo.absoluteFilePath(); -+ << enc_par.avi_input_finfo.absoluteFilePath() -+ << "-y" -+ << "-target" -+ << "dvd" //autodetects pal/ntsc -+ << "-f" -+ << "mpeg2video" //else ffmpeg creates an mpegps stream that mplex can not handle -+ << "-vf" -+ << str_aspect_opt //workaround for mpeg2video not preserving aspect ratio in combination with --enable-avfilter -+ << enc_par.mpeg2_output_finfo.absoluteFilePath(); - - log->infoMsg(c_name, strl_command_line.join(" ")); - } -@@ -124,7 +124,7 @@ - int update = EVENT_LOOP_INTERVALL; //update intervall for local event loop - transcode_success = false; - -- // create the process object for transcode -+ // create the process object for ffmpeg - proc = new QProcess(); - - // read both channels: stderr and stdout -@@ -197,12 +197,12 @@ - switch (e_status) { - case QProcess::NormalExit: - //log->debugMsg(c_name, "The process ecxited normally: %d", e_code); -- procMsg = tr("Transcode exit normally ... done(0)"); -+ procMsg = tr("ffmpeg exit normally ... done(0)"); - transcode_success = true; - break; - case QProcess::CrashExit: - //log->debugMsg(c_name, "The process crashed: %d", e_code); -- procMsg = tr("Transcode crashed"); -+ procMsg = tr("ffmpeg crashed"); - transcode_success = false; - break; - default: diff --git a/media-video/ttcut/files/ttcut-0.19.6-no_implicit_GLU.patch b/media-video/ttcut/files/ttcut-0.19.6-no_implicit_GLU.patch deleted file mode 100644 index afb83aa296db..000000000000 --- a/media-video/ttcut/files/ttcut-0.19.6-no_implicit_GLU.patch +++ /dev/null @@ -1,24 +0,0 @@ -Stop relying on implicit usage of GLU for compability with >=x11-libs/qt-opengl-4.8 -See, http://bugs.gentoo.org/407391 - ---- mpeg2window/ttmpeg2window.cpp -+++ mpeg2window/ttmpeg2window.cpp -@@ -33,6 +33,7 @@ - // qApplication for the qApp pointer - #include <QApplication> - #include <QPixmap> -+#include <GL/glu.h> - - // ----------------------------------------------------------------------------- - // class declaration ---- ttcut.pro -+++ ttcut.pro -@@ -15,7 +15,7 @@ - DEFINES += _FILE_OFFSET_BITS=64 - DIST = TTCut - TARGET = ttcut --LIBS = -lmpeg2 -lmpeg2convert -+LIBS = -lmpeg2 -lmpeg2convert -lGLU - OBJECTS_DIR = obj - MOC_DIR = moc - UI_DIR = ui_h diff --git a/media-video/ttcut/files/ttcut-0.19.6-ntsc-fps.patch b/media-video/ttcut/files/ttcut-0.19.6-ntsc-fps.patch deleted file mode 100644 index 0af76de1d095..000000000000 --- a/media-video/ttcut/files/ttcut-0.19.6-ntsc-fps.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -upr ttcut-old/avstream/ttac3audiostream.cpp ttcut/avstream/ttac3audiostream.cpp ---- ttcut-old/avstream/ttac3audiostream.cpp 2011-05-01 21:51:10.865817426 -0400 -+++ ttcut/avstream/ttac3audiostream.cpp 2011-05-01 21:45:34.213440925 -0400 -@@ -256,6 +256,7 @@ void TTAC3AudioStream::cut( TTFileBuffer - float audio_start_time;
- float audio_end_time;
- float local_audio_offset = 0.0;
-+ float fps = cut_list->videoStream()->frameRate();
-
- #if defined(AC3STREAM_DEBUG)
- log->debugMsg(c_name, "-----------------------------------------------");
-@@ -286,7 +287,7 @@ void TTAC3AudioStream::cut( TTFileBuffer -
- //qDebug( "%sstart / end : %d / %d",c_name,start_pos,end_pos );
- //search
-- video_frame_length = 1000.0 / 25.0; //TODO: replace with fps
-+ video_frame_length = 1000.0 / fps;
-
- //qDebug( "%slocal audio offset: %f",c_name,local_audio_offset );
-
-diff -upr ttcut-old/avstream/ttmpeg2videoheader.cpp ttcut/avstream/ttmpeg2videoheader.cpp ---- ttcut-old/avstream/ttmpeg2videoheader.cpp 2011-05-01 21:20:42.675440912 -0400 -+++ ttcut/avstream/ttmpeg2videoheader.cpp 2011-04-29 23:06:29.684768509 -0400 -@@ -193,6 +193,7 @@ QString TTSequenceHeader::frameRateText( -
- if ( frame_rate_code == 2 ) szTemp = "24 fps";
- if ( frame_rate_code == 3 ) szTemp = "25 fps";
-+ if ( frame_rate_code == 4 ) szTemp = "29.970 fps";
- if ( frame_rate_code == 5 ) szTemp = "30 fps";
-
- return szTemp;
-@@ -207,6 +208,7 @@ float TTSequenceHeader::frameRateValue() -
- if ( frame_rate_code == 2 ) value = 24.0;
- if ( frame_rate_code == 3 ) value = 25.0;
-+ if ( frame_rate_code == 4 ) value = 29.970;
- if ( frame_rate_code == 5 ) value = 30.0;
-
- if ( frame_rate_code < 2 || frame_rate_code > 5 )
-diff -upr ttcut-old/avstream/ttmpegaudiostream.cpp ttcut/avstream/ttmpegaudiostream.cpp ---- ttcut-old/avstream/ttmpegaudiostream.cpp 2011-05-01 21:20:42.679440927 -0400 -+++ ttcut/avstream/ttmpegaudiostream.cpp 2011-05-01 21:45:55.036441412 -0400 -@@ -308,6 +308,7 @@ void TTMPEGAudioStream::cut( TTFileBuffe - float audio_start_time;
- float audio_end_time;
- float local_audio_offset = 0.0;
-+ float fps = cut_list->videoStream()->frameRate();
-
- #if defined MPEGAUDIO_DEBUG
- log->infoMsg(c_name, "-----------------------------------------------");
-@@ -338,7 +339,7 @@ void TTMPEGAudioStream::cut( TTFileBuffe -
- //qDebug( "%sstart / end : %d / %d",c_name,start_pos,end_pos );
- //search
-- video_frame_length = 1000.0 / 25.0; //TODO: replace with fps
-+ video_frame_length = 1000.0 / fps;
-
- //qDebug( "%slocal audio offset: %f",c_name,local_audio_offset );
-
-diff -upr ttcut-old/avstream/ttaviwriter.cpp ttcut/avstream/ttaviwriter.cpp ---- ttcut-old/avstream/ttaviwriter.cpp 2011-05-01 22:05:47.307819446 -0400 -+++ ttcut/avstream/ttaviwriter.cpp 2011-05-01 22:08:27.427839373 -0400 -@@ -49,6 +49,7 @@ TTAVIWriter::TTAVIWriter( TTProgressBar* -
- file_size = 0;
- file_offset = 0;
-+ fps = 0.0;
- }
-
-
-@@ -78,6 +79,7 @@ bool TTAVIWriter::initAVIWriter( TTVideo - index_list = v_stream->indexList();
- header_list = v_stream->headerList();
- file_size = v_stream->streamLengthByte();
-+ fps = v_stream->frameRate();
-
- //create the decoder object
- decoder = new TTMpeg2Decoder( qPrintable(video_file_name), index_list, header_list );
-@@ -125,8 +127,7 @@ int TTAVIWriter::writeAVI( int start_fra -
- //qDebug( "%sAVI frame info: width: %d x height: %d",c_name,frameInfo->width,frameInfo->height );
-
-- //TODO: avoid setting hard coded frame rate!
-- AVI_set_video(avi_file, frameInfo->width, frameInfo->height, 25.0, (char*)"YV12");
-+ AVI_set_video(avi_file, frameInfo->width, frameInfo->height, fps, (char*)"YV12");
-
- ref_data = new uint8_t [frameInfo->size+2*frameInfo->chroma_size];
-
-diff -upr ttcut-old/avstream/ttaviwriter.h ttcut/avstream/ttaviwriter.h ---- ttcut-old/avstream/ttaviwriter.h 2011-05-01 22:05:47.308819943 -0400 -+++ ttcut/avstream/ttaviwriter.h 2011-05-01 22:06:17.162739403 -0400 -@@ -72,6 +72,7 @@ class TTAVIWriter - off64_t file_offset; - uint8_t* ref_data; - avi_t* avi_file; -+ float fps; - }; - - #endif //TTAVIWRITER_H diff --git a/media-video/ttcut/ttcut-0.19.6-r3.ebuild b/media-video/ttcut/ttcut-0.19.6-r3.ebuild deleted file mode 100644 index 99b5e6857847..000000000000 --- a/media-video/ttcut/ttcut-0.19.6-r3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils fdo-mime qt4-r2 - -DESCRIPTION="Tool for cutting MPEG files especially for removing commercials" -HOMEPAGE="http://www.tritime.de/ttcut/" -SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=">=media-libs/libmpeg2-0.4.0 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - virtual/glu - virtual/opengl" -RDEPEND="${DEPEND} - media-video/mplayer - >=media-video/ffmpeg-1.0.8[encode]" - -S=${WORKDIR}/${PN} - -PATCHES=( - "${FILESDIR}"/${P}-deprecated.patch - "${FILESDIR}"/${P}-ntsc-fps.patch - "${FILESDIR}"/${P}-ffmpeg-vf-setdar.patch - "${FILESDIR}"/${P}-no_implicit_GLU.patch - ) - -src_install() { - dobin ttcut - - domenu "${FILESDIR}"/${PN}.desktop - - dodoc AUTHORS BUGS CHANGELOG README.* TODO -} diff --git a/media-video/ttcut/ttcut-0.19.6_p1.ebuild b/media-video/ttcut/ttcut-0.19.6_p1.ebuild index 443d4abb2b0a..3321a25b40f8 100644 --- a/media-video/ttcut/ttcut-0.19.6_p1.ebuild +++ b/media-video/ttcut/ttcut-0.19.6_p1.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 @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND=">=media-libs/libmpeg2-0.4.0 |