@@ -1,4 +1,12 @@

 -------------------------------------------------------------------

+Mon Apr  6 19:29:20 UTC 2015 - aloisio@gmx.com

+

+- Version 0.35.0

+  * minor changes

+  * moved project to github 

+- Dropped tovid-rpmlintrc

+

+-------------------------------------------------------------------

 Sat Mar 14 15:34:58 UTC 2015 - aloisio@gmx.com

 - Update to 0.35

​

@@ -1,123 +1,93 @@

 # vim: set ts=4 sw=4 et:

+#

+# Copyright (c) 2015 Luigi Baldoni <aloisio@gmx.com>

 # Copyright (c) 2005-2010 oc2pus

-# This file and all modifications and additions to the pristine

-# package are under the same license as the package itself.

 #

+# All modifications and additions to the file contributed by third parties

+# remain the property of their copyright owners, unless otherwise agreed

+# upon. The license for this file, and modifications and additions to the

+# file, is the same license as for the pristine package itself (unless the

+# license for the pristine package is not an Open Source License, in which

+# case the license is the MIT License). An "Open Source License" is a

+# license that conforms to the Open Source Definition (Version 1.9)

+# published by the Open Source Initiative.

+

 # Please submit bugfixes or comments to packman@links2linux.de

-%{!?python_sitelib:  %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}

-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}

-Summary:        Video conversion and DVD authoring tools

+%{!?python_sitelib:  %global python_sitelib  %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}

+%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}

 Name:           tovid

-Version:        0.35

-Release:        0.pm.1

-Group:          Productivity/Multimedia/Video/Editors and Convertors

+Version:        0.35.0

+Release:        0

+Summary:        Video conversion and DVD authoring tools

 License:        GPL-2.0+

-Url:            http://tovid.sourceforge.net/

-# http://tovid.googlecode.com/files/tovid-%{version}.tar.gz

-Source:         tovid-%{version}.tar.gz

-Source90:       %{name}-rpmlintrc

-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

-%if %suse_version > 1110

-BuildArch:      noarch

-%endif

-%py_requires

-BuildRequires:  fdupes

+Group:          Productivity/Multimedia/Video/Editors and Convertors

+Url:            http://tovid.wikia.com/wiki/Tovid_Wiki

+Source:         https://github.com/tovid-suite/tovid/releases/download/v0.35.0/tovid-%{version}.tar.gz

 BuildRequires:  hicolor-icon-theme

 BuildRequires:  python-devel

 BuildRequires:  python-setuptools

 BuildRequires:  txt2tags

 BuildRequires:  update-desktop-files

+Requires:       ImageMagick >= 6.0

+Requires:       MPlayer

+Requires:       bc

 Requires:       binutils

 Requires:       dvd+rw-tools

 Requires:       dvdauthor >= 0.6.0

 Requires:       ffmpeg

-Requires:       ImageMagick >= 6.0

 Requires:       lsdvd

 Requires:       mjpegtools

-Requires:       /usr/bin/mkisofs

-Requires:       MPlayer

+Requires:       mkisofs

 Requires:       normalize

-%if %suse_version >= 1110

 Requires:       python-base >= %{py_ver}

-%else

-Requires:       python >= %{py_ver}

-%endif

-Requires:       python-cairo

-Requires:       python-imaging

-%if 0%{?suse_version} >= 1320

-Requires:       python-wxGTK >= 3.0

-%else

-Requires:       python-wxGTK < 3.0

-%endif

+Requires:       python-tk

 Requires:       sox

-Requires:       transcode

-Requires:       vcdimager

-Recommends:        libdvdcss2

-BuildRequires:  dvd+rw-tools

-BuildRequires:  dvdauthor >= 0.6.0

-BuildRequires:  ffmpeg

-BuildRequires:  ImageMagick >= 6.0

-BuildRequires:  lsdvd

-BuildRequires:  mjpegtools

-%if 0%{?suse_version} <= 1230

-BuildRequires:  mkisofs

-%else

-BuildRequires:  cdrkit-cdrtools-compat

-%endif

-BuildRequires:  MPlayer

-BuildRequires:  normalize

