Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/videotrans/files/, media-video/videotrans/
Date: Tue, 27 Oct 2015 18:59:01
Message-Id: 1445972311.4291060c3ac0c5e000c74ab8691c13ea1a3dc124.pacho@gentoo
1 commit: 4291060c3ac0c5e000c74ab8691c13ea1a3dc124
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 27 18:58:31 2015 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 27 18:58:31 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4291060c
7
8 media-video/videotrans: Support libav too (#474350)
9
10 Package-Manager: portage-2.2.23
11
12 .../videotrans/files/videotrans-1.6.1-libav.patch | 52 ++++++++++++++++++++++
13 media-video/videotrans/videotrans-1.6.1-r1.ebuild | 42 +++++++++++++++++
14 2 files changed, 94 insertions(+)
15
16 diff --git a/media-video/videotrans/files/videotrans-1.6.1-libav.patch b/media-video/videotrans/files/videotrans-1.6.1-libav.patch
17 new file mode 100644
18 index 0000000..2b4cd0a
19 --- /dev/null
20 +++ b/media-video/videotrans/files/videotrans-1.6.1-libav.patch
21 @@ -0,0 +1,52 @@
22 +Description: Migrate from ffmpeg to avconv.
23 +Author: Alessio Treglia <alessio@××××××.org>
24 +---
25 + data/library.sh.in | 8 ++++----
26 + src/movie-title.in | 2 +-
27 + src/movie-to-dvd.in | 2 +-
28 + 3 files changed, 6 insertions(+), 6 deletions(-)
29 +
30 +--- videotrans.orig/data/library.sh.in
31 ++++ videotrans/data/library.sh.in
32 +@@ -250,15 +250,15 @@ audio_params()
33 + then
34 + if [ "${force_or_auto}" = "ac3" ]
35 + then
36 +- msg="${msg}Converting the audio from WAV to AC3 with ${new_ch} channels using ffmpeg. "
37 ++ msg="${msg}Converting the audio from WAV to AC3 with ${new_ch} channels using avconv. "
38 + if [ "${audio_bitrate_override}" != "auto" -a "${audio_bitrate_override}" != "" ]
39 + then
40 +- audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab ${audio_bitrate_override}k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
41 ++ 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"`"
42 + elif [ "${new_ch}" = "2" ]
43 + then
44 +- audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab 192k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
45 ++ audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a 192k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
46 + else
47 +- audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab 448k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
48 ++ audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a 448k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
49 + fi
50 + audio_ext="ac3"
51 + else
52 +--- videotrans.orig/src/movie-title.in
53 ++++ videotrans/src/movie-title.in
54 +@@ -961,7 +961,7 @@ else
55 + \> "${TEMP}.mplayer" 2\>\&1 \< /dev/null \&
56 + mplayer_pid="$!"
57 +
58 +- # Start mp2enc or ffmpeg to encode the audio
59 ++ # Start mp2enc or avconv to encode the audio
60 +
61 + {
62 + < "${TEMP}.wav" $audio_filter_cmd | eval ${audio_encode}
63 +--- videotrans.orig/src/movie-to-dvd.in
64 ++++ videotrans/src/movie-to-dvd.in
65 +@@ -698,7 +698,7 @@ do
66 + } > "${TEMP}.video" 2>&1 &
67 + video_enc_pid="$!"
68 +
69 +- # Start mp2enc or ffmpeg to encode the audio
70 ++ # Start mp2enc or avconv to encode the audio
71 +
72 + {
73 + < "${TEMP}.wav" $audio_filter_cmd | eval ${audio_encode}
74
75 diff --git a/media-video/videotrans/videotrans-1.6.1-r1.ebuild b/media-video/videotrans/videotrans-1.6.1-r1.ebuild
76 new file mode 100644
77 index 0000000..7ed3412
78 --- /dev/null
79 +++ b/media-video/videotrans/videotrans-1.6.1-r1.ebuild
80 @@ -0,0 +1,42 @@
81 +# Copyright 1999-2014 Gentoo Foundation
82 +# Distributed under the terms of the GNU General Public License v2
83 +# $Id$
84 +
85 +EAPI=5
86 +inherit eutils
87 +
88 +DESCRIPTION="A package to convert movies to DVD format and to build DVDs with"
89 +HOMEPAGE="http://videotrans.sourceforge.net/"
90 +SRC_URI="mirror://sourceforge/videotrans/${P}.tar.bz2"
91 +
92 +LICENSE="BSD"
93 +SLOT="0"
94 +
95 +KEYWORDS="~amd64 ~ppc ~x86"
96 +
97 +IUSE="libav"
98 +
99 +DEPEND="
100 + media-video/mplayer
101 + media-video/mjpegtools[png]
102 + media-video/dvdauthor
103 + || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
104 + libav? ( media-video/libav )
105 + !libav? ( media-video/ffmpeg:0 )
106 +"
107 +
108 +RDEPEND="${DEPEND}
109 + www-client/lynx
110 + app-shells/bash
111 + sys-devel/bc
112 +"
113 +
114 +DOCS="aspects.txt CHANGES THANKS TODO"
115 +
116 +src_prepare() {
117 + # fixing LDFLAGS usage
118 + sed -i -e 's|^\(LDFLAGS.*=\).*\( @LIBS@.*\)|\1\2 @LDFLAGS@|' src/Makefile.in
119 +
120 + # Debian patch to support libav
121 + use libav && epatch "${FILESDIR}"/${P}-libav.patch
122 +}