[gentoo-commits] repo/gentoo:master commit in: media-video/videotrans/files/, media-video/videotrans/

[Mikle Kolyada]

commit:     3a17689979e63b43640c5305130c83e4da611599
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 09:09:12 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 09:09:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a176899

media-video/videotrans: migrate from libav

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 .../videotrans/files/videotrans-1.6.1-libav.patch  | 52 ----------------------
 media-video/videotrans/videotrans-1.6.1-r2.ebuild  | 11 +----
 2 files changed, 2 insertions(+), 61 deletions(-)

diff --git a/media-video/videotrans/files/videotrans-1.6.1-libav.patch b/media-video/videotrans/files/videotrans-1.6.1-libav.patch
deleted file mode 100644
index 2b4cd0a15b8..00000000000
--- a/media-video/videotrans/files/videotrans-1.6.1-libav.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Migrate from ffmpeg to avconv.
-Author: Alessio Treglia <alessio@××××××.org>
----
- data/library.sh.in  |    8 ++++----
- src/movie-title.in  |    2 +-
- src/movie-to-dvd.in |    2 +-
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
---- videotrans.orig/data/library.sh.in
-+++ videotrans/data/library.sh.in
-@@ -250,15 +250,15 @@ audio_params()
- 	then
- 		if [ "${force_or_auto}" = "ac3" ]
- 		then
--			msg="${msg}Converting the audio from WAV to AC3 with ${new_ch} channels using ffmpeg. "
-+			msg="${msg}Converting the audio from WAV to AC3 with ${new_ch} channels using avconv. "
- 			if [ "${audio_bitrate_override}" != "auto" -a "${audio_bitrate_override}" != "" ]
- 			then
--				audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab ${audio_bitrate_override}k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
-+				audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a ${audio_bitrate_override}k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
- 			elif [ "${new_ch}" = "2" ]
- 			then
--				audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab 192k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
-+				audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a 192k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
- 			else
--				audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab 448k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
-+				audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a 448k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
- 			fi
- 			audio_ext="ac3"
- 		else
---- videotrans.orig/src/movie-title.in
-+++ videotrans/src/movie-title.in
-@@ -961,7 +961,7 @@ else
- 			\> "${TEMP}.mplayer" 2\>\&1 \< /dev/null \&
- 		mplayer_pid="$!"
- 
--		# Start mp2enc or ffmpeg to encode the audio
-+		# Start mp2enc or avconv to encode the audio
- 
- 		{
- 			< "${TEMP}.wav" $audio_filter_cmd | eval ${audio_encode}
---- videotrans.orig/src/movie-to-dvd.in
-+++ videotrans/src/movie-to-dvd.in
-@@ -698,7 +698,7 @@ do
- 	} > "${TEMP}.video" 2>&1 &
- 	video_enc_pid="$!"
- 
--	# Start mp2enc or ffmpeg to encode the audio
-+	# Start mp2enc or avconv to encode the audio
- 
- 	{
- 		< "${TEMP}.wav" $audio_filter_cmd | eval ${audio_encode}

diff --git a/media-video/videotrans/videotrans-1.6.1-r2.ebuild b/media-video/videotrans/videotrans-1.6.1-r2.ebuild
index 969d72bc3b7..ea33b07bb2a 100644
--- a/media-video/videotrans/videotrans-1.6.1-r2.ebuild
+++ b/media-video/videotrans/videotrans-1.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,17 +11,12 @@ SRC_URI="mirror://sourceforge/videotrans/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="libav"
-
 DEPEND="
 	media-video/mplayer
 	media-video/mjpegtools[png]
 	media-video/dvdauthor
 	virtual/imagemagick-tools
-	libav? ( media-video/libav )
-	!libav? ( media-video/ffmpeg:0 )
+	media-video/ffmpeg:0
 "
 
 RDEPEND="${DEPEND}
@@ -36,6 +31,4 @@ src_prepare() {
 	# fixing LDFLAGS usage
 	sed -i -e 's|^\(LDFLAGS.*=\).*\( @LIBS@.*\)|\1\2 @LDFLAGS@|' src/Makefile.in
 
-	# Debian patch to support libav
-	use libav && epatch "${FILESDIR}"/${P}-libav.patch
 }