-BuildRequires:  python-cairo

-BuildRequires:  python-imaging

-%if 0%{?suse_version} >= 1320

-BuildRequires:  python-wxGTK >= 3.0

-%else

-BuildRequires:  python-wxGTK < 3.0

+Requires:       tix

+Requires:       tk

+Recommends:     libdvdcss2

+Recommends:     transcode

+BuildRoot:      %{_tmppath}/%{name}-%{version}-build

+%py_requires

+%if 0%{?suse_version} > 1110

+BuildArch:      noarch

 %endif

-BuildRequires:  sox

-BuildRequires:  transcode

-BuildRequires:  vcdimager

 %description

-tovid is a suite of utilities designed to make VCD, SVCD, and DVD

+tovid is a suite of utilities designed to make DVD

 authoring a little less painful. tovid can create MPEG output

-from arbitrary video formats; other components in the suite can

-help you identify video files, generate graphical menus for DVD,

-and write the XML for authoring DVDs. Video files converted with

-tovid can subsequently be burned to a CD or DVD, using software

-that can create the appropriate file structure for VCD or SVCD

-such as k3b or dvdauthor.

+from arbitrary video formats, help you identify video files,

+generate graphical menus for DVD (animated or static),

+generate DVD directories with the appropriate file structure,

+and optionally burn them to disk.

 %prep

 %setup -q

 %build

-%__python setup.py build

+python setup.py build

 %install

-%__python setup.py install \

+python setup.py install \

     --prefix=%{_prefix} \

     --root=%{buildroot}

-%__rm -f "%{buildroot}%{_usr}/lib/tovid/.install.log"

+rm -f "%{buildroot}%{_prefix}/lib/tovid/.install.log"

+chmod +x %{buildroot}%{_prefix}/lib/tovid/set_chapters

+chmod +x %{buildroot}%{_prefix}/lib/tovid/tovid-init

 for x in tovidgui titleset-wizard; do

     %suse_update_desktop_file -r "$x" AudioVideo AudioVideoEditing

 done

-%fdupes -s "%{buildroot}"

-

-%clean

-%{?buildroot:%__rm -rf "%{buildroot}"}

-

 %files

 %defattr(-,root,root)

 %doc AUTHORS ChangeLog COPYING README

 %{_bindir}/tovid

 %{python_sitelib}/libtovid

 %{python_sitelib}/tovid-%{version}*

-%{_usr}/lib/tovid

+%{_prefix}/lib/tovid

 %{_datadir}/applications/tovidgui.desktop

 %{_datadir}/applications/titleset-wizard.desktop

 %{_datadir}/icons/*/*/apps/tovid.png

​

@@ -1,10 +1,11 @@

-Metadata-Version: 1.0

+Metadata-Version: 1.1

 Name: tovid

-Version: 0.35

-Summary: UNKNOWN

+Version: 0.35.0

+Summary: A suite of tools for making video DVDs

 Home-page: http://tovid.wikia.com/

-Author: Eric Pierce

-Author-email: wapcaplet88@gmail.com

+Author: grepper

+Author-email: grepper@gmail.com

 License: GPL

-Description: UNKNOWN

-Platform: UNKNOWN

+Download-URL: https://github.com/tovid-suite/tovid/

+Description: A suite of tools for making video DVDs

+Platform: Linux

​

@@ -45,5 +45,3 @@

     http://tovid.wikia.com/

 tovid-users discussion group:

     http://groups.google.com/group/tovid-users

-tovid IRC channel:

-    irc.freenode.org, channel #tovid

​

@@ -0,0 +1,1918 @@

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

+<HTML>

+<HEAD>

+<META NAME="generator" CONTENT="http://txt2tags.org">

+<TITLE>tovid manual</TITLE>

+</HEAD><BODY BGCOLOR="white" TEXT="black">

+<CENTER>

+<H1>tovid manual</H1>

+</CENTER>

+

+<P></P>

+<HR NOSHADE SIZE=1>

+<P></P>

+

+  <UL>

+  <LI><A HREF="#toc1">Name</A>

+  <LI><A HREF="#toc2">Description</A>

