diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2011-12-02 19:53:15 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-12-02 19:53:15 +0000 |
commit | 91c10fe2b07890343e2afce911d0a799dbef31f1 (patch) | |
tree | f363db712ed0db2de402dd6a229d6c3f2840bb5f | |
parent | amd64/x86 stable wrt #391897 (diff) | |
download | historical-91c10fe2b07890343e2afce911d0a799dbef31f1.tar.gz historical-91c10fe2b07890343e2afce911d0a799dbef31f1.tar.bz2 historical-91c10fe2b07890343e2afce911d0a799dbef31f1.zip |
old
Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
-rw-r--r-- | media-video/tovid/ChangeLog | 8 | ||||
-rw-r--r-- | media-video/tovid/Manifest | 22 | ||||
-rw-r--r-- | media-video/tovid/files/tovid-0.30-configure.patch | 11 | ||||
-rw-r--r-- | media-video/tovid/files/tovid-0.31-sox.patch | 61 | ||||
-rw-r--r-- | media-video/tovid/files/tovid-0.31-todisc.patch | 12 | ||||
-rw-r--r-- | media-video/tovid/files/tovid-0.31-transcode-1.1.5.patch | 22 | ||||
-rw-r--r-- | media-video/tovid/tovid-0.31-r2.ebuild | 100 |
7 files changed, 15 insertions, 221 deletions
diff --git a/media-video/tovid/ChangeLog b/media-video/tovid/ChangeLog index abf05c771700..e835870160f3 100644 --- a/media-video/tovid/ChangeLog +++ b/media-video/tovid/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/tovid # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/ChangeLog,v 1.28 2011/12/02 19:52:19 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/ChangeLog,v 1.29 2011/12/02 19:53:15 ssuominen Exp $ + + 02 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> + -files/tovid-0.30-configure.patch, -tovid-0.31-r2.ebuild, + -files/tovid-0.31-sox.patch, -files/tovid-0.31-todisc.patch, + -files/tovid-0.31-transcode-1.1.5.patch: + old 02 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> tovid-0.34.ebuild: amd64/x86 stable wrt #391897 diff --git a/media-video/tovid/Manifest b/media-video/tovid/Manifest index 0ff7844e54d2..4f80cd2ce702 100644 --- a/media-video/tovid/Manifest +++ b/media-video/tovid/Manifest @@ -1,24 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX tovid-0.30-configure.patch 263 RMD160 fb74007a796ace83357ae304fe70afd6cb104f99 SHA1 884a64a84a0bc13f375926897dec5752d5cf7ab2 SHA256 bad68a1a8afca29440156f3d1cc38fb2718151170d46407a503ad5b0b13b57ae -AUX tovid-0.31-sox.patch 2377 RMD160 603b8696d6eaa63ff1d4785e509cf9e7bb0650fe SHA1 a98793d85e93eee171c57eade94396a94f9a2e75 SHA256 adc3e8d7e5162376106b7513af3cd917962fe4e12a49db81e195a330b618ab0e -AUX tovid-0.31-todisc.patch 510 RMD160 18a88e357370d633037154f3e01a6ce397010635 SHA1 905417a98c5d4ba51bcef26ca54a96188ea9cd24 SHA256 0ee1b00f1c42926fb2dc7da840992a1f300c762274d835c7f96ac7a9e25dda18 -AUX tovid-0.31-transcode-1.1.5.patch 1176 RMD160 7e1ebed4eb6ce3851a4944324f86f7cb8b250dc4 SHA1 a9a195057ad6dfbfebf60b864413653470962c67 SHA256 02c106d6a817243da30dfeb75fbc218c4abb1ffbdcf7ddc495de8f2c4f327e41 -DIST tovid-0.31.tar.gz 415625 RMD160 c79e7fe566256699e65cc4bd94cf5a1f98503502 SHA1 1c3ec16a7654e7f1248da2fc666b797efa29d0ae SHA256 e51e38c3f2da9898a8c2466b0ef3298519300e274568097388b7a0d066400d23 DIST tovid-0.34.tar.gz 512950 RMD160 417b1c29d634f03aa6667407826f2e2dbd5175b0 SHA1 e652b9b402174d8c81a2e3b9962c17d25f4feefa SHA256 f95d14ffbd2bd491751b529b09fb27ae45e24af1ad44c87b25bac9c1a184f4ee -EBUILD tovid-0.31-r2.ebuild 3074 RMD160 ccf9bd87d7b62b1f3ed0531ba2bf695ac2f7194e SHA1 1d72811247c9dc7786f53c8e09dfef42c0d99745 SHA256 b117ff0c90c2972178012a70151a3adae5e86ad579a0a7f255328cf348db985c EBUILD tovid-0.34.ebuild 1322 RMD160 a9db5a599abcba0d2fa1ffb8dbc277fa271dfada SHA1 13341e187dcd1108f651579c3168763d4a106875 SHA256 d9e7cc2d42706bc46821b7c94ea0b0cc57c3ace19b8d4998c2e5321fd8881e17 -MISC ChangeLog 4396 RMD160 bb53c82f7d9ac32853b005c2bc71099985fce24f SHA1 097bc24c81d0bbf3b5bf6d44fda10a2c5a22e1ec SHA256 6f75184118562d51373b03c927b185bdb3a86473866816c2e22620ab5ddf56f3 +MISC ChangeLog 4623 RMD160 76a2d8e1570cc6c02882bb86cb5ce33dd9e57ff4 SHA1 a433691be4cdd152cb82556a2ccdfccb77ca6069 SHA256 273c5110f389f4c9806fa181bf2540100b0a1bf6d813f0cf8dee77d9adb97a23 MISC metadata.xml 158 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 SHA1 9ac37da489ebe6e58e32fe8e037b1ef2d99c6638 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJO2Sx4AAoJEEdUh39IaPFN8XwH/3cb1xUmG2MMnwqijz2SgmiB -hS9YDF1Nd9BGUEV472hL4i8A4RKtiy8vNEy+hv+t7TBkxSwlNmnTkyAxKZpAuVXF -udzOVmndgyazDv7FVU7gJakmyOjkHvjnRC4NO7OJxuJjiih5zeYlItV32astaQb+ -67q6eNOG+8wGzLJiJGvgpxn8BuKttHZOwFXegsc9GE98msw4YuK5fIocoy+rnAQA -xlEB/iHN+3phSiKD11g5Aq7frc6KuKqIC6vrhjm/V6KzeJSXmQpUNi5fYoaxaZoy -keoxmcIQRKfGbaRkLux8LHDtOreMwqSVe92/CAKkaV32jMhPepyQ3GJ5/2oWZ6M= -=uHf0 +iQEcBAEBAgAGBQJO2SyvAAoJEEdUh39IaPFNs7oH/16BCsRK8Ypkv7STuViOnFIv +WMAM3NY/xM4tjc0tZSc+U2l0MpaXq8UkRNai7sWIC2u+16gPsXkhHjggXbaIsLmm +xoLFi4K88KSocsAIUbNBzR4FJJ44Sx0BtdGLe6VEZzvujzz4X08OWDP7nPlruRMi +OiKOsh1Db7h3W4ZFwQWN3U+aEN1BNLN9i45whF83RXiQu9MOzsap6XHxGZ4vziK5 +7P+G00EmBVvTypItwgERfgpSpvJtwczIS8nGKt6RlSDCJEc5QKa0OD6lb8PtZteW +UkGhuYzfH/t6F3yiKBK3Pm0mNPMKeV4TfimyCDLXBJMWw/jiTVKcz/qmUfzgloo= +=UKw9 -----END PGP SIGNATURE----- diff --git a/media-video/tovid/files/tovid-0.30-configure.patch b/media-video/tovid/files/tovid-0.30-configure.patch deleted file mode 100644 index 306218f37e84..000000000000 --- a/media-video/tovid/files/tovid-0.30-configure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure 2007-02-13 03:16:02.000000000 +0100 -+++ configure.new 2007-02-15 12:34:20.000000000 +0100 -@@ -2392,9 +2392,9 @@ - - - -- PYTHON_PREFIX='${prefix}' -+ PYTHON_PREFIX='/usr' - -- PYTHON_EXEC_PREFIX='${exec_prefix}' -+ PYTHON_EXEC_PREFIX='/usr' diff --git a/media-video/tovid/files/tovid-0.31-sox.patch b/media-video/tovid/files/tovid-0.31-sox.patch deleted file mode 100644 index 866a9a25ad88..000000000000 --- a/media-video/tovid/files/tovid-0.31-sox.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -ur tovid-0.31.old/src/todisc tovid-0.31/src/todisc ---- tovid-0.31.old/src/todisc 2008-12-20 00:39:06.000000000 -0600 -+++ tovid-0.31/src/todisc 2008-12-20 00:51:58.000000000 -0600 -@@ -1189,6 +1189,14 @@ - # $VMGM_ONLY && $SKIP_VMGM && mv "$BASEDIR/dummy.mpg" "$BASEDIR/VMGM.mpg" - } - -+get_sox_arg() -+{ -+ sox_version=$(sox --version) -+ sox_version=${sox_version##*v} -+ test_version $sox_version 13.0.0 && echo '-2' || echo '-w' -+} -+ -+ - ############################################################################## - # End of functions # - ############################################################################## -@@ -5240,9 +5248,10 @@ - fi - BG_AUDIO_LENGTH="-t $MENU_ATIME" - # create audio background for the main menu -+sample_size=$(get_sox_arg) - if [[ -z "$BG_AUDIO" || "$BG_AUDIO" = "none" ]]; then # no audio: use silence -- cat /dev/zero 2>/dev/null | nice -n 0 sox -t raw -c 2 -r 48000 -w \ -- -s - $WORK_DIR/intro.wav trim 0 $MENU_ATIME -+ cat /dev/zero 2>/dev/null | nice -n 0 sox -t raw -c 2 -r 48000 \ -+ $sample_size -s - $WORK_DIR/intro.wav trim 0 $MENU_ATIME - # Make sure file exists - elif test ! -s "$BG_AUDIO"; then - runtime_error "Cannot find background audio file: $BG_AUDIO" -diff -ur tovid-0.31.old/src/tovid-init.in tovid-0.31/src/tovid-init.in ---- tovid-0.31.old/src/tovid-init.in 2007-08-18 15:21:37.000000000 -0500 -+++ tovid-0.31/src/tovid-init.in 2008-12-20 00:51:24.000000000 -0600 -@@ -376,6 +376,26 @@ - } - - # ****************************************************************************** -+# takes 2 args: (1) version (2) the version testing against -+# return true if version is >= to the test version (same or newer) -+# ****************************************************************************** -+test_version() -+{ -+ OIFS=$IFS -+ IFS='.' -+ local version test_version -+ version=${1//,/.} # allow comma separated version string too -+ version=($version) -+ test_version=($2) -+ IFS=$OIFS -+ for i in ${!test_version[@]}; do -+ [[ -z ${version[i]} ]] && version[i]=0 -+ (( ${version[i]} < ${test_version[i]} )) && return 1 -+ done -+ return 0 -+} -+ -+# ****************************************************************************** - # ****************************************************************************** - # - # diff --git a/media-video/tovid/files/tovid-0.31-todisc.patch b/media-video/tovid/files/tovid-0.31-todisc.patch deleted file mode 100644 index c248c72df372..000000000000 --- a/media-video/tovid/files/tovid-0.31-todisc.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/todisc 2007-08-19 21:27:36.000000000 -0400 -+++ src/todisc.new 2007-10-19 22:43:33.000000000 -0400 -@@ -3736,8 +3736,7 @@ - # if static menu and no background audio, ignore MENU_AUDIOLENGTH - $STATIC && [[ -z "$BG_AUDIO" ]] && ! $SWITCHED && unset MENU_AUDIOLENGTH - # Check input files for compliance; offer to tovid-encode non-compliant files --$SWITCHED && MN=2 || MN=1 --if [[ $MENU_NUM -eq $MN ]]; then -+if [[ $MENU_NUM = [1-2] ]]; then - check_compliance - $GROUPING && check_compliance group - fi diff --git a/media-video/tovid/files/tovid-0.31-transcode-1.1.5.patch b/media-video/tovid/files/tovid-0.31-transcode-1.1.5.patch deleted file mode 100644 index 78e70d578ad3..000000000000 --- a/media-video/tovid/files/tovid-0.31-transcode-1.1.5.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=294492 - ---- src/todisc -+++ src/todisc -@@ -3965,7 +3965,7 @@ - NAV_SEEK[i]="--nav_seek" - NAVSEEK[i]=${IN_FILES[i]}.nav_log - fi -- TRANSCODE_CMD2=(nice transcode --print_status 10 \ -+ TRANSCODE_CMD2=(nice transcode --progress_meter 1 --progress_rate 10 \ - --write_pid $WORK_DIR/tcode$i.pid -q 1 -i "${IN_FILES[i]}" \ - -c ${SEEK_FRAMES[i]}-$((${SEEK_FRAMES[i]} + $FRAMES)) ${NAV_SEEK[i]} "${NAVSEEK[i]}" \ - -o "$WORK_DIR/pics/$i/" -f $FRAME_RATE -Z $THUMB_SIZE $EXPORT) -@@ -4438,7 +4438,7 @@ - yecho "Creating $TOTAL_JPEGS chapter images for "${IN_FILES[i]}"" - yecho - for t in "${cmd[@]}"; do -- TCODE_CMD=(nice transcode --print_status 10 --write_pid $WORK_DIR/tcode$i.pid \ -+ TCODE_CMD=(nice transcode --progress_meter 1 --progress_rate 10 --write_pid $WORK_DIR/tcode$i.pid \ - -q 1 -i "${IN_FILES[i]}" ${NAV_SEEK[i]} "${NAVSEEK[i]}" \ - -o "${PICS_OUT[@]}" -f $FRAME_RATE -Z ${GEO_ARRAY[C]},fast -c $t -y $SM_IMG_FMT,null) - echo "Running ${TCODE_CMD[@]}" | diff --git a/media-video/tovid/tovid-0.31-r2.ebuild b/media-video/tovid/tovid-0.31-r2.ebuild deleted file mode 100644 index 8ad8a61a3f3b..000000000000 --- a/media-video/tovid/tovid-0.31-r2.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/tovid-0.31-r2.ebuild,v 1.6 2011/05/28 23:50:52 zmedico Exp $ - -inherit eutils python - -DESCRIPTION="Video conversion and DVD authoring tools" -HOMEPAGE="http://tovid.wikia.com/" -SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz" -IUSE="tk wxwidgets" -DEPEND="media-video/mplayer - app-text/txt2tags" -RDEPEND="media-video/mjpegtools - virtual/ffmpeg - >=media-video/transcode-1.1.5 - media-sound/normalize - media-gfx/imagemagick - media-sound/sox - media-video/dvdauthor - media-video/vcdimager - media-video/lsdvd - virtual/cdrtools - dev-python/pycairo - wxwidgets? ( =dev-python/wxpython-2.6* ) - app-cdr/dvd+rw-tools - app-cdr/cdrdao - dev-python/imaging - sys-devel/bc" -KEYWORDS="amd64 x86" -LICENSE="GPL-2" -SLOT="0" - -pkg_setup() { - if use tk && ( ! built_with_use dev-lang/python tk ); then - eerror "Please emerge python with useflag 'tk' enabled." - die "Fix USE flags and re-emerge" - elif ! use tk; then - ewarn "If you want to use 'todiscgui', then emerge" - ewarn "dev-lang/python and this package with the 'tk' use flag" - fi - if ! built_with_use media-video/mplayer encode; then - eerror "Please emerge media-video/mplayer with useflag 'encode'." - die "Fix USE flags and re-emerge" - fi - if ! use wxwidgets; then - ewarn "You have choosen to disable all tovidgui interface." - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-0.30-configure.patch \ - "${FILESDIR}"/${P}-todisc.patch \ - "${FILESDIR}"/${P}-sox.patch \ - "${FILESDIR}"/${P}-transcode-1.1.5.patch -} - -src_install() { - emake DESTDIR="${D}" install || die "make install died" - dodoc AUTHORS ChangeLog NEWS README - - # remove wxgtk components - if ! use wxwidgets; then - rm -f "${D}/usr/bin/tovidgui" - rm -rf "${D}$(python_get_sitedir)/libtovid/gui" - rm -f "${D}/usr/share/applications/tovidgui.desktop" - fi - - # remove tk components - if ! use tk; then - rm -f "${D}/usr/bin/todiscgui" - rm -rf "${D}$(python_get_sitedir)/libtovid/metagui" - rm -f "${D}/usr/share/applications/todiscgui.desktop" - fi -} - -pkg_postinst() { - elog "" - elog "List of suite components:" - elog " idvid: Identifies video format, resolution, and length" - elog " makemenu: Creates (S)VCD/DVD menus" - elog " makeslides: Creates mpeg still slides for (S)VCD" - elog " makexml: Creates XML specification for an (S)VCD or DVD navigation hierarchy" - elog " makedvd: Creates the DVD structure and/or iso image" - elog " postproc: Adjusts A/V sync and does shrinking of encoded video" - elog " tovid: Converts video to (S)VCD or DVD mpeg format" - if use wxwidgets; then - elog " tovidgui: The tovid GUI" - fi - elog " pytovid: The new (experimental) python based tovid script" - elog " todisc: Create a DVD with animated menus" - if use tk; then - elog " todiscgui: Experimental gui for todisc" - fi - elog "" - elog "Please check out the tovid documentation on the web:" - elog " http://tovid.wikia.com/" - elog "" -} |