From 65c2de51839ba31db497f0e63028131f6a367ede Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Mon, 17 Jun 2013 18:01:38 +0000 Subject: Fix usage of more deprecated symbols to be happy with libav9. Just append the diff to current libavformat53 patch. Package-Manager: portage-2.2.0_alpha180/cvs/Linux x86_64 Manifest-Sign-Key: 0x8EEE3BE8 --- media-video/2mandvd/2mandvd-1.8.1.ebuild | 97 ---------------------- media-video/2mandvd/ChangeLog | 7 +- media-video/2mandvd/Manifest | 36 ++++---- .../files/2mandvd-1.8.4-libavformat54.patch | 35 ++++++-- 4 files changed, 52 insertions(+), 123 deletions(-) delete mode 100644 media-video/2mandvd/2mandvd-1.8.1.ebuild (limited to 'media-video/2mandvd') diff --git a/media-video/2mandvd/2mandvd-1.8.1.ebuild b/media-video/2mandvd/2mandvd-1.8.1.ebuild deleted file mode 100644 index d230ac696af1..000000000000 --- a/media-video/2mandvd/2mandvd-1.8.1.ebuild +++ /dev/null @@ -1,97 +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.1.ebuild,v 1.3 2013/03/02 22:06:19 hwoarang Exp $ - -EAPI=4 -LANGS="cs de en it ru" - -inherit eutils 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}/${P}.tar.gz" - -LICENSE="GPL-3" -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}-fix-const-char-concatenation.patch" - "${FILESDIR}/${PN}-1.7.3-libav.patch" -) - -src_prepare() { - # Cleaning old backup files - find . -name "*~" -delete || die - - for file in *.cpp; do - # Fix path - sed -e "s:qApp->applicationDirPath().\?+.\?\":\"/usr/share/${PN}:g" -i "${file}" || die "sed failed" - sed -e "s:qApp->applicationDirPath():\"/usr/share/${PN}/\":g" -i "${file}" || die "sed failed" - done - - # We'll make a newbin called ${PN} so we need to change references to the old "2ManDVD" (${MY_PN}). - # Sed is more flexible than a patch. - sed -e "s:openargument.right(${#MY_PN}) != \"${MY_PN}\":openargument.right(${#PN}) != \"${PN}\":" \ - -e "s:openargument.right($(( ${#MY_PN} + 2 ))) != \"./${MY_PN}\":openargument.right($(( ${#PN} + 2 ))) != \"./${PN}\":" \ - -i mainfrm.cpp || die "sed failed" - - qt4-r2_src_prepare -} - -src_install() { - insinto /usr/share/${PN} - - # Data: - doins -r Bibliotheque - doins -r Interface - - doins fake.pl - - # Translations: - for lang in ${LINGUAS}; do - for x in ${LANGS}; do - [[ ${lang} == ${x} ]] && doins ${PN}_${x}.qm - done - done - [[ -z ${LINGUAS} ]] && doins ${PN}_en.qm - - # Doc: - dodoc README.txt - - # Bin and menu entry: - newbin 2ManDVD ${PN} - doicon Interface/mandvd.png - make_desktop_entry ${PN} ${MY_PN} mandvd "Qt;AudioVideo;Video" -} - -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 3765fd22e378..0008d6f1512b 100644 --- a/media-video/2mandvd/ChangeLog +++ b/media-video/2mandvd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/2mandvd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.30 2013/03/02 22:06:19 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.31 2013/06/17 18:00:46 scarabeus Exp $ + + 17 Jun 2013; Tomáš Chvátal -2mandvd-1.8.1.ebuild, + 2mandvd-1.8.4.ebuild, files/2mandvd-1.8.4-libavformat54.patch: + Fix usage of more deprecated symbols to be happy with libav9. Just append the + diff to current libavformat53 patch. 02 Mar 2013; Markos Chandras 2mandvd-1.8.1.ebuild, 2mandvd-1.8.4.ebuild: diff --git a/media-video/2mandvd/Manifest b/media-video/2mandvd/Manifest index fcdbdb7e6c1a..d1919f6b1057 100644 --- a/media-video/2mandvd/Manifest +++ b/media-video/2mandvd/Manifest @@ -2,30 +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 514 SHA256 96b15adc6b7941e4509b9bd01e3c52d7a516c5b084590bf1ce5ada1d0d04f62b SHA512 5cbf80f7db82143c8f9d676c245ef16a03ac9a3f962aacaed51130b3bb2bd228a894a9522cc1b223fadf75ee16358c373e17db8d6ffec4504a68f4e0a8c459f8 WHIRLPOOL aa1160ed28404335214911c3ca0789706219024cea766daa0192ed2f354e1c459cd1e12692080ca945d0e54793a90b65c0bba443874c7948333237cea7f76f6e +AUX 2mandvd-1.8.4-libavformat54.patch 1297 SHA256 272f2792ceff27c64ec86847e6fa97bcc5270291fb7a46eb6959f2054bdd23d3 SHA512 b212f4d6418986c45589756d7602898b5f86292785cb28e480ca8896d786ce40aa4fa49d9aced87f5429d208090cc17814ddbc6e8502689e2012190489a167f0 WHIRLPOOL 0f85d721766b00193543f0db445a5b8f9ae0a4da660a54a6cd996b07c4fa1ab6728bed0cde586ffdc2c8be466212e883061cd513ee54aa2f274e40cf6bc593e6 AUX 2mandvd-fix-const-char-concatenation.patch 671 SHA256 4799eb928497642b5440224667af2eb52fd31505d48e075dd7deb234d7ee69f0 SHA512 e93c2eb39589c1b428a9da049440507e31b9fdfecb79e2ee7c5b87c7bd40cb3f8fe53d875e5cf6efc3a4091eabc972919b2b251d2f41043bd56e0554fc2c35f1 WHIRLPOOL 376708c77e5b5f2e1fb58a874a9d40850a8d1f455a1ffc761a06ea8790c5d75b9b4da8315f7787a97a311e5a7164f21c67f45722cd1ddd15ecff705d55cc92d3 DIST 2ManDVD-1.8.4.tar.gz 29523342 SHA256 b74e8a62b4e396c4cbb1db2864d77c87ea45f74bb599f4f270608d9e7f91888c SHA512 2bef9b5cdda2949507855193607cf953d4127bd1fb913c7710e1d3e7753bc6ba64bf04f5b1158a500c84d798c513dd4106a1ec7b54ae5054801a1215ade7ed09 WHIRLPOOL 4af1bd075a0d21d64afb955963da90d32ba5682209a125d55b5de32690c545081be6c46cd81e33da79724790511f83c62e9a2d85a8d83de45b17cd642800554d -DIST 2mandvd-1.8.1.tar.gz 29615342 SHA256 cd1252afe1733d1aa2517947a6199369d6b946e50c75e1f9fd3445c1ff717d7a SHA512 cd2334aee0204c26fa8ecf53ba942940023f5d4d71c3dac37083fc2f87152a400e54825062cb9910829fbe53f29a898009044eb6c24a043ae60834655ed52e20 WHIRLPOOL b1612c85ce0bdc0324748146f5302d1946d0d2b81ec73d7c5577b56c537b7b1ae1628705d3da60524a75c7751e0a62ad7bd193b04eae9e0251b4c3957ea743d9 -EBUILD 2mandvd-1.8.1.ebuild 2388 SHA256 274d2ce50eae44a07d91faee014c22705cc5939c9700338a0a5011f0c1295ac6 SHA512 22a12fe0bb33e84307eca618bddd8e1bf0a199830ce5ab6baac3a7b13d13ea3223cdea835794d6b17dc2c752e39a7e6cbf694a67bc9b9879ae1e47bb087bf444 WHIRLPOOL 9a45ed95c2c02c961b7223210711ad910ed86888144c6cf43e688a1ac8c5e07480ec6c3b4585022d5ccd43505d8b7f68214e43507d94881430de587894872d53 EBUILD 2mandvd-1.8.4.ebuild 1470 SHA256 717ab8b3876ad4eb7b39d44e0a83989184bc965763d2ce021ad3e50dc2c2777c SHA512 4aa7083aa9069c5c742013383d7464b0326df0f9b1e0e084077ceb9a74ab58de57dccedf81fe3da430f7108335206703331e5e6bee27411ef1290d21e771e4b8 WHIRLPOOL 15ce9a44878fede680d300e1769c3ae6149a2c4b961bf272a99c8b72b77059db4c0a47374d94d01b0fb074478fe1b132b7a6aad5395bdfb6919271c7ecba520c -MISC ChangeLog 4834 SHA256 c75ba1654ce681b60cb689844a2a24011927f92f13d75ebace8eb93ceb1fc063 SHA512 10772675cf65bac067159202d7eec41dfabe9ce7fd4c30281d5416dcf45290401246f70ab293162939325753eae636edb2094569f23ad5c4ca3694054537f516 WHIRLPOOL a306324a6823f75afe3105c07fa95135d1e54c40fa7218de451dd6eeb913ede844d3b65850e8b75269495866d8bd6272d5ba968961c81909e3a80cdcb81f3eb6 +MISC ChangeLog 5098 SHA256 7555e92be96fef13fd5af5dd5f710cbf7101ce41e6bdac421c15ddfd76e80355 SHA512 70e038a6907e8af809c3d06ad8078bbe5f02135fc81439342fe8200bbf78d2c41a1102d76311506e5a341aa98423ca14367127ece93bc0bd3bfc8841347c10bc WHIRLPOOL 5425fe68a791da064df6dc573633e1bd982698c1bae5d86260c3c9d7b985341623d9c932a624bc825acd0853ba1da5f98dd15781f5a91a64f2b915c1bcce1549 MISC metadata.xml 155 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7 SHA512 f05c8982778167c3667c9246b9730ba49fec2967731ed2c615e31a7fddc220fcea8c0843caa70a14957c8c4910892c512b6f2e00a9724d65e6032e1289f4562a WHIRLPOOL 25ccd49f04da07c8525fe18b21229764bb4104938abefc6c953bf9caa533dd5c10ae7b3f80a1251182e6c1520c09383d9f1d0ac1dc74832a99299c9be27406c4 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iQJ8BAEBCABmBQJRMnfaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw -OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88JzwP/Ribhv06mBE0HObin1L5Q8QC -Oco3rOf0Vv3ODxJiwefuGcwrl3MVtKwMplHXzsBefW1y+4mol28sIY3F7fYtiqkZ -hK92lLgvuCCFFujVuOr8L/9O3FgKHtdZs4fo7I8RAMBtBOP4BFAFuL2fa07zvnuk -Du4WBJcxfheDiJk11poFvtZEEQObakJBEmS2xYP4SLSrz263EtS2G/wQaTYGhsbe -J3ZJQozgBCnZSdpTyMOLx20NONKUtiRYlTzqrNwMXf91WV52z5ZAQ6iQe2N1ofeE -d2InRSlQ4fR08pYupFIBPo2+VOKTNXdvV9YdrIBcATlpM/cEJgI8FXrKu8QJUhk1 -19xUcBq0w5OcjtAtK7AIzWRJXf9RVB/2mKUZ8NvsvKoRChb8/lfjDXiO0BU5VSxr -5XvNYkyjs8tZy/NhPNZKdHUewzVDPPIz1+TK6CQyhfVgzFIRA95am+vCHzLW19FG -U2dvL9BHWdFjXIePwr63x8L1jeHkf/XtOelPuVdIaF7hKM0G0FvJg4m/xDIZBHzC -0M/JCkqEjKYMbZYXCWdKAvXPOdMvIZ5akJ/k0pihOzkaTk8VBdcnuz10F/AracEp -e+TBUbfxugtRpK7Tn7hZSCpGoV2FbVo4KEqkpx+f9FUh0wcArY03QqxJeMR6IS43 -QvlSc5JYOSSXzCq8Xj02 -=yHQ5 +iQIcBAEBCAAGBQJRv07vAAoJEOSiRoyO7jvoQqQP/iMwOg/FUj15DjFVEURoEzlc +uFdMonASWshU4S3LGqP/xXvcZdEDgcw+dTcJIHbpyS2mg+j2kgc85iP8LuRH0l7M +HiTrrP8p324FjfW95IXCg8PVRCrJf2DXe3rMX5QNofMpfwths5bQJzHyhaLF/DzQ +yizS2zXU6Fj1FUCS/Gn+WQrm6FSCU4/8qqKci9i0tJknjRPEIsfLWwPpvaXpC9HR +/SA/etmdQz3t3/8Fz69MRmszBo5awPhti8YoNwrucRuWrYDUBQ14qBpKEwC3rUt9 +vggsr/70ltz0s+ayIJkouxzKflYHf+qhpXmVkQkLqWj/f3cS2Nj1egtluAa/ivxJ +XpjGAZddqrgXhcoI9H2ZMOaQprsbmwig4NJ+P7nJE3s3YnJyCJhelqhx66ATceKN +gxbWRel3ymSj7DbOEs0xHKZ4sC2+5crRQDTw4kBcVAMfdgHKY6HnM2++OuFpYRdC +Ty2z21shpaFO4OYoNYxDUIdgpAXb5LvL5uUREXdwYgocGvZGWRFnaUgr1homO+0z +fT4VwZ/zzZ0slNZLV+Il5910fX2dsmhyP9NY2nRXeWwhnkWNpZBf7KeFBfIRpwyX +gBclyiO/rRKrVtPsCQcWDcIDK+XNEPHTLu5Tmeyf8qE4PYvJbSTWPDxlvPlmX/6R +pxAbdVIb6/vanwFJJmFb +=Exdg -----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 index 73b8a5335fb4..454a8efc9a2b 100644 --- a/media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch +++ b/media-video/2mandvd/files/2mandvd-1.8.4-libavformat54.patch @@ -1,8 +1,7 @@ -Index: 2ManDVD/videowrapper.cpp -=================================================================== ---- 2ManDVD.orig/videowrapper.cpp -+++ 2ManDVD/videowrapper.cpp -@@ -38,7 +38,7 @@ void videowrapper::delete_videowrapper() +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 *** @@ -11,3 +10,29 @@ Index: 2ManDVD/videowrapper.cpp 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, -- cgit v1.2.3-65-gdbad