6:11 p.m.
Author: goeran
Update of /cvs/free/rpms/m2vmp2cut/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9438/F-14
Modified Files:
.cvsignore sources
Added Files:
m2vmp2cut.1 m2vmp2cut.help-in-share.patch
m2vmp2cut.libexec.patch m2vmp2cut.optflags.patch
m2vmp2cut.spec m2vmp2cut.timestamps.patch
Log Message:
Importing m2vmp2cut in CVS for F-14.
--- NEW FILE m2vmp2cut.1 ---
.TH m2vmp2cut 1 2010-12-13
.SH NAME
m2vmp2cut \- MPEG2 frame accurate cutter
.SH SYNOPSIS
.B m2vmp2cut
.I command
.RI [ argument "... ]"
.SH DESCRIPTION
.B M2vmp2cut
is 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).
.TP
.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
version.
.TP
\fBdemux\fP [\fIfile\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
files.
Note that this doubles the disk usage of a particular source file.
.TP
\fBselect\fP \fIdirectory\fP
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...]
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.
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.
.TP
\fBmove\fP \fIdirectory\fP \fIdestfile\fP
Moves final output file to a new destination.
.TP
\fBgetyuv\fP [\fIdirectory\fP|\fBexamples\fP]
Decodes selected mpeg2 frames as a stream of yuv4mpeg pictures.
Useful for further encoding.
.TP
\fBgetmp2\fP [\fIdirectory\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.
.TP
.B help
Display 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
future than other
.B m2vmp2cut
functionality, in short term period.
m2vmp2cut.help-in-share.patch:
Makefile | 8 ++++----
bin/m2vmp2cut.pl | 2 +-
bin/wrapper.sh | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
--- NEW FILE m2vmp2cut.help-in-share.patch ---
--- bin/wrapper.sh~ 2009-01-24 12:04:23.000000000 +0100
+++ bin/wrapper.sh 2010-12-13 13:24:59.000000000 +0100
@@ -54,8 +54,8 @@
;;
m2vcut_outputhelp)
f=`echo $LANG |sed 's/[^A-Za-z_].*//'`
- pd=`cd \`dirname "$0"\`/..; pwd`
- helpprefix="$pd/doc/m2vcut_help"
+ pd=`cd \`dirname "$0"\`/../../..; pwd`
+ helpprefix="$pd/share/m2vmp2cut/m2vcut_help"
test -f "$helpprefix-$f" && cat "$helpprefix-$f" || cat
"$helpprefix-default"
read line
;;
--- bin/m2vmp2cut.pl~ 2009-02-07 21:54:24.000000000 +0100
+++ bin/m2vmp2cut.pl 2010-12-13 13:24:55.000000000 +0100
@@ -43,7 +43,7 @@
open STDOUT, ">&STDERR" || warn "1>&2 redirection failed:
$! !!!\n";
}
- system 'cat', "$M2VMP2CUT_CMD_PATH/../doc/$_[1]";
+ system 'cat',
"$M2VMP2CUT_CMD_PATH/../../../share/m2vmp2cut/$_[1]";
exit $_[0];
}
--- Makefile~ 2010-12-13 12:05:16.000000000 +0100
+++ Makefile 2010-12-13 12:14:26.000000000 +0100
@@ -35,8 +35,8 @@
m2vmp2cut.pl m2vmp2cut.sh m2v_catfiltered.py m2v_somehdrinfo.py \
wrapper.sh lvev6frames.pl getyuv.pl getmp2.sh m2vmp2cut.pm
-#TRG_DOCS = Examples m2vcut_help-default m2vcut_help-fi_FI Options Usage
-TRG_DOCS = m2vcut_help-default m2vcut_help-fi_FI Options Usage
+TRG_DOCS = Examples m2vcut_help-default m2vcut_help-fi_FI Options Usage
+#TRG_DOCS = m2vcut_help-default m2vcut_help-fi_FI Options Usage
chkfiles: all
@for i in $(TRG_BINS:%=bin/%) $(TRG_DOCS:%=doc/%); \
@@ -48,10 +48,10 @@
@chkdir() { [ -d "$$1" ] || mkdir -m 755 -p "$$1"; }; \
chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER); chkdir $(PREFIX)/bin; \
chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin; \
- chkdir $(PREFIX)/lib/m2vmp2cut-$(VER)/doc; \
+ chkdir $(PREFIX)/share/m2vmp2cut; \
chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
cp $(TRG_BINS:%=bin/%) $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin
- cp $(TRG_DOCS:%=doc/%) $(PREFIX)/lib/m2vmp2cut-$(VER)/doc
+ cp $(TRG_DOCS:%=doc/%) $(PREFIX)/share/m2vmp2cut
cp contrib/* $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
cp m2vmp2cut $(PREFIX)/bin/m2vmp2cut
@test x'$(PJXJAR)' = x || \
m2vmp2cut.libexec.patch:
Makefile | 12 ++++++------
m2vmp2cut | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
--- NEW FILE m2vmp2cut.libexec.patch ---
--- Makefile~ 2009-11-21 11:24:30.000000000 +0100
+++ Makefile 2010-12-11 23:20:17.000000000 +0100
@@ -44,15 +44,15 @@
@test -f m2vmp2cut
install: chkfiles chkprefix chkpjxjar
- @rm -rf $(PREFIX)/lib/m2vmp2cut-$(VER)
+ @rm -rf $(PREFIX)/libexec/m2vmp2cut-$(VER)
@chkdir() { [ -d "$$1" ] || mkdir -m 755 -p "$$1"; }; \
- chkdir $(PREFIX)/lib/m2vmp2cut-$(VER); chkdir $(PREFIX)/bin; \
- chkdir $(PREFIX)/lib/m2vmp2cut-$(VER)/bin; \
+ chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER); chkdir $(PREFIX)/bin; \
+ chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin; \
chkdir $(PREFIX)/lib/m2vmp2cut-$(VER)/doc; \
- chkdir $(PREFIX)/lib/m2vmp2cut-$(VER)/contrib
- cp $(TRG_BINS:%=bin/%) $(PREFIX)/lib/m2vmp2cut-$(VER)/bin
+ chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
+ cp $(TRG_BINS:%=bin/%) $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin
cp $(TRG_DOCS:%=doc/%) $(PREFIX)/lib/m2vmp2cut-$(VER)/doc
- cp contrib/* $(PREFIX)/lib/m2vmp2cut-$(VER)/contrib
+ cp contrib/* $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
cp m2vmp2cut $(PREFIX)/bin/m2vmp2cut
@test x'$(PJXJAR)' = x || \
ln -s $(PJXJAR) $(PREFIX)/lib/m2vmp2cut-$(VER)/bin/ProjectX.jar
--- m2vmp2cut~ 2009-11-21 11:25:18.000000000 +0100
+++ m2vmp2cut 2010-12-12 10:47:55.000000000 +0100
@@ -19,11 +19,11 @@
case $dn in
*bin)
- c1="$dn/../lib/m2vmp2cut-$ver/bin/m2vmp2cut.sh"
+ c1="$dn/../libexec/m2vmp2cut-$ver/bin/m2vmp2cut.sh"
test -x "$c1" && exec "$c1" "$@" \
|| exec "$dn/bin/m2vmp2cut.sh" "$@" ;;
*)
c1="$dn/bin/m2vmp2cut.sh"
test -x "$c1" && exec "$c1" "$@" \
- || exec "$dn/../lib/m2vmp2cut-$ver/bin/m2vmp2cut.sh" "$@" ;;
+ || exec "$dn/../libexec/m2vmp2cut-$ver/bin/m2vmp2cut.sh" "$@" ;;
esac
m2vmp2cut.optflags.patch:
m2vcut-gui.c | 2 +-
m2vtoyuv.c | 2 +-
warpxpointer.c | 2 +-
wavgraph.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE m2vmp2cut.optflags.patch ---
--- src/m2vcut-gui.c~ 2009-01-24 12:04:23.000000000 +0100
+++ src/m2vcut-gui.c 2010-12-20 19:22:21.000000000 +0100
@@ -7,7 +7,7 @@
xo="`pkg-config --cflags --libs gtk+-2.0` -lutil $mpeg2_both"
xo="$xo -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
date=`date`; set -x
-${CC:-gcc} -ggdb -std=gnu99 $WARN "$@" -o "$TRG" "$0" $xo
-DCDATE="\"$date\""
+${CC:-gcc} -ggdb -std=gnu99 $RPM_OPT_FLAGS "$@" -o "$TRG"
"$0" $xo -DCDATE="\"$date\""
# ${CC:-gcc} -O2 -std=c99 $WARN "$@" -o "$TRG" "$0" $xo
-DCDATE="\"$date\""
exit 0
*/
--- src/m2vtoyuv.c~ 2009-01-24 12:04:23.000000000 +0100
+++ src/m2vtoyuv.c 2010-12-20 19:25:06.000000000 +0100
@@ -7,7 +7,7 @@
XF="$mpeg2_only -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
date=`date`; set -x
#${CC:-gcc} -ggdb $WARN "$@" -o "$TRG" "$0" $XF
-DCDATE="\"$date\""
- ${CC:-gcc} -O2 $WARN "$@" -o "$TRG" "$0" $XF
-DCDATE="\"$date\""
+ ${CC:-gcc} $RPM_OPT_FLAGS "$@" -o "$TRG" "$0" $XF
-DCDATE="\"$date\""
exit 0
*/
#endif
--- src/warpxpointer.c~ 2009-01-24 12:04:23.000000000 +0100
+++ src/warpxpointer.c 2010-12-20 19:23:22.000000000 +0100
@@ -5,7 +5,7 @@
WARN="$WARN -W -Wwrite-strings -Wcast-qual -Wshadow" # -Wconversion
date=`date`; set -x
#${CC:-gcc} -ggdb $WARN "$@" -o "$TRG" "$0"
-DCDATE="\"$date\""
- ${CC:-gcc} -O2 $WARN "$@" -o "$TRG" "$0" -lX11
-DCDATE="\"$date\""
+ ${CC:-gcc} $RPM_OPT_FLAGS "$@" -o "$TRG" "$0" -lX11
-DCDATE="\"$date\""
exit $?
*/
#endif
--- src/wavgraph.c~ 2009-01-24 12:04:23.000000000 +0100
+++ src/wavgraph.c 2010-12-20 19:22:50.000000000 +0100
@@ -5,7 +5,7 @@
WARN="$WARN -W -Wwrite-strings -Wcast-qual -Wshadow" # -Wconversion
date=`date`; set -x
#${CC:-gcc} -ggdb -std=gnu99 $WARN "$@" -o "$TRG" "$0"
-DCDATE="\"$date\""
- ${CC:-gcc} -O2 -std=gnu99 $WARN "$@" -o "$TRG" "$0"
obj_b/x.o
+ ${CC:-gcc} -std=gnu99 $RPM_OPT_FLAGS "$@" -o "$TRG" "$0"
obj_b/x.o
exit $?
*/
#endif
--- NEW FILE m2vmp2cut.spec ---
Name: m2vmp2cut
Version: 0.79
Release: 5%{?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
Source1: %{name}.1
Patch0: %{name}.optflags.patch
Patch1: %{name}.libexec.patch
Patch2: %{name}.help-in-share.patch
Patch3: %{name}.timestamps.patch
BuildRequires: libtool
BuildRequires: gtk2-devel
BuildRequires: libmpeg2-devel
Requires: ProjectX
Requires: mjpegtools
Requires: python
Requires: xterm
Requires: bash
Requires: libmpeg2 >= 0.5.1
Requires: transcode
%filter_from_requires /perl(m2vmp2cut)/d
%filter_setup
%description
m2vmp2cut is 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).
%description -l sv
m2vmp2cut är ett bildprecist redigeringsprogram för mpeg2 video (för
närvarande PAL, m2v-fil) med tillhörande mp2-audio (mp2-fil).
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
ä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
%build
unset CCACHE_UMASK
make %{?_smp_mflags} CFLAGS='%{optflags} $(LF_OPTS)'
%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.
mkdir dummybin
touch dummybin/projectx
chmod +x dummybin/projectx
PATH=$(pwd)/dummybin:$PATH make install PREFIX=%{buildroot}%{_prefix}
mkdir -p %{buildroot}%{_mandir}/man1
cp -p %{SOURCE1} %{buildroot}%{_mandir}/man1
%files
%defattr(-,root,root,-)
%doc ANNOUNCE COPYING HISTORY README TODO
%{_bindir}/%{name}
%{_libexecdir}/%{name}-%{version}-dev
%{_datadir}/%{name}
%{_mandir}/man1/%{name}.1.gz
%changelog
* Mon Dec 27 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.79-5
- Simplify optimization patch, by not modifying the makefile where it only
does linking.
* Mon Dec 20 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.79-4
- Let rpm's optflags OVERRIDE rather than ADD TO the upstreams flags.
- Unset CCACHE_UMASK to avoid getting group writable binaries.
* Mon Dec 13 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.79-3
- Compile with optflags.
- Require transcode, it is strongly recommended even if not strictly required.
- License is GPLv2 only.
- Use a separate patch file to put helper programs in libexec.
- Put help files in /usr/share.
- Remove obsolete unused macro definitions.
- Filter perl requirements according to updated recommendations.
- Add disttag.
- Require the package xterm rather than the uxterm binary.
- Preserve timestamps when installing files.
- Add braces around variables.
- Include a simple manual pages, based on "m2vmp2cut help ."
* Sun Sep 19 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.79-2
- Added COPYING and doc/Examples to the documentation.
- Changed to "global" in definition of __perl_requires.
- Create a dummy projectx in the path, to avoid having ProjectX as a
build requirement.
* Thu Apr 8 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.79-1
- Version 0.79.
- SPEC file updated to match Fedora packaging standards.
* Tue Feb 10 2009 Göran Uddeborg <goeran(a)uddeborg.se> 0.77-1
- Version 0.77 with fix for an A/V sync problem.
* Sat Feb 7 2009 Göran Uddeborg <goeran(a)uddeborg.se> 0.76-2
- Add missing perl quote in m2vmp2cut.pl
* Sat Feb 7 2009 Göran Uddeborg <goeran(a)uddeborg.se> 0.76-1
- Bump to new version.
* Tue Sep 9 2008 Göran Uddeborg <goeran(a)uddeborg.se> 0.72-2
- Patch for sync problem.
* Sun Aug 17 2008 Göran Uddeborg <goeran(a)uddeborg.se> 0.72-1
- Version bump
- Fix for offset type bug
* Mon Jul 28 2008 Göran Uddeborg <goeran(a)uddeborg.se> 0.68-1
- First RPM packaging
m2vmp2cut.timestamps.patch:
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE m2vmp2cut.timestamps.patch ---
--- Makefile~ 2010-12-13 14:08:29.000000000 +0100
+++ Makefile 2010-12-13 14:37:33.000000000 +0100
@@ -50,10 +50,10 @@
chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin; \
chkdir $(PREFIX)/share/m2vmp2cut; \
chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
- cp $(TRG_BINS:%=bin/%) $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin
- cp $(TRG_DOCS:%=doc/%) $(PREFIX)/share/m2vmp2cut
- cp contrib/* $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
- cp m2vmp2cut $(PREFIX)/bin/m2vmp2cut
+ cp -p $(TRG_BINS:%=bin/%) $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin
+ cp -p $(TRG_DOCS:%=doc/%) $(PREFIX)/share/m2vmp2cut
+ cp -p contrib/* $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
+ cp -p m2vmp2cut $(PREFIX)/bin/m2vmp2cut
@test x'$(PJXJAR)' = x || \
ln -s $(PJXJAR) $(PREFIX)/lib/m2vmp2cut-$(VER)/bin/ProjectX.jar
# v=$(VER); sed "s/=devel/=$$v/" m2vmp2cut > $(PREFIX)/bin/m2vmp2cut
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/m2vmp2cut/F-14/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Dec 2010 11:26:21 -0000 1.1
+++ .cvsignore 30 Dec 2010 18:11:16 -0000 1.2
@@ -0,0 +1 @@
+m2vmp2cut-0.79-dev.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/m2vmp2cut/F-14/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Dec 2010 11:26:21 -0000 1.1
+++ sources 30 Dec 2010 18:11:16 -0000 1.2
@@ -0,0 +1 @@
+9eb1e0455fa803b5f0cba34270532839 m2vmp2cut-0.79-dev.tar.gz