diff options
| -rw-r--r-- | media-video/2mandvd/2mandvd-1.8.4.ebuild | 65 | ||||
| -rw-r--r-- | media-video/2mandvd/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/2mandvd/Manifest | 24 | ||||
| -rw-r--r-- | media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch | 38 |
4 files changed, 21 insertions, 112 deletions
diff --git a/media-video/2mandvd/2mandvd-1.8.4.ebuild b/media-video/2mandvd/2mandvd-1.8.4.ebuild deleted file mode 100644 index ca1eb0f3e50b..000000000000 --- a/media-video/2mandvd/2mandvd-1.8.4.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.8.4.ebuild,v 1.5 2013/03/02 22:06:19 hwoarang Exp $ - -EAPI=4 -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" - -DEPEND="media-libs/libsdl - virtual/ffmpeg - 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.4-libavformat54.patch" -) - -src_prepare() { - # Cleaning old 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/ChangeLog b/media-video/2mandvd/ChangeLog index cf069ffe8ca9..321303add1af 100644 --- a/media-video/2mandvd/ChangeLog +++ b/media-video/2mandvd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/2mandvd # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.34 2015/05/15 07:29:59 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.35 2015/05/15 16:57:37 kensington Exp $ + + 15 May 2015; Michael Palimaka <kensington@gentoo.org> -2mandvd-1.8.4.ebuild, + -files/2mandvd-1.8.4-libavformat54.patch: + Remove old. 15 May 2015; Pacho Ramos <pacho@gentoo.org> 2mandvd-1.8.5.ebuild: amd64/x86 stable, bug #547658 diff --git a/media-video/2mandvd/Manifest b/media-video/2mandvd/Manifest index a5174332993b..858a63a87a85 100644 --- a/media-video/2mandvd/Manifest +++ b/media-video/2mandvd/Manifest @@ -2,18 +2,26 @@ Hash: SHA256 AUX 2mandvd-1.7.3-libav.patch 269 SHA256 5c60fc260aca4a7c32e9a54646b8fae88eabbdc9a9fb8f867f2f81de62abefe5 SHA512 fc6d557ee3bf81f388f3f76b57a76364d1c68105d89391eaad74f2a429e1847d97a937c627ca28085dd3e9c12d9b882e0ffa68ffe9ba7b917faa9e952a8de0c5 WHIRLPOOL 8d95a4b78043d9026a06b8c292dcdc17f55569780b270de3ea0ec0d9b6181b8480b9d89bc0968d6d7bc6627e3581a96383848e784de52fb896e5cc911bc43d55 -AUX 2mandvd-1.8.4-libavformat54.patch 1297 SHA256 272f2792ceff27c64ec86847e6fa97bcc5270291fb7a46eb6959f2054bdd23d3 SHA512 b212f4d6418986c45589756d7602898b5f86292785cb28e480ca8896d786ce40aa4fa49d9aced87f5429d208090cc17814ddbc6e8502689e2012190489a167f0 WHIRLPOOL 0f85d721766b00193543f0db445a5b8f9ae0a4da660a54a6cd996b07c4fa1ab6728bed0cde586ffdc2c8be466212e883061cd513ee54aa2f274e40cf6bc593e6 AUX 2mandvd-1.8.5-libavformat54.patch 819 SHA256 e4d662a31da92c83947f388cad545b1a592659911a7e8e11ee4399bbfff493ae SHA512 ff1500e95646966258890983a37abdd42eb4509d1bb084fd901cc9ab420be1108cb2b7fe3d3db1c92c453c8ae3a2ebc60218fe4994ca7f3fc91feaffcdc23b61 WHIRLPOOL 28aaef96fd9c4d6248a39289a2246ddfd447474753679329f9ce63fde2aaab60154c76974078c44127eddf120f7d1ea51720db11239b9a6c776920df0a8c2c7c -DIST 2ManDVD-1.8.4.tar.gz 29523342 SHA256 b74e8a62b4e396c4cbb1db2864d77c87ea45f74bb599f4f270608d9e7f91888c SHA512 2bef9b5cdda2949507855193607cf953d4127bd1fb913c7710e1d3e7753bc6ba64bf04f5b1158a500c84d798c513dd4106a1ec7b54ae5054801a1215ade7ed09 WHIRLPOOL 4af1bd075a0d21d64afb955963da90d32ba5682209a125d55b5de32690c545081be6c46cd81e33da79724790511f83c62e9a2d85a8d83de45b17cd642800554d DIST 2ManDVD-1.8.5.tar.gz 29525071 SHA256 19c3c02123684220e77b3baa12f37b6feb5ecb523c504c65d306c75136191873 SHA512 1e43034cab310ce0a642afdfcb2b4ddbc47b16b0f353adebd1fd2ec5f8445add41226390c6656e7cb520d9900e1b482adee7adb6f784d2fbfbaff2334feb3284 WHIRLPOOL 1a5b8e148fbfb2d7e67e18f64f15f560fe421e0f32d7f416ceea30a4b318f5078506d755df487be83032a7eb3279ced716a4122c215d5aed1bf69816f3a53f9f -EBUILD 2mandvd-1.8.4.ebuild 1470 SHA256 717ab8b3876ad4eb7b39d44e0a83989184bc965763d2ce021ad3e50dc2c2777c SHA512 4aa7083aa9069c5c742013383d7464b0326df0f9b1e0e084077ceb9a74ab58de57dccedf81fe3da430f7108335206703331e5e6bee27411ef1290d21e771e4b8 WHIRLPOOL 15ce9a44878fede680d300e1769c3ae6149a2c4b961bf272a99c8b72b77059db4c0a47374d94d01b0fb074478fe1b132b7a6aad5395bdfb6919271c7ecba520c EBUILD 2mandvd-1.8.5.ebuild 1517 SHA256 5a4099c476daa2adbaca4b99a79bab527118a2158f0e521f2d96d7f495e8e6ac SHA512 8adefe8e64052af64d11c1ff5dfee640a70ffdbd5e7eee0e3dda1e08bab0bf53cbfe07ac84206708eb7bb72430a2cb1c7b78c628819c03c5223f1eaab153813a WHIRLPOOL 3be6493ac1204f0cd9cef6b8ef62a91f306bfdae99659e4f1ff5545ba0c5b7c7c6dc868e1c63638e5e8ad628ae8dbffb173a8791cf9bb96a85cbc3f633c16371 -MISC ChangeLog 5527 SHA256 1e27f24acf949f77018a8bc95b4e6111e1ef8c39c1a04ddf841340474bb42d97 SHA512 4a2e1339200843412dcc464b836f35176b2ad0bd82b7128e96ff28117dd157f535a560a4e11e395dc437ca7f851937dd7c85040d0f6952c8f42907ef645a6453 WHIRLPOOL 257f68b2057e2c1f5c5886b8a6caacf7dd06cc1238cff28143431ccd2e6a715887dbc7d5bd9838eda1923fe63deb6a6e5db00c3623e6ca9f8087757dfd764fe3 +MISC ChangeLog 5670 SHA256 57cb4676c37b2a6e67f8d6a34e27a5294872a2208c2896b1a139a7a364003443 SHA512 87b575a53d84b6fc6b03178dcc524ce69229b6f026f5b664b1532bcc4439041768926fc21c0ac6ed1e458fbf3c1fa0d1f60274f5f37c0ae742d9ac0e20519da2 WHIRLPOOL 76011952ad47840d46f28b6beec894193cb3b00141b220fa748810f0b72dcabb9abf3fba0834c3ec578b7812dc306c17301290d077ba5956892e81695d3b409a MISC metadata.xml 155 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7 SHA512 f05c8982778167c3667c9246b9730ba49fec2967731ed2c615e31a7fddc220fcea8c0843caa70a14957c8c4910892c512b6f2e00a9724d65e6032e1289f4562a WHIRLPOOL 25ccd49f04da07c8525fe18b21229764bb4104938abefc6c953bf9caa533dd5c10ae7b3f80a1251182e6c1520c09383d9f1d0ac1dc74832a99299c9be27406c4 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iEYEAREIAAYFAlVVoHgACgkQCaWpQKGI+9TNlwCbBuyPNo4tVY7xCMc1vS4wSHFu -S0EAnRhv03VV1u/nbuUV1guuwIkR4qKF -=ma3p +iQJiBAEBCABMBQJVViWCRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5 +MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh +7JfGD/9xWC5y1j0FjV4yMWVh0FqJQCa0mHaRAu7V7QbntZ7LEBPf0H8LU/dMWGXK +N+SPUe5n7ovEqA8IRN8TC3BsdYSGw0hnePkySLQlUqBQS1tu0W3s2SMP4KH8umC4 +YaagK+ZB3tJXoUSqGaYcHvDV81R9xiY00YfEiARUpqZU4DTCGjx/FQUIPIcPOf4P +nizEqED6nqzbkmsTay8Nn2H8LxOWIl1uQoj7q5tvH93JSATCoaoH4CXMe6R3Yy1z +3z4zKCedmIhkzYBswHCL7m6mCTwDj8WXmpaizMOaxsdBHbO5tH1kyQx0EgPxZtq2 +67xZ0jPoGtvReqmGpkobnHceyxNVzs9dUMNhWmSLBOsJ1ImMBPZuCX2CVAc6VOJh +UJjnJMKy3Lm3yB3m+GJy68kz/4pwSTFowE/FeGaKTfvZSykP6SOHMLZNYDqsS2P7 +pSCwGRJQZj9oNaJs2rhAJMoRaIP3SO7IJnaWFcJ7JpEwRftlxziPr4gvvWpqj9HQ +QZMJ3UW608C9mfKOddRxxzTDymQSU/l6WkrPuUlqTPS1gjMLN/8+7em7oLkxw7XD +7IZQkF3kxs7/Rh8xzG3ezyGICUpUFn/HeGH/VheFnmZ3At2djQiDrs4KAYww3/dc +PDvFMBioFH11w7o915+H3CBISfdgk4J7TxZh+TYXNjepZj5VqQ== +=NWt4 -----END PGP SIGNATURE----- diff --git a/media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch b/media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch deleted file mode 100644 index 454a8efc9a2b..000000000000 --- a/media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -urN 2ManDVD.old/videowrapper.cpp 2ManDVD/videowrapper.cpp ---- 2ManDVD.old/videowrapper.cpp 2013-06-17 19:46:47.455636396 +0200 -+++ 2ManDVD/videowrapper.cpp 2013-06-17 19:55:04.156618725 +0200 -@@ -38,7 +38,7 @@ - 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 -@@ -50,7 +50,7 @@ - } - - // *** RECUPERATION DES INFORMATIONS DU MEDIA *** -- if(av_find_stream_info(pFormatCtx)<0) -+ if(avformat_find_stream_info(pFormatCtx, NULL)<0) - { - qDebug() << "CAN'T READ INFORMATION FROM VIDEO FILE : " << filename; - return 1; -@@ -90,15 +90,10 @@ - - // *** OUVERTURE DU CODEC *** - -- if(avcodec_open(pCodecCtx, pCodec)<0) -- { -+ if (avcodec_open2(pCodecCtx, pCodec, NULL) < 0) { - qDebug() << "CAN'T FIND VIDEO CODEC"; - return 1; - } -- /*if (avcodec_open2(pCodecCtx, pCodec, NULL) < 0) { -- qDebug() << "CAN'T FIND VIDEO CODEC"; -- return 1; -- }*/ - - img_convert_ctx = sws_getContext(pCodecCtx->width, - pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width, |