9:36 p.m.
Author: goeran
Update of /cvs/free/rpms/m2vmp2cut/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17160
Modified Files:
.cvsignore m2vmp2cut.1 m2vmp2cut.spec sources
Removed Files:
m2vmp2cut.demuxpath.patch m2vmp2cut.help-in-share.patch
m2vmp2cut.libexec.patch m2vmp2cut.optflags.patch
m2vmp2cut.timestamps.patch
Log Message:
* Sun Oct 7 2012 Göran Uddeborg <goeran(a)uddeborg.se> 0.86-1
- Upgrade to version 0.86.
- All patches have been included upstreams, in one way or another, and
are removed from the RPM
- Remove "dev" directory suffix since this is an official release.
- More dummy programs needed during build.
- The manual page updated to match the current documentation.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/m2vmp2cut/F-18/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 30 Dec 2010 18:06:48 -0000 1.2
+++ .cvsignore 18 Oct 2012 21:36:06 -0000 1.3
@@ -1 +1 @@
-m2vmp2cut-0.79-dev.tar.gz
+m2vmp2cut-0.86.tar.xz
Index: m2vmp2cut.1
===================================================================
RCS file: /cvs/free/rpms/m2vmp2cut/F-18/m2vmp2cut.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- m2vmp2cut.1 30 Dec 2010 18:06:48 -0000 1.1
+++ m2vmp2cut.1 18 Oct 2012 21:36:06 -0000 1.2
@@ -1,71 +1,133 @@
-.TH m2vmp2cut 1 2010-12-13
+.TH m2vmp2cut 1 2012-10-18
.SH NAME
m2vmp2cut \- MPEG2 frame accurate cutter
.SH SYNOPSIS
.B m2vmp2cut
+.RB [ -batch ]
+.RI ( file | directory )
.I command
.RI [ argument "... ]"
.SH DESCRIPTION
.B M2vmp2cut
-is frame accurate (currently PAL) mpeg2 video (m2v file) with
+is a command-line driven frame accurate (currently PAL) mpeg2 video
+(m2v file) with
accompanied mp2 audio (mp2 file) cutter.
Frame accuracy is achieved by re-encoding video around cutpoints.
Audio is cut from separate mp2 file at positions that keep a/v sync as
good as possible (maximum sync difference is around 10-15
milliseconds).
+.PP
+M2vmp2cut requires 2 arguments,
+.IR file / directory
+and
+.IR command .
+Enter `.' as the file/directory argument when it is irrelevant.
+The following commands are available:
.TP
-.B lvev6frames
+.B "lvev6frames !"
Old versions of m2vmp2cut supported using lve-generated "edit lists"
for cutpoint information.
-With lvev6frames these old edits can be used with this m2vmp2cut
+With
+.B lvev6frames
+these old edits can be used with this m2vmp2cut
version.
+This is a deprecated feature.
+To use this the `!' needs to be added to the command line.
.TP
-\fBdemux\fP [\fIfile\fP...]
+\fBdemux\fP [\fIprojectx options\fP]
.B M2vmp2cut
requires mpeg files to be demuxed to elementary streams before
cutting.
This command uses
.BR ProjectX (1)
to do the demuxing.
-A separate directory (based on source filename) is created for output
+A separate directory (in current directory, based on source filename)
+is created for output
files.
-Note that this doubles the disk usage of a particular source file.
+.I "projectx options"
+may contain e.g. more filenames to be demuxed into output streams.
.TP
-\fBselect\fP \fIdirectory\fP
+.B select
This command uses new
.B m2vcut-gui
graphical utility for searching cutpoints.
This work is done frame-accurately.
.TP
-\fBcut\fP \fIdirectory\fP [\fIoption\fP...]
+\fBcut\fP [\fIoptions\fP] ...
This command is wrapper to m2vmp2cut.pl (which used to be the frontend
of m2vmp2cut in old versions).
-This command has extensive help of it's own.
+This command has extensive help.
Note that this (again) adds one third of disk usage so far when this
creates final output file.
.TP
-\fBplay\fP \fIdirectory\fP [\fIoption\fP...]
-This command runs mplayer for the file created with cut command.
+\fBplay\fP [\fIoptions\fP]
+This command runs
+.BR mplayer (1)
+for the file created with cut command.
.TP
-\fBmove\fP \fIdirectory\fP \fIdestfile\fP
+\fBmove\fP \fIdestfile\fP
Moves final output file to a new destination.
.TP
-\fBgetyuv\fP [\fIdirectory\fP|\fBexamples\fP]
+\fBgetyuv\fP [\fBexamples\fP]
Decodes selected mpeg2 frames as a stream of yuv4mpeg pictures.
Useful for further encoding.
+If an
+.B examples
+argument is given this command provides example output.
.TP
-\fBgetmp2\fP [\fIdirectory\fP|\fBexamples\fP]
+\fBgetmp2\fP [\fBexamples\fP]
Extracts selected mp2 audio data, to be muxed with (re-encoded) video.
Mp2 data can be used as is, or as encoded to mp3 or vorbis.
+If an
+.B examples
+argument is given this command provides example output.
.TP
.B help
-Display help message.
+Display an help message.
.TP
.B contrib
Contribution material.
Mostly encoding scripts.
The command line interface of the programs these scripts invoke may
-change over time \(em there is less quarantees that these work in
+change over time \(em there is less guarantees that these work in
future than other
.B m2vmp2cut
functionality, in short term period.
+.SH EXAMPLE
+First run:
+.IP
+m2vmp2cut \fImpeg2_file\fP demux \fImore mpeg2 files or other ProjectX opts\fP
+.PP
+to demultiplex the source mpeg2, then execute GUI for cutpoint hunt:
+.IP
+m2vmp2cut \fImpeg2_file/demux_outputdir\fP select
+.PP
+.I "demux outdir"
+is derived from the original mpeg2 file by removing latest suffix
+after dot (.) and replacing that with '.d'.
+.PP
+In order for to
+.I select
+to work the directory where m2v and mp2 files were demuxed
+must have
+.I video.m2v
+symlinked to the video and
+.I audio.mp2
+to the audio;
+if those exist, the
+.I select
+tool can be used to continue with content demuxed
+by something else than m2vmp2cut.
+.PP
+After selection of cutpoints are done, the
+.I cut
+command will create a new mpeg2 file from the selected contents,
+re-encoding some video frames to achieve frame accuracy.
+Audio frames don't require any re-encoding.
+Alternatively, there are some scripts in the
+.I contrib
+directory which can re-encode the selected material to other
+formats.
+The
+.I contrib
+command will show available contrib scripts.
Index: m2vmp2cut.spec
===================================================================
RCS file: /cvs/free/rpms/m2vmp2cut/F-18/m2vmp2cut.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- m2vmp2cut.spec 20 Mar 2012 12:02:57 -0000 1.7
+++ m2vmp2cut.spec 18 Oct 2012 21:36:08 -0000 1.8
@@ -1,19 +1,13 @@
Name: m2vmp2cut
-Version: 0.79
-Release: 10%{?dist}
+Version: 0.86
+Release: 1%{?dist}
Summary: MPEG2 frame accurate cutter
Summary(sv): MPEG2 bildprecis redigerare
-Group: Applications/Multimedia
License: GPLv2
URL: http://www.guru-group.fi/~too/sw/%{name}/
-Source0: http://www.guru-group.fi/~too/sw/%{name}/%{name}-%{version}-dev.tar.gz
+Source0: http://www.guru-group.fi/~too/sw/%{name}/%{name}-%{version}.tar.xz
Source1: %{name}.1
-Patch0: %{name}.optflags.patch
-Patch1: %{name}.libexec.patch
-Patch2: %{name}.help-in-share.patch
-Patch3: %{name}.timestamps.patch
-Patch4: %{name}.demuxpath.patch
BuildRequires: libtool
BuildRequires: gtk2-devel
BuildRequires: libmpeg2-devel
@@ -49,49 +43,51 @@
Bildprecision åstadkoms med omkodning av video runt snittpunkter.
Audio klipps från en separat mp2-fil på positions som håller
-a/v-synkroniseringen så bra som möjligt (maximal synkroniseringskillnad
+a/v-synkroniseringen så bra som möjligt (maximal synkroniseringsskillnad
är runt 10-15 millisekunder).
%prep
-%setup -q -n %{name}-%{version}-dev
-# Insert optimizer flags where needed
-%patch0
-# Put helper programs in libexec
-%patch1
-# Put help files in /usr/share
-%patch2
-# Preserve timestamps when installing
-%patch3
-# Bug which appears when trying to demux on a file not in the current
-# directory. It is reported upstreams via email, and the fix will be
-# integrated in a future version of m2vmp2cut
-%patch4 -p1
+%setup -q
%build
-unset CCACHE_UMASK
-make %{?_smp_mflags} CFLAGS='%{optflags} $(LF_OPTS)'
+make %{?_smp_mflags} OPTFLAGS='%{optflags}'
+
%install
-# Put a dummy projectx in the path. At run time, the real projectx
-# script will be used. With this trick we do not have to have
-# ProjectX as a BuildRequires.
+# Put dummy versions of a few commands the path. At run time, the
+# real programs will be used, the package requirements ensures that.
+# At build time only their existence is tested. With this trick we do
+# not have to add a lot of essentially unused stuff as a
+# BuildRequires.
mkdir dummybin
-touch dummybin/projectx
-chmod +x dummybin/projectx
-PATH=$(pwd)/dummybin:$PATH make install PREFIX=%{buildroot}%{_prefix}
+for command in projectx java mplex
+do touch dummybin/$command
+ chmod +x dummybin/$command
+done
+PATH=$(pwd)/dummybin:$PATH make install PREFIX=%{_prefix} \
+ LIBEXECDIR=%{_libexecdir}/%{name} DATAROOTDIR=%{_datadir} \
+ DESTDIR=%{buildroot}
mkdir -p %{buildroot}%{_mandir}/man1
cp -p %{SOURCE1} %{buildroot}%{_mandir}/man1
%files
%defattr(-,root,root,-)
-%doc ANNOUNCE COPYING HISTORY README TODO
+%doc ANNOUNCE COPYING NEWS README
%{_bindir}/%{name}
-%{_libexecdir}/%{name}-%{version}-dev
-%{_datadir}/%{name}
+%{_libexecdir}/%{name}
+%{_datadir}/doc/%{name}-%{version}
%{_mandir}/man1/%{name}.1.gz
%changelog
+* Sun Oct 7 2012 Göran Uddeborg <goeran(a)uddeborg.se> 0.86-1
+- Upgrade to version 0.86.
+- All patches have been included upstreams, in one way or another, and
+ are removed from the RPM
+- Remove "dev" directory suffix since this is an official release.
+- More dummy programs needed during build.
+- The manual page updated to match the current documentation.
+
* Tue Mar 20 2012 Göran Uddeborg <goeran(a)uddeborg.se> 0.79-10
- There should still be a guard around the perl filtering.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/m2vmp2cut/F-18/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 30 Dec 2010 18:06:48 -0000 1.2
+++ sources 18 Oct 2012 21:36:08 -0000 1.3
@@ -1 +1 @@
-9eb1e0455fa803b5f0cba34270532839 m2vmp2cut-0.79-dev.tar.gz
+6edee88ebbdb63e64b08896c6a5e280b m2vmp2cut-0.86.tar.xz
--- m2vmp2cut.demuxpath.patch DELETED ---
--- m2vmp2cut.help-in-share.patch DELETED ---
--- m2vmp2cut.libexec.patch DELETED ---
--- m2vmp2cut.optflags.patch DELETED ---
--- m2vmp2cut.timestamps.patch DELETED ---