+  <LI><A HREF="#toc3">Usage</A>

+  <LI><A HREF="#toc4">Configuration</A>

+  <LI><A HREF="#toc5">Command:gui</A>

+  <LI><A HREF="#toc6">Usage</A>

+  <LI><A HREF="#toc7">Command:titlesets</A>

+  <LI><A HREF="#toc8">Command:disc</A>

+    <UL>

+    <LI><A HREF="#toc9">Usage</A>

+    <LI><A HREF="#toc10">General Options</A>

+    <LI><A HREF="#toc11">Menu style</A>

+    <LI><A HREF="#toc12">Thumbnail style</A>

+    <LI><A HREF="#toc13">Slideshows</A>

+    <LI><A HREF="#toc14">Burning the disc</A>

+    <LI><A HREF="#toc15">Advanced usage</A>

+    <LI><A HREF="#toc16">Menu Style</A>

+    <LI><A HREF="#toc17">Thumbnail Style</A>

+    <LI><A HREF="#toc18">Dvdauthor options</A>

+    <LI><A HREF="#toc19">Usage notes</A>

+    </UL>

+  <LI><A HREF="#toc20">Command:mpg</A>

+    <UL>

+    <LI><A HREF="#toc21">Usage</A>

+    <LI><A HREF="#toc22">Basic options</A>

+    <LI><A HREF="#toc23">Advanced options</A>

+    </UL>

+  <LI><A HREF="#toc24">Command:id</A>

+    <UL>

+    <LI><A HREF="#toc25">Usage</A>

+    <LI><A HREF="#toc26">Options</A>

+    <LI><A HREF="#toc27">Examples</A>

+    </UL>

+  <LI><A HREF="#toc28">Command:dvd</A>

+    <UL>

+    <LI><A HREF="#toc29">Usage</A>

+    <LI><A HREF="#toc30">Options</A>

+    </UL>

+  <LI><A HREF="#toc31">Command:chapters</A>

+    <UL>

+    <LI><A HREF="#toc32">Examples</A>

+    </UL>

+  <LI><A HREF="#toc33">CONTACT</A>

+  </UL>

+

+<P></P>

+<HR NOSHADE SIZE=1>

+<P></P>

+

+<A NAME="toc1"></A>

+<H1>Name</H1>

+

+<P>

+tovid: Make DVDs from video files

+</P>

+

+<A NAME="toc2"></A>

+<H1>Description</H1>

+

+<P>

+<B>tovid</B> is a command-line tool for creating DVDs. It can encode your video

+files to DVD-compliant MPEG format, generate simple or complex DVD menus,

+author and burn a ready-to-watch DVD, with just a few shell commands. A

+graphical interface is also provided to make the process even easier.

+</P>

+<P>

+<B>NOTE</B>: As of tovid 0.35, the legacy scripts <B>makemenu</B> and <B>makexml</B>

+have been removed and no longer appear in this manpage.

+All of their functions and more can be done with the 'tovid disc' command,

+(todisc script). See <B>Command:disc</B> and the <A HREF="http://tovid.wikia.com">wiki</A>

+for more info.

+</P>

+<P>

+Also note that as of tovid 0.32, this is the only manual page provided by tovid.

+There is now a single executable frontend to all functionality in the suite, so

+if you were expecting to find manpages for <B>todisc</B>, <B>idvid</B>, <B>makempg</B>

+and their kin, they can all be found in the <B>tovid</B> manpage you are reading now.

+And yes, this makes for a pretty large manual page. If you are viewing this

+manpage from the command-line <B>man</B> utility, which normally pages through the

+<B>less</B> utility, you can skip to a section by searching with the <B>/</B> key,

+followed by a <B>^</B> to match the given section name. For example, to skip to

+the <B>mpg</B> command, type <B>/^Command:mpg</B>. See <B>man less</B> for more on how

+to navigate.

+</P>

+

+<A NAME="toc3"></A>

+<H1>Usage</H1>

+

+<P>

+<B>tovid</B> <I>COMMAND</I> [<I>OPTIONS</I>]

+</P>

+<P>

+Where <I>COMMAND</I> is one of the following:

+</P>

