[SCM] dvdwizard/master: Port from ffmpeg to avconv.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Mon Feb 24 14:45:36 UTC 2014
The following commit has been merged in the master branch:
commit 65851e0e84c5ab3567083245259de1957f67c06e
Author: Alessio Treglia <alessio at debian.org>
Date: Mon Feb 24 14:41:04 2014 +0000
Port from ffmpeg to avconv.
Closes: #721165
diff --git a/debian/control b/debian/control
index 418ebc7..60af516 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Package: dvdwizard
Architecture: all
Depends:
dvdauthor,
- ffmpeg,
+ libav-tools,
imagemagick (>= 7:6.6.0),
mjpegtools (>= 1.6.0),
transcode,
diff --git a/debian/patches/port-to-avconv.patch b/debian/patches/port-to-avconv.patch
new file mode 100644
index 0000000..b6892a0
--- /dev/null
+++ b/debian/patches/port-to-avconv.patch
@@ -0,0 +1,264 @@
+Description: Port from ffmpeg to avconv.
+Author: Dmitrijs Ledkovs <xnox at ubuntu.com>
+
+--- dvdwizard-0.7.1.orig/DVDwizard.texi
++++ dvdwizard-0.7.1/DVDwizard.texi
+@@ -514,7 +514,7 @@ Specifies the maximum length of the movi
+ code may be behind this value. Defaults to 14400 seconds = 240 minutes =
+ 4 hours.
+ @quotation Note
+-DVDwizard calculates the duration of a movie usind @command{ffmpeg -i}
++DVDwizard calculates the duration of a movie usind @command{avconv -i}
+ and specifies the calculated duration using this option while calling
+ @command{chaptercheck}.
+ @end quotation
+--- dvdwizard-0.7.1.orig/dvdwizard
++++ dvdwizard-0.7.1/dvdwizard
+@@ -140,7 +140,7 @@ DVD-specific options:
+ -MS | --vmgmsound Soundfile to be used as background sound for all
+ menus (may be overwritten for specific titlesets with
+ -ms|--vtsmsound). If empty, a silent audio track will
+- be produced. Can be any format, ffmpeg recognizes and
++ be produced. Can be any format, avconv recognizes and
+ will be converted to ac3, if neccessary.
+ -W | --pause Wait a number of seconds as pause at the end of each
+ titleset.
+@@ -603,7 +603,7 @@ call_mk_vtsm()
+ # Recalculate Chapters if we have had a restart
+ #
+ if [ -z "$chapters" ]; then
+- duration=$(ffmpeg -i $mf 2>&1 | grep Duration | cut -d' ' -f4 | cut -d'.' -f1)
++ duration=$(avconv -i $mf 2>&1 | grep Duration | cut -d' ' -f4 | cut -d'.' -f1)
+ durHH=$(echo $duration | cut -d':' -f1)
+ durMM=$(echo $duration | cut -d':' -f2)
+ durSS=$(echo $duration | cut -d':' -f3)
+--- dvdwizard-0.7.1.orig/dvdwizard_common
++++ dvdwizard-0.7.1/dvdwizard_common
+@@ -48,12 +48,12 @@
+ # 2010-08-17 Markus Kohm
+ # * new functions is_integer and is_real
+ # 2010-09-29 Joo Martin
+-# * relaced `-ab 224kb' by `-ab 224000' at ffmpeg calls
++# * relaced `-ab 224kb' by `-ab 224000' at avconv calls
+ # 2010-09-29 Markus Kohm
+ # * check_tools for ${thisscript} == sh does not longer check
+ # for the DVDwizard tools
+ # 2011-06-30 Markus Kohm
+-# * workaround for ffmpeg 0.8 floating point exception
++# * workaround for avconv 0.8 floating point exception
+ # 2012-03-18 Joo Martin
+ # * user config file always in $HOME/.config/dvdwizard/
+ # but search first at older place of user config file
+@@ -207,18 +207,18 @@ check_tools()
+ fi >&2
+
+ commonTools="awk basename cat convert cp cut date dirname dvdauthor grep identify ln mkdir mktemp mplex mv ppmtoy4m rm sed seq tail tee tr wc"
+- dvdwizard="chaptercheck dvdcpics dvdtguess ffmpeg mk_vmgm mk_vtsm mk_vtsm_info mk_vtsm_lang mpgprobe nice"
+- mk_vmgm="composite ffmpeg montage mpeg2enc spumux"
++ dvdwizard="chaptercheck dvdcpics dvdtguess avconv mk_vmgm mk_vtsm mk_vtsm_info mk_vtsm_lang mpgprobe nice"
++ mk_vmgm="composite avconv montage mpeg2enc spumux"
+ mk_vtsm="$mk_vmgm mogrify"
+ chaptercheck="bc"
+ dvdcpics="display tcprobe transcode"
+ dvdtguess=""
+- mpgprobe="ffmpeg"
++ mpgprobe="avconv"
+ txt2png="mogrify"
+ mk_vtsm_lang="$mk_vtsm"
+ mk_vtsm_info="$mk_vtsm txt2png"
+ dvdwizard_test="bc sox"
+- sh="ffmpeg nice ${mk_vmgm} ${mk_vtsm} ${chaptercheck} ${dvdcpics} ${dvdtguess} ${mpgprobe} ${mogrify} ${txt2png} ${mk_vtsm_lang} ${dvdwizard_test}"
++ sh="avconv nice ${mk_vmgm} ${mk_vtsm} ${chaptercheck} ${dvdcpics} ${dvdtguess} ${mpgprobe} ${mogrify} ${txt2png} ${mk_vtsm_lang} ${dvdwizard_test}"
+ eval tools="\${$thisscript}"
+ tools="$commonTools $tools"
+
+@@ -705,7 +705,7 @@ create_common_objects()
+ # Create audio track
+ #
+ echo -n $"Creating empty AC3 Audio-Track..."
+- ffmpeg -ar 48000 -f s16le -i /dev/zero -ab 224000 -ar 48000 -ac 2 -t 1 "$silence" 1>/dev/null 2>&1 || error_out
++ avconv -ar 48000 -f s16le -i /dev/zero -ab 224000 -ar 48000 -ac 2 -t 1 "$silence" 1>/dev/null 2>&1 || error_out
+ echo $"done."
+ fi
+
+@@ -1021,7 +1021,7 @@ mk_tmpdvd()
+ eval cspec=\"\$CHAPTERSPEC_$i\"
+ for j in $(seq 1 $files); do
+ eval vtstitle=\"\$VTSM_"$i"_FILE_$j\"
+- duration=$(ffmpeg -i "$vtstitle" 2>&1 | grep Duration |\
++ duration=$(avconv -i "$vtstitle" 2>&1 | grep Duration |\
+ sed 's/.*ation:.\(.*\), start.*/\1/' | cut -d'.' -f1)
+ if [ "$duration" == "N/A" ]; then
+ printf $"Error: invalid duration value: N/A\nCheck duration time of \`%s'.\n" "$vtstitle" >> "$LOGFILE"
+--- dvdwizard-0.7.1.orig/dvdwizard_test
++++ dvdwizard-0.7.1/dvdwizard_test
+@@ -176,7 +176,7 @@ for movie in A B; do
+
+ printf "\t"$"Encoding movie %s: " "${movie}" >&2
+
+- ffmpeg -i ${DVDWIZARD_TMPDIR}/countdown${movie}%04d.ppm \
++ avconv -i ${DVDWIZARD_TMPDIR}/countdown${movie}%04d.ppm \
+ -i sound1000.${ext} \
+ -target pal-dvd countdown${movie}.mpg -aspect "4:3"
+
+--- dvdwizard-0.7.1.orig/mk_vmgm
++++ dvdwizard-0.7.1/mk_vmgm
+@@ -37,7 +37,7 @@
+ # 2010-06-22 Markus Kohm
+ # * usage of printf to place ${DW_NAME}
+ # 2010-09-29 Joo Martin
+-# * relaced `-ab 224kb' by `-ab 224000' at ffmpeg calls
++# * relaced `-ab 224kb' by `-ab 224000' at avconv calls
+ # 2011-01-04 Joo Martion
+ # * setting of VIDEO_FORMAT at call of spumux
+ # 2012-03-18 Joo Martin
+@@ -104,7 +104,7 @@ DVD-specific options:
+ -MS | --vmgmsound Soundfile to be used as background sound for all
+ menus (may be overwritten for specific titlesets with
+ -ms|--vtsmsound). If empty, a silent audio track will
+- be produced. Can be any format, ffmpeg recognizes and
++ be produced. Can be any format, avconv recognizes and
+ will be converted to ac3, if neccessary.
+
+ Title-specific options:
+@@ -967,7 +967,7 @@ for i in $(seq 1 $about); do
+ if [ "$fext" != "ac3" ]; then
+ audiotrack_ac3="$TMPDIR/common_objects/vts_$i.ac3"
+ if [ ! -e "$audiotrack_ac3" ]; then
+- ffmpeg -i "$audiotrack" -ab 224000 -ar 48000 -ac 2 \
++ avconv -i "$audiotrack" -ab 224000 -ar 48000 -ac 2 \
+ "$audiotrack_ac3" 1>/dev/null 2>&1 || error_out
+ fi
+ audiotrack="$audiotrack_ac3"
+--- dvdwizard-0.7.1.orig/mk_vtsm
++++ dvdwizard-0.7.1/mk_vtsm
+@@ -35,7 +35,7 @@
+ # * usage of gettext features for multilanguage ui
+ # -several `echo' replaced by `printf'
+ # 2010-09-29 Joo Martin
+-# * relaced `-ab 224kb' by `-ab 224000' at ffmpeg calls
++# * relaced `-ab 224kb' by `-ab 224000' at avconv calls
+ # 2011-01-04 Joo Martin
+ # * added setting of VIDEO_FORMAT at spumux call
+ # 2012-03-18 Joo Martin
+@@ -101,7 +101,7 @@ Title-specific options:
+ thumbnails. <4:3|16:9> [4:3]
+ -ms | --vtsmsound Soundfile to be used as background sound for the menu.
+ If empty, a silent audio track will be produced. Can
+- be any format, ffmpeg recognizes and will be converted
++ be any format, avconv recognizes and will be converted
+ to ac3, if neccessary.
+ --hasaudio Title has multiple audio tracks. A button to jump to
+ the audio selection menu will be created.
+@@ -762,7 +762,7 @@ for page in $(seq 1 $numPages); do
+ if [ "$fext" != "ac3" ]; then
+ audiotrack_ac3="$TMPDIR/common_objects/vts_$vts.ac3"
+ if [ ! -e "$audiotrack_ac3" ]; then
+- ffmpeg -i "$audiotrack" -ab 224000 -ar 48000 -ac 2 \
++ avconv -i "$audiotrack" -ab 224000 -ar 48000 -ac 2 \
+ "$audiotrack_ac3" 1>/dev/null 2>&1 || error_out
+ fi
+ audiotrack="$audiotrack_ac3"
+--- dvdwizard-0.7.1.orig/mk_vtsm_info
++++ dvdwizard-0.7.1/mk_vtsm_info
+@@ -32,7 +32,7 @@
+ # * usage of gettext features for multilanguage ui
+ # -several `echo' replaced by `printf'
+ # 2010-09-29 Joo Martin
+-# * relaced `-ab 224kb' by `-ab 224000' at ffmpeg calls
++# * relaced `-ab 224kb' by `-ab 224000' at avconv calls
+ # 2011-01-04 Joo Martion
+ # * setting of VIDEO_FORMAT at call of spumux
+ # * fixed: background for the buttons
+@@ -85,7 +85,7 @@ currently supported options:
+ Textelements are defined in config file
+ -ms | --vtsmsound Soundfile to be used as background sound for the
+ menu. If empty, a silent audio track will be
+- produced. Can be any format, ffmpeg recognizes and
++ produced. Can be any format, avconv recognizes and
+ will be converted to ac3, if neccessary.
+ -h | --help print this lot out
+ -v | --version print version information only
+@@ -641,7 +641,7 @@ for page in $(seq 1 $numPages); do
+ if [ "$fext" != "ac3" ]; then
+ audiotrack_ac3="$TMPDIR/common_objects/vts_$vts.ac3"
+ if [ ! -e "$audiotrack_ac3" ]; then
+- ffmpeg -i "$audiotrack" -ab 224000 -ar 48000 -ac 2 \
++ avconv -i "$audiotrack" -ab 224000 -ar 48000 -ac 2 \
+ "$audiotrack_ac3" 1>/dev/null 2>&1 || error_out
+ fi
+ audiotrack="$audiotrack_ac3"
+--- dvdwizard-0.7.1.orig/mk_vtsm_lang
++++ dvdwizard-0.7.1/mk_vtsm_lang
+@@ -36,7 +36,7 @@
+ # 2010-08-03 Markus Kohm
+ # * audio tracks may be mono or stereo
+ # 2010-09-29 Joo Martin
+-# * relaced `-ab 224kb' by `-ab 224000' at ffmpeg calls
++# * relaced `-ab 224kb' by `-ab 224000' at avconv calls
+ # 2011-01-04 Joo Martion
+ # * setting of VIDEO_FORMAT at call of spumux
+ # * fixed: background for the buttons
+@@ -89,7 +89,7 @@ supported options:
+ Textelements are defined in config file
+ -ms | --vtsmsound Soundfile to be used as background sound for the
+ menu. If empty, a silent audio track will be
+- produced. Can be any format, ffmpeg recognizes and
++ produced. Can be any format, avconv recognizes and
+ will be converted to ac3, if neccessary.
+ -h | --help print this lot out
+ -v | --version print version information only
+@@ -765,7 +765,7 @@ fext="${audiotrack##*.}"
+ if [ "$fext" != "ac3" ]; then
+ audiotrack_ac3="$TMPDIR/common_objects/vts_$vts.ac3"
+ if [ ! -e "$audiotrack_ac3" ]; then
+- ffmpeg -i "$audiotrack" -ab 224000 -ar 48000 -ac 2 \
++ avconv -i "$audiotrack" -ab 224000 -ar 48000 -ac 2 \
+ "$audiotrack_ac3" 1>/dev/null 2>&1 || error_out
+ fi
+ audiotrack="$audiotrack_ac3"
+--- dvdwizard-0.7.1.orig/mpgprobe
++++ dvdwizard-0.7.1/mpgprobe
+@@ -27,9 +27,9 @@
+ # 2004-10-29 Stefan Becker
+ # * recognize pcm und dts audio tracks
+ # 2008-12-12 Joo Martin
+-# * update for newer ffmpeg ('fps' goes to 'tb')
++# * update for newer avconv ('fps' goes to 'tb')
+ # 2009-02-25 Joo Martin
+-# * update for newer ffmpeg (more tb variables)
++# * update for newer avconv (more tb variables)
+ # 2009-09-10 Joo Martin
+ # * change reading audio codec
+ # 2010-06-21 Markus Kohm
+@@ -90,16 +90,16 @@ if [ ! -e "$@" ]; then
+ fi
+
+ #
+-# Call ffmpeg on given mpeg file
++# Call avconv on given mpeg file
+ #
+-# example of ffmpeg 2007 output:
++# example of avconv 2007 output:
+ # Stream #0.0[0x1e0]: Video: mpeg2video, yuv420p, 720x576 [PAR 16:15 DAR 4:3], 6400 kb/s, 25.00 fps(r)
+-# example of ffmpeg 2008 output:
++# example of avconv 2008 output:
+ # Stream #0.0[0x1e0]: Video: mpeg2video, yuv420p, 720x576 [PAR 16:15 DAR 4:3], 6400 kb/s, 25.00 tb(r)
+-# example of ffmpeg 2009 output:
++# example of avconv 2009 output:
+ # Stream #0.0[0x1e0]: Video: mpeg2video, yuv420p, 720x576 [PAR 16:15 DAR 4:3], 9500 kb/s, 25 tbr, 90k tbn, 25 tbc
+
+-vstrfull="$(LANG=C ffmpeg -i "$@" 2>&1 |\
++vstrfull="$(LANG=C avconv -i "$@" 2>&1 |\
+ grep 'Stream #' | grep 'Video:' |\
+ sed -e 's#\ fps#\ tb#' | sed -e 's#\ tb(r)# tbr#')"
+ vstring="$(echo "$vstrfull" | \
+@@ -111,7 +111,7 @@ echo "Video:${vstring}"
+ # for dvd standard)
+ #
+ echo -n "Audio:" # DO NOT REPLACE THIS BY $"Audio:"!!!
+-for i in $(LANG=C ffmpeg -i "$@" 2>&1 | grep 'Stream #' | grep 'Audio:' | \
++for i in $(LANG=C avconv -i "$@" 2>&1 | grep 'Stream #' | grep 'Audio:' | \
+ sed -e 's/liba52/ac3/g' -e 's/^.*Audio:\ //' | cut -d',' -f1);
+ do
+ echo -n "$i "
diff --git a/debian/patches/series b/debian/patches/series
index d62b052..90c0ce9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01-dvdwizardrc_path.patch
02-buildsystem.patch
+port-to-avconv.patch
--
dvdwizard packaging
More information about the pkg-multimedia-commits
mailing list