Fix usage of more deprecated symbols to be happy with libav9. Just append the diff to current libavformat53 patch.

(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

3 files changed, 36 insertions, 103 deletions

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 <scarabeus@gentoo.org> -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 <hwoarang@gentoo.org> 2mandvd-1.8.1.ebuild,
   2mandvd-1.8.4.ebuild:
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,