+<P>

+    Main Commands

+</P>

+

+<DL>

+<DT><B>disc</B></DT><DD>

+    Encode, make menus, author, burn. (was <B>todisc</B>. See <B>Command:disc</B>)

+<DT><B>gui</B></DT><DD>

+    Start the tovid GUI (was <B>todiscgui</B>. See <B>Command:gui</B>)

+<DT><B>titlesets</B></DT><DD>

+    A GUI wizard for multiple titlesets. (new: See <B>Command:titlesets</B>)

+</DL>

+

+<P>

+    Helper Commands

+</P>

+

+<DL>

+<DT><B>mpg</B></DT><DD>

+    Encode videos to MPEG format (was <B>tovid</B>. See <B>Command:mpg</B>)

+<DT><B>dvd</B></DT><DD>

+    Author and/or burn a DVD (was <B>makedvd</B>. See <B>Command:dvd</B>)

+<DT><B>id</B></DT><DD>

+    Identify one or more video files (was <B>idvid</B>. See <B>Command:id</B>)

+<DT><B>chapters</B></DT><DD>

+    A GUI using mplayer for setting chapter points.  It will return a string of

+    chapter points to the terminal, in a format recognized by 'tovid disc'

+    (todisc) or by 'tovid gui', for the  <B>-chapters</B> option.

+</DL>

+

+<P>

+The <I>OPTIONS</I> differ for each command; run <B>tovid &lt;command&gt;</B> with no

+further arguments to get help on a command, and what options it expects.

+</P>

+

+<A NAME="toc4"></A>

+<H1>Configuration</H1>

+

+<P>

+Two configuration files are created the first time you run tovid:

+</P>

+

+<DL>

+<DT><B>~/.tovid/preferences</B></DT><DD>

+    Defines working directory for all scripts.

+    You can define the output directory for makempg here.

+    The 'ffmpeg' executable can be set here: ffmpeg or avconv (TOVID_FFMPEG)

+<DT><B>~/.tovid/tovid.ini</B></DT><DD>

+    Includes command-line options that should be passed to the various

+    <B>tovid</B> sub-commands.  Note: each sub-command has its own section,

+    starting with the line [sub-command], for example:

+

+<PRE>

+      [disc]

+      ; -no-warn

+      -static

+      -no-ask

+</PRE>

+

+</DL>

+

+<P>

+Edit these files if you wish to change your configuration.

+</P>

+<P>

+The following environment variables are also honoured:

+</P>

+

+<PRE>

+      TOVID_HOME (directory containing preferences: ~/.tovid)

+      TOVID_WORKING_DIR (working directory for all scripts).

+      TOVID_OUTPUT_DIR (output directory for the makempg script).

+      TOVID_FFMPEG_CMD (the 'ffmpeg' executable to use: ffmpeg or avconv)

+</PRE>

+

+<P>

+These will override 'TOVID_HOME', 'WORKING_DIR', 'OUTPUT_DIR',

+and 'TOVID_FFMPEG' if set in ~/.tovid/preferences.

+</P>

+

+<A NAME="toc5"></A>

+<H1>Command:gui</H1>

+

+<A NAME="toc6"></A>

+<H1>Usage</H1>

+

+<P>

+<B>tovid gui</B> [<I>OPTIONS</I>]

+</P>

+<P>

​

@@ -0,0 +1,1663 @@

+'''tovid manual'''

+

+

+

+

+----

+

+__TOC__

+

+----

+

+

+== Name ==

+

+tovid: Make DVDs from video files

+

+== Description ==

+

+'''tovid''' is a command-line tool for creating DVDs. It can encode your video

+files to DVD-compliant MPEG format, generate simple or complex DVD menus,

+author and burn a ready-to-watch DVD, with just a few shell commands. A

+graphical interface is also provided to make the process even easier.

+

+'''NOTE''': As of tovid 0.35, the legacy scripts '''makemenu''' and '''makexml'''

+have been removed and no longer appear in this manpage.

+All of their functions and more can be done with the 'tovid disc' command,

+(todisc script). See '''Command:disc''' and the [http://tovid.wikia.com wiki]

+for more info.

+

+Also note that as of tovid 0.32, this is the only manual page provided by tovid.

+There is now a single executable frontend to all functionality in the suite, so

+if you were expecting to find manpages for '''todisc''', '''idvid''', '''makempg'''

+and their kin, they can all be found in the '''tovid''' manpage you are reading now.

+And yes, this makes for a pretty large manual page. If you are viewing this

+manpage from the command-line '''man''' utility, which normally pages through the

+'''less''' utility, you can skip to a section by searching with the '''/''' key,

+followed by a '''^''' to match the given section name. For example, to skip to

+the '''mpg''' command, type '''/^Command:mpg'''. See '''man less''' for more on how

+to navigate.

+

+== Usage ==

+

+'''tovid''' ''COMMAND'' [''OPTIONS'']

+

+Where ''COMMAND'' is one of the following:

+

+    Main Commands

+

+; '''disc'''

+: Encode, make menus, author, burn. (was '''todisc'''. See '''Command:disc''')

+; '''gui'''

+: Start the tovid GUI (was '''todiscgui'''. See '''Command:gui''')

+; '''titlesets'''

+: A GUI wizard for multiple titlesets. (new: See '''Command:titlesets''')

+

+    Helper Commands

+

+; '''mpg'''

+: Encode videos to MPEG format (was '''tovid'''. See '''Command:mpg''')

+; '''dvd'''

+: Author and/or burn a DVD (was '''makedvd'''. See '''Command:dvd''')

+; '''id'''

+: Identify one or more video files (was '''idvid'''. See '''Command:id''')

+; '''chapters'''

+: A GUI using mplayer for setting chapter points.  It will return a string of

+: chapter points to the terminal, in a format recognized by 'tovid disc'

+: (todisc) or by 'tovid gui', for the  '''-chapters''' option.

+

+The ''OPTIONS'' differ for each command; run '''tovid <command>''' with no

+further arguments to get help on a command, and what options it expects.

+

+== Configuration ==

+

+Two configuration files are created the first time you run tovid:

+

+; '''~/.tovid/preferences'''

+: Defines working directory for all scripts.

+: You can define the output directory for makempg here.

+: The 'ffmpeg' executable can be set here: ffmpeg or avconv (TOVID_FFMPEG)

+; '''~/.tovid/tovid.ini'''

+: Includes command-line options that should be passed to the various

+: '''tovid''' sub-commands.  Note: each sub-command has its own section,

+: starting with the line [sub-command], for example:

+<pre>

+    [disc]

+    ; -no-warn

+    -static

+    -no-ask

+</pre>

+

+

+Edit these files if you wish to change your configuration.

+

+The following environment variables are also honoured:

+

+<pre>

+    TOVID_HOME (directory containing preferences: ~/.tovid)

+    TOVID_WORKING_DIR (working directory for all scripts).

+    TOVID_OUTPUT_DIR (output directory for the makempg script).

+    TOVID_FFMPEG_CMD (the 'ffmpeg' executable to use: ffmpeg or avconv)

+</pre>

+

+These will override 'TOVID_HOME', 'WORKING_DIR', 'OUTPUT_DIR',

+and 'TOVID_FFMPEG' if set in ~/.tovid/preferences.

+

+== Command:gui ==

+

+== Usage ==

+

+'''tovid gui''' [''OPTIONS'']

+

+'''tovid gui''' starts the graphical user interface (GUI) for tovid. This is

+the easiest way to start creating DVDs with tovid. The optional arguments

+''OPTIONS'' are any option used by todisc ('tovid disc') which will save

+entering it manually, OR the full path to a saved script from the GUI.

+You can also combine these, but the script must be the FIRST option

+directly after '''tovid gui''' .  (This option to save the contents of your

+project allows you to use it as a bash script later, or to reload the

+project to continue working with it at another time.)

+

+'''tovid gui''' will also take the option '''--position''', which denotes the

+screen position that the GUI will start at, in the form '+X+Y', similar to

+this part of the Xorg -geometry string.

+

+All help is integrated in the form of tooltips.  You can also see

+**Command:disc ** for more detail about the options.  Note: if you wish to use

+a GUI to make multiple titlesets on the same DVD use '''*tovid titlesets*''',

+which is a wizard that uses the the 'tovid gui. See '''*Command:titlesets*'''.

+

+Please note that although the interface may seem complex with so many options,

+you can create a fully functional DVD with only a few options on the opening

+tab of the GUI (select video files and an output name).

+

+== Command:titlesets ==

+

+'''tovid titlesets''' will assist in making a DVD with multiple titlesets.  It can

+be started without any options, or you can feed it the path to a saved titleset

+script as an option.  The option to save a script is also useful as the resulting

+script can be run later from a terminal.

+

+== Command:disc ==

+

+'''tovid disc''' creates a DVD file-system with optional menus, from a list of

+multimedia video files and their titles.  As todisc can function as a master

+script, calling other scripts as it needs them, it is the easiest command line

+program for creating a DVD from start to finish, including automatically

+converting non-compliant videos and prompting to burn at completion.  It can do

+animated menus, static thumbnail menus, text-only menus, or author with no menu.

+In addition, it can do slideshows, using images as input, and even combine

+slideshows with videos.  It supports sub-menus for chapter breaks,

+configurable menu style, animated backgrounds and transparency effects.

+From simple (no menu) to complex (switched menus and titlesets), you should

+be able to do what you want with 'tovid disc'.

+

+=== Usage ===

+

+<pre>

+ tovid disc [OPTIONS] \

+    -files <file list> -titles <title list>

+    -out mydvd

+</pre>

+

+For example:

+

+<pre>

+ $ tovid disc -files File1.mpg File2.mpg File3.mpg \

+      -titles "Episode 1" "Episode 2" "Episode 3" \

+      -out Season_one

+</pre>

+

+The number of '''-files''' and '''-titles''' must be equal, though if you do not

+include any titles '''tovid disc''' will use the basename of the included files

+as titles.  If you are doing a slideshow or multiple slideshows, use

+'''-slides''' rather than '''-files''' for passing in the images.  You may use

+-files and -slides more than once to create an ordering in a mixed

+slideshows/videos menu.  See Slideshows part of Usage section, below.

+

+If the input files are not mpeg, you will have the option to auto-encode them.

+

+General Options

+

+'''At present there are 2 display arrangements or "templates":'''

+

+; A. (Default)

+: Thumbs will be centred, and as large as space restraints allow.

+: 

+; B. '''-showcase''' IMAGE|VIDEO

+: Produces an arrangement with small buttons on

+: the side and the showcase image/video in the centre.  If no IMAGE or VIDEO

+: argument is supplied, the central thumb will be omitted.

+: 

+: Note: '''-textmenu''', '''-quick-menu''' and '''-switched-menus''' are all types

+: of showcase style menus.  See descriptions under '''Menu style''' section.

+

+The '''-titles''' arguments should be double or single quoted, or have the spaces

+backslash-escaped. Special characters (like ", !, *, &, ?) may need to be

+backslash-escaped.  To include a quoted string within a title, backslash-escape

+the quotes.  These titles are used for labelling thumbnails on the main menu,

+and for the submenu title for that video.  ( see also '''-submenu-titles''' )

​

@@ -390,7 +390,7 @@

         # Hack: This is broken (commented section), presumably because of

         # load_args limitations. This hack fixes it for libtovid, but does not

         # belong in metagui.  So refactor this when load_args is fixed.

-        # see http://code.google.com/p/tovid/issues/detail?id=121

+        # see https://github.com/tovid-suite/tovid/issues/121

         filename = askopenfilename(parent=self,

             title="Select a shell script or text file to load",

             filetypes=[('Shell scripts', '*.sh *.bash'),

@@ -437,7 +437,7 @@

     def load_script(self, filename):

         # this is now disabled and its functionality passed to guis.helpers.py

-        # see http://code.google.com/p/tovid/issues/detail?id=121

+        # see https://github.com/tovid-suite/tovid/issues/121

         pass

         #"""Load current Control settings from a text file.

         #"""

​

@@ -44,7 +44,7 @@

 # Current SVN version number

 #_tovid_version = svn_version()

 # Official release number

-_tovid_version = '0.35'

+_tovid_version = '0.35.0'

 import os

@@ -194,8 +194,12 @@

     version = _tovid_version, # Defined at the top of this file

     url = 'http://tovid.wikia.com/',

     license = 'GPL',

-    maintainer = 'Eric Pierce',

-    maintainer_email = 'wapcaplet88@gmail.com',

+    maintainer = 'grepper',

+    maintainer_email = 'grepper@gmail.com',

+    description = 'A suite of tools for making video DVDs',

+    platforms = 'Linux',

+    download_url = 'https://github.com/tovid-suite/tovid/',

+    long_description = 'A suite of tools for making video DVDs',

     cmdclass = {

         'install': InstallCommand,

​

@@ -80,7 +80,7 @@

     echo "$@"

     echo "See if anything in the above output helps you diagnose the"

     echo "problem, and please file a bug report at:"

-    echo "   http://code.google.com/p/tovid/issues"

+    echo "   https://github.com/tovid-suite/tovid/issues"

     echo "(_not_ the dvdauthor list) containing the above output."

     echo "Sorry for the inconvenience!"

     echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

​

@@ -810,7 +810,7 @@

         echo "See the manual ('man tovid') for more information and options."

         echo

         echo "Please report bugs to:"

-        echo "   http://code.google.com/p/tovid/issues/list"

+        echo "   https://github.com/tovid-suite/tovid/issues"

         yecho "Thanks for using tovid!"

         yecho

     fi

​

@@ -0,0 +1,158 @@

+#!/bin/sh

+

+# file identification script

+#

+# manual usage:

+#   mpv_identify.sh foo.mkv

+#

+# sh/dash/ksh/bash usage:

+#   . mpv_identify.sh FOO_ foo.mkv

+# will fill properties into variables like FOO_length

+#

+# zsh usage:

+#   mpv_identify() { emulate -L sh; . mpv_identify.sh "$@"; }

+#   mpv_identify FOO_ foo.mkv

+# will fill properties into variables like FOO_length

+#

+# When multiple files were specified, their info will be put into FOO_* for the

+# first file, FOO_1_* for the second file, FOO_2_* for the third file, etc.

+#

+# Note: this script appears without a COPYRIGHT header in the mpv source

+# according to the mpv COPYRIGHT:

+# "Files without Copyright notice are licensed as LGPLv2+."

+

+__midentify__main() {

+

+    case "$0" in

+        mpv_identify.sh|*/mpv_identify.sh)

+            # we are NOT being sourced

+            [ -n "$1" ] && set -- '' "$@"

+            ;;

+    esac

+

+    if [ "$#" -lt 2 ]; then

+        cat >&2 <<EOF

+Usage 1 (for humans only): $0 filename.mkv

+will print all property values.

+Note that this output really shouldn't be parsed, as the

+format is subject to change.

+

+Usage 2 (for use by scripts): see top of this file

+

+NOTE: for mkv with ordered chapters, this may

+not always identify the specified file, but the

+file providing the first chapter. Specify

+--no-ordered-chapters to prevent this.

+EOF

+        return 2

+    fi

+

+    local LF="

+"

+

+    local nextprefix="$1"

+    shift

+

+    if [ -n "$nextprefix" ]; then

+        # in case of error, we always want this unset

+        unset "${nextprefix}path"

+    fi

+

+    local allprops="

+        filename

+        path

+        stream-start

+        stream-end

+        stream-length

+

+        demuxer

+

+        length

+        chapters

+        editions

+        titles

+

+        audio

+        audio-bitrate

+        audio-codec

+        audio-format

+        channels

+        samplerate

+

+        video

+        angle

+        video-bitrate

+        video-codec

+        video-format

+        video-aspect

+        fps

+        width

+        height

+        dwidth

+        dheight

+

+        sub

+    "

+    # TODO add metadata support once mpv can do it

+

+    local propstr="X-MIDENTIFY-START:$LF"

+    local key

+    for key in $allprops; do

+        propstr="${propstr}X-MIDENTIFY: $key \${=$key}$LF"

+        key="$(printf '%s\n' "$key" | tr - _)"

+        unset "$nextprefix$key"

+    done

+

+    local fileindex=0

+    local prefix=

+    local line

+    while IFS= read -r line; do

+        case "$line" in

+            X-MIDENTIFY-START:)

+                if [ -n "$nextprefix" ]; then

+                    prefix="$nextprefix"

+                    if [ "$fileindex" -gt 0 ]; then

+                        nextprefix="${prefix%${fileindex}_}"

+                    fi

+                    fileindex="$((fileindex+1))"

+                    nextprefix="${nextprefix}${fileindex}_"

+                    for key in $allprops; do

+                        key="$(printf '%s\n' "$key" | tr - _)"

+                        unset "$nextprefix$key"

+                    done

+                else

+                    if [ "$fileindex" -gt 0 ]; then

+                        printf '\n'

+                    fi

+                    fileindex="$((fileindex+1))"

+                fi

+                ;;

+            X-MIDENTIFY:\ *)

+                local key="${line#X-MIDENTIFY: }"

+                local value="${key#* }"

+                key="${key%% *}"

+                key="$(printf '%s\n' "$key" | tr - _)"

+                if [ -n "$nextprefix" ]; then

+                    if [ -z "$prefix" ]; then

+                        echo >&2 "Got X-MIDENTIFY: without X-MIDENTIFY-START:"

+                    elif [ -n "$value" ]; then

+                        eval "$prefix$key"='"$value"'

+                    fi

+                else

+                    if [ -n "$value" ]; then

+                        printf '%s=%s\n' "$key" "$value"

+                    fi

+                fi

+                ;;

+        esac

+    done <<EOF

+echo $propstr

+

+$(${MPV:-mpv} --term-playing-msg="$propstr" --vo=null --ao=null \

+              --frames=1 --quiet --no-cache --no-config -- "$@")

+EOF

+}

+

+__midentify__main "$@"

+

+echo Running mpv --term-playing-msg="$propstr" --vo=null --ao=null --frames=1 --quiet --no-cache --no-config -- "$@" >&2

​

@@ -119,6 +119,6 @@

     print(' ')

     print("Done encoding '%s' to '%s.mpg'" % (options['in'], options['out']))

     print(' ')

-    print("Please report bugs to http://code.google.com/p/tovid/issues/list")

+    print("Please report bugs to https://github.com/tovid-suite/tovid/issues")

     print("Thanks for using pytovid!")

​

@@ -45,7 +45,7 @@

 #set -u

 # Suite version

-TOVID_VERSION="0.35"

+TOVID_VERSION="0.35.0"

 # String used to separate blocks of output

 SEPARATOR="========================================================="

@@ -53,7 +53,7 @@

 TOVID_HOME="$HOME/.tovid"

 TOVID_HOME_PAGE="http://tovid.wikia.com"

 TOVID_FORUMS="http://groups.google.com/group/tovid-users"

-TOVID_ISSUES="http://code.google.com/p/tovid/issues/list"

+TOVID_ISSUES="https://github.com/tovid-suite/tovid/issues"

 # ******************************************************************************

 # ******************************************************************************

​

@@ -53,7 +53,7 @@

 TOVID_HOME="$HOME/.tovid"

 TOVID_HOME_PAGE="http://tovid.wikia.com"

 TOVID_FORUMS="http://groups.google.com/group/tovid-users"

-TOVID_ISSUES="http://code.google.com/p/tovid/issues/list"

+TOVID_ISSUES="https://github.com/tovid-suite/tovid/issues"

 # ******************************************************************************

 # ******************************************************************************

​

@@ -165,7 +165,7 @@

         OUTFILE="$DEFAULT_OUTFILE"

         rm -f "$OUTFILE"

     fi

-    CMD="tovid $@ -overwrite -out $OUTFILE"

+    CMD="tovid mpg $@ -overwrite -out $OUTFILE"

     $TEST_FFMPEG && CMD="$CMD -ffmpeg"

     yecho $CMD

     if $DEBUG; then

​

@@ -1,1 +0,0 @@

-addFilter("python-naming-policy-not-applied